v2.2.2 (#24)

- *Fixed:* Corrected the YAML to JSON conversion for `long` vs `string` values.

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 Represents the **NuGet** versions.
 
+## v2.2.2
+- *Fixed:* Corrected the YAML to JSON conversion for `long` vs `string` values.
+
 ## v2.2.1
 - *Fixed:* All dependencies updated to the latest version.
 

src/OnRamp/OnRamp.csproj

@@ -4,7 +4,7 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netstandard2.1</TargetFramework>
     <RootNamespace>OnRamp</RootNamespace>
-    <Version>2.2.1</Version>
+    <Version>2.2.2</Version>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <Authors>Avanade</Authors>
     <Company>Avanade</Company>

src/OnRamp/Utility/StreamExtensions.cs

@@ -105,12 +105,12 @@ bool INodeTypeResolver.Resolve(NodeEvent? nodeEvent, ref Type currentType)
             {
                 if (nodeEvent is Scalar scalar && scalar.Style == YamlDotNet.Core.ScalarStyle.Plain)
                 {
-                    if (decimal.TryParse(scalar.Value, out _))
+                    if (decimal.TryParse(scalar.Value, out var dv))
                     {
                         if (scalar.Value.Length > 1 && scalar.Value.StartsWith('0')) // Valid JSON does not support a number that starts with a zero.
                             currentType = typeof(string);
                         else
-                            currentType = typeof(decimal);
+                            currentType = dv == Math.Round(dv) ? typeof(long) : typeof(decimal);
 
                         return true;
                     }

tests/OnRamp.Test/Config/EntityConfigEditor.cs

@@ -9,6 +9,11 @@ public Task BeforePrepareAsync(IRootConfig config)
         {
             var ec = config as EntityConfig;
             ec.Name = ec.Name.ToUpperInvariant();
+
+            var p = ec.Properties[2];
+            if (p.Count != 4 || p.Amount != 3.95M)
+                throw new System.InvalidOperationException("Count or Amount was incorrectly parsed.");
+
             return Task.CompletedTask;
         }
     }

tests/OnRamp.Test/Config/PropertyConfig.cs

@@ -24,6 +24,14 @@ public class PropertyConfig : ConfigBase<EntityConfig, EntityConfig>
         [CodeGenProperty("Key", Title = "Indicates whether the property is nullable.")]
         public bool? IsNullable { get; set; }
 
+        [JsonPropertyName("count")]
+        [CodeGenProperty("Key", Title = "Test out an integer.")]
+        public int? Count { get; set; }
+
+        [JsonPropertyName("amount")]
+        [CodeGenProperty("Key", Title = "Test out a decimal.")]
+        public decimal? Amount { get; set; }
+
         protected override Task PrepareAsync()
         {
             Type = DefaultWhereNull(Type, () => "string");

tests/OnRamp.Test/Data/ValidEntity.yaml

@@ -2,4 +2,4 @@
 properties:
 - { name: Name }
 - { name: Age, type: int }
-- { name: Salary, type: decimal, isNullable: true }
+- { name: Salary, type: decimal, isNullable: true, count: 4, amount: 3.95 }

tests/OnRamp.Test/Expected/Property.md

@@ -12,4 +12,6 @@ Property | Description
 **`name`** | The property name. [Mandatory]
 **`type`** | The property type. Valid options are: `string`, `int`, `decimal`.<br/>&dagger; This is a more detailed description for the property type.
 `isNullable` | Indicates whether the property is nullable.
+`count` | Test out an integer.
+`amount` | Test out a decimal.
 

tests/OnRamp.Test/Expected/Schema.json

@@ -45,6 +45,14 @@
         "isNullable": {
           "type": "boolean",
           "title": "Indicates whether the property is nullable."
+        },
+        "count": {
+          "type": "integer",
+          "title": "Test out an integer."
+        },
+        "amount": {
+          "type": "number",
+          "title": "Test out a decimal."
         }
       },
       "required": [