Support jsonSerializationContext in global namespace (#36)

aviationexam · Nov 8, 2023 · 7bd4719 · 7bd4719
1 parent 32028fe
commit 7bd4719
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/...rGeneratorSnapshotTests.TopLevelStatementWorks#ProjectJsonSerializerContext.g.verified.cs b/...rGeneratorSnapshotTests.TopLevelStatementWorks#ProjectJsonSerializerContext.g.verified.cs
@@ -1,8 +1,6 @@
 //HintName: ProjectJsonSerializerContext.g.cs
 #nullable enable
 
-namespace PolymorphicGlobalNamespace;
-
 public partial class ProjectJsonSerializerContext
 {
     public static System.Collections.Generic.IReadOnlyCollection<System.Text.Json.Serialization.JsonConverter> GetPolymorphicConverters() => new System.Text.Json.Serialization.JsonConverter[]

diff --git a/...JsonConverters.SourceGenerator/Generators/JsonConvertersSerializerJsonContextGenerator.cs b/...JsonConverters.SourceGenerator/Generators/JsonConvertersSerializerJsonContextGenerator.cs
@@ -33,7 +33,7 @@ IReadOnlyCollection<JsonConverter> converters
         }
 
         var targetNamespace = jsonSerializerContextClassType.ContainingNamespace.IsGlobalNamespace
-            ? JsonPolymorphicConverterIncrementalGenerator.EmptyPolymorphicNamespace
+            ? null
             : jsonSerializerContextClassType.ContainingNamespace.ToDisplayString(JsonPolymorphicConverterIncrementalGenerator.NamespaceFormat);
 
         return Generate(
@@ -55,14 +55,24 @@ IReadOnlyCollection<JsonConverter> converters
     {
         var converterTypeString = converterType.ToString();
 
+        var namespaceLine = string.Empty;
+        if (jsonSerializerContext.Namespace is { } jsonConverterNamespace)
+        {
+            namespaceLine =
+                // language=cs
+                $"""
+
+                 namespace {jsonConverterNamespace};
+
+                 """;
+        }
+
         return new FileWithName(
             $"{jsonSerializerContext.ClassName}.g.cs",
             // language=cs
             $$"""
               #nullable enable
-
-              namespace {{jsonSerializerContext.Namespace}};
-
+              {{namespaceLine}}
               {{jsonSerializerContext.ClassAccessibility}} partial class {{jsonSerializerContext.ClassName}}
               {
                   public static System.Collections.Generic.IReadOnlyCollection<System.Text.Json.Serialization.JsonConverter> Get{{converterTypeString}}Converters() => new System.Text.Json.Serialization.JsonConverter[]

diff --git a/...m.GeneratedJsonConverters.SourceGenerator/JsonPolymorphicConverterIncrementalGenerator.cs b/...m.GeneratedJsonConverters.SourceGenerator/JsonPolymorphicConverterIncrementalGenerator.cs
@@ -19,7 +19,7 @@ public class JsonPolymorphicConverterIncrementalGenerator : IIncrementalGenerato
 {
     public const string Id = "AVI_JPC";
 
-    public const string EmptyPolymorphicNamespace = "PolymorphicGlobalNamespace";
+    private const string EmptyPolymorphicNamespace = "PolymorphicGlobalNamespace";
 
     internal static readonly SymbolDisplayFormat NamespaceFormat = new(
         globalNamespaceStyle: SymbolDisplayGlobalNamespaceStyle.Omitted,

diff --git a/src/Aviationexam.GeneratedJsonConverters.SourceGenerator/JsonSerializerContext.cs b/src/Aviationexam.GeneratedJsonConverters.SourceGenerator/JsonSerializerContext.cs
@@ -2,6 +2,6 @@ namespace Aviationexam.GeneratedJsonConverters.SourceGenerator;
 
 internal sealed record JsonSerializerContext(
     string ClassAccessibility,
-    string Namespace,
+    string? Namespace,
     string ClassName
 );