A Swiss Army knife for developers.
C# blazorcross-platformcsharpdesktopdesktop-appdesktop-applicationdeveloper-toolsextensiblefluentfluent-designlinuxmacosmicasyntax-highlightingtypescriptwindowswindows-10windows-11winui
Fixes numbers are converted to string in Yaml to Json conversion (#236)
A. Karboush9bf2a9623e9b
diff --git a/src/dev/impl/DevToys/DevToys.csproj b/src/dev/impl/DevToys/DevToys.csprojindex e48b976eb..955ac91c7 100644--- a/src/dev/impl/DevToys/DevToys.csproj+++ b/src/dev/impl/DevToys/DevToys.csproj@@ -46,6 +46,8 @@<Compile Include="ViewModels\Tools\AllTools\AllToolsToolProvider.cs" /><Compile Include="ViewModels\Tools\AllTools\AllToolsToolViewModel.cs" /><Compile Include="ViewModels\Tools\Converters\ConvertersGroupToolProvider.cs" />+ <Compile Include="ViewModels\Tools\Converters\JsonYaml\DecimalJsonConverter.cs" />+ <Compile Include="ViewModels\Tools\Converters\JsonYaml\DecimalYamlTypeResolver.cs" /><Compile Include="ViewModels\Tools\EncodersDecoders\EncodersDecodersGroupToolProvider.cs" /><Compile Include="ViewModels\Tools\Generators\GeneratorsGroupToolProvider.cs" /><Compile Include="ViewModels\Tools\Generators\LoremIpsumGenerator\LoremIpsumGeneratorToolProvider.cs" />diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/DecimalJsonConverter.cs b/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/DecimalJsonConverter.csnew file mode 100644index 000000000..09a61ccfe--- /dev/null+++ b/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/DecimalJsonConverter.cs@@ -0,0 +1,19 @@+using System;+using Newtonsoft.Json;++namespace DevToys.ViewModels.Tools.Converters.JsonYaml+{+ internal class DecimalJsonConverter : JsonConverter<decimal>+ {+ public override decimal ReadJson(JsonReader reader, Type objectType, decimal existingValue, bool hasExistingValue, JsonSerializer serializer)+ {+ throw new NotImplementedException();+ }++ public override void WriteJson(JsonWriter writer, decimal value, JsonSerializer serializer)+ {+ // prevent adding trailing zeros+ writer.WriteRawValue(value.ToString());+ }+ }+}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/DecimalYamlTypeResolver.cs b/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/DecimalYamlTypeResolver.csnew file mode 100644index 000000000..624a6906b--- /dev/null+++ b/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/DecimalYamlTypeResolver.cs@@ -0,0 +1,28 @@+using System;+using YamlDotNet.Core.Events;+using YamlDotNet.Serialization;++namespace DevToys.ViewModels.Tools.Converters.JsonYaml+{+ internal class DecimalYamlTypeResolver : INodeTypeResolver+ {+ public bool Resolve(NodeEvent? nodeEvent, ref Type currentType)+ {+ if (nodeEvent is Scalar scalar)+ {+ // avoid unnecessary parsing attempts+ bool couldBeNumber =+ scalar.Value.Length != 0 &&+ scalar.Value[0] is >= '0' and <= '9' ||+ scalar.Value[0] == '-';++ if (couldBeNumber && decimal.TryParse(scalar.Value, out _))+ {+ currentType = typeof(decimal);+ return true;+ }+ }+ return false;+ }+ }+}diff --git a/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/JsonYamlToolViewModel.cs b/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/JsonYamlToolViewModel.csindex 15b72d906..c630a7d6c 100644--- a/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/JsonYamlToolViewModel.cs+++ b/src/dev/impl/DevToys/ViewModels/Tools/Converters/JsonYaml/JsonYamlToolViewModel.cs@@ -19,6 +19,7 @@ using Microsoft.Toolkit.Mvvm.ComponentModel;using Newtonsoft.Json;using YamlDotNet.Core;using YamlDotNet.Serialization;+using DevToys.ViewModels.Tools.Converters.JsonYaml;namespace DevToys.ViewModels.Tools.JsonYaml{@@ -282,7 +283,10 @@ namespace DevToys.ViewModels.Tools.JsonYaml{using var stringReader = new StringReader(input);- var deserializer = new Deserializer();+ var deserializer = new DeserializerBuilder()+ .WithNodeTypeResolver(new DecimalYamlTypeResolver())+ .Build();+object? yamlObject = deserializer.Deserialize(stringReader);if (yamlObject is null or string)@@ -313,7 +317,10 @@ namespace DevToys.ViewModels.Tools.JsonYamlthrow new NotSupportedException();}- var jsonSerializer = new JsonSerializer();+ var jsonSerializer = JsonSerializer.CreateDefault(new JsonSerializerSettings()+ {+ Converters = { new DecimalJsonConverter() }+ });jsonSerializer.Serialize(jsonTextWriter, yamlObject);}