GlobalOptions runtime complete

neuecc · neuecc · commit 03bc45286d6e · 2025-10-28T15:55:37.000+09:00
diff --git a/sandbox/GeneratorSandbox/Program.cs b/sandbox/GeneratorSandbox/Program.cs
@@ -91,6 +91,13 @@
 
 var builder = ConsoleApp.Create();
 
+
+builder.ConfigureDefaultConfiguration()
+    .ConfigureServices((c, x) =>
+    {
+
+    });
+
 builder.UseFilter<NopFilter1>();
 builder.UseFilter<NopFilter2>();
 
diff --git a/src/ConsoleAppFramework/Emitter.cs b/src/ConsoleAppFramework/Emitter.cs
@@ -768,78 +768,119 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)
         // DependencyInjection
         if (dllReference.HasDependencyInjection)
         {
+            // field
             if (dllReference.HasConfiguration)
             {
-                sb.AppendLine("Action<IConfiguration, IServiceCollection>? configureServices;");
+                sb.AppendLine("Action<ConsoleAppContext, IConfiguration, IServiceCollection>? configureServices;");
             }
             else
             {
-                sb.AppendLine("Action<IServiceCollection>? configureServices;");
+                sb.AppendLine("Action<ConsoleAppContext, IServiceCollection>? configureServices;");
             }
 
-            sb.AppendLine();
-            using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IServiceCollection> configure)"))
+            // methods
+            if (dllReference.HasConfiguration)
             {
-                if (dllReference.HasConfiguration)
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IServiceCollection> configure)"))
                 {
-                    sb.AppendLine("this.configureServices = (_, services) => configure(services);");
+                    sb.AppendLine("this.configureServices = (_, _, services) => configure(services);");
+                    sb.AppendLine("return this;");
                 }
-                else
+
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IConfiguration, IServiceCollection> configure)"))
+                {
+                    // for backward-compatiblity, we chooce (IConfiguration, IServiceCollection) for two arguments overload
+                    sb.AppendLine("this.requireConfiguration = true;");
+                    sb.AppendLine("this.configureServices = (_, configuration, services) => configure(configuration, services);");
+                    sb.AppendLine("return this;");
+                }
+
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<ConsoleAppContext, IConfiguration, IServiceCollection> configure)"))
                 {
+                    sb.AppendLine("this.requireConfiguration = true;");
                     sb.AppendLine("this.configureServices = configure;");
+                    sb.AppendLine("return this;");
                 }
-                sb.AppendLine("return this;");
             }
-
-            if (dllReference.HasConfiguration)
+            else
             {
                 sb.AppendLine();
-                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IConfiguration, IServiceCollection> configure)"))
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IServiceCollection> configure)"))
+                {
+                    sb.AppendLine("this.configureServices = (_, _, services) => configure(services);");
+                    sb.AppendLine("return this;");
+                }
+
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<ConsoleAppContext, IServiceCollection> configure)"))
                 {
-                    sb.AppendLine("this.requireConfiguration = true;");
                     sb.AppendLine("this.configureServices = configure;");
                     sb.AppendLine("return this;");
                 }
             }
+
             sb.AppendLine();
         }
 
         // Logging
         if (dllReference.HasLogging)
         {
+            // field
             if (dllReference.HasConfiguration)
             {
-                sb.AppendLine("Action<IConfiguration, ILoggingBuilder>? configureLogging;");
+                sb.AppendLine("Action<ConsoleAppContext, IConfiguration, ILoggingBuilder>? configureLogging;");
             }
             else
             {
-                sb.AppendLine("Action<ILoggingBuilder>? configureLogging;");
+                sb.AppendLine("Action<ConsoleAppContext, ILoggingBuilder>? configureLogging;");
             }
 
-            sb.AppendLine();
-            using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ILoggingBuilder> configure)"))
+            // methods
+            if (dllReference.HasConfiguration)
             {
-                if (dllReference.HasConfiguration)
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ILoggingBuilder> configure)"))
                 {
-                    sb.AppendLine("this.configureLogging = (_, logging) => configure(logging);");
+                    sb.AppendLine("this.configureLogging = (_, _, logging) => configure(logging);");
+                    sb.AppendLine("return this;");
                 }
-                else
+
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<IConfiguration, ILoggingBuilder> configure)"))
+                {
+                    sb.AppendLine("this.requireConfiguration = true;");
+                    sb.AppendLine("this.configureLogging = (_, configuration, logging) => configure(configuration, logging);");
+                    sb.AppendLine("return this;");
+                }
+
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ConsoleAppContext, IConfiguration, ILoggingBuilder> configure)"))
                 {
+                    sb.AppendLine("this.requireConfiguration = true;");
                     sb.AppendLine("this.configureLogging = configure;");
+                    sb.AppendLine("return this;");
                 }
-                sb.AppendLine("return this;");
             }
-
-            if (dllReference.HasConfiguration)
+            else
             {
                 sb.AppendLine();
-                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<IConfiguration, ILoggingBuilder> configure)"))
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ILoggingBuilder> configure)"))
+                {
+                    sb.AppendLine("this.configureLogging = (_, logging) => configure(logging);");
+                    sb.AppendLine("return this;");
+                }
+
+                sb.AppendLine();
+                using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ConsoleAppContext, ILoggingBuilder> configure)"))
                 {
-                    sb.AppendLine("this.requireConfiguration = true;");
                     sb.AppendLine("this.configureLogging = configure;");
                     sb.AppendLine("return this;");
                 }
             }
+
             sb.AppendLine();
         }
 
@@ -869,11 +910,11 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)
                 sb.AppendLine("var services = new ServiceCollection();");
                 if (dllReference.HasConfiguration)
                 {
-                    sb.AppendLine("configureServices?.Invoke(configuration!, services);");
+                    sb.AppendLine("configureServices?.Invoke(context, config!, services);");
                 }
                 else
                 {
-                    sb.AppendLine("configureServices?.Invoke(services);");
+                    sb.AppendLine("configureServices?.Invoke(context, services);");
                 }
 
                 if (dllReference.HasLogging)
@@ -885,11 +926,11 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)
                         {
                             if (dllReference.HasConfiguration)
                             {
-                                sb.AppendLine("configure!(config!, logging);");
+                                sb.AppendLine("configure!(context, config!, logging);");
                             }
                             else
                             {
-                                sb.AppendLine("configure!(logging);");
+                                sb.AppendLine("configure!(context, logging);");
                             }
                         }
                         sb.AppendLine("});");

Original file line number	Diff line number	Diff line change
`@@ -768,78 +768,119 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)`
`768`	`768`	`// DependencyInjection`
`769`	`769`	`if (dllReference.HasDependencyInjection)`
`770`	`770`	`{`
	`771`	`+ // field`
`771`	`772`	`if (dllReference.HasConfiguration)`
`772`	`773`	`{`
`773`		`- sb.AppendLine("Action<IConfiguration, IServiceCollection>? configureServices;");`
	`774`	`+ sb.AppendLine("Action<ConsoleAppContext, IConfiguration, IServiceCollection>? configureServices;");`
`774`	`775`	`}`
`775`	`776`	`else`
`776`	`777`	`{`
`777`		`- sb.AppendLine("Action<IServiceCollection>? configureServices;");`
	`778`	`+ sb.AppendLine("Action<ConsoleAppContext, IServiceCollection>? configureServices;");`
`778`	`779`	`}`
`779`	`780`
`780`		`- sb.AppendLine();`
`781`		`- using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IServiceCollection> configure)"))`
	`781`	`+ // methods`
	`782`	`+ if (dllReference.HasConfiguration)`
`782`	`783`	`{`
`783`		`- if (dllReference.HasConfiguration)`
	`784`	`+ sb.AppendLine();`
	`785`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IServiceCollection> configure)"))`
`784`	`786`	`{`
`785`		`- sb.AppendLine("this.configureServices = (_, services) => configure(services);");`
	`787`	`+ sb.AppendLine("this.configureServices = (_, _, services) => configure(services);");`
	`788`	`+ sb.AppendLine("return this;");`
`786`	`789`	`}`
`787`		`- else`
	`790`	`+`
	`791`	`+ sb.AppendLine();`
	`792`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IConfiguration, IServiceCollection> configure)"))`
	`793`	`+ {`
	`794`	`+ // for backward-compatiblity, we chooce (IConfiguration, IServiceCollection) for two arguments overload`
	`795`	`+ sb.AppendLine("this.requireConfiguration = true;");`
	`796`	`+ sb.AppendLine("this.configureServices = (_, configuration, services) => configure(configuration, services);");`
	`797`	`+ sb.AppendLine("return this;");`
	`798`	`+ }`
	`799`	`+`
	`800`	`+ sb.AppendLine();`
	`801`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<ConsoleAppContext, IConfiguration, IServiceCollection> configure)"))`
`788`	`802`	`{`
	`803`	`+ sb.AppendLine("this.requireConfiguration = true;");`
`789`	`804`	`sb.AppendLine("this.configureServices = configure;");`
	`805`	`+ sb.AppendLine("return this;");`
`790`	`806`	`}`
`791`		`- sb.AppendLine("return this;");`
`792`	`807`	`}`
`793`		`-`
`794`		`- if (dllReference.HasConfiguration)`
	`808`	`+ else`
`795`	`809`	`{`
`796`	`810`	`sb.AppendLine();`
`797`		`- using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IConfiguration, IServiceCollection> configure)"))`
	`811`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<IServiceCollection> configure)"))`
	`812`	`+ {`
	`813`	`+ sb.AppendLine("this.configureServices = (_, _, services) => configure(services);");`
	`814`	`+ sb.AppendLine("return this;");`
	`815`	`+ }`
	`816`	`+`
	`817`	`+ sb.AppendLine();`
	`818`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureServices(Action<ConsoleAppContext, IServiceCollection> configure)"))`
`798`	`819`	`{`
`799`		`- sb.AppendLine("this.requireConfiguration = true;");`
`800`	`820`	`sb.AppendLine("this.configureServices = configure;");`
`801`	`821`	`sb.AppendLine("return this;");`
`802`	`822`	`}`
`803`	`823`	`}`
	`824`	`+`
`804`	`825`	`sb.AppendLine();`
`805`	`826`	`}`
`806`	`827`
`807`	`828`	`// Logging`
`808`	`829`	`if (dllReference.HasLogging)`
`809`	`830`	`{`
	`831`	`+ // field`
`810`	`832`	`if (dllReference.HasConfiguration)`
`811`	`833`	`{`
`812`		`- sb.AppendLine("Action<IConfiguration, ILoggingBuilder>? configureLogging;");`
	`834`	`+ sb.AppendLine("Action<ConsoleAppContext, IConfiguration, ILoggingBuilder>? configureLogging;");`
`813`	`835`	`}`
`814`	`836`	`else`
`815`	`837`	`{`
`816`		`- sb.AppendLine("Action<ILoggingBuilder>? configureLogging;");`
	`838`	`+ sb.AppendLine("Action<ConsoleAppContext, ILoggingBuilder>? configureLogging;");`
`817`	`839`	`}`
`818`	`840`
`819`		`- sb.AppendLine();`
`820`		`- using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ILoggingBuilder> configure)"))`
	`841`	`+ // methods`
	`842`	`+ if (dllReference.HasConfiguration)`
`821`	`843`	`{`
`822`		`- if (dllReference.HasConfiguration)`
	`844`	`+ sb.AppendLine();`
	`845`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ILoggingBuilder> configure)"))`
`823`	`846`	`{`
`824`		`- sb.AppendLine("this.configureLogging = (_, logging) => configure(logging);");`
	`847`	`+ sb.AppendLine("this.configureLogging = (_, _, logging) => configure(logging);");`
	`848`	`+ sb.AppendLine("return this;");`
`825`	`849`	`}`
`826`		`- else`
	`850`	`+`
	`851`	`+ sb.AppendLine();`
	`852`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<IConfiguration, ILoggingBuilder> configure)"))`
	`853`	`+ {`
	`854`	`+ sb.AppendLine("this.requireConfiguration = true;");`
	`855`	`+ sb.AppendLine("this.configureLogging = (_, configuration, logging) => configure(configuration, logging);");`
	`856`	`+ sb.AppendLine("return this;");`
	`857`	`+ }`
	`858`	`+`
	`859`	`+ sb.AppendLine();`
	`860`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ConsoleAppContext, IConfiguration, ILoggingBuilder> configure)"))`
`827`	`861`	`{`
	`862`	`+ sb.AppendLine("this.requireConfiguration = true;");`
`828`	`863`	`sb.AppendLine("this.configureLogging = configure;");`
	`864`	`+ sb.AppendLine("return this;");`
`829`	`865`	`}`
`830`		`- sb.AppendLine("return this;");`
`831`	`866`	`}`
`832`		`-`
`833`		`- if (dllReference.HasConfiguration)`
	`867`	`+ else`
`834`	`868`	`{`
`835`	`869`	`sb.AppendLine();`
`836`		`- using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<IConfiguration, ILoggingBuilder> configure)"))`
	`870`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ILoggingBuilder> configure)"))`
	`871`	`+ {`
	`872`	`+ sb.AppendLine("this.configureLogging = (_, logging) => configure(logging);");`
	`873`	`+ sb.AppendLine("return this;");`
	`874`	`+ }`
	`875`	`+`
	`876`	`+ sb.AppendLine();`
	`877`	`+ using (sb.BeginBlock("public ConsoleApp.ConsoleAppBuilder ConfigureLogging(Action<ConsoleAppContext, ILoggingBuilder> configure)"))`
`837`	`878`	`{`
`838`		`- sb.AppendLine("this.requireConfiguration = true;");`
`839`	`879`	`sb.AppendLine("this.configureLogging = configure;");`
`840`	`880`	`sb.AppendLine("return this;");`
`841`	`881`	`}`
`842`	`882`	`}`
	`883`	`+`
`843`	`884`	`sb.AppendLine();`
`844`	`885`	`}`
`845`	`886`
`@@ -869,11 +910,11 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)`
`869`	`910`	`sb.AppendLine("var services = new ServiceCollection();");`
`870`	`911`	`if (dllReference.HasConfiguration)`
`871`	`912`	`{`
`872`		`- sb.AppendLine("configureServices?.Invoke(configuration!, services);");`
	`913`	`+ sb.AppendLine("configureServices?.Invoke(context, config!, services);");`
`873`	`914`	`}`
`874`	`915`	`else`
`875`	`916`	`{`
`876`		`- sb.AppendLine("configureServices?.Invoke(services);");`
	`917`	`+ sb.AppendLine("configureServices?.Invoke(context, services);");`
`877`	`918`	`}`
`878`	`919`
`879`	`920`	`if (dllReference.HasLogging)`
`@@ -885,11 +926,11 @@ public void EmitConfigure(SourceBuilder sb, DllReference dllReference)`
`885`	`926`	`{`
`886`	`927`	`if (dllReference.HasConfiguration)`
`887`	`928`	`{`
`888`		`- sb.AppendLine("configure!(config!, logging);");`
	`929`	`+ sb.AppendLine("configure!(context, config!, logging);");`
`889`	`930`	`}`
`890`	`931`	`else`
`891`	`932`	`{`
`892`		`- sb.AppendLine("configure!(logging);");`
	`933`	`+ sb.AppendLine("configure!(context, logging);");`
`893`	`934`	`}`
`894`	`935`	`}`
`895`	`936`	`sb.AppendLine("});");`