Add ConsoleAPp.Create(configure) if MS.E.DI is referenced

Author: neuecc

sandbox/GeneratorSandbox/Filters.cs

@@ -1,6 +1,6 @@
 
 using ConsoleAppFramework;
-using Microsoft.Extensions.DependencyInjection;
+// using Microsoft.Extensions.DependencyInjection;
 using System.Diagnostics;
 using System.Reflection;
 
@@ -107,12 +107,12 @@ public override async Task InvokeAsync(ConsoleAppContext context, CancellationTo
 }
 
 
-internal class ServiceProviderScopeFilter(IServiceProvider serviceProvider, ConsoleAppFilter next) : ConsoleAppFilter(next)
-{
-    public override async Task InvokeAsync(ConsoleAppContext context, CancellationToken cancellationToken)
-    {
-        // create Microsoft.Extensions.DependencyInjection scope
-        await using var scope = serviceProvider.CreateAsyncScope();
-        await Next.InvokeAsync(context, cancellationToken);
-    }
-}
+//internal class ServiceProviderScopeFilter(IServiceProvider serviceProvider, ConsoleAppFilter next) : ConsoleAppFilter(next)
+//{
+//    public override async Task InvokeAsync(ConsoleAppContext context, CancellationToken cancellationToken)
+//    {
+//        // create Microsoft.Extensions.DependencyInjection scope
+//        await using var scope = serviceProvider.CreateAsyncScope();
+//        await Next.InvokeAsync(context, cancellationToken);
+//    }
+//}

sandbox/GeneratorSandbox/Program.cs

@@ -1,11 +1,20 @@
 using ConsoleAppFramework;
 using FilterShareProject;
+using Microsoft.Extensions.DependencyInjection;
 
 
 args = ["Output"];
 
 var app = ConsoleApp.Create();
 
+// ConsoleApp.ServiceProvider
+// ConsoleApp.Create(
+
+ConsoleApp.Create(sc =>
+{
+    
+});
+
 app.Add<MyCommands>();
 
 app.Run(args);
@@ -38,4 +47,24 @@ public void Output(string msg = @"\\")
     {
         Console.WriteLine(msg); // 「\」
     }
+}
+
+namespace ConsoleAppFramework
+{
+    internal static partial class ConsoleApp
+    {
+        //public static ConsoleAppBuilder Create(IServiceProvider serviceProvider)
+        //{
+        //    ConsoleApp.ServiceProvider = serviceProvider;
+        //    return ConsoleApp.Create();
+        //}
+
+        //public static ConsoleAppBuilder Create(Action<IServiceCollection> configure)
+        //{
+        //    var services = new ServiceCollection();
+        //    configure(services);
+        //    ConsoleApp.ServiceProvider = services.BuildServiceProvider();
+        //    return ConsoleApp.Create();
+        //}
+    }
 }

src/ConsoleAppFramework/ConsoleAppGenerator.cs

@@ -199,6 +199,12 @@ public static Task RunAsync(string[] args)
 
     public static ConsoleAppBuilder Create() => new ConsoleAppBuilder();
 
+    public static ConsoleAppBuilder Create(IServiceProvider serviceProvider)
+    {
+        ConsoleApp.ServiceProvider = serviceProvider;
+        return ConsoleApp.Create();
+    }
+
     static void ThrowArgumentParseFailed(string argumentName, string value)
     {
         throw new ArgumentParseFailedException($"Argument '{argumentName}' failed to parse, provided value: {value}");
@@ -667,6 +673,26 @@ static void EmitConsoleAppBuilder(SourceProductionContext sourceProductionContex
             emitter.EmitHelp(help, commandIds!);
         }
         sourceProductionContext.AddSource("ConsoleApp.Builder.Help.g.cs", help.ToString());
+
+        // emit Create(IServiceCollection) if exists Microsoft.Extensions.DependencyInjection.ServiceCollection
+        if (collectBuilderContext.HasDependencyInjectionReference)
+        {
+            var runBuilder = new SourceBuilder(0);
+            runBuilder.AppendLine(GeneratedCodeHeader);
+            runBuilder.AppendLine("using Microsoft.Extensions.DependencyInjection");
+            runBuilder.AppendLine();
+            using (runBuilder.BeginBlock("internal static partial class ConsoleApp"))
+            {
+                using (runBuilder.BeginBlock("public static ConsoleAppBuilder Create(Action<IServiceCollection> configure)"))
+                {
+                    runBuilder.AppendLine("var services = new ServiceCollection();");
+                    runBuilder.AppendLine("configure(services);");
+                    runBuilder.AppendLine("ConsoleApp.ServiceProvider = services.BuildServiceProvider();");
+                    runBuilder.AppendLine("return ConsoleApp.Create();");
+                }
+            }
+            sourceProductionContext.AddSource("ConsoleApp.Builder.Run.g.cs", runBuilder.ToString());
+        }
     }
 
     class CommanContext(Command? command, bool isAsync, DiagnosticReporter diagnosticReporter, InvocationExpressionSyntax node) : IEquatable<CommanContext>
@@ -694,6 +720,7 @@ class CollectBuilderContext : IEquatable<CollectBuilderContext>
         public CancellationToken CancellationToken { get; }
         public bool HasRun { get; }
         public bool HasRunAsync { get; }
+        public bool HasDependencyInjectionReference { get; }
 
         public CollectBuilderContext(ImmutableArray<BuilderContext> contexts, CancellationToken cancellationToken)
         {
@@ -805,13 +832,18 @@ public CollectBuilderContext(ImmutableArray<BuilderContext> contexts, Cancellati
             this.Commands = commands1.Concat(commands2!).ToArray()!; // not null if no diagnostics
             this.HasRun = methodGroup["Run"].Any();
             this.HasRunAsync = methodGroup["RunAsync"].Any();
+            
+            var model = contexts[0].Model;
+            var serviceCollectionSymbol = model.Compilation.GetTypeByMetadataName("Microsoft.Extensions.DependencyInjection.ServiceCollection");
+            this.HasDependencyInjectionReference = serviceCollectionSymbol != null;
         }
 
         public bool Equals(CollectBuilderContext other)
         {
             if (DiagnosticReporter.HasDiagnostics || other.DiagnosticReporter.HasDiagnostics) return false;
             if (HasRun != other.HasRun) return false;
             if (HasRunAsync != other.HasRunAsync) return false;
+            if (HasDependencyInjectionReference != other.HasDependencyInjectionReference) return false;
 
             return Commands.AsSpan().SequenceEqual(other.Commands);
         }