Add ConfigurationPath property

almostchristian · Sep 26, 2023 · ed1dc7c · ed1dc7c
1 parent d5ec76d
commit ed1dc7c
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 3 deletions.
diff --git a/sample/TestWebApiGenerator/ServiceRegistrationExtensions.cs b/sample/TestWebApiGenerator/ServiceRegistrationExtensions.cs
@@ -5,7 +5,7 @@ namespace TestWebApiGenerator;
 
 internal static partial class ServiceRegistrationExtensions
 {
-    [GenerateConfiguration("Services", ExcludedSections = new[] { "Hsts" }, ImplicitSuffixes = new[] { "Instrumentation", "Exporter" })]
+    [GenerateConfiguration("Services", ExcludedSections = new[] { "Hsts" }, ImplicitSuffixes = new[] { "Instrumentation", "Exporter" }, ConfigurationPath = nameof(WebApplicationBuilder.Configuration))]
     public static partial void AddServicesFromConfiguration(this WebApplicationBuilder builder);
 
     // [GenerateServiceRegistration("Services")]

diff --git a/src/ConfigurationProcessor.Generator/GenerateConfigurationAttribute.cs b/src/ConfigurationProcessor.Generator/GenerateConfigurationAttribute.cs
@@ -24,6 +24,11 @@ public GenerateConfigurationAttribute(string configurationSection)
     /// </summary>
     public string ConfigurationFile { get; set; } = DefaultConfigurationFile;
 
+    /// <summary>
+    /// The configuration path.
+    /// </summary>
+    public string? ConfigurationPath { get; set; }
+
     /// <summary>
     /// Sections to exclude.
     /// </summary>

diff --git a/src/ConfigurationProcessor.SourceGeneration/Parser.cs b/src/ConfigurationProcessor.SourceGeneration/Parser.cs
@@ -80,7 +80,7 @@ internal IReadOnlyList<ServiceRegistrationClass> GetServiceRegistrationClasses(I
 
                     IMethodSymbol? configurationMethodSymbol = sm.GetDeclaredSymbol(method, cancellationToken)!;
                     Debug.Assert(configurationMethodSymbol != null, "configuration method is present.");
-                    (string configurationSection, string? configurationFile) = (string.Empty, null);
+                    (string configurationSection, string? configurationFile, string? configurationPath) = (string.Empty, null, null);
                     string[] excluded = Array.Empty<string>();
                     string[] suffixes = Array.Empty<string>();
                     foreach (AttributeListSyntax mal in method.AttributeLists)
@@ -157,6 +157,9 @@ internal IReadOnlyList<ServiceRegistrationClass> GetServiceRegistrationClasses(I
                                                 case "ConfigurationFile":
                                                     configurationFile = (string?)GetItem(value);
                                                     break;
+                                                case "ConfigurationPath":
+                                                    configurationPath = (string?)GetItem(value);
+                                                    break;
                                                 case "ExcludedSections":
                                                     var values = (ImmutableArray<TypedConstant>)GetItem(value)!;
                                                     excluded = values.Select(x => $"{configurationSection}:{x.Value}").ToArray();
@@ -357,6 +360,11 @@ static string ToDisplay(IParameterSymbol parameter)
                                             foundTarget = false;
                                         }
 
+                                        if (!string.IsNullOrEmpty(configurationPath))
+                                        {
+                                            lm.ConfigurationField = $"{paramName}.{configurationPath}";
+                                        }
+
                                         var properties = paramTypeSymbol.GetMembers().OfType<IPropertySymbol>().ToArray();
                                         foreach (var property in properties)
                                         {

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -10,7 +10,7 @@
    </PropertyGroup>
 
    <PropertyGroup Condition="$(MSBuildProjectName.EndsWith('.Generator')) OR $(MSBuildProjectName.EndsWith('.SourceGeneration'))">
-	  <Version>0.4.0</Version>
+	  <Version>0.4.1</Version>
 	  <PackageVersion>$(Version)-beta.1</PackageVersion>
    </PropertyGroup>