Fixed generation of explicit enum strings.

corvus-dotnet · Jan 23, 2024 · 821d82b · 821d82b
1 parent 0b18872
commit 821d82b
Show file tree

Hide file tree

Showing 136 changed files with 2,259 additions and 5 deletions.
diff --git a/...1909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Array.Add.Partial.cs b/...1909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Array.Add.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...n.201909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Array.Partial.cs b/...n.201909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Array.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...9/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Array.Remove.Partial.cs b/...9/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Array.Remove.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...201909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Boolean.Partial.cs b/...201909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Boolean.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...n.201909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Const.Partial.cs b/...n.201909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Const.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Conversions.Accessors.Partial.cs b/...Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Conversions.Accessors.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Conversions.Operators.Partial.cs b/...Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Conversions.Operators.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...01909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Defaults.Partial.cs b/...01909/Corvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.Defaults.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...vus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.DependentRequired.Partial.cs b/...vus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.DependentRequired.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>

diff --git a/...orvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.DependentSchema.Partial.cs b/...orvus.Json.CodeGeneration.Draft201909/Generators/CodeGenerator.DependentSchema.Partial.cs
@@ -2422,6 +2422,16 @@ private static string GetRawTextAsQuotedString(JsonAny? value)
         throw new ArgumentNullException(nameof(value));
     }
 
+    private static string GetRawStringValueAsQuotedString(JsonAny? value)
+    {
+        if (value is JsonAny actualValue && actualValue.ValueKind == JsonValueKind.String)
+        {
+            return Formatting.FormatLiteralOrNull(actualValue.AsJsonElement.GetRawText()[1..^1], true);
+        }
+
+        throw new ArgumentNullException(nameof(value));
+    }
+
     private bool MatchType(string typeToMatch)
     {
         if (this.TypeDeclaration.Schema().Type.IsNotUndefined())
@@ -2727,6 +2737,7 @@ public EnumValue(JsonAny value)
             this.IsArray = value.ValueKind == JsonValueKind.Array;
             this.IsNull = value.IsNull();
             this.SerializedValue = GetRawTextAsQuotedString(value);
+            this.RawStringValue = value.ValueKind == JsonValueKind.String ? GetRawStringValueAsQuotedString(value) : null;
             this.AsPropertyName = Formatting.ToPascalCaseWithReservedWords(this.SerializedValue.Trim('"')).ToString();
         }
 
@@ -2765,6 +2776,11 @@ public EnumValue(JsonAny value)
         /// </summary>
         public string SerializedValue { get; }
 
+        /// <summary>
+        /// Gets the raw value of a string value, as a quoted string. This will be null if the value was not a string.
+        /// </summary>
+        public string? RawStringValue { get; }
+
         /// <summary>
         /// Gets the serialized value as a property name.
         /// </summary>