@hpcc-js/marshaller 2.28.7 → 2.28.8

package/dist/index.js

@@ -5,8 +5,8 @@
 })(this, (function (exports, comms, common, util$1, chart, dgrid, form, graph, map, layout, phosphor, codemirror, other) { 'use strict';
 
   var PKG_NAME$1 = "@hpcc-js/marshaller";
-  var PKG_VERSION$1 = "2.28.6";
-  var BUILD_VERSION = "2.108.6";
+  var PKG_VERSION$1 = "2.28.8";
+  var BUILD_VERSION = "2.108.8";
 
   /******************************************************************************
   Copyright (c) Microsoft Corporation.
@@ -2338,7 +2338,7 @@
   }
 
   var PKG_NAME = "@hpcc-js/ddl-shim";
-  var PKG_VERSION = "2.25.0";
+  var PKG_VERSION = "2.25.1";
 
   function isWorkunitDatasource(ref) {
       return ref.WUID !== undefined;
@@ -6173,6 +6173,11 @@
   	    , 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);
@@ -6259,6 +6264,7 @@
   	        'equal',
   	        'ucs2length',
   	        'ValidationError',
+  	        'regExp',
   	        sourceCode
   	      );
 
@@ -6272,7 +6278,8 @@
   	        customRules,
   	        equal,
   	        ucs2length,
-  	        ValidationError
+  	        ValidationError,
+  	        opts.regExp
   	      );
 
   	      refVal[0] = validate;
@@ -6489,11 +6496,6 @@
   	}
 
 
-  	function patternCode(i, patterns) {
-  	  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
-  	}
-
-
   	function defaultCode(i) {
   	  return 'var default' + i + ' = defaults[' + i + '];';
   	}
@@ -8517,6 +8519,7 @@
   	  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) {
@@ -8525,12 +8528,21 @@
   	  } 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 */