@hpcc-js/ddl-shim 2.25.1 → 2.25.2

package/dist/index.es6.js

@@ -14,8 +14,8 @@ function _mergeNamespaces(n, m) {
 }
 
 var PKG_NAME = "@hpcc-js/ddl-shim";
-var PKG_VERSION = "2.25.0";
-var BUILD_VERSION = "2.108.6";
+var PKG_VERSION = "2.25.2";
+var BUILD_VERSION = "2.108.10";
 
 function isWorkunitDatasource(ref) {
     return ref.WUID !== undefined;
@@ -3881,6 +3881,11 @@ function requireCompile () {
 	    , defaultsHash = {}
 	    , customRules = [];
 
+	  function patternCode(i, patterns) {
+	    var regExpCode = opts.regExp ? 'regExp' : 'new RegExp';
+	    return 'var pattern' + i + ' = ' + regExpCode + '(' + util.toQuotedString(patterns[i]) + ');';
+	  }
+
 	  root = root || { schema: schema, refVal: refVal, refs: refs };
 
 	  var c = checkCompiling.call(this, schema, root, baseId);
@@ -3967,6 +3972,7 @@ function requireCompile () {
 	        'equal',
 	        'ucs2length',
 	        'ValidationError',
+	        'regExp',
 	        sourceCode
 	      );
 
@@ -3980,7 +3986,8 @@ function requireCompile () {
 	        customRules,
 	        equal,
 	        ucs2length,
-	        ValidationError
+	        ValidationError,
+	        opts.regExp
 	      );
 
 	      refVal[0] = validate;
@@ -4197,11 +4204,6 @@ function requireCompile () {
 	}
 
 
-	function patternCode(i, patterns) {
-	  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
-	}
-
-
 	function defaultCode(i) {
 	  return 'var default' + i + ' = defaults[' + i + '];';
 	}
@@ -6225,6 +6227,7 @@ function requirePattern () {
 	  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
 	  var $breakOnError = !it.opts.allErrors;
 	  var $data = 'data' + ($dataLvl || '');
+	  var $valid = 'valid' + $lvl;
 	  var $isData = it.opts.$data && $schema && $schema.$data,
 	    $schemaValue;
 	  if ($isData) {
@@ -6233,12 +6236,21 @@ function requirePattern () {
 	  } else {
 	    $schemaValue = $schema;
 	  }
-	  var $regexp = $isData ? '(new RegExp(' + $schemaValue + '))' : it.usePattern($schema);
-	  out += 'if ( ';
+	  var $regExpCode = it.opts.regExp ? 'regExp' : 'new RegExp';
 	  if ($isData) {
-	    out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
+	    out += ' var ' + ($valid) + ' = true; try { ' + ($valid) + ' = ' + ($regExpCode) + '(' + ($schemaValue) + ').test(' + ($data) + '); } catch(e) { ' + ($valid) + ' = false; } if ( ';
+	    if ($isData) {
+	      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
+	    }
+	    out += ' !' + ($valid) + ') {';
+	  } else {
+	    var $regexp = it.usePattern($schema);
+	    out += ' if ( ';
+	    if ($isData) {
+	      out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
+	    }
+	    out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {';
 	  }
-	  out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {   ';
 	  var $$outStack = $$outStack || [];
 	  $$outStack.push(out);
 	  out = ''; /* istanbul ignore else */