Added tools for building source generators based on Corvus.JsonSchema (…

…#513) * Added tools library for people building source generators based on Corvus.JsonSchema * Added self-contained version of CJEx. * Removed package dependency on Community.HighPerformance. Added README Added Corvus.Json.JsonSchema libraries as direct inclusions. * Fixed nuget packaging.
corvus-dotnet · Dec 17, 2024 · 4a6034e · 4a6034e
1 parent f9614fd
commit 4a6034e
Show file tree

Hide file tree

Showing 86 changed files with 10,286 additions and 372 deletions.
diff --git a/...n.CodeGeneration/Corvus.Json.CodeGeneration/TypeDeclarations/TypeDeclarationExtensions.cs b/...n.CodeGeneration/Corvus.Json.CodeGeneration/TypeDeclarations/TypeDeclarationExtensions.cs
@@ -2072,13 +2072,15 @@ private static void SetSingleConstantValue(TypeDeclaration typeDeclaration)
                     // We don't have an existing constant value,
                     foundElement = value;
                 }
+#if !BUILDING_SOURCE_GENERATOR
                 else if (JsonElement.DeepEquals(foundElement, value))
                 {
                     // The new constant is the same as the old value
                     // (typically because a composing type explicitly restates the
                     // constant from one of the composed types)
                     continue;
                 }
+#endif
                 else
                 {
                     // We have more than keyword that explicitly provides a single constant value
@@ -2105,13 +2107,15 @@ private static void SetSingleConstantValue(TypeDeclaration typeDeclaration)
                         // an explicit declaration
                         foundElement = constantValue;
                     }
+#if !BUILDING_SOURCE_GENERATOR
                     else if (JsonElement.DeepEquals(foundElement, constantValue))
                     {
                         // The new type is the same as the old type
                         // (typically because a composing type explicitly restates the
                         // type from one of the composed types)
                         continue;
                     }
+#endif
                     else
                     {
                         // We have more than keyword that explicitly provides a format

diff --git a/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/BinaryJsonNumber.NetStandard.cs b/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/BinaryJsonNumber.NetStandard.cs
@@ -11,7 +11,6 @@
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Text.Json;
-using CommunityToolkit.HighPerformance;
 
 namespace Corvus.Json;
 

diff --git a/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/Internal/JsonReaderHelper.cs b/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/Internal/JsonReaderHelper.cs
@@ -15,7 +15,6 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Runtime.InteropServices;
 using System.Text;
-using CommunityToolkit.HighPerformance.Buffers;
 
 namespace Corvus.Json
 {

diff --git a/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/Internal/LowAllocJsonUtils.cs b/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/Internal/LowAllocJsonUtils.cs
@@ -38,8 +38,27 @@ public static bool ProcessRawText<TState, TResult>(
         in Utf8Parser<TState, TResult> callback,
         [NotNullWhen(true)] out TResult? result)
     {
+#if BUILDING_SOURCE_GENERATOR
+        PooledWriter? writerPair = null;
+        try
+        {
+            writerPair = WriterPool.Get();
+            (Utf8JsonWriter w, ArrayPoolBufferWriter<byte> writer) = writerPair.Get();
+            element.WriteTo(w);
+            w.Flush();
+            return callback(writer.WrittenSpan[1..^1], state, out result);
+        }
+        finally
+        {
+            if (writerPair is not null)
+            {
+                WriterPool.Return(writerPair);
+            }
+        }
+#else
         ReadOnlySpan<byte> rawValue = JsonMarshal.GetRawUtf8Value(element);
         return callback(rawValue[1..^1], state, out result);
+#endif
     }
 
     /// <summary>
@@ -58,8 +77,27 @@ public static bool ProcessRawValue<TState, TResult>(
         in Utf8Parser<TState, TResult> callback,
         [NotNullWhen(true)] out TResult? result)
     {
+#if BUILDING_SOURCE_GENERATOR
+        PooledWriter? writerPair = null;
+        try
+        {
+            writerPair = WriterPool.Get();
+            (Utf8JsonWriter w, ArrayPoolBufferWriter<byte> writer) = writerPair.Get();
+            element.WriteTo(w);
+            w.Flush();
+            return callback(writer.WrittenSpan, state, out result);
+        }
+        finally
+        {
+            if (writerPair is not null)
+            {
+                WriterPool.Return(writerPair);
+            }
+        }
+#else
         ReadOnlySpan<byte> rawValue = JsonMarshal.GetRawUtf8Value(element);
-        return callback(rawValue[1..^1], state, out result);
+        return callback(rawValue, state, out result);
+#endif
     }
 
     /// <summary>

diff --git a/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/JsonElementExtensions.cs b/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/JsonElementExtensions.cs
@@ -59,7 +59,7 @@ public static bool TryGetRawText<TState, TResult>(this JsonElement element, in U
     /// </exception>
     public static bool TryGetRawText<TState, TResult>(this JsonElement element, in Utf8Parser<TState, TResult> parser, in TState state, bool decode, [NotNullWhen(true)] out TResult? value)
     {
-        return element.ProcessRawValue(new Utf8ParserStateWrapper<TState, TResult>(parser, state, decode), ProcessRawText, out value);
+        return element.ProcessRawText(new Utf8ParserStateWrapper<TState, TResult>(parser, state, decode), ProcessRawText, out value);
     }
 
     /// <summary>

diff --git a/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/ValidationContext.cs b/Solutions/Corvus.Json.ExtendedTypes/Corvus.Json/ValidationContext.cs
@@ -5,7 +5,6 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Runtime.InteropServices;
-using CommunityToolkit.HighPerformance;
 
 namespace Corvus.Json;