Allow negative numbers in decimal type (#140)

digitaltwinconsortium · Oct 11, 2024 · 772de8e · 772de8e
1 parent 0e42fbf
commit 772de8e
Show file tree

Hide file tree

Showing 4 changed files with 49 additions and 9 deletions.
diff --git a/dotnet/src/DTDLParser/generated/DTDecimalInfo.g.cs b/dotnet/src/DTDLParser/generated/DTDecimalInfo.g.cs
@@ -32,7 +32,7 @@ public class DTDecimalInfo : DTNumericSchemaInfo, ITypeChecker, IConstrainer, IE
 
         private static readonly HashSet<string> VersionlessTypes = new HashSet<string>();
 
-        private static readonly Regex ElementValueInstanceRegexPatternV4 = new Regex(@"^(?:[1-9][0-9]*|0)(?:\.[0-9]*)?$", RegexOptions.Compiled);
+        private static readonly Regex ElementValueInstanceRegexPatternV4 = new Regex(@"^(?:\+|-)?(?:[1-9][0-9]*|0)(?:\.[0-9]*)?$", RegexOptions.Compiled);
 
         private bool checkedForDescendantSchemaArray = false;
 

diff --git a/dotnet/src/DTDLParser/generated/ModelElements.g.json b/dotnet/src/DTDLParser/generated/ModelElements.g.json
@@ -393,7 +393,7 @@
       "Decimal"
     ],
     "description": {
-      "en-US": "a string of decimal digits with an optional decimal point and fractional component"
+      "en-US": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
     },
     "displayName": "decimal"
   },

diff --git a/dtdl/dtdl_digest.json b/dtdl/dtdl_digest.json
@@ -2374,7 +2374,7 @@
         "Decimal"
       ],
       "description": {
-        "en-US": "a string of decimal digits with an optional decimal point and fractional component"
+        "en-US": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
       },
       "displayName": "decimal"
     },
@@ -19674,7 +19674,7 @@
         "4": [
           {
             "description": {
-              "en-us": "a string of decimal digits with an optional decimal point and fractional component"
+              "en-us": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
             },
             "id": "dtmi:dtdl:instance:Schema:decimal;4",
             "name": "decimal"
@@ -19699,7 +19699,7 @@
           "element": {
             "datatype": "decimal",
             "jsonType": "string",
-            "pattern": "^(?:[1-9][0-9]*|0)(?:\\.[0-9]*)?$"
+            "pattern": "^(?:\\+|-)?(?:[1-9][0-9]*|0)(?:\\.[0-9]*)?$"
           }
         },
         "conformanceText": "the XSD definition of 'decimal'",
@@ -21054,7 +21054,7 @@
           },
           {
             "description": {
-              "en-us": "a string of decimal digits with an optional decimal point and fractional component"
+              "en-us": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
             },
             "id": "dtmi:dtdl:instance:Schema:decimal;4",
             "name": "decimal"
@@ -26564,7 +26564,7 @@
           },
           {
             "description": {
-              "en-us": "a string of decimal digits with an optional decimal point and fractional component"
+              "en-us": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
             },
             "id": "dtmi:dtdl:instance:Schema:decimal;4",
             "name": "decimal"
@@ -27706,7 +27706,7 @@
           },
           {
             "description": {
-              "en-us": "a string of decimal digits with an optional decimal point and fractional component"
+              "en-us": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
             },
             "id": "dtmi:dtdl:instance:Schema:decimal;4",
             "name": "decimal"
@@ -29509,7 +29509,7 @@
           },
           {
             "description": {
-              "en-us": "a string of decimal digits with an optional decimal point and fractional component"
+              "en-us": "a string of decimal digits with an optional decimal point and fractional component, optionally preceded by a sign"
             },
             "id": "dtmi:dtdl:instance:Schema:decimal;4",
             "name": "decimal"

diff --git a/test-cases/generated/DecimalInstancesV4.json b/test-cases/generated/DecimalInstancesV4.json
@@ -23,6 +23,16 @@
       "conforms": true,
       "submit": "\"0\""
     },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"+0\""
+    },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"-0\""
+    },
     {
       "subject": "dtmi:dtdl:instance:Schema:decimal;4",
       "conforms": false,
@@ -33,6 +43,16 @@
       "conforms": true,
       "submit": "\"1\""
     },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"+1\""
+    },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"-1\""
+    },
     {
       "subject": "dtmi:dtdl:instance:Schema:decimal;4",
       "conforms": true,
@@ -43,6 +63,16 @@
       "conforms": true,
       "submit": "\"123\""
     },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"+123\""
+    },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"-123\""
+    },
     {
       "subject": "dtmi:dtdl:instance:Schema:decimal;4",
       "conforms": false,
@@ -108,6 +138,16 @@
       "conforms": true,
       "submit": "\"1.5\""
     },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"+1.5\""
+    },
+    {
+      "subject": "dtmi:dtdl:instance:Schema:decimal;4",
+      "conforms": true,
+      "submit": "\"-1.5\""
+    },
     {
       "subject": "dtmi:dtdl:instance:Schema:decimal;4",
       "conforms": true,