refactor: including package path in implicit service name

di_test.go

@@ -52,27 +52,27 @@ func TestProvide(t *testing.T) {
 
 	is.Len(i.services, 2)
 
-	s1, ok1 := i.services["*do.test"]
+	s1, ok1 := i.services["github.com/samber/do.*test"]
 	is.True(ok1)
 	if ok1 {
 		s, ok := s1.(Service[*test])
 		is.True(ok)
 		if ok {
-			is.Equal("*do.test", s.getName())
+			is.Equal("github.com/samber/do.*test", s.getName())
 		}
 	}
 
-	s2, ok2 := i.services["do.test"]
+	s2, ok2 := i.services["github.com/samber/do.test"]
 	is.True(ok2)
 	if ok2 {
 		s, ok := s2.(Service[test])
 		is.True(ok)
 		if ok {
-			is.Equal("do.test", s.getName())
+			is.Equal("github.com/samber/do.test", s.getName())
 		}
 	}
 
-	_, ok3 := i.services["*do.plop"]
+	_, ok3 := i.services["github.com/samber/do.*plop"]
 	is.False(ok3)
 }
 
@@ -133,7 +133,7 @@ func TestInvoke(t *testing.T) {
 
 	is.Len(i.services, 1)
 
-	s0a, ok0a := i.services["do.test"]
+	s0a, ok0a := i.services["github.com/samber/do.test"]
 	is.True(ok0a)
 
 	s0b, ok0b := s0a.(*ServiceLazy[test])
@@ -348,24 +348,24 @@ func TestDoubleInjection(t *testing.T) {
 		})
 	})
 
-	is.PanicsWithError("DI: service `*do.test` has already been declared", func() {
+	is.PanicsWithError("DI: service `github.com/samber/do.*test` has already been declared", func() {
 		Provide(i, func(i *Injector) (*test, error) {
 			return &test{}, nil
 		})
 	})
 
-	is.PanicsWithError("DI: service `*do.test` has already been declared", func() {
+	is.PanicsWithError("DI: service `github.com/samber/do.*test` has already been declared", func() {
 		ProvideValue(i, &test{})
 	})
 
-	is.PanicsWithError("DI: service `*do.test` has already been declared", func() {
-		ProvideNamed(i, "*do.test", func(i *Injector) (*test, error) {
+	is.PanicsWithError("DI: service `github.com/samber/do.*test` has already been declared", func() {
+		ProvideNamed(i, "github.com/samber/do.*test", func(i *Injector) (*test, error) {
 			return &test{}, nil
 		})
 	})
 
-	is.PanicsWithError("DI: service `*do.test` has already been declared", func() {
-		ProvideNamedValue(i, "*do.test", &test{})
+	is.PanicsWithError("DI: service `github.com/samber/do.*test` has already been declared", func() {
+		ProvideNamedValue(i, "github.com/samber/do.*test", &test{})
 	})
 }
 
@@ -389,15 +389,15 @@ func TestOverride(t *testing.T) {
 		})
 		is.Equal(1, MustInvoke[*test](i).foobar)
 
-		OverrideNamed(i, "*do.test", func(i *Injector) (*test, error) {
+		OverrideNamed(i, "github.com/samber/do.*test", func(i *Injector) (*test, error) {
 			return &test{2}, nil
 		})
 		is.Equal(2, MustInvoke[*test](i).foobar)
 
 		OverrideValue(i, &test{3})
 		is.Equal(3, MustInvoke[*test](i).foobar)
 
-		OverrideNamedValue(i, "*do.test", &test{4})
+		OverrideNamedValue(i, "github.com/samber/do.*test", &test{4})
 		is.Equal(4, MustInvoke[*test](i).foobar)
 	})
 }

service.go

@@ -1,7 +1,7 @@
 package do
 
 import (
-	"fmt"
+	"reflect"
 )
 
 type Service[T any] interface {
@@ -22,15 +22,34 @@ type shutdownableService interface {
 
 func generateServiceName[T any]() string {
 	var t T
+	typeOfT := reflect.TypeOf(t)
+	prefix := ""
 
-	// struct
-	name := fmt.Sprintf("%T", t)
-	if name != "<nil>" {
-		return name
+	if typeOfT == nil {
+		typeOfT = reflect.TypeOf(&t)
 	}
 
-	// interface
-	return fmt.Sprintf("%T", new(T))
+	for {
+		if typeOfT.Kind() == reflect.Pointer {
+			typeOfT = typeOfT.Elem()
+			prefix += "*"
+		} else if typeOfT.Kind() == reflect.Slice || typeOfT.Kind() == reflect.Array {
+			typeOfT = typeOfT.Elem()
+			prefix += "[]"
+		} else {
+			break
+		}
+	}
+
+	if typeOfT.Name() == "" {
+		// @TODO: handle "any" and "interface{}" types
+	}
+
+	pkgPath := typeOfT.PkgPath()
+	if pkgPath != "" {
+		pkgPath += "."
+	}
+	return pkgPath + prefix + typeOfT.Name()
 }
 
 type Healthcheckable interface {

service_test.go

@@ -9,14 +9,54 @@ import (
 func TestGenerateServiceName(t *testing.T) {
 	is := assert.New(t)
 
-	type test struct{} //nolint:unused
+	type testStruct struct{} //nolint:unused
 
-	name := generateServiceName[test]()
-	is.Equal("do.test", name)
+	type testInterface interface{} //nolint:unused
 
-	name = generateServiceName[*test]()
-	is.Equal("*do.test", name)
+	name := generateServiceName[testStruct]()
+	is.Equal("github.com/samber/do.testStruct", name)
+	name = generateServiceName[[]testStruct]()
+	is.Equal("github.com/samber/do.[]testStruct", name)
+
+	name = generateServiceName[*testStruct]()
+	is.Equal("github.com/samber/do.*testStruct", name)
+	name = generateServiceName[*[]testStruct]()
+	is.Equal("github.com/samber/do.*[]testStruct", name)
+	name = generateServiceName[[]*testStruct]()
+	is.Equal("github.com/samber/do.[]*testStruct", name)
+	name = generateServiceName[*[]*testStruct]()
+	is.Equal("github.com/samber/do.*[]*testStruct", name)
+	name = generateServiceName[*[]*[]**testStruct]()
+	is.Equal("github.com/samber/do.*[]*[]**testStruct", name)
+
+	name = generateServiceName[***testStruct]()
+	is.Equal("github.com/samber/do.***testStruct", name)
+	name = generateServiceName[testInterface]()
+	is.Equal("github.com/samber/do.*testInterface", name)
+	name = generateServiceName[*testInterface]()
+	is.Equal("github.com/samber/do.*testInterface", name)
+	name = generateServiceName[***testInterface]()
+	is.Equal("github.com/samber/do.***testInterface", name)
 
 	name = generateServiceName[int]()
 	is.Equal("int", name)
+	name = generateServiceName[[]int]()
+	is.Equal("[]int", name)
+
+	name = generateServiceName[*int]()
+	is.Equal("*int", name)
+	name = generateServiceName[*[]int]()
+	is.Equal("*[]int", name)
+	name = generateServiceName[[]*int]()
+	is.Equal("[]*int", name)
+	name = generateServiceName[*[]*int]()
+	is.Equal("*[]*int", name)
+	name = generateServiceName[*[]*[]**int]()
+	is.Equal("*[]*[]**int", name)
+
+	// name = generateServiceName[any]()
+	// is.Equal("any", name)
+
+	// name = generateServiceName[*any]()
+	// is.Equal("any", name)
 }