WIP FromKeyedServices

neuecc · neuecc · commit 9aaa85cbe2db · 2025-06-19T16:44:44.000+09:00
diff --git a/sandbox/CliFrameworkBenchmark/Program.cs b/sandbox/CliFrameworkBenchmark/Program.cs
@@ -1,4 +1,4 @@
-// This benchmark project is based on CliFx.Benchmarks.
+﻿// This benchmark project is based on CliFx.Benchmarks.
 // https://github.com/Tyrrrz/CliFx/tree/master/CliFx.Benchmarks/
 
 using BenchmarkDotNet.Configs;
diff --git a/sandbox/GeneratorSandbox/Program.cs b/sandbox/GeneratorSandbox/Program.cs
@@ -1,4 +1,4 @@
-#nullable enable
+﻿#nullable enable
 
 using ConsoleAppFramework;
 using GeneratorSandbox;
@@ -38,14 +38,20 @@
 
 var app = ConsoleApp.Create();
 
-app.Add("run", (string project, ConsoleAppContext context) =>
+app.Add("run", ([FromKeyedServices("takoyaki")] List<int> testList, string project, ConsoleAppContext context) =>
 {
     // run --project foo.csproj -- --foo 100 --bar bazbaz
     Console.WriteLine(string.Join(" ", context.Arguments));
 
     // --project foo.csproj
     Console.WriteLine(string.Join(" ", context.CommandArguments!));
 
+    //IServiceProvider ServiceProvider = null!;
+    // ((Microsoft.Extensions.DependencyInjection.IKeyedServiceProvider)ServiceProvider).GetKeyedService(Type, "");
+
+    // FromKeyedServicesAttribute
+    // IKeyedServiceProvider
+
     // --foo 100 --bar bazbaz
     Console.WriteLine(string.Join(" ", context.EscapedArguments!));
 });
diff --git a/src/ConsoleAppFramework/Command.cs b/src/ConsoleAppFramework/Command.cs
@@ -1,4 +1,4 @@
-using Microsoft.CodeAnalysis;
+﻿using Microsoft.CodeAnalysis;
 using System.Text;
 
 namespace ConsoleAppFramework;
@@ -159,9 +159,11 @@ public record class CommandParameter
     public object? DefaultValue { get; init; }
     public required EquatableTypeSymbol? CustomParserType { get; init; }
     public required bool IsFromServices { get; init; }
+    public required bool IsFromKeyedServices { get; init; }
+    public required object? KeyedServiceKey { get; init; }
     public required bool IsConsoleAppContext { get; init; }
     public required bool IsCancellationToken { get; init; }
-    public bool IsParsable => !(IsFromServices || IsCancellationToken || IsConsoleAppContext);
+    public bool IsParsable => !(IsFromServices || IsFromKeyedServices || IsCancellationToken || IsConsoleAppContext);
     public bool IsFlag => Type.SpecialType == SpecialType.System_Boolean;
     public required bool HasValidation { get; init; }
     public required int ArgumentIndex { get; init; } // -1 is not Argument, other than marked as [Argument]
@@ -330,6 +332,14 @@ public string ToTypeShortString()
         return IsNullableReference ? $"{t}?" : t;
     }
 
+    public string GetFormattedKeyedServiceKey()
+    {
+        if (KeyedServiceKey == null) return "null";
+
+        if (KeyedServiceKey is string) return $"\"{KeyedServiceKey}\"";
+        return $"({KeyedServiceKey.GetType().FullName}){KeyedServiceKey.ToString()}";
+    }
+
     public override string ToString()
     {
         var sb = new StringBuilder();
diff --git a/src/ConsoleAppFramework/ConsoleAppGenerator.cs b/src/ConsoleAppFramework/ConsoleAppGenerator.cs
@@ -1,4 +1,4 @@
-using Microsoft.CodeAnalysis;
+﻿using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using System.Collections.Immutable;
@@ -31,7 +31,7 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
                     var name = x.Display;
                     if (name == null) continue;
 
-                    if (!hasDependencyInjection && name.EndsWith("Microsoft.Extensions.DependencyInjection.dll")) // BuildServiceProvider
+                    if (!hasDependencyInjection && name.EndsWith("Microsoft.Extensions.DependencyInjection.dll")) // BuildServiceProvider, IKeyedServiceProvider
                     {
                         hasDependencyInjection = true;
                         continue;
diff --git a/src/ConsoleAppFramework/Emitter.cs b/src/ConsoleAppFramework/Emitter.cs
@@ -1,4 +1,4 @@
-using Microsoft.CodeAnalysis;
+﻿using Microsoft.CodeAnalysis;
 using System.Reflection.Metadata;
 
 namespace ConsoleAppFramework;
@@ -123,6 +123,12 @@ public void EmitRun(SourceBuilder sb, CommandWithId commandWithId, bool isRunAsy
                     var type = parameter.Type.ToFullyQualifiedFormatDisplayString();
                     sb.AppendLine($"var arg{i} = ({type})ServiceProvider!.GetService(typeof({type}))!;");
                 }
+                else if (parameter.IsFromKeyedServices)
+                {
+                    var type = parameter.Type.ToFullyQualifiedFormatDisplayString();
+                    var line = $"var arg{i} = ({type})((Microsoft.Extensions.DependencyInjection.IKeyedServiceProvider)ServiceProvider).GetKeyedService(typeof({type}), {parameter.GetFormattedKeyedServiceKey()})!;";
+                    sb.AppendLine(line);
+                }
             }
             sb.AppendLineIfExists(command.Parameters.AsSpan());
 
diff --git a/src/ConsoleAppFramework/Parser.cs b/src/ConsoleAppFramework/Parser.cs
@@ -1,4 +1,4 @@
-using Microsoft.CodeAnalysis;
+﻿using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 
@@ -321,6 +321,40 @@ internal class Parser(ConsoleAppFrameworkGeneratorOptions generatorOptions, Diag
                         return identifier is "FromServices" or "FromServicesAttribute";
                     });
 
+                object? keyedServiceKey = null;
+                var isFromKeyedServices = x.AttributeLists.SelectMany(x => x.Attributes)
+                    .Any(x =>
+                    {
+                        var name = x.Name;
+                        if (x.Name is QualifiedNameSyntax qns)
+                        {
+                            name = qns.Right;
+                        }
+                        
+                        var identifier = name.ToString();
+                        var result = identifier is "FromKeyedServices" or "FromKeyedServicesAttribute";
+                        if (result)
+                        {
+                            SemanticModel semanticModel = model; // we can use SemanticModel
+                            if (x.ArgumentList?.Arguments.Count > 0)
+                            {
+                                var argumentExpression = x.ArgumentList.Arguments[0].Expression;
+
+                                var constantValue = semanticModel.GetConstantValue(argumentExpression);
+                                if (constantValue.HasValue)
+                                {
+                                    keyedServiceKey = constantValue.Value;
+                                }
+                                else if (argumentExpression is TypeOfExpressionSyntax typeOf)
+                                {
+                                    var typeInfo = semanticModel.GetTypeInfo(typeOf.Type);
+                                    keyedServiceKey = typeInfo.Type;
+                                }
+                            }
+                        }
+                        return result;
+                    });
+
                 var hasArgument = x.AttributeLists.SelectMany(x => x.Attributes)
                     .Any(x =>
                     {
@@ -368,6 +402,8 @@ internal class Parser(ConsoleAppFrameworkGeneratorOptions generatorOptions, Diag
                     HasValidation = hasValidation,
                     IsCancellationToken = isCancellationToken,
                     IsFromServices = isFromServices,
+                    IsFromKeyedServices = isFromKeyedServices,
+                    KeyedServiceKey = keyedServiceKey,
                     Aliases = [],
                     Description = "",
                     ArgumentIndex = argumentIndex,
@@ -512,11 +548,18 @@ internal class Parser(ConsoleAppFrameworkGeneratorOptions generatorOptions, Diag
             {
                 var customParserType = x.GetAttributes().FirstOrDefault(x => x.AttributeClass?.AllInterfaces.Any(y => y.Name == "IArgumentParser") ?? false);
                 var hasFromServices = x.GetAttributes().Any(x => x.AttributeClass?.Name == "FromServicesAttribute");
+                var hasFromKeyedServices = x.GetAttributes().Any(x => x.AttributeClass?.Name == "FromKeyedServicesAttribute");
                 var hasArgument = x.GetAttributes().Any(x => x.AttributeClass?.Name == "ArgumentAttribute");
                 var hasValidation = x.GetAttributes().Any(x => x.AttributeClass?.GetBaseTypes().Any(y => y.Name == "ValidationAttribute") ?? false);
                 var isCancellationToken = SymbolEqualityComparer.Default.Equals(x.Type, wellKnownTypes.CancellationToken);
                 var isConsoleAppContext = x.Type!.Name == "ConsoleAppContext";
 
+                object? keyedServiceKey = null;
+                if (hasFromKeyedServices)
+                {
+                    // TODO: try to get keyedservicekey
+                }
+
                 string description = "";
                 string[] aliases = [];
                 if (parameterDescriptions != null && parameterDescriptions.TryGetValue(x.Name, out var desc))
@@ -554,6 +597,8 @@ internal class Parser(ConsoleAppFrameworkGeneratorOptions generatorOptions, Diag
                     CustomParserType = customParserType?.AttributeClass?.ToEquatable(),
                     IsCancellationToken = isCancellationToken,
                     IsFromServices = hasFromServices,
+                    IsFromKeyedServices = hasFromKeyedServices,
+                    KeyedServiceKey = keyedServiceKey,
                     HasValidation = hasValidation,
                     Aliases = aliases,
                     ArgumentIndex = argumentIndex,

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-// This benchmark project is based on CliFx.Benchmarks.`
	`1`	`+// This benchmark project is based on CliFx.Benchmarks.`
`2`	`2`	`// https://github.com/Tyrrrz/CliFx/tree/master/CliFx.Benchmarks/`
`3`	`3`
`4`	`4`	`using BenchmarkDotNet.Configs;`