@hpcc-js/marshaller 2.28.6 → 2.28.8

package/dist/index.es6.js

@@ -13,8 +13,8 @@ import { JSONEditor, JSEditor } from '@hpcc-js/codemirror';
 import { PropertyEditor } from '@hpcc-js/other';
 
 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.
@@ -2330,7 +2330,7 @@ var DSPicker = /** @class */ (function (_super) {
 }(ActivitySelection));
 DSPicker.prototype._class += " DSPicker";
 
-function _mergeNamespaces(n, m) {
+function _mergeNamespaces$1(n, m) {
     m.forEach(function (e) {
         e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
             if (k !== 'default' && !(k in n)) {
@@ -2346,7 +2346,7 @@ function _mergeNamespaces(n, m) {
 }
 
 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;
@@ -3405,10 +3405,10 @@ var hasRequiredUri_all;
 function requireUri_all () {
 	if (hasRequiredUri_all) return uri_all$1.exports;
 	hasRequiredUri_all = 1;
-	(function (module, exports) {
+	(function (module, exports$1) {
 		(function (global, factory) {
-			factory(exports) ;
-		}(uri_all, (function (exports) {
+			factory(exports$1) ;
+		}(uri_all, (function (exports$1) {
 		function merge() {
 		    for (var _len = arguments.length, sets = Array(_len), _key = 0; _key < _len; _key++) {
 		        sets[_key] = arguments[_key];
@@ -4790,20 +4790,20 @@ function requireUri_all () {
 		SCHEMES[handler$5.scheme] = handler$5;
 		SCHEMES[handler$6.scheme] = handler$6;
 
-		exports.SCHEMES = SCHEMES;
-		exports.pctEncChar = pctEncChar;
-		exports.pctDecChars = pctDecChars;
-		exports.parse = parse;
-		exports.removeDotSegments = removeDotSegments;
-		exports.serialize = serialize;
-		exports.resolveComponents = resolveComponents;
-		exports.resolve = resolve;
-		exports.normalize = normalize;
-		exports.equal = equal;
-		exports.escapeComponent = escapeComponent;
-		exports.unescapeComponent = unescapeComponent;
-
-		Object.defineProperty(exports, '__esModule', { value: true });
+		exports$1.SCHEMES = SCHEMES;
+		exports$1.pctEncChar = pctEncChar;
+		exports$1.pctDecChars = pctDecChars;
+		exports$1.parse = parse;
+		exports$1.removeDotSegments = removeDotSegments;
+		exports$1.serialize = serialize;
+		exports$1.resolveComponents = resolveComponents;
+		exports$1.resolve = resolve;
+		exports$1.normalize = normalize;
+		exports$1.equal = equal;
+		exports$1.escapeComponent = escapeComponent;
+		exports$1.unescapeComponent = unescapeComponent;
+
+		Object.defineProperty(exports$1, '__esModule', { value: true });
 
 		})));
 		
@@ -6181,6 +6181,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);
@@ -6267,6 +6272,7 @@ function requireCompile () {
 	        'equal',
 	        'ucs2length',
 	        'ValidationError',
+	        'regExp',
 	        sourceCode
 	      );
 
@@ -6280,7 +6286,8 @@ function requireCompile () {
 	        customRules,
 	        equal,
 	        ucs2length,
-	        ValidationError
+	        ValidationError,
+	        opts.regExp
 	      );
 
 	      refVal[0] = validate;
@@ -6497,11 +6504,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 + '];';
 	}
@@ -8525,6 +8527,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) {
@@ -8533,12 +8536,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 */
@@ -10898,7 +10910,7 @@ function requireAjv () {
 var ajvExports = requireAjv();
 var ajv = /*@__PURE__*/getDefaultExportFromCjs(ajvExports);
 
-var _Ajv = /*#__PURE__*/_mergeNamespaces({
+var _Ajv = /*#__PURE__*/_mergeNamespaces$1({
     __proto__: null,
     default: ajv
 }, [ajvExports]);