fix resolution of boolean properties

collectioneering · Jan 21, 2024 · 14afb39 · 14afb39
1 parent f26a12a
commit 14afb39
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/src/Art.Common/ArtifactToolOptionExtensions.cs b/src/Art.Common/ArtifactToolOptionExtensions.cs
@@ -10,7 +10,7 @@ namespace Art.Common;
 /// </summary>
 public static class ArtifactToolOptionExtensions
 {
-    private static readonly HashSet<string> s_yesLower = new() { "y", "yes", "" };
+    private static readonly HashSet<string> s_yesLower = new() { "y", "yes", "1", "true" };
 
     #region Base
 

diff --git a/src/Art.Tesler/Common.cs b/src/Art.Tesler/Common.cs
@@ -96,15 +96,41 @@ internal static void AddProps(this Dictionary<string, JsonElement> dictionary, I
     {
         foreach (string prop in props)
         {
-            if (s_propRe.Match(prop) is not { Success: true } match) throw new ArgumentException($@"Invalid property entry ""{prop}""");
+            if (s_propRe.Match(prop) is not { Success: true } match)
+            {
+                throw new ArgumentException($@"Invalid property entry ""{prop}""");
+            }
             string k = match.Groups[1].Value;
             string val = match.Groups[2].Value;
             JsonElement v;
-            if (val.StartsWith('{') || val.StartsWith('[')) v = JsonSerializer.Deserialize(val, SourceGenerationContext.s_context.JsonElement);
-            else if (long.TryParse(val, out long valLong)) v = JsonSerializer.SerializeToElement(valLong, SourceGenerationContext.s_context.Int64);
-            else if (ulong.TryParse(val, out ulong valULong)) v = JsonSerializer.SerializeToElement(valULong, SourceGenerationContext.s_context.UInt64);
-            else if (double.TryParse(val, out double valDouble)) v = JsonSerializer.SerializeToElement(valDouble, SourceGenerationContext.s_context.Double);
-            else v = JsonSerializer.SerializeToElement(val, SourceGenerationContext.s_context.String);
+            if (val.StartsWith('{') || val.StartsWith('['))
+            {
+                v = JsonSerializer.Deserialize(val, SourceGenerationContext.s_context.JsonElement);
+            }
+            else if (long.TryParse(val, out long valLong))
+            {
+                v = JsonSerializer.SerializeToElement(valLong, SourceGenerationContext.s_context.Int64);
+            }
+            else if (ulong.TryParse(val, out ulong valULong))
+            {
+                v = JsonSerializer.SerializeToElement(valULong, SourceGenerationContext.s_context.UInt64);
+            }
+            else if (double.TryParse(val, out double valDouble))
+            {
+                v = JsonSerializer.SerializeToElement(valDouble, SourceGenerationContext.s_context.Double);
+            }
+            else if (string.Equals(val, "true", StringComparison.InvariantCulture))
+            {
+                v = JsonSerializer.SerializeToElement(true, SourceGenerationContext.s_context.Boolean);
+            }
+            else if (string.Equals(val, "false", StringComparison.InvariantCulture))
+            {
+                v = JsonSerializer.SerializeToElement(false, SourceGenerationContext.s_context.Boolean);
+            }
+            else
+            {
+                v = JsonSerializer.SerializeToElement(val, SourceGenerationContext.s_context.String);
+            }
             dictionary.AddPropWithWarning(k, v, console);
         }
     }

diff --git a/src/Art.Tesler/SourceGenerationContext.cs b/src/Art.Tesler/SourceGenerationContext.cs
@@ -4,6 +4,7 @@
 namespace Art.Tesler;
 
 [JsonSourceGenerationOptions(WriteIndented = true)]
+[JsonSerializable(typeof(bool))]
 [JsonSerializable(typeof(ulong))]
 [JsonSerializable(typeof(long))]
 [JsonSerializable(typeof(double))]