feat(*): Support string length validation (#3)

Signed-off-by: [email protected] <[email protected]>
accordproject · May 16, 2023 · 2ab4abe · 2ab4abe
1 parent 5f88b5c
commit 2ab4abe
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 6 deletions.
diff --git a/lib/metamodel.cto b/lib/metamodel.cto
@@ -148,13 +148,19 @@ concept DateTimeProperty extends Property {
 concept StringProperty extends Property {
   o String defaultValue optional
   o StringRegexValidator validator optional
+  o StringLengthValidator lengthValidator optional
 }
 
 concept StringRegexValidator {
   o String pattern
   o String flags
 }
 
+concept StringLengthValidator {
+  o Integer minLength optional
+  o Integer maxLength optional
+}
+
 concept DoubleProperty extends Property {
   o Double defaultValue optional
   o DoubleDomainValidator validator optional
@@ -239,6 +245,7 @@ concept DoubleScalar extends ScalarDeclaration {
 concept StringScalar extends ScalarDeclaration {
   o String defaultValue optional
   o StringRegexValidator validator optional
+  o StringLengthValidator lengthValidator optional
 }
 
 concept DateTimeScalar extends ScalarDeclaration {

diff --git a/lib/metamodel.js b/lib/metamodel.js
diff --git a/lib/metamodel.json b/lib/metamodel.json
@@ -698,6 +698,16 @@
                     },
                     "isArray": false,
                     "isOptional": true
+                },
+                {
+                    "$class": "[email protected]",
+                    "name": "lengthValidator",
+                    "type": {
+                        "$class": "[email protected]",
+                        "name": "StringLengthValidator"
+                    },
+                    "isArray": false,
+                    "isOptional": true
                 }
             ],
             "superType": {
@@ -724,6 +734,25 @@
                 }
             ]
         },
+        {
+            "$class": "[email protected]",
+            "name": "StringLengthValidator",
+            "isAbstract": false,
+            "properties": [
+                {
+                    "$class": "[email protected]",
+                    "name": "minLength",
+                    "isArray": false,
+                    "isOptional": true
+                },
+                {
+                    "$class": "[email protected]",
+                    "name": "maxLength",
+                    "isArray": false,
+                    "isOptional": true
+                }
+            ]
+        },
         {
             "$class": "[email protected]",
             "name": "DoubleProperty",
@@ -1125,6 +1154,16 @@
                     },
                     "isArray": false,
                     "isOptional": true
+                },
+                {
+                    "$class": "[email protected]",
+                    "name": "lengthValidator",
+                    "type": {
+                        "$class": "[email protected]",
+                        "name": "StringLengthValidator"
+                    },
+                    "isArray": false,
+                    "isOptional": true
                 }
             ],
             "superType": {

diff --git a/test/cto/person.cto b/test/cto/person.cto
@@ -13,8 +13,9 @@ abstract participant Individual {
 }
 
 participant Person extends Individual {
-  o String firstName regex=/[a-zA-Z]*/u
-  o String lastName
+  o String firstName regex=/[a-zA-Z]*/u length=[1,]
+  o String lastName length=[,100]
+  o string middleName length=[1,100]
   o Address address
   o Address address2 default="USAddress"
   @description("Work Address")

diff --git a/test/cto/person.json b/test/cto/person.json
@@ -249,13 +249,32 @@
                 "$class": "[email protected]",
                 "pattern": "[a-zA-Z]*",
                 "flags": "u"
+              },
+              "lengthValidator": {
+                "$class": "[email protected]",
+                "minLength": 1
               }
             },
             {
               "$class": "[email protected]",
               "name": "lastName",
               "isArray": false,
-              "isOptional": false
+              "isOptional": false,
+              "lengthValidator": {
+                "$class": "[email protected]",
+                "maxLength": 100
+              }
+            },
+            {
+              "$class": "[email protected]",
+              "name": "middleName",
+              "isArray": false,
+              "isOptional": false,
+              "lengthValidator": {
+                "$class": "[email protected]",
+                "minLength": 1,
+                "maxLength": 100
+              }
             },
             {
               "$class": "[email protected]",

diff --git a/test/cto/personResolved.json b/test/cto/personResolved.json
@@ -52,13 +52,32 @@
             "$class": "[email protected]",
             "pattern": "[a-zA-Z]*",
             "flags": "u"
+          },
+          "lengthValidator": {
+            "$class": "[email protected]",
+            "minLength": 1
           }
         },
         {
           "$class": "[email protected]",
           "name": "lastName",
           "isArray": false,
-          "isOptional": false
+          "isOptional": false,
+          "lengthValidator": {
+            "$class": "[email protected]",
+            "maxLength": 100
+          }
+        },
+        {
+          "$class": "[email protected]",
+          "name": "middleName",
+          "isArray": false,
+          "isOptional": false,
+          "lengthValidator": {
+            "$class": "[email protected]",
+            "minLength": 1,
+            "maxLength": 100
+          }
         },
         {
           "$class": "[email protected]",