Merge pull request #479 from gregsdennis/yaml/decimal-parsing

use invariant culture when parsing numbers from yaml data

Yaml2JsonNode.Tests/ClientTests.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Nodes;
+using System.Globalization;
+using System.Text.Json.Nodes;
 using Json.More;
 using NUnit.Framework;
 using YamlDotNet.RepresentationModel;
@@ -49,4 +50,50 @@ public void Issue476_YamlNumberAsString()
 
 		Console.WriteLine(text);
 	}
+
+	[Test]
+	public void Issue478_DecimalFormatting_Comma()
+	{
+		var culture = CultureInfo.CurrentCulture;
+
+		try
+		{
+			CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("es-ES");
+
+			var yamlText = @"data: 4,789";
+
+			var expected = new JsonObject { ["data"] = 4789 };
+
+			var actual = YamlSerializer.Parse(yamlText).Single().ToJsonNode();
+
+			Assert.True(actual.IsEquivalentTo(expected));
+		}
+		finally
+		{
+			CultureInfo.CurrentCulture = culture;
+		}
+	}
+
+	[Test]
+	public void Issue478_DecimalFormatting_Dot()
+	{
+		var culture = CultureInfo.CurrentCulture;
+
+		try
+		{
+			CultureInfo.CurrentCulture = CultureInfo.GetCultureInfo("es-ES");
+
+			var yamlText = @"data: 4.789";
+
+			var expected = new JsonObject { ["data"] = 4.789 };
+
+			var actual = YamlSerializer.Parse(yamlText).Single().ToJsonNode();
+
+			Assert.True(actual.IsEquivalentTo(expected));
+		}
+		finally
+		{
+			CultureInfo.CurrentCulture = culture;
+		}
+	}
 }

Yaml2JsonNode/Yaml2JsonNode.csproj

@@ -4,9 +4,9 @@
     <TargetFramework>netstandard2.0</TargetFramework>
 	  <PackageId>Yaml2JsonNode</PackageId>
 	  <Authors>Greg Dennis</Authors>
-	  <Version>1.2.1</Version>
+	  <Version>1.2.2</Version>
 	  <AssemblyVersion>1.0.0.0</AssemblyVersion>
-	  <FileVersion>1.2.1.0</FileVersion>
+	  <FileVersion>1.2.2.0</FileVersion>
 	  <Description>Allows conversion of YamlDotNet's YAML models to JsonNodes.</Description>
 	  <PackageLicenseFile>LICENSE</PackageLicenseFile>
 	  <PackageProjectUrl>https://github.com/gregsdennis/json-everything</PackageProjectUrl>

Yaml2JsonNode/YamlConverter.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Text.Json.Nodes;
 using YamlDotNet.Core;
@@ -101,23 +102,20 @@ private static YamlSequenceNode ToYamlSequence(this JsonArray arr)
 
 	private static JsonValue ToJsonValue(this YamlScalarNode yaml)
 	{
-		switch (yaml.Style)
+		return yaml.Style switch
 		{
-			case ScalarStyle.Plain:
-				return decimal.TryParse(yaml.Value, out var d)
-					? JsonValue.Create(d)
-					: bool.TryParse(yaml.Value, out var b)
-						? JsonValue.Create(b)
-						: JsonValue.Create(yaml.Value)!;
-			case ScalarStyle.SingleQuoted:
-			case ScalarStyle.DoubleQuoted:
-			case ScalarStyle.Literal:
-			case ScalarStyle.Folded:
-			case ScalarStyle.Any:
-				return JsonValue.Create(yaml.Value)!;
-			default:
-				throw new ArgumentOutOfRangeException();
-		}
+			ScalarStyle.Plain => decimal.TryParse(yaml.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out var d)
+				? JsonValue.Create(d)
+				: bool.TryParse(yaml.Value, out var b)
+					? JsonValue.Create(b)
+					: JsonValue.Create(yaml.Value)!,
+			ScalarStyle.SingleQuoted => JsonValue.Create(yaml.Value)!,
+			ScalarStyle.DoubleQuoted => JsonValue.Create(yaml.Value)!,
+			ScalarStyle.Literal => JsonValue.Create(yaml.Value)!,
+			ScalarStyle.Folded => JsonValue.Create(yaml.Value)!,
+			ScalarStyle.Any => JsonValue.Create(yaml.Value)!,
+			_ => throw new ArgumentOutOfRangeException()
+		};
 	}
 
 	private static YamlScalarNode ToYamlScalar(this JsonValue val)

tools/ApiDocsGenerator/release-notes/rn-yaml.md

@@ -4,6 +4,10 @@ title: Yaml2JsonNode
 icon: fas fa-tag
 order: "8.12"
 ---
+# [1.2.2](https://github.com/gregsdennis/json-everything/pull/479) {#release-yaml-1.2.2}
+
+[#478](https://github.com/gregsdennis/json-everything/issues/478) - Converting numbers from YAML to JSON parses numbers against the machine's current culture, not the invariant culture.
+
 # [1.2.1](https://github.com/gregsdennis/json-everything/pull/477) {#release-yaml-1.2.1}
 
 [#476](https://github.com/gregsdennis/json-everything/issues/476) - [@amis92](https://github.com/amis92) discovered that JSON -> YAML -> JSON doesn't work when the data has string-encoded numbers and proposed the fix.