fix(core) Properly handles flags in string regex validators

Signed-off-by: jeromesimeon <[email protected]>
accordproject · Aug 4, 2021 · cb3a82e · cb3a82e
1 parent 3cd19ca
commit cb3a82e
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/packages/concerto-core/lib/introspect/parser.js b/packages/concerto-core/lib/introspect/parser.js
diff --git a/packages/concerto-core/lib/introspect/parser.pegjs b/packages/concerto-core/lib/introspect/parser.pegjs
@@ -283,13 +283,7 @@ UnicodeEscapeSequence
 
 RegularExpressionLiteral "regular expression"
   = "/" pattern:$RegularExpressionBody "/" flags:$RegularExpressionFlags {
-      var value;
-
-      try {
-        value = new RegExp(pattern, flags);
-      } catch (e) {
-        error(e.message);
-      }
+      var value = `/${pattern}/${flags}`;
 
       return { type: "Literal", value: value };
     }

diff --git a/packages/concerto-core/lib/introspect/stringvalidator.js b/packages/concerto-core/lib/introspect/stringvalidator.js
@@ -33,10 +33,18 @@ class StringValidator extends Validator{
      * @throws {IllegalModelException}
      */
     constructor(field, validator) {
-        super(field,validator);
+        super(field, validator);
         try {
-            // discard the leading / and closing /
-            this.regex = new RegExp(validator.substring(1,validator.length-1));
+            // Extract the RegExp components (pattern and flag)
+            const match = validator.match(/^\/([^/]*)\/(.*)$/);
+            const pattern = match[1];
+            const flags = match[2];
+
+            if (flags) {
+                this.regex = new RegExp(pattern, flags);
+            } else {
+                this.regex = new RegExp(pattern);
+            }
         }
         catch(exception) {
             this.reportError(exception.message);
@@ -53,7 +61,7 @@ class StringValidator extends Validator{
     validate(identifier, value) {
         if(value !== null) {
             if(!this.regex.test(value)) {
-                this.reportError(identifier, 'Value + \'' + value + '\' failed to match validation regex: ' + this.regex);
+                this.reportError(identifier, 'Value \'' + value + '\' failed to match validation regex: ' + this.regex);
             }
         }
     }

diff --git a/packages/concerto-core/test/introspect/field.js b/packages/concerto-core/test/introspect/field.js
@@ -43,7 +43,7 @@ describe('Field', () => {
             should.equal(f.validator, null);
         });
 
-        it('should save the incoming validator', () => {
+        it('should save the incoming string validator', () => {
 
             let f = new Field(mockClassDeclaration, {
                 id: {
@@ -52,7 +52,21 @@ describe('Field', () => {
                 propertyType: {
                     name: 'String'
                 },
-                regex: 'suchValidator'
+                regex: '/^suchValidator$/'
+            });
+            f.getValidator().validate('id', 'suchValidator');
+        });
+
+        it('should save the incoming string validator (with flag)', () => {
+
+            let f = new Field(mockClassDeclaration, {
+                id: {
+                    name: 'field',
+                },
+                propertyType: {
+                    name: 'String'
+                },
+                regex: '/^suchValidator$/u'
             });
             f.getValidator().validate('id', 'suchValidator');
         });