@hpcc-js/ddl-shim 2.25.1 → 2.25.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -20,8 +20,8 @@
20
20
  }
21
21
 
22
22
  var PKG_NAME = "@hpcc-js/ddl-shim";
23
- var PKG_VERSION = "2.25.0";
24
- var BUILD_VERSION = "2.108.6";
23
+ var PKG_VERSION = "2.25.2";
24
+ var BUILD_VERSION = "2.108.10";
25
25
 
26
26
  function isWorkunitDatasource(ref) {
27
27
  return ref.WUID !== undefined;
@@ -3887,6 +3887,11 @@
3887
3887
  , defaultsHash = {}
3888
3888
  , customRules = [];
3889
3889
 
3890
+ function patternCode(i, patterns) {
3891
+ var regExpCode = opts.regExp ? 'regExp' : 'new RegExp';
3892
+ return 'var pattern' + i + ' = ' + regExpCode + '(' + util.toQuotedString(patterns[i]) + ');';
3893
+ }
3894
+
3890
3895
  root = root || { schema: schema, refVal: refVal, refs: refs };
3891
3896
 
3892
3897
  var c = checkCompiling.call(this, schema, root, baseId);
@@ -3973,6 +3978,7 @@
3973
3978
  'equal',
3974
3979
  'ucs2length',
3975
3980
  'ValidationError',
3981
+ 'regExp',
3976
3982
  sourceCode
3977
3983
  );
3978
3984
 
@@ -3986,7 +3992,8 @@
3986
3992
  customRules,
3987
3993
  equal,
3988
3994
  ucs2length,
3989
- ValidationError
3995
+ ValidationError,
3996
+ opts.regExp
3990
3997
  );
3991
3998
 
3992
3999
  refVal[0] = validate;
@@ -4203,11 +4210,6 @@
4203
4210
  }
4204
4211
 
4205
4212
 
4206
- function patternCode(i, patterns) {
4207
- return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
4208
- }
4209
-
4210
-
4211
4213
  function defaultCode(i) {
4212
4214
  return 'var default' + i + ' = defaults[' + i + '];';
4213
4215
  }
@@ -6231,6 +6233,7 @@
6231
6233
  var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
6232
6234
  var $breakOnError = !it.opts.allErrors;
6233
6235
  var $data = 'data' + ($dataLvl || '');
6236
+ var $valid = 'valid' + $lvl;
6234
6237
  var $isData = it.opts.$data && $schema && $schema.$data,
6235
6238
  $schemaValue;
6236
6239
  if ($isData) {
@@ -6239,12 +6242,21 @@
6239
6242
  } else {
6240
6243
  $schemaValue = $schema;
6241
6244
  }
6242
- var $regexp = $isData ? '(new RegExp(' + $schemaValue + '))' : it.usePattern($schema);
6243
- out += 'if ( ';
6245
+ var $regExpCode = it.opts.regExp ? 'regExp' : 'new RegExp';
6244
6246
  if ($isData) {
6245
- out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
6247
+ out += ' var ' + ($valid) + ' = true; try { ' + ($valid) + ' = ' + ($regExpCode) + '(' + ($schemaValue) + ').test(' + ($data) + '); } catch(e) { ' + ($valid) + ' = false; } if ( ';
6248
+ if ($isData) {
6249
+ out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
6250
+ }
6251
+ out += ' !' + ($valid) + ') {';
6252
+ } else {
6253
+ var $regexp = it.usePattern($schema);
6254
+ out += ' if ( ';
6255
+ if ($isData) {
6256
+ out += ' (' + ($schemaValue) + ' !== undefined && typeof ' + ($schemaValue) + ' != \'string\') || ';
6257
+ }
6258
+ out += ' !' + ($regexp) + '.test(' + ($data) + ') ) {';
6246
6259
  }
6247
- out += ' !' + ($regexp) + '.test(' + ($data) + ') ) { ';
6248
6260
  var $$outStack = $$outStack || [];
6249
6261
  $$outStack.push(out);
6250
6262
  out = ''; /* istanbul ignore else */