Fixing Default Values Ignoring Meta properties. (#1013)

* Validating defaultValue against range constriants for numbers

Signed-off-by: Khaled Gadelhaq <[email protected]>

* Validating defaultValue against regex and length constriants and fixing an invalid regex

Signed-off-by: Khaled Gadelhaq <[email protected]>

* Fixing concerto-cto tests due the recent changes

Signed-off-by: Khaled Gadelhaq <[email protected]>

---------

Signed-off-by: Khaled Gadelhaq <[email protected]>
Co-authored-by: Khaled Gadelhaq <[email protected]>

Author: khaledGadelhaQ

packages/concerto-core/lib/introspect/numbervalidator.js

@@ -65,6 +65,17 @@ class NumberValidator extends Validator{
                 this.reportError(null, 'Lower bound must be less than or equal to upper bound.');
             }
         }
+
+        if(this.field?.ast?.defaultValue !== undefined) {
+            let value = this.field.ast.defaultValue;
+            if(this.lowerBound !== null && value < this.lowerBound) {
+                this.reportError(null, `Value ${value} is outside lower bound ${this.lowerBound}`);
+            }
+
+            if(this.upperBound !== null && value > this.upperBound) {
+                this.reportError(null, `Value ${value} is outside upper bound ${this.upperBound}`);
+            }
+        }
     }
 
     /**

packages/concerto-core/lib/introspect/stringvalidator.js

@@ -74,6 +74,10 @@ class StringValidator extends Validator{
                 this.reportError(field.getName(), exception.message, ErrorCodes.REGEX_VALIDATOR_EXCEPTION);
             }
         }
+
+        if(this.field?.ast?.defaultValue) {
+            this.validate(field.getName(), this.field.ast.defaultValue);
+        }
     }
 
     /**

packages/concerto-core/test/data/model/dependencies/base/base.cto

@@ -68,4 +68,4 @@ concept Address {
   o String postOfficeBoxNumber optional
 }
 
-scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\{4}+/
+scalar SSN extends String default="000-00-0000" regex= /\d{3}-\d{2}-\d{4}/

packages/concerto-core/test/data/parser/classdeclaration.scalararray.cto

@@ -14,7 +14,7 @@
 
 namespace com.testing
 
-scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\{4}+/
+scalar SSN extends String default="000-00-0000" regex= /\d{3}-\d{2}-\d{4}/
 
 concept Persons {
     o SSN[] ssnArray

packages/concerto-core/test/data/parser/classdeclaration.scalaridentifier.cto

@@ -14,7 +14,7 @@
 
 namespace com.testing
 
-scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\{4}+/
+scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\d{4}/
 
 concept Person identified by ssn {
     o SSN ssn

packages/concerto-core/test/data/parser/scalardeclaration.ssn.cto

@@ -14,5 +14,5 @@
 
 namespace com.testing
 
-scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\{4}+/
+scalar SSN extends String default="000-00-0000" regex= /\d{3}-\d{2}-\d{4}/
 scalar BoolWithDefault extends Boolean default=false

packages/concerto-core/test/introspect/numbervalidator.js

@@ -71,6 +71,41 @@ describe('NumberValidator', () => {
                 new NumberValidator(mockField, LOWER_IS_HIGHER_THAN_UPPER);
             }).should.throw(/Lower bound must be less than or equal to upper bound./);
         });
+
+        it('should use default value if input is null and within range', () => {
+            mockField.ast = { defaultValue: 50 };
+            (() => {
+                new NumberValidator(mockField, { lower: 0, upper: 100 });
+            }).should.not.throw();
+        });
+
+        it('should throw an error if default value is outside the lower bound', () => {
+            mockField.ast = { defaultValue: 5 };
+            (() => {
+                new NumberValidator(mockField, { lower: 10, upper: 100 });
+            }).should.throw(/Value 5 is outside lower bound 10/);
+        });
+
+        it('should throw an error if default value is outside the upper bound', () => {
+            mockField.ast = { defaultValue: 60 };
+            (() => {
+                new NumberValidator(mockField, { lower: 0, upper: 50 });
+            }).should.throw(/Value 60 is outside upper bound 50/);
+        });
+
+        it('should not throw an error if default value is exactly at the lower bound', () => {
+            mockField.ast = { defaultValue: 10 };
+            (() => {
+                new NumberValidator(mockField, { lower: 10, upper: 100 });
+            }).should.not.throw();
+        });
+
+        it('should not throw an error if default value is exactly at the upper bound', () => {
+            mockField.ast = { defaultValue: 50 };
+            (() => {
+                new NumberValidator(mockField, { lower: 0, upper: 50 });
+            }).should.not.throw();
+        });
     });
 
     describe('#validate', () => {

packages/concerto-core/test/introspect/scalardeclaration.js

@@ -144,7 +144,7 @@ describe('ScalarDeclaration', () => {
         });
         it('should return the validator', () => {
             const testClass = modelManager.getType('com.testing.SSN');
-            should.equal(testClass.getValidator().validator.pattern, '\\d{3}-\\d{2}-\\{4}+');
+            should.equal(testClass.getValidator().validator.pattern, '\\d{3}-\\d{2}-\\d{4}');
         });
     });
 

packages/concerto-core/test/introspect/stringvalidator.js

@@ -81,6 +81,36 @@ describe('StringValidator', () => {
                 new StringValidator(mockField, null, NEGETIVE_LENGTH);
             }).should.throw(/minLength and-or maxLength must be positive integers/);
         });
+
+        it('should throw when defaultValue length is less than minLength', () => {
+            mockField.ast = { defaultValue: 'abc' };
+            (() => {
+                new StringValidator(mockField, null, {
+                    minLength: 5,
+                    maxLength: 10,
+                });
+            }).should.throw(/The string length of 'abc' should be at least 5 characters./);
+        });
+
+        it('should throw when defaultValue length is greater than maxLength', () => {
+            mockField.ast = { defaultValue: 'abcdefgh' };
+            (() => {
+                new StringValidator(mockField, null, {
+                    minLength: 2,
+                    maxLength: 5,
+                });
+            }).should.throw(/The string length of 'abcdefgh' should not exceed 5 characters./);
+        });
+
+        it('should accept valid defaultValue that matches length and pattern constraints', () => {
+            mockField.ast = { defaultValue: 'ABC' };
+            (()=>{
+                new StringValidator(mockField,
+                    { pattern: '^[A-Z]{3,5}$' },
+                    { minLength: 3, maxLength: 5 },
+                );
+            }).should.not.throw();
+        });
     });
 
     describe('#validate', () => {

packages/concerto-cto/test/cto/scalar.cto

@@ -69,7 +69,7 @@ concept ScalarsWithFieldMetaProperties {
   o StringScalarWithDefaultAndRegex[] stringScalarWithDefaultAndRegexOptionalArray optional
 }
 
-scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\{4}+/ length=[1,100]
+scalar SSN extends String default="000-00-0000" regex=/\d{3}-\d{2}-\d{4}/ length=[1,100]
 
 concept Person identified by ssn {
   o SSN ssn