fix(fxworker): Fix resolution collision by using full import path in type IDs (ankorstore#365)

Author: damnedest

fxworker/reflect.go

@@ -4,12 +4,39 @@ import (
 	"reflect"
 )
 
-// GetType returns the type of a target.
+// fullTypeID builds a stable identifier for a type in the form "<pkgpath>.<TypeName>".
+func fullTypeID(t reflect.Type) string {
+	if t == nil {
+		return ""
+	}
+
+	// Unwrap pointers to get the underlying named type (if any).
+	for t.Kind() == reflect.Pointer {
+		t = t.Elem()
+	}
+
+	// For named types, PkgPath() + Name() gives a unique and stable identity.
+	if t.Name() != "" && t.PkgPath() != "" {
+		return t.PkgPath() + "." + t.Name()
+	}
+
+	// Fallback for non-named kinds (slices, maps, func, etc.).
+	return t.String()
+}
+
+// GetType returns a stable identifier for the given target’s type.
 func GetType(target any) string {
-	return reflect.TypeOf(target).String()
+	return fullTypeID(reflect.TypeOf(target))
 }
 
-// GetReturnType returns the return type of a target.
+// GetReturnType returns a stable identifier for the return type of constructor-like target.
+// If a target is a function, we examine its first return value (index 0), unwrap pointers, and
+// build an identifier for that named type. For non-function or empty-return cases, we return "".
 func GetReturnType(target any) string {
-	return reflect.TypeOf(target).Out(0).String()
+	t := reflect.TypeOf(target)
+	if t == nil || t.Kind() != reflect.Func || t.NumOut() == 0 {
+		return ""
+	}
+
+	return fullTypeID(t.Out(0))
 }

fxworker/reflect_test.go

@@ -15,9 +15,10 @@ func TestGetType(t *testing.T) {
 		target   any
 		expected string
 	}{
+		{nil, ""},
 		{123, "int"},
 		{"test", "string"},
-		{workers.NewClassicWorker(), "*workers.ClassicWorker"},
+		{workers.NewClassicWorker(), "github.com/ankorstore/yokai/worker/testdata/workers.ClassicWorker"},
 	}
 
 	for _, tt := range tests {
@@ -39,6 +40,7 @@ func TestGetReturnType(t *testing.T) {
 		target   any
 		expected string
 	}{
+		{nil, ""},
 		{func() string { return "test" }, "string"},
 		{func() int { return 123 }, "int"},
 	}

fxworker/registry_test.go

@@ -31,8 +31,8 @@ func TestResolveCheckerProbesRegistrationsSuccess(t *testing.T) {
 			workers.NewCancellableWorker(),
 		},
 		Definitions: []fxworker.WorkerDefinition{
-			fxworker.NewWorkerDefinition("*workers.ClassicWorker"),
-			fxworker.NewWorkerDefinition("*workers.CancellableWorker"),
+			fxworker.NewWorkerDefinition("github.com/ankorstore/yokai/worker/testdata/workers.ClassicWorker"),
+			fxworker.NewWorkerDefinition("github.com/ankorstore/yokai/worker/testdata/workers.CancellableWorker"),
 		},
 	}