Test and fix custom StructId namespace support

Author: kzu

src/StructId.Analyzer/BaseGenerator.cs

@@ -22,7 +22,7 @@ public enum ReferenceCheck
 
 public abstract class BaseGenerator(string referenceType, string stringTemplate, string typeTemplate, ReferenceCheck referenceCheck = ReferenceCheck.ValueIsType) : IIncrementalGenerator
 {
-    protected record struct TemplateArgs(string TargetNamespace, INamedTypeSymbol StructId, INamedTypeSymbol ValueType, INamedTypeSymbol ReferenceType, INamedTypeSymbol StringType);
+    protected record struct TemplateArgs(string StructIdNamespace, INamedTypeSymbol StructId, INamedTypeSymbol ValueType, INamedTypeSymbol ReferenceType, INamedTypeSymbol StringType);
 
     public virtual void Initialize(IncrementalGeneratorInitializationContext context)
     {
@@ -79,8 +79,8 @@ protected static void AddFromTemplate(SourceProductionContext context, TemplateA
         // replace tokens in the template
         var replaced = template
             // Adjust to current target namespace
-            .Replace("namespace StructId;", $"namespace {args.TargetNamespace};")
-            .Replace("using StructId;", $"using {args.TargetNamespace};")
+            .Replace("namespace StructId;", $"namespace {args.StructIdNamespace};")
+            .Replace("using StructId;", $"using {args.StructIdNamespace};")
             // Simple names suffices since we emit a partial in the same namespace
             .Replace("TSelf", args.StructId.Name)
             .Replace("Self", args.StructId.Name)

src/StructId.Analyzer/DapperExtensions.sbn

@@ -6,7 +6,7 @@ using System.ComponentModel;
 using System.Data;
 using Dapper;
 
-namespace StructId;
+namespace {{ Namespace }};
 
 /// <summary>
 /// Provides extensions for Dapper.

src/StructId.Analyzer/DapperGenerator.cs

@@ -33,13 +33,16 @@ void GenerateHandlers(SourceProductionContext context, ImmutableArray<TemplateAr
     {
         if (args.Length == 0)
             return;
+        
+        var model = new SelectorModel(
+            args.First().StructIdNamespace, 
+            args.Select(x => new StructIdModel(x.StructId.ToFullName(), x.ValueType.Name)));
 
-        var model = new SelectorModel(args.Select(x => new StructIdModel(x.StructId.ToFullName(), x.ValueType.Name)));
         var output = template.Render(model, member => member.Name);
         context.AddSource($"DapperExtensions.cs", output);
     }
 
     record StructIdModel(string TSelf, string TId);
 
-    record SelectorModel(IEnumerable<StructIdModel> Ids);
+    record SelectorModel(string Namespace, IEnumerable<StructIdModel> Ids);
 }

src/StructId.Analyzer/NewtonsoftJsonGenerator.cs

@@ -17,14 +17,19 @@ public override void Initialize(IncrementalGeneratorInitializationContext contex
 
         context.RegisterSourceOutput(
             context.CompilationProvider
-            .Select((x, _) => x.GetTypeByMetadataName("Newtonsoft.Json.JsonConverter`1")),
+            .Select((x, _) => x.GetTypeByMetadataName("Newtonsoft.Json.JsonConverter`1"))
+            .Combine(context.AnalyzerConfigOptionsProvider
+            .Select((x, _) => x.GlobalOptions.TryGetValue("build_property.StructIdNamespace", out var ns) ? ns : "StructId")),
             (context, source) =>
             {
-                if (source == null)
+                if (source.Left == null)
                     return;
 
                 context.AddSource("NewtonsoftJsonConverter.cs", SourceText.From(
-                    ThisAssembly.Resources.Templates.NewtonsoftJsonConverter_1.Text, Encoding.UTF8));
+                    ThisAssembly.Resources.Templates.NewtonsoftJsonConverter_1.Text
+                    .Replace("namespace StructId;", $"namespace {source.Right};")
+                    .Replace("using StructId;", $"using {source.Right};"), 
+                    Encoding.UTF8));
             });
     }
 }

src/StructId.FunctionalTests/IIdTemplate.cs

@@ -4,6 +4,7 @@
 using System.Text;
 using System.Threading.Tasks;
 using StructId;
+using StructId.Functional;
 
 [TStructId]
 file partial record struct IIdTemplate(Guid Value) : IId

src/StructId.FunctionalTests/ObjectTemplate.cs

@@ -1,4 +1,5 @@
 using StructId;
+using StructId.Functional;
 
 [TStructId]
 file partial record struct ObjectTemplate(object Value)

src/StructId.FunctionalTests/StructId.FunctionalTests.csproj

@@ -5,6 +5,7 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+    <RootNamespace>StructId.Functional</RootNamespace>
   </PropertyGroup>
 
   <ItemGroup>

src/StructId.FunctionalTests/StructTemplate.cs

@@ -1,4 +1,5 @@
 using StructId;
+using StructId.Functional;
 
 [TStructId]
 file partial record struct StructTemplate(ValueType Value)