@hpcc-js/marshaller 2.28.7 → 2.28.8

package/LICENSE

@@ -1,43 +1,43 @@
-HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-
-
-Intersection Algorithms Provided by Kevin Lindsey
-Copyright (c) 2000-2011, Kevin Lindsey
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    - Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-
-    - Redistributions in binary form must reproduce the above copyright
-      notice, this list of conditions and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-
-    - Neither the name of this software nor the names of its contributors
-      may be used to endorse or promote products derived from this software
-      without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+HPCC SYSTEMS software Copyright (C) 2012 HPCC Systems.
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
+
+
+Intersection Algorithms Provided by Kevin Lindsey
+Copyright (c) 2000-2011, Kevin Lindsey
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+    - Redistributions of source code must retain the above copyright notice,
+      this list of conditions and the following disclaimer.
+
+    - Redistributions in binary form must reproduce the above copyright
+      notice, this list of conditions and the following disclaimer in the
+      documentation and/or other materials provided with the distribution.
+
+    - Neither the name of this software nor the names of its contributors
+      may be used to endorse or promote products derived from this software
+      without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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.
@@ -2346,7 +2346,7 @@ function _mergeNamespaces$1(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;
@@ -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 */