Add keyed service support

gehongyan · Nov 6, 2024 · d81d27e · d81d27e
1 parent 75355f7
commit d81d27e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/src/Kook.Net.Commands/Kook.Net.Commands.csproj b/src/Kook.Net.Commands/Kook.Net.Commands.csproj
@@ -13,4 +13,8 @@
     <ProjectReference Include="..\Kook.Net.Core\Kook.Net.Core.csproj"/>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Kook.Net.Commands/Utilities/ReflectionUtils.cs b/src/Kook.Net.Commands/Utilities/ReflectionUtils.cs
@@ -1,4 +1,5 @@
 using System.Reflection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Kook.Commands;
 
@@ -18,12 +19,12 @@ internal static Func<IServiceProvider, T> CreateBuilder<T>(TypeInfo typeInfo, Co
         return services =>
         {
             object[] args = parameters
-                .Select(x => GetMember(commands, services, x.ParameterType, typeInfo))
+                .Select(x => GetMember(commands, services, x.ParameterType, typeInfo, x.GetCustomAttributes()))
                 .ToArray();
 
             T obj = InvokeConstructor<T>(constructor, args, typeInfo);
             foreach (PropertyInfo property in properties)
-                property.SetValue(obj, GetMember(commands, services, property.PropertyType, typeInfo));
+                property.SetValue(obj, GetMember(commands, services, property.PropertyType, typeInfo, null));
             return obj;
         };
     }
@@ -68,11 +69,13 @@ private static PropertyInfo[] GetProperties(TypeInfo? ownerType)
         return result.ToArray();
     }
 
-    private static object GetMember(CommandService commands, IServiceProvider services, Type memberType, TypeInfo ownerType)
+    private static object GetMember(CommandService commands, IServiceProvider services, Type memberType, TypeInfo ownerType, IEnumerable<object>? attributes)
     {
         if (memberType == typeof(CommandService)) return commands;
         if (memberType == typeof(IServiceProvider) || memberType == services.GetType()) return services;
-        object? service = services.GetService(memberType);
+        object? service = attributes?.FirstOrDefault(x => x.GetType() == typeof(FromKeyedServicesAttribute)) is { } keyedAttribute
+            ? services.GetKeyedServices(memberType, ((FromKeyedServicesAttribute)keyedAttribute).Key).First()
+            : services.GetService(memberType);
         if (service != null) return service;
         throw new InvalidOperationException($"Failed to create \"{ownerType.FullName}\", dependency \"{memberType.Name}\" was not found.");
     }