feat: add SafeToString method and update dependency resolution logic

Author: kengwang

.github/workflows/nuget-push.yml

@@ -33,7 +33,7 @@ jobs:
           dotnet pack Depository.Extensions.DependencyInjection/Depository.Extensions.DependencyInjection.csproj -c Release -o Packages/
 
       - name: Publish Packages to Artifacts
-        uses: actions/upload-artifact@v3.1.1
+        uses: actions/upload-artifact@v4
         with:
           name: packages
           path: Packages

Depository.Core/Depository.Resolve.cs

@@ -284,8 +284,25 @@ private object ResolveTypeToObject(Type implementType, DependencyResolveOption?
 
 
         var parameterInfos = constructorInfo.GetParameters();
-        var parameters = new List<object>();
+        var parameters = ResolveParameterInfos(implementType, parameterInfos, option);
+        
+        var dependencyImpl = constructorInfo.Invoke(parameters.ToArray());
+        if (option?.FatherImplementations is { Count: > 0 })
+        {
+            foreach (var kvp in option.FatherImplementations)
+            {
+                _fatherToChildRelation.GetOrCreateValue(kvp.Value).Add(new WeakReference(dependencyImpl));
+                _childToFatherRelation.GetOrCreateValue(dependencyImpl).Add(new WeakReference(kvp.Value));
+            }
+        }
+        
+        return dependencyImpl;
+    }
+
+    public List<object> ResolveParameterInfos(Type implementType, ParameterInfo[] parameterInfos, DependencyResolveOption? option)
+    {
         var previousThrowWhenNotExists = true;
+        var parameters = new List<object>();
         foreach (var parameterInfo in parameterInfos)
         {
             if (option?.FatherImplementations?.TryGetValue(parameterInfo.ParameterType, out var impl) is true)
@@ -305,7 +322,7 @@ private object ResolveTypeToObject(Type implementType, DependencyResolveOption?
                     if (msattr is not null)
                     {
                         var key = msattr.GetType().GetProperty("Key")?.GetValue(msattr);
-                        option.RelationName = $"{key?.GetType()}:{key?.GetHashCode()}";
+                        option.RelationName = SafeToString(key);
                     }
                 }
                 if (parameterInfo.GetCustomAttributes().FirstOrDefault(t => t is FromNamedServiceAttribute) is
@@ -337,20 +354,9 @@ private object ResolveTypeToObject(Type implementType, DependencyResolveOption?
                     $"The constructor of {implementType.Name} contains a parameter called {parameterInfo.Name} ({parameterInfo.Position}) which cannot resolved");
             }
         }
-
         if (option is not null)
             option.ThrowWhenNotExists = previousThrowWhenNotExists;
-        var dependencyImpl = constructorInfo.Invoke(parameters.ToArray());
-        if (option?.FatherImplementations is { Count: > 0 })
-        {
-            foreach (var kvp in option.FatherImplementations)
-            {
-                _fatherToChildRelation.GetOrCreateValue(kvp.Value).Add(new WeakReference(dependencyImpl));
-                _childToFatherRelation.GetOrCreateValue(dependencyImpl).Add(new WeakReference(kvp.Value));
-            }
-        }
-
-        return dependencyImpl;
+        return parameters;
     }
 
 
@@ -418,4 +424,23 @@ private object ResolveSingleton(Type implementType, DependencyResolveOption? opt
         RootScope.SetImplementation(implementType, impl, option?.RelationName);
         return impl;
     }
+    
+    internal static string SafeToString(object? obj)
+    {
+        if (obj == null)
+            return "null";
+
+        var type = obj.GetType();
+        var toStringMethod = type.GetMethod("ToString", Type.EmptyTypes);
+
+        // 检查是否在当前类型中重写了 ToString（排除继承自 object 的）
+        if (toStringMethod != null && toStringMethod.DeclaringType != typeof(object))
+        {
+            return obj.ToString();
+        }
+        else
+        {
+            return $"{type.FullName}@{obj.GetHashCode():X}";
+        }
+    }
 }

Depository.Core/Depository.cs

@@ -1,9 +1,12 @@
-using Depository.Abstraction.Enums;
+using System.Runtime.CompilerServices;
+using Depository.Abstraction.Enums;
 using Depository.Abstraction.Interfaces;
 using Depository.Abstraction.Interfaces.Pipeline;
 using Depository.Abstraction.Models;
 using Depository.Abstraction.Models.Options;
 
+[assembly:InternalsVisibleTo("Depository.Extensions.DependencyInjection")]
+
 namespace Depository.Core;
 
 public partial class Depository : IDepository

Depository.Extensions.DependencyInjection/DepositoryServiceProvider.cs

@@ -35,15 +35,15 @@ public object GetRequiredService(Type serviceType)
             return _depository.ResolveDependency(serviceType, new DependencyResolveOption()
             {
                 ThrowWhenNotExists = false,
-                RelationName = DepositoryServiceProviderFactory.SafeToString(serviceKey)
+                RelationName = Core.Depository.SafeToString(serviceKey)
             });
         }
 
         public object GetRequiredKeyedService(Type serviceType, object? serviceKey)
         {
             return _depository.ResolveDependency(serviceType, new DependencyResolveOption()
             {
-                RelationName = DepositoryServiceProviderFactory.SafeToString(serviceKey)
+                RelationName = Core.Depository.SafeToString(serviceKey)
             });
         }
 
@@ -55,7 +55,7 @@ public bool IsService(Type serviceType)
         public bool IsKeyedService(Type serviceType, object? serviceKey)
         {
             var dependency = _depository.GetDependency(serviceType);
-            return dependency is not null && _depository.GetRelations(dependency).Any(t=>t.Name == DepositoryServiceProviderFactory.SafeToString(serviceKey));
+            return dependency is not null && _depository.GetRelations(dependency).Any(t=>t.Name == Core.Depository.SafeToString(serviceKey));
         }
 
         public IServiceScope CreateScope()

Depository.Extensions.DependencyInjection/DepositoryServiceProviderFactory.cs

@@ -50,7 +50,7 @@ serviceDescriptor.KeyedImplementationInstance is null &&
                     relation = new DependencyRelation(serviceDescriptor.KeyedImplementationType!)
                     {
                         DefaultImplementation = serviceDescriptor.KeyedImplementationInstance,
-                        Name = SafeToString(serviceDescriptor.ServiceKey)
+                        Name = Core.Depository.SafeToString(serviceDescriptor.ServiceKey)
                     };
                     if (serviceDescriptor.KeyedImplementationFactory is not null)
                     {
@@ -99,24 +99,5 @@ private static void QuickAddSingleton<TService, TImplement>(IDepository deposito
             var relation = new DependencyRelation(typeof(TImplement), sp);
             depository.AddRelation(dependency, relation);
         }
-        
-        public static string SafeToString(object? obj)
-        {
-            if (obj == null)
-                return "null";
-
-            var type = obj.GetType();
-            var toStringMethod = type.GetMethod("ToString", Type.EmptyTypes);
-
-            // 检查是否在当前类型中重写了 ToString（排除继承自 object 的）
-            if (toStringMethod != null && toStringMethod.DeclaringType != typeof(object))
-            {
-                return obj.ToString();
-            }
-            else
-            {
-                return $"{type.FullName}@{obj.GetHashCode():X}";
-            }
-        }
     }
 }