Перевод на Source Gen Json (#80)

* #45 - тестовый workflow для проверки AOT publish на инфре GitHub Actions * #45 - перевёл бекенд на json source gen * fix * #45 - перевёл SG на json source gen * #45 - перевёл Infrastructure на json source gen * Revert "#45 - тестовый workflow для проверки AOT publish на инфре GitHub Actions" This reverts commit 3014c53.
Stepami · Aug 5, 2024 · 9f379c8 · 9f379c8
1 parent 8bdd77a
commit 9f379c8
Show file tree

Hide file tree

Showing 11 changed files with 58 additions and 54 deletions.
diff --git a/ExtendedJavaScriptSubset.sln b/ExtendedJavaScriptSubset.sln
@@ -62,6 +62,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{04AB
 		samples\this.js = samples\this.js
 		samples\typeresolving.js = samples\typeresolving.js
 		samples\vec2d.js = samples\vec2d.js
+		samples\cycled.js = samples\cycled.js
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Src", "Src", "{FB8F6EE1-1942-46D6-954E-9A1647BBDF10}"

diff --git a/samples/cycled.js b/samples/cycled.js
@@ -0,0 +1,8 @@
+type CycledType = {
+    x: CycledType;
+}
+let obj: CycledType = {
+    x: null;
+}
+obj.x = obj
+print(obj as string)
diff --git a/src/Domain/HydraScript.Domain.BackEnd/HydraScript.Domain.BackEnd.csproj b/src/Domain/HydraScript.Domain.BackEnd/HydraScript.Domain.BackEnd.csproj
@@ -7,4 +7,8 @@
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     </PropertyGroup>
 
+    <PropertyGroup>
+        <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
+    </PropertyGroup>
+
 </Project>
diff --git a/src/Domain/HydraScript.Domain.BackEnd/Impl/Instructions/WithAssignment/AsString.cs b/src/Domain/HydraScript.Domain.BackEnd/Impl/Instructions/WithAssignment/AsString.cs
@@ -3,25 +3,34 @@
 
 namespace HydraScript.Domain.BackEnd.Impl.Instructions.WithAssignment;
 
-public class AsString(IValue value) : Simple(value)
+public partial class AsString(IValue value) : Simple(value)
 {
+    private static readonly AsStringSerializationContext AsStringJsonContext = new(new JsonSerializerOptions
+    {
+        WriteIndented = true,
+        ReferenceHandler = ReferenceHandler.IgnoreCycles,
+        PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+        NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
+    });
+
     public override IAddress Execute(IExecuteParams executeParams)
     {
         var frame = executeParams.Frames.Peek();
         frame[Left!] = JsonSerializer.Serialize(
-            Right.right!.Get(frame),
-            new JsonSerializerOptions
-            {
-                WriteIndented = true,
-                PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
-                ReferenceHandler = ReferenceHandler.IgnoreCycles,
-                NumberHandling = JsonNumberHandling.AllowNamedFloatingPointLiterals
-            }
-        );
+            value: Right.right!.Get(frame)!,
+            AsStringJsonContext.Object);
 
         return Address.Next;
     }
 
     protected override string ToStringInternal() =>
         $"{Left} = {Right.right} as string";
+
+    [JsonSourceGenerationOptions(GenerationMode = JsonSourceGenerationMode.Serialization)]
+    [JsonSerializable(typeof(List<object>))]
+    [JsonSerializable(typeof(Dictionary<string, object>))]
+    [JsonSerializable(typeof(bool))]
+    [JsonSerializable(typeof(double))]
+    [JsonSerializable(typeof(string))]
+    private partial class AsStringSerializationContext : JsonSerializerContext;
 }
diff --git a/....Infrastructure.LexerRegexGenerator/HydraScript.Infrastructure.LexerRegexGenerator.csproj b/....Infrastructure.LexerRegexGenerator/HydraScript.Infrastructure.LexerRegexGenerator.csproj
@@ -22,4 +22,8 @@
         </PackageReference>
     </ItemGroup>
 
+    <PropertyGroup>
+        <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
+    </PropertyGroup>
+
 </Project>
diff --git a/...rastructure/HydraScript.Infrastructure.LexerRegexGenerator/PatternGenerator.TokenTypes.cs b/...rastructure/HydraScript.Infrastructure.LexerRegexGenerator/PatternGenerator.TokenTypes.cs
@@ -1,16 +1,9 @@
-using System.Diagnostics.CodeAnalysis;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
 namespace HydraScript.Infrastructure.LexerRegexGenerator;
 
 public partial class PatternGenerator
 {
-    private static readonly JsonSerializerOptions JsonSerializerOptions = new()
-    {
-        Converters = { new TokenTypesReadConverter() }
-    };
-
     private record TokenType(
         string Tag,
         string Pattern,
@@ -19,31 +12,7 @@ private record TokenType(
         public string GetNamedRegex() => $"(?<{Tag}>{Pattern})";
     }
 
-    [ExcludeFromCodeCoverage]
-    private class TokenTypesReadConverter : JsonConverter<IEnumerable<TokenType>>
-    {
-        public override IEnumerable<TokenType> Read(
-            ref Utf8JsonReader reader,
-            Type typeToConvert,
-            JsonSerializerOptions options)
-        {
-            var root = JsonElement.ParseValue(ref reader);
-            var tokenTypes = root.EnumerateArray()
-                .Select(element =>
-                {
-                    var tag = element.GetProperty("tag").GetString()!;
-                    var pattern = element.GetProperty("pattern").GetString()!;
-                    var priority = element.GetProperty("priority").GetInt32();
-
-                    return new TokenType(tag, pattern, priority);
-                })
-                .OrderBy(x => x.Priority);
-            return tokenTypes;
-        }
-
-        public override void Write(
-            Utf8JsonWriter writer,
-            IEnumerable<TokenType> value,
-            JsonSerializerOptions options) => throw new NotSupportedException();
-    }
+    [JsonSourceGenerationOptions(PropertyNamingPolicy = JsonKnownNamingPolicy.CamelCase)]
+    [JsonSerializable(typeof(IEnumerable<TokenType>))]
+    private partial class PatternGeneratorContext : JsonSerializerContext;
 }
diff --git a/src/Infrastructure/HydraScript.Infrastructure.LexerRegexGenerator/PatternGenerator.cs b/src/Infrastructure/HydraScript.Infrastructure.LexerRegexGenerator/PatternGenerator.cs
@@ -64,9 +64,10 @@ private static void GenerateCode(
     {
         foreach (var info in containerInfos)
         {
-            var tokenTypes = JsonSerializer.Deserialize<IEnumerable<TokenType>>(
+            var tokenTypes = JsonSerializer.Deserialize(
                     info.Json,
-                    JsonSerializerOptions)!
+                    PatternGeneratorContext.Default.IEnumerableTokenType)!
+                .OrderBy(x => x.Priority)
                 .Concat([new TokenType("ERROR", @"\S+", int.MaxValue)]);
             var pattern = string.Join('|', tokenTypes.Select(t => t.GetNamedRegex()));
 

diff --git a/src/Infrastructure/HydraScript.Infrastructure/HydraScript.Infrastructure.csproj b/src/Infrastructure/HydraScript.Infrastructure/HydraScript.Infrastructure.csproj
@@ -28,4 +28,8 @@
         <InternalsVisibleTo Include="HydraScript.Tests" />
     </ItemGroup>
 
+    <PropertyGroup>
+        <JsonSerializerIsReflectionEnabledByDefault>false</JsonSerializerIsReflectionEnabledByDefault>
+    </PropertyGroup>
+
 </Project>
diff --git a/src/Infrastructure/HydraScript.Infrastructure/TokenTypesProvider.cs b/src/Infrastructure/HydraScript.Infrastructure/TokenTypesProvider.cs
@@ -6,17 +6,12 @@
 
 namespace HydraScript.Infrastructure;
 
-internal class TokenTypesProvider : ITokenTypesProvider
+internal partial class TokenTypesProvider : ITokenTypesProvider
 {
-    private static readonly JsonSerializerOptions JsonSerializerOptions = new()
-    {
-        Converters = { new TokenTypesReadConverter() }
-    };
-
     public IEnumerable<TokenType> GetTokenTypes() =>
-        JsonSerializer.Deserialize<IEnumerable<TokenType>>(
+        JsonSerializer.Deserialize(
             TokenTypesJson.String,
-            JsonSerializerOptions)!;
+            TokenTypesProviderContext.Default.IEnumerableTokenType)!;
 
     [ExcludeFromCodeCoverage]
     private class TokenTypesReadConverter : JsonConverter<IEnumerable<TokenType>>
@@ -52,4 +47,8 @@ public override void Write(
 
         private record PrioritizedTokenType(TokenType TokenType, int Priority);
     }
+
+    [JsonSourceGenerationOptions(Converters = [typeof(TokenTypesReadConverter)])]
+    [JsonSerializable(typeof(IEnumerable<TokenType>))]
+    private partial class TokenTypesProviderContext : JsonSerializerContext;
 }
diff --git a/tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj b/tests/HydraScript.IntegrationTests/HydraScript.IntegrationTests.csproj
@@ -40,6 +40,10 @@
             <Link>Samples\ceil.js</Link>
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </Content>
+        <Content Include="..\..\samples\cycled.js">
+            <Link>Samples\cycled.js</Link>
+            <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+        </Content>
         <Content Include="..\..\samples\defaultarray.js">
             <Link>Samples\defaultarray.js</Link>
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>

diff --git a/tests/HydraScript.IntegrationTests/SuccessfulProgramsTests.cs b/tests/HydraScript.IntegrationTests/SuccessfulProgramsTests.cs
@@ -24,6 +24,7 @@ public void Invoke_NoError_ReturnCodeIsZero(string fileName)
             "arraddremove.js",
             "arreditread.js",
             "ceil.js",
+            "cycled.js",
             "defaultarray.js",
             "equals.js",
             "exprtest.js",