imp - Color templates support numbers!

--- We've added support for literal integers for deserializing colors from JSON. --- Type: imp Breaking: False Doc Required: False Part: 1/1
Aptivi · Apr 17, 2024 · 31bffa5 · 31bffa5
1 parent ed34c28
commit 31bffa5
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Terminaux.Console/Fixtures/Cases/Writer/PrintTemplate.cs b/Terminaux.Console/Fixtures/Cases/Writer/PrintTemplate.cs
@@ -40,7 +40,7 @@ public void RunFixture()
  "Name": "{{name}}",
  "Components": {
  "Text": "#876543",
- "Component": "#345678"
+ "Component": 168555
  }
  }
  """;

diff --git a/Terminaux/Colors/ColorSerializer.cs b/Terminaux/Colors/ColorSerializer.cs
@@ -37,8 +37,13 @@ public override bool CanConvert(Type objectType) =>
  /// <inheritdoc/>
  public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
  {
- var result = reader.Value is string value ? value : "";
- var color = new Color(result);
+ Color color;
+ if (reader.Value is string colorValueString)
+ color = new Color(colorValueString);
+ else if (reader.Value is long colorValueLong)
+ color = new Color((int)colorValueLong);
+ else
+ throw new TerminauxException($"Can't determine how to convert a(n) {reader.TokenType} of {reader.ValueType?.Name ?? "an unknown type"} to a color.");
  return color;
  }