Fix bug with scalar values (#7) (#8)

Co-authored-by: Gilles TOURREAU <gilles.tourreau@pos-informatique.fr>

Co-authored-by: Gilles TOURREAU <gilles.tourreau@pos-informatique.fr>

Author: GillesTourreau

MSBuild.Yaml.Tests/YamlToJsonTest.cs

@@ -49,8 +49,13 @@ public void Execute_WithIndentation()
             var yaml = @"
 object:
 - value: 'v1'
+- booleanValue: false
+- decimalValue: 11.22
+- stringValue: ""Blabla""
+- stringValue2: 'Blabla'
+- nullValue: 
 - innerObject:
-  innerValue: 1234
+    innerIntValue: 1234
 ";
 
             File.WriteAllText(@"sub\folder\yaml.yaml", yaml);
@@ -78,7 +83,33 @@ public void Execute_WithIndentation()
 
             var json = File.ReadAllText(@"sub\folder\json.json");
 
-            json.Should().Be("{\r\n  \"object\": [\r\n    {\r\n      \"value\": \"v1\"\r\n    },\r\n    {\r\n      \"innerObject\": null,\r\n      \"innerValue\": \"1234\"\r\n    }\r\n  ]\r\n}");
+            json.Should().Be(@"{
+  ""object"": [
+    {
+      ""value"": ""v1""
+    },
+    {
+      ""booleanValue"": false
+    },
+    {
+      ""decimalValue"": 11.22
+    },
+    {
+      ""stringValue"": ""Blabla""
+    },
+    {
+      ""stringValue2"": ""Blabla""
+    },
+    {
+      ""nullValue"": null
+    },
+    {
+      ""innerObject"": {
+        ""innerIntValue"": 1234
+      }
+    }
+  ]
+}");
 
             buildEngine.Verify(b => b.LogMessageEvent(It.IsAny<BuildMessageEventArgs>()));
         }
@@ -96,8 +127,13 @@ public void Execute_WithNoIndentation()
             var yaml = @"
 object:
 - value: 'v1'
+- booleanValue: false
+- decimalValue: 11.22
+- stringValue: ""Blabla""
+- stringValue2: 'Blabla'
+- nullValue: 
 - innerObject:
-  innerValue: 1234
+    innerIntValue: 1234
 ";
 
             File.WriteAllText(@"sub\folder\yaml.yaml", yaml);
@@ -125,7 +161,7 @@ public void Execute_WithNoIndentation()
 
             var json = File.ReadAllText(@"sub\folder\json.json");
 
-            json.Should().Be("{\"object\":[{\"value\":\"v1\"},{\"innerObject\":null,\"innerValue\":\"1234\"}]}");
+            json.Should().Be(@"{""object"":[{""value"":""v1""},{""booleanValue"":false},{""decimalValue"":11.22},{""stringValue"":""Blabla""},{""stringValue2"":""Blabla""},{""nullValue"":null},{""innerObject"":{""innerIntValue"":1234}}]}");
 
             buildEngine.Verify(b => b.LogMessageEvent(It.IsAny<BuildMessageEventArgs>()));
         }

MSBuild.Yaml/MSBuild.Yaml.csproj

@@ -15,12 +15,14 @@
     <RepositoryUrl>https://github.com/PosInformatique/PosInformatique.MSBuild.Yaml.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>msbuild yaml json converter</PackageTags>
-    <PackageReleaseNotes>1.0.0 - Initial version</PackageReleaseNotes>
+    <PackageReleaseNotes>1.0.1 - Fix bugs with scalar values as boolean, integer, decimal and null.
+1.0.0 - Initial version</PackageReleaseNotes>
 
     <!-- NuGet packaging options -->
     <BuildOutputTargetFolder>tasks</BuildOutputTargetFolder>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <NoPackageAnalysis>true</NoPackageAnalysis>
+    <Version>1.0.1</Version>
 
   </PropertyGroup>
 

MSBuild.Yaml/YamlToJson.cs

@@ -6,16 +6,25 @@
 namespace PosInformatique.MSBuild.Yaml
 {
     using System;
+    using System.Globalization;
     using System.IO;
     using Microsoft.Build.Framework;
     using Newtonsoft.Json;
+    using YamlDotNet.Core;
+    using YamlDotNet.Core.Events;
     using YamlDotNet.Serialization;
 
     /// <summary>
     /// MSBuild task which convert a YAML file into a JSON file.
     /// </summary>
     public sealed class YamlToJson : Microsoft.Build.Utilities.Task
     {
+        /// <summary>
+        /// YAML deserializer.
+        /// </summary>
+        private static readonly IDeserializer yamlDeserializer = new DeserializerBuilder()
+            .WithNodeDeserializer(new ScalarNodeDeserializer()).Build();
+
         /// <summary>
         /// Initializes a new instance of the <see cref="YamlToJson"/> class.
         /// </summary>
@@ -73,8 +82,6 @@ public override bool Execute()
                 this.Log.LogMessage(MessageImportance.Normal, MsBuildYamlResources.LogConvertingYamlFile, this.YamlInputFile, this.JsonOutputFile, MsBuildYamlResources.WithoutIndentation);
             }
 
-            var yamlDeserializer = new Deserializer();
-
             using (var inputReader = new StreamReader(this.YamlInputFile))
             {
                 var yamlContent = yamlDeserializer.Deserialize(inputReader);
@@ -94,5 +101,60 @@ public override bool Execute()
 
             return true;
         }
+
+        /// <summary>
+        /// Implementation of the <see cref="INodeDeserializer"/> which allows to
+        /// parse the scalar values:
+        /// - Boolean
+        /// - Integer
+        /// - Decimal
+        /// - Empty values to null
+        /// </summary>
+        private sealed class ScalarNodeDeserializer : INodeDeserializer
+        {
+            /// <summary>
+            /// <see cref="YamlDotNet.Serialization.NodeDeserializers.ScalarNodeDeserializer"/> used to retrieve
+            /// the default behavior for the not supported scalar values.
+            /// </summary>
+            private static readonly INodeDeserializer defaultNodeDeserializer = new YamlDotNet.Serialization.NodeDeserializers.ScalarNodeDeserializer();
+
+            /// <inheritdoc />
+            public bool Deserialize(IParser reader, Type expectedType, Func<IParser, Type, object> nestedObjectDeserializer, out object value)
+            {
+                if (reader.Accept(out Scalar scalar))
+                {
+                    if (string.IsNullOrEmpty(scalar.Value))
+                    {
+                        value = null;
+                        reader.MoveNext();
+
+                        return true;
+                    }
+                    else if (bool.TryParse(scalar.Value, out bool booleanValue))
+                    {
+                        value = booleanValue;
+                        reader.MoveNext();
+
+                        return true;
+                    }
+                    else if (int.TryParse(scalar.Value, NumberStyles.Any, CultureInfo.InvariantCulture, out int integerValue))
+                    {
+                        value = integerValue;
+                        reader.MoveNext();
+
+                        return true;
+                    }
+                    else if (decimal.TryParse(scalar.Value, NumberStyles.Any, CultureInfo.InvariantCulture , out decimal decimalValue))
+                    {
+                        value = decimalValue;
+                        reader.MoveNext();
+
+                        return true;
+                    }
+                }
+
+                return defaultNodeDeserializer.Deserialize(reader, expectedType, nestedObjectDeserializer, out value);
+            }
+        }
     }
 }

README.md

@@ -54,7 +54,7 @@ To declare YAML files to generate automatically before compilation:
 - Install the [PosInformatique.MSBuild.Yaml](https://www.nuget.org/packages/PosInformatique.MSBuild.Yaml/)
 package using the following command line in the Visual Studio Package Manager console:
 ```powershell
-Install-Package PosInformatique.AspNetCore.Server.AspNet
+Install-Package PosInformatique.MSBuild.Yaml
 ```
 
 - Updates the `.xxproj` file by declaring the YAML files in the `<YamlToJsonFile>`