@hpcc-js/ddl-shim 2.17.20 → 2.17.21

package/dist/index.es6.js

@@ -1,6 +1,21 @@
+function _mergeNamespaces(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)) {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    });
+    return Object.freeze(n);
+}
+
 var PKG_NAME = "@hpcc-js/ddl-shim";
-var PKG_VERSION = "2.17.20";
-var BUILD_VERSION = "2.94.0";
+var PKG_VERSION = "2.17.21";
+var BUILD_VERSION = "2.97.0";
 
 function isWorkunitDatasource(ref) {
     return ref.WUID !== undefined;
@@ -95,7 +110,7 @@ function isLimitActivity(activity) {
 }
 var VisibilitySet = ["normal", "flyout"];
 
-var v2 = /*#__PURE__*/Object.freeze({
+var v2$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     isDatabombRef: isDatabombRef,
     isWUResultRef: isWUResultRef,
@@ -143,7 +158,7 @@ function __spreadArray(to, from, pack) {
             ar[i] = from[i];
         }
     }
-    return to.concat(ar || from);
+    return to.concat(ar || Array.prototype.slice.call(from));
 }
 
 var classMappings = {
@@ -359,7 +374,7 @@ function apply_to_properties_layout(ddl2, dermObj) {
     });
     return retVal;
 }
-function upgrade(ddl2, dermObj) {
+function upgrade$1(ddl2, dermObj) {
     apply_to_dataviews(ddl2, dermObj);
     return apply_to_properties_layout(ddl2, dermObj);
 }
@@ -579,7 +594,7 @@ var DDLUpgrade = /** @class */ (function () {
                                     break;
                                 default:
                                     groupByColumns.push(this.toLowerCase(field.id));
-                                    throw new Error("Unhandled field function: " + field.properties.function);
+                                    throw new Error("Unhandled field function: ".concat(field.properties.function));
                             }
                         }
                         else {
@@ -590,7 +605,7 @@ var DDLUpgrade = /** @class */ (function () {
                         this._ddl2DataviewActivities[viz.id].project.transformations = projectTransformations;
                     }
                     if (aggrFields.length) {
-                        this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray([], groupByColumns);
+                        this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray([], groupByColumns, true);
                         this._ddl2DataviewActivities[viz.id].groupBy.aggregates = aggrFields;
                     }
                 }
@@ -608,7 +623,7 @@ var DDLUpgrade = /** @class */ (function () {
             case "MAX":
                 return "max";
         }
-        throw new Error("Unknown DDL1 Function Type:  " + func);
+        throw new Error("Unknown DDL1 Function Type:  ".concat(func));
     };
     DDLUpgrade.prototype.readMappings = function () {
         for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
@@ -635,7 +650,7 @@ var DDLUpgrade = /** @class */ (function () {
                     this.readSliderMappings(viz);
                 }
                 else {
-                    throw new Error("Unkown DDL1 mapping type:  " + viz.type);
+                    throw new Error("Unkown DDL1 mapping type:  ".concat(viz.type));
                 }
             }
         }
@@ -750,7 +765,7 @@ var DDLUpgrade = /** @class */ (function () {
                 var flag = _a[_i];
                 if (flag.fieldid) {
                     mappings.transformations.push({
-                        fieldID: "annotation_" + idx++,
+                        fieldID: "annotation_".concat(idx++),
                         type: "map",
                         sourceFieldID: this.toLowerCase(flag.fieldid),
                         default: {},
@@ -809,7 +824,7 @@ var DDLUpgrade = /** @class */ (function () {
                                         var mapping = update.mappings[key];
                                         var dsFilter = (mapping && dsFilters[mapping]) ? dsFilters[mapping].filter : undefined;
                                         if (!dsFilter) {
-                                            console.warn("Select Mapping \"" + mapping + "\" in viz \"" + viz.id + "\" not found in filters for \"" + otherViz.id + "\"");
+                                            console.warn("Select Mapping \"".concat(mapping, "\" in viz \"").concat(viz.id, "\" not found in filters for \"").concat(otherViz.id, "\""));
                                         }
                                         else {
                                             condition.mappings.push({
@@ -1060,43 +1075,24 @@ var DDLUpgrade = /** @class */ (function () {
     };
     return DDLUpgrade;
 }());
-function upgrade$1(ddl, baseUrl, wuid, toLowerCase, dermatologyJson) {
+function upgrade(ddl, baseUrl, wuid, toLowerCase, dermatologyJson) {
     if (toLowerCase === void 0) { toLowerCase = true; }
     if (dermatologyJson === void 0) { dermatologyJson = {}; }
     var ddlUp = new DDLUpgrade(ddl, baseUrl, wuid, toLowerCase);
     var retVal = ddlUp.write();
-    retVal.properties = upgrade(retVal, dermatologyJson);
+    retVal.properties = upgrade$1(retVal, dermatologyJson);
     return retVal;
 }
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-function unwrapExports (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-
-function createCommonjsModule(fn, basedir, module) {
-	return module = {
-	  path: basedir,
-	  exports: {},
-	  require: function (path, base) {
-      return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
-    }
-	}, fn(module, module.exports), module.exports;
-}
+var uri_all = {exports: {}};
 
-function getCjsExportFromNamespace (n) {
-	return n && n['default'] || n;
-}
-
-function commonjsRequire () {
-	throw new Error('Dynamic requires are not currently supported by @rollup/plugin-commonjs');
-}
-
-var uri_all = createCommonjsModule(function (module, exports) {
 /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
+
+(function (module, exports) {
 (function (global, factory) {
-	 factory(exports) ;
+	factory(exports) ;
 }(commonjsGlobal, (function (exports) {
 function merge() {
     for (var _len = arguments.length, sets = Array(_len), _key = 0; _key < _len; _key++) {
@@ -1150,10 +1146,10 @@ function buildExps(isIRI) {
         //subset, excludes bidi control characters
     IPRIVATE$$ = isIRI ? "[\\uE000-\\uF8FF]" : "[]",
         //subset
-    UNRESERVED$$ = merge(ALPHA$$, DIGIT$$, "[\\-\\.\\_\\~]", UCSCHAR$$),
-        SCHEME$ = subexp(ALPHA$$ + merge(ALPHA$$, DIGIT$$, "[\\+\\-\\.]") + "*"),
-        USERINFO$ = subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]")) + "*"),
-        DEC_OCTET_RELAXED$ = subexp(subexp("25[0-5]") + "|" + subexp("2[0-4]" + DIGIT$$) + "|" + subexp("1" + DIGIT$$ + DIGIT$$) + "|" + subexp("0?[1-9]" + DIGIT$$) + "|0?0?" + DIGIT$$),
+    UNRESERVED$$ = merge(ALPHA$$, DIGIT$$, "[\\-\\.\\_\\~]", UCSCHAR$$);
+        subexp(ALPHA$$ + merge(ALPHA$$, DIGIT$$, "[\\+\\-\\.]") + "*");
+        subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]")) + "*");
+        var DEC_OCTET_RELAXED$ = subexp(subexp("25[0-5]") + "|" + subexp("2[0-4]" + DIGIT$$) + "|" + subexp("1" + DIGIT$$ + DIGIT$$) + "|" + subexp("0?[1-9]" + DIGIT$$) + "|0?0?" + DIGIT$$),
         //relaxed parsing rules
     IPV4ADDRESS$ = subexp(DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$),
         H16$ = subexp(HEXDIG$$ + "{1,4}"),
@@ -1177,14 +1173,14 @@ function buildExps(isIRI) {
     IPV6ADDRESS9$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,6}" + H16$) + "?\\:\\:"),
         //[ *6( h16 ":" ) h16 ] "::"
     IPV6ADDRESS$ = subexp([IPV6ADDRESS1$, IPV6ADDRESS2$, IPV6ADDRESS3$, IPV6ADDRESS4$, IPV6ADDRESS5$, IPV6ADDRESS6$, IPV6ADDRESS7$, IPV6ADDRESS8$, IPV6ADDRESS9$].join("|")),
-        ZONEID$ = subexp(subexp(UNRESERVED$$ + "|" + PCT_ENCODED$) + "+"),
+        ZONEID$ = subexp(subexp(UNRESERVED$$ + "|" + PCT_ENCODED$) + "+");
         //RFC 6874, with relaxed parsing rules
-    IPVFUTURE$ = subexp("[vV]" + HEXDIG$$ + "+\\." + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]") + "+"),
+    subexp("[vV]" + HEXDIG$$ + "+\\." + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]") + "+");
         //RFC 6874
-    REG_NAME$ = subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$)) + "*"),
-        PCHAR$ = subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:\\@]")),
-        SEGMENT_NZ_NC$ = subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\@]")) + "+"),
-        QUERY$ = subexp(subexp(PCHAR$ + "|" + merge("[\\/\\?]", IPRIVATE$$)) + "*");
+    subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$)) + "*");
+        var PCHAR$ = subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:\\@]"));
+        subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\@]")) + "+");
+        subexp(subexp(PCHAR$ + "|" + merge("[\\/\\?]", IPRIVATE$$)) + "*");
     return {
         NOT_SCHEME: new RegExp(merge("[^]", ALPHA$$, DIGIT$$, "[\\+\\-\\.]"), "g"),
         NOT_USERINFO: new RegExp(merge("[^\\%\\:]", UNRESERVED$$, SUB_DELIMS$$), "g"),
@@ -2298,7 +2294,7 @@ var handler$3 = {
 
 var O = {};
 //RFC 3986
-var UNRESERVED$$ = "[A-Za-z0-9\\-\\.\\_\\~" + ( "\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF" ) + "]";
+var UNRESERVED$$ = "[A-Za-z0-9\\-\\.\\_\\~" + ("\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF" ) + "]";
 var HEXDIG$$ = "[0-9A-Fa-f]"; //case-insensitive
 var PCT_ENCODED$ = subexp(subexp("%[EFef]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%[89A-Fa-f]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%" + HEXDIG$$ + HEXDIG$$)); //expanded
 //RFC 5322, except these symbols as per RFC 6068: @ : / ? # [ ] & ; =
@@ -2496,9 +2492,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 })));
 
-});
-
-unwrapExports(uri_all);
+}(uri_all, uri_all.exports));
 
 var isArray = Array.isArray;
 var keyList = Object.keys;
@@ -2556,7 +2550,7 @@ var fastDeepEqual = function equal(a, b) {
 
 // https://mathiasbynens.be/notes/javascript-encoding
 // https://github.com/bestiejs/punycode.js - punycode.ucs2.decode
-var ucs2length = function ucs2length(str) {
+var ucs2length$1 = function ucs2length(str) {
   var length = 0
     , len = str.length
     , pos = 0
@@ -2573,16 +2567,16 @@ var ucs2length = function ucs2length(str) {
   return length;
 };
 
-var util = {
+var util$5 = {
   copy: copy,
   checkDataType: checkDataType,
   checkDataTypes: checkDataTypes,
   coerceToTypes: coerceToTypes,
-  toHash: toHash,
+  toHash: toHash$1,
   getProperty: getProperty,
   escapeQuotes: escapeQuotes,
   equal: fastDeepEqual,
-  ucs2length: ucs2length,
+  ucs2length: ucs2length$1,
   varOccurences: varOccurences,
   varReplace: varReplace,
   cleanUpCode: cleanUpCode,
@@ -2632,7 +2626,7 @@ function checkDataTypes(dataTypes, data) {
     case 1: return checkDataType(dataTypes[0], data, true);
     default:
       var code = '';
-      var types = toHash(dataTypes);
+      var types = toHash$1(dataTypes);
       if (types.array && types.object) {
         code = types.null ? '(': '(!' + data + ' || ';
         code += 'typeof ' + data + ' !== "object")';
@@ -2649,7 +2643,7 @@ function checkDataTypes(dataTypes, data) {
 }
 
 
-var COERCE_TO_TYPES = toHash([ 'string', 'number', 'integer', 'boolean', 'null' ]);
+var COERCE_TO_TYPES = toHash$1([ 'string', 'number', 'integer', 'boolean', 'null' ]);
 function coerceToTypes(optionCoerceTypes, dataTypes) {
   if (Array.isArray(dataTypes)) {
     var types = [];
@@ -2667,19 +2661,19 @@ function coerceToTypes(optionCoerceTypes, dataTypes) {
 }
 
 
-function toHash(arr) {
+function toHash$1(arr) {
   var hash = {};
   for (var i=0; i<arr.length; i++) hash[arr[i]] = true;
   return hash;
 }
 
 
-var IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
+var IDENTIFIER$1 = /^[a-z$_][a-z$_0-9]*$/i;
 var SINGLE_QUOTE = /'|\\/g;
 function getProperty(key) {
   return typeof key == 'number'
           ? '[' + key + ']'
-          : IDENTIFIER.test(key)
+          : IDENTIFIER$1.test(key)
             ? '.' + key
             : "['" + escapeQuotes(key) + "']";
 }
@@ -2783,17 +2777,17 @@ function getPath(currentPath, prop, jsonPointers) {
 }
 
 
-var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
-var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
+var JSON_POINTER$1 = /^\/(?:[^~]|~0|~1)*$/;
+var RELATIVE_JSON_POINTER$1 = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
 function getData($data, lvl, paths) {
   var up, jsonPointer, data, matches;
   if ($data === '') return 'rootData';
   if ($data[0] == '/') {
-    if (!JSON_POINTER.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
+    if (!JSON_POINTER$1.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
     jsonPointer = $data;
     data = 'rootData';
   } else {
-    matches = $data.match(RELATIVE_JSON_POINTER);
+    matches = $data.match(RELATIVE_JSON_POINTER$1);
     if (!matches) throw new Error('Invalid JSON-pointer: ' + $data);
     up = +matches[1];
     jsonPointer = matches[2];
@@ -2845,15 +2839,17 @@ function unescapeJsonPointer(str) {
   return str.replace(/~1/g, '/').replace(/~0/g, '~');
 }
 
-var schema_obj = SchemaObject;
+var util$4 = util$5;
+
+var schema_obj = SchemaObject$2;
 
-function SchemaObject(obj) {
-  util.copy(obj, this);
+function SchemaObject$2(obj) {
+  util$4.copy(obj, this);
 }
 
-var jsonSchemaTraverse = createCommonjsModule(function (module) {
+var jsonSchemaTraverse = {exports: {}};
 
-var traverse = module.exports = function (schema, opts, cb) {
+var traverse$1 = jsonSchemaTraverse.exports = function (schema, opts, cb) {
   // Legacy support for v0.3.1 and earlier.
   if (typeof opts == 'function') {
     cb = opts;
@@ -2868,7 +2864,7 @@ var traverse = module.exports = function (schema, opts, cb) {
 };
 
 
-traverse.keywords = {
+traverse$1.keywords = {
   additionalItems: true,
   items: true,
   contains: true,
@@ -2877,21 +2873,21 @@ traverse.keywords = {
   not: true
 };
 
-traverse.arrayKeywords = {
+traverse$1.arrayKeywords = {
   items: true,
   allOf: true,
   anyOf: true,
   oneOf: true
 };
 
-traverse.propsKeywords = {
+traverse$1.propsKeywords = {
   definitions: true,
   properties: true,
   patternProperties: true,
   dependencies: true
 };
 
-traverse.skipKeywords = {
+traverse$1.skipKeywords = {
   default: true,
   enum: true,
   const: true,
@@ -2919,16 +2915,16 @@ function _traverse(opts, pre, post, schema, jsonPtr, rootSchema, parentJsonPtr,
     for (var key in schema) {
       var sch = schema[key];
       if (Array.isArray(sch)) {
-        if (key in traverse.arrayKeywords) {
+        if (key in traverse$1.arrayKeywords) {
           for (var i=0; i<sch.length; i++)
             _traverse(opts, pre, post, sch[i], jsonPtr + '/' + key + '/' + i, rootSchema, jsonPtr, key, schema, i);
         }
-      } else if (key in traverse.propsKeywords) {
+      } else if (key in traverse$1.propsKeywords) {
         if (sch && typeof sch == 'object') {
           for (var prop in sch)
             _traverse(opts, pre, post, sch[prop], jsonPtr + '/' + key + '/' + escapeJsonPtr(prop), rootSchema, jsonPtr, key, schema, prop);
         }
-      } else if (key in traverse.keywords || (opts.allKeys && !(key in traverse.skipKeywords))) {
+      } else if (key in traverse$1.keywords || (opts.allKeys && !(key in traverse$1.skipKeywords))) {
         _traverse(opts, pre, post, sch, jsonPtr + '/' + key, rootSchema, jsonPtr, key, schema);
       }
     }
@@ -2940,16 +2936,21 @@ function _traverse(opts, pre, post, schema, jsonPtr, rootSchema, parentJsonPtr,
 function escapeJsonPtr(str) {
   return str.replace(/~/g, '~0').replace(/\//g, '~1');
 }
-});
 
-var resolve_1 = resolve;
+var URI$1 = uri_all.exports
+  , equal$1 = fastDeepEqual
+  , util$3 = util$5
+  , SchemaObject$1 = schema_obj
+  , traverse = jsonSchemaTraverse.exports;
+
+var resolve_1 = resolve$3;
 
-resolve.normalizeId = normalizeId;
-resolve.fullPath = getFullPath;
-resolve.url = resolveUrl;
-resolve.ids = resolveIds;
-resolve.inlineRef = inlineRef;
-resolve.schema = resolveSchema;
+resolve$3.normalizeId = normalizeId;
+resolve$3.fullPath = getFullPath;
+resolve$3.url = resolveUrl;
+resolve$3.ids = resolveIds;
+resolve$3.inlineRef = inlineRef;
+resolve$3.schema = resolveSchema;
 
 /**
  * [resolve and compile the references ($ref)]
@@ -2959,16 +2960,16 @@ resolve.schema = resolveSchema;
  * @param  {String} ref reference to resolve
  * @return {Object|Function} schema object (if the schema can be inlined) or validation function
  */
-function resolve(compile, root, ref) {
+function resolve$3(compile, root, ref) {
   /* jshint validthis: true */
   var refVal = this._refs[ref];
   if (typeof refVal == 'string') {
     if (this._refs[refVal]) refVal = this._refs[refVal];
-    else return resolve.call(this, compile, root, refVal);
+    else return resolve$3.call(this, compile, root, refVal);
   }
 
   refVal = refVal || this._schemas[ref];
-  if (refVal instanceof schema_obj) {
+  if (refVal instanceof SchemaObject$1) {
     return inlineRef(refVal.schema, this._opts.inlineRefs)
             ? refVal.schema
             : refVal.validate || this._compile(refVal);
@@ -2982,7 +2983,7 @@ function resolve(compile, root, ref) {
     baseId = res.baseId;
   }
 
-  if (schema instanceof schema_obj) {
+  if (schema instanceof SchemaObject$1) {
     v = schema.validate || compile.call(this, schema.schema, root, undefined, baseId);
   } else if (schema !== undefined) {
     v = inlineRef(schema, this._opts.inlineRefs)
@@ -3003,7 +3004,7 @@ function resolve(compile, root, ref) {
  */
 function resolveSchema(root, ref) {
   /* jshint validthis: true */
-  var p = uri_all.parse(ref)
+  var p = URI$1.parse(ref)
     , refPath = _getFullPath(p)
     , baseId = getFullPath(this._getId(root.schema));
   if (Object.keys(root.schema).length === 0 || refPath !== baseId) {
@@ -3011,12 +3012,12 @@ function resolveSchema(root, ref) {
     var refVal = this._refs[id];
     if (typeof refVal == 'string') {
       return resolveRecursive.call(this, root, refVal, p);
-    } else if (refVal instanceof schema_obj) {
+    } else if (refVal instanceof SchemaObject$1) {
       if (!refVal.validate) this._compile(refVal);
       root = refVal;
     } else {
       refVal = this._schemas[id];
-      if (refVal instanceof schema_obj) {
+      if (refVal instanceof SchemaObject$1) {
         if (!refVal.validate) this._compile(refVal);
         if (id == normalizeId(ref))
           return { schema: refVal, root: root, baseId: baseId };
@@ -3047,7 +3048,7 @@ function resolveRecursive(root, ref, parsedRef) {
 }
 
 
-var PREVENT_SCOPE_CHANGE = util.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
+var PREVENT_SCOPE_CHANGE = util$3.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
 /* @this Ajv */
 function getJsonPointer(parsedRef, baseId, schema, root) {
   /* jshint validthis: true */
@@ -3058,7 +3059,7 @@ function getJsonPointer(parsedRef, baseId, schema, root) {
   for (var i = 1; i < parts.length; i++) {
     var part = parts[i];
     if (part) {
-      part = util.unescapeFragment(part);
+      part = util$3.unescapeFragment(part);
       schema = schema[part];
       if (schema === undefined) break;
       var id;
@@ -3082,7 +3083,7 @@ function getJsonPointer(parsedRef, baseId, schema, root) {
 }
 
 
-var SIMPLE_INLINED = util.toHash([
+var SIMPLE_INLINED = util$3.toHash([
   'type', 'format', 'pattern',
   'maxLength', 'minLength',
   'maxProperties', 'minProperties',
@@ -3142,13 +3143,13 @@ function countKeys(schema) {
 
 function getFullPath(id, normalize) {
   if (normalize !== false) id = normalizeId(id);
-  var p = uri_all.parse(id);
+  var p = URI$1.parse(id);
   return _getFullPath(p);
 }
 
 
 function _getFullPath(p) {
-  return uri_all.serialize(p).split('#')[0] + '#';
+  return URI$1.serialize(p).split('#')[0] + '#';
 }
 
 
@@ -3160,7 +3161,7 @@ function normalizeId(id) {
 
 function resolveUrl(baseId, id) {
   id = normalizeId(id);
-  return uri_all.resolve(baseId, id);
+  return URI$1.resolve(baseId, id);
 }
 
 
@@ -3172,25 +3173,25 @@ function resolveIds(schema) {
   var localRefs = {};
   var self = this;
 
-  jsonSchemaTraverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
+  traverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
     if (jsonPtr === '') return;
     var id = self._getId(sch);
     var baseId = baseIds[parentJsonPtr];
     var fullPath = fullPaths[parentJsonPtr] + '/' + parentKeyword;
     if (keyIndex !== undefined)
-      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util.escapeFragment(keyIndex));
+      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util$3.escapeFragment(keyIndex));
 
     if (typeof id == 'string') {
-      id = baseId = normalizeId(baseId ? uri_all.resolve(baseId, id) : id);
+      id = baseId = normalizeId(baseId ? URI$1.resolve(baseId, id) : id);
 
       var refVal = self._refs[id];
       if (typeof refVal == 'string') refVal = self._refs[refVal];
       if (refVal && refVal.schema) {
-        if (!fastDeepEqual(sch, refVal.schema))
+        if (!equal$1(sch, refVal.schema))
           throw new Error('id "' + id + '" resolves to more than one schema');
       } else if (id != normalizeId(fullPath)) {
         if (id[0] == '#') {
-          if (localRefs[id] && !fastDeepEqual(sch, localRefs[id]))
+          if (localRefs[id] && !equal$1(sch, localRefs[id]))
             throw new Error('id "' + id + '" resolves to more than one schema');
           localRefs[id] = sch;
         } else {
@@ -3205,28 +3206,30 @@ function resolveIds(schema) {
   return localRefs;
 }
 
+var resolve$2 = resolve_1;
+
 var error_classes = {
-  Validation: errorSubclass(ValidationError),
-  MissingRef: errorSubclass(MissingRefError)
+  Validation: errorSubclass(ValidationError$1),
+  MissingRef: errorSubclass(MissingRefError$1)
 };
 
 
-function ValidationError(errors) {
+function ValidationError$1(errors) {
   this.message = 'validation failed';
   this.errors = errors;
   this.ajv = this.validation = true;
 }
 
 
-MissingRefError.message = function (baseId, ref) {
+MissingRefError$1.message = function (baseId, ref) {
   return 'can\'t resolve reference ' + ref + ' from id ' + baseId;
 };
 
 
-function MissingRefError(baseId, ref, message) {
-  this.message = message || MissingRefError.message(baseId, ref);
-  this.missingRef = resolve_1.url(baseId, ref);
-  this.missingSchema = resolve_1.normalizeId(resolve_1.fullPath(this.missingRef));
+function MissingRefError$1(baseId, ref, message) {
+  this.message = message || MissingRefError$1.message(baseId, ref);
+  this.missingRef = resolve$2.url(baseId, ref);
+  this.missingSchema = resolve$2.normalizeId(resolve$2.fullPath(this.missingRef));
 }
 
 
@@ -3294,7 +3297,7 @@ var fastJsonStableStringify = function (data, opts) {
     })(data);
 };
 
-var validate = function generate_validate(it, $keyword, $ruleType) {
+var validate$1 = function generate_validate(it, $keyword, $ruleType) {
   var out = '';
   var $async = it.schema.$async === true,
     $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref'),
@@ -3788,17 +3791,24 @@ var validate = function generate_validate(it, $keyword, $ruleType) {
   return out;
 };
 
+var resolve$1 = resolve_1
+  , util$2 = util$5
+  , errorClasses$1 = error_classes
+  , stableStringify$1 = fastJsonStableStringify;
+
+var validateGenerator = validate$1;
+
 /**
  * Functions below are used inside compiled validations function
  */
 
-var ucs2length$1 = util.ucs2length;
-
+var ucs2length = util$2.ucs2length;
+var equal = fastDeepEqual;
 
 // this error is thrown by async schemas to return validation errors via exception
-var ValidationError$1 = error_classes.Validation;
+var ValidationError = errorClasses$1.Validation;
 
-var compile_1 = compile;
+var compile_1 = compile$1;
 
 
 /**
@@ -3810,7 +3820,7 @@ var compile_1 = compile;
  * @param  {String} baseId base ID for IDs in the schema
  * @return {Function} validation function
  */
-function compile(schema, root, localRefs, baseId) {
+function compile$1(schema, root, localRefs, baseId) {
   /* jshint validthis: true, evil: true */
   /* eslint no-shadow: 0 */
   var self = this
@@ -3862,11 +3872,11 @@ function compile(schema, root, localRefs, baseId) {
   function localCompile(_schema, _root, localRefs, baseId) {
     var isRoot = !_root || (_root && _root.schema == _schema);
     if (_root.schema != root.schema)
-      return compile.call(self, _schema, _root, localRefs, baseId);
+      return compile$1.call(self, _schema, _root, localRefs, baseId);
 
     var $async = _schema.$async === true;
 
-    var sourceCode = validate({
+    var sourceCode = validateGenerator({
       isTop: true,
       schema: _schema,
       isRoot: isRoot,
@@ -3875,11 +3885,11 @@ function compile(schema, root, localRefs, baseId) {
       schemaPath: '',
       errSchemaPath: '#',
       errorPath: '""',
-      MissingRefError: error_classes.MissingRef,
+      MissingRefError: errorClasses$1.MissingRef,
       RULES: RULES,
-      validate: validate,
-      util: util,
-      resolve: resolve_1,
+      validate: validateGenerator,
+      util: util$2,
+      resolve: resolve$1,
       resolveRef: resolveRef,
       usePattern: usePattern,
       useDefault: useDefault,
@@ -3891,12 +3901,12 @@ function compile(schema, root, localRefs, baseId) {
     });
 
     sourceCode = vars(refVal, refValCode) + vars(patterns, patternCode)
-                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
+                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode$1)
                    + sourceCode;
 
     if (opts.processCode) sourceCode = opts.processCode(sourceCode);
     // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
-    var validate$1;
+    var validate;
     try {
       var makeValidate = new Function(
         'self',
@@ -3912,7 +3922,7 @@ function compile(schema, root, localRefs, baseId) {
         sourceCode
       );
 
-      validate$1 = makeValidate(
+      validate = makeValidate(
         self,
         RULES,
         formats,
@@ -3920,36 +3930,36 @@ function compile(schema, root, localRefs, baseId) {
         refVal,
         defaults,
         customRules,
-        fastDeepEqual,
-        ucs2length$1,
-        ValidationError$1
+        equal,
+        ucs2length,
+        ValidationError
       );
 
-      refVal[0] = validate$1;
+      refVal[0] = validate;
     } catch(e) {
       self.logger.error('Error compiling schema, function code:', sourceCode);
       throw e;
     }
 
-    validate$1.schema = _schema;
-    validate$1.errors = null;
-    validate$1.refs = refs;
-    validate$1.refVal = refVal;
-    validate$1.root = isRoot ? validate$1 : _root;
-    if ($async) validate$1.$async = true;
+    validate.schema = _schema;
+    validate.errors = null;
+    validate.refs = refs;
+    validate.refVal = refVal;
+    validate.root = isRoot ? validate : _root;
+    if ($async) validate.$async = true;
     if (opts.sourceCode === true) {
-      validate$1.source = {
+      validate.source = {
         code: sourceCode,
         patterns: patterns,
         defaults: defaults
       };
     }
 
-    return validate$1;
+    return validate;
   }
 
   function resolveRef(baseId, ref, isRoot) {
-    ref = resolve_1.url(baseId, ref);
+    ref = resolve$1.url(baseId, ref);
     var refIndex = refs[ref];
     var _refVal, refCode;
     if (refIndex !== undefined) {
@@ -3967,13 +3977,13 @@ function compile(schema, root, localRefs, baseId) {
     }
 
     refCode = addLocalRef(ref);
-    var v = resolve_1.call(self, localCompile, root, ref);
+    var v = resolve$1.call(self, localCompile, root, ref);
     if (v === undefined) {
       var localSchema = localRefs && localRefs[ref];
       if (localSchema) {
-        v = resolve_1.inlineRef(localSchema, opts.inlineRefs)
+        v = resolve$1.inlineRef(localSchema, opts.inlineRefs)
             ? localSchema
-            : compile.call(self, localSchema, root, localRefs, baseId);
+            : compile$1.call(self, localSchema, root, localRefs, baseId);
       }
     }
 
@@ -4022,10 +4032,10 @@ function compile(schema, root, localRefs, baseId) {
       case 'number':
         return '' + value;
       case 'string':
-        return util.toQuotedString(value);
+        return util$2.toQuotedString(value);
       case 'object':
         if (value === null) return 'null';
-        var valueStr = fastJsonStableStringify(value);
+        var valueStr = stableStringify$1(value);
         var index = defaultsHash[valueStr];
         if (index === undefined) {
           index = defaultsHash[valueStr] = defaults.length;
@@ -4140,7 +4150,7 @@ function compIndex(schema, root, baseId) {
 
 
 function patternCode(i, patterns) {
-  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
+  return 'var pattern' + i + ' = new RegExp(' + util$2.toQuotedString(patterns[i]) + ');';
 }
 
 
@@ -4154,7 +4164,7 @@ function refValCode(i, refVal) {
 }
 
 
-function customRuleCode(i) {
+function customRuleCode$1(i) {
   return 'var customRule' + i + ' = customRules[' + i + '];';
 }
 
@@ -4167,33 +4177,33 @@ function vars(arr, statement) {
   return code;
 }
 
-var cache = createCommonjsModule(function (module) {
+var cache = {exports: {}};
 
-
-var Cache = module.exports = function Cache() {
+var Cache$1 = cache.exports = function Cache() {
   this._cache = {};
 };
 
 
-Cache.prototype.put = function Cache_put(key, value) {
+Cache$1.prototype.put = function Cache_put(key, value) {
   this._cache[key] = value;
 };
 
 
-Cache.prototype.get = function Cache_get(key) {
+Cache$1.prototype.get = function Cache_get(key) {
   return this._cache[key];
 };
 
 
-Cache.prototype.del = function Cache_del(key) {
+Cache$1.prototype.del = function Cache_del(key) {
   delete this._cache[key];
 };
 
 
-Cache.prototype.clear = function Cache_clear() {
+Cache$1.prototype.clear = function Cache_clear() {
   this._cache = {};
 };
-});
+
+var util$1 = util$5;
 
 var DATE = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
 var DAYS = [0,31,28,31,30,31,30,31,31,30,31,30,31];
@@ -4209,20 +4219,20 @@ var URITEMPLATE = /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|
 // var URL = /^(?:(?:https?|ftp):\/\/)(?:\S+(?::\S*)?@)?(?:(?!10(?:\.\d{1,3}){3})(?!127(?:\.\d{1,3}){3})(?!169\.254(?:\.\d{1,3}){2})(?!192\.168(?:\.\d{1,3}){2})(?!172\.(?:1[6-9]|2\d|3[0-1])(?:\.\d{1,3}){2})(?:[1-9]\d?|1\d\d|2[01]\d|22[0-3])(?:\.(?:1?\d{1,2}|2[0-4]\d|25[0-5])){2}(?:\.(?:[1-9]\d?|1\d\d|2[0-4]\d|25[0-4]))|(?:(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)(?:\.(?:[a-z\u{00a1}-\u{ffff}0-9]+-?)*[a-z\u{00a1}-\u{ffff}0-9]+)*(?:\.(?:[a-z\u{00a1}-\u{ffff}]{2,})))(?::\d{2,5})?(?:\/[^\s]*)?$/iu;
 var URL = /^(?:(?:http[s\u017F]?|ftp):\/\/)(?:(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+(?::(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?@)?(?:(?!10(?:\.[0-9]{1,3}){3})(?!127(?:\.[0-9]{1,3}){3})(?!169\.254(?:\.[0-9]{1,3}){2})(?!192\.168(?:\.[0-9]{1,3}){2})(?!172\.(?:1[6-9]|2[0-9]|3[01])(?:\.[0-9]{1,3}){2})(?:[1-9][0-9]?|1[0-9][0-9]|2[01][0-9]|22[0-3])(?:\.(?:1?[0-9]{1,2}|2[0-4][0-9]|25[0-5])){2}(?:\.(?:[1-9][0-9]?|1[0-9][0-9]|2[0-4][0-9]|25[0-4]))|(?:(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-?)*(?:[0-9KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[KSa-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF]){2,})))(?::[0-9]{2,5})?(?:\/(?:[\0-\x08\x0E-\x1F!-\x9F\xA1-\u167F\u1681-\u1FFF\u200B-\u2027\u202A-\u202E\u2030-\u205E\u2060-\u2FFF\u3001-\uD7FF\uE000-\uFEFE\uFF00-\uFFFF]|[\uD800-\uDBFF][\uDC00-\uDFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])*)?$/i;
 var UUID = /^(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}$/i;
-var JSON_POINTER$1 = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
+var JSON_POINTER = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
 var JSON_POINTER_URI_FRAGMENT = /^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
-var RELATIVE_JSON_POINTER$1 = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
+var RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
 
 
-var formats_1 = formats;
+var formats_1 = formats$1;
 
-function formats(mode) {
+function formats$1(mode) {
   mode = mode == 'full' ? 'full' : 'fast';
-  return util.copy(formats[mode]);
+  return util$1.copy(formats$1[mode]);
 }
 
 
-formats.fast = {
+formats$1.fast = {
   // date: http://tools.ietf.org/html/rfc3339#section-5.6
   date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/,
   // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
@@ -4247,14 +4257,14 @@ formats.fast = {
   uuid: UUID,
   // JSON-pointer: https://tools.ietf.org/html/rfc6901
   // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A
-  'json-pointer': JSON_POINTER$1,
+  'json-pointer': JSON_POINTER,
   'json-pointer-uri-fragment': JSON_POINTER_URI_FRAGMENT,
   // relative JSON-pointer: http://tools.ietf.org/html/draft-luff-relative-json-pointer-00
-  'relative-json-pointer': RELATIVE_JSON_POINTER$1
+  'relative-json-pointer': RELATIVE_JSON_POINTER
 };
 
 
-formats.full = {
+formats$1.full = {
   date: date,
   time: time,
   'date-time': date_time,
@@ -4268,9 +4278,9 @@ formats.full = {
   ipv6: /^\s*(?:(?:(?:[0-9a-f]{1,4}:){7}(?:[0-9a-f]{1,4}|:))|(?:(?:[0-9a-f]{1,4}:){6}(?::[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){5}(?:(?:(?::[0-9a-f]{1,4}){1,2})|:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3})|:))|(?:(?:[0-9a-f]{1,4}:){4}(?:(?:(?::[0-9a-f]{1,4}){1,3})|(?:(?::[0-9a-f]{1,4})?:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){3}(?:(?:(?::[0-9a-f]{1,4}){1,4})|(?:(?::[0-9a-f]{1,4}){0,2}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){2}(?:(?:(?::[0-9a-f]{1,4}){1,5})|(?:(?::[0-9a-f]{1,4}){0,3}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?:(?:[0-9a-f]{1,4}:){1}(?:(?:(?::[0-9a-f]{1,4}){1,6})|(?:(?::[0-9a-f]{1,4}){0,4}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:))|(?::(?:(?:(?::[0-9a-f]{1,4}){1,7})|(?:(?::[0-9a-f]{1,4}){0,5}:(?:(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)(?:\.(?:25[0-5]|2[0-4]\d|1\d\d|[1-9]?\d)){3}))|:)))(?:%.+)?\s*$/i,
   regex: regex,
   uuid: UUID,
-  'json-pointer': JSON_POINTER$1,
+  'json-pointer': JSON_POINTER,
   'json-pointer-uri-fragment': JSON_POINTER_URI_FRAGMENT,
-  'relative-json-pointer': RELATIVE_JSON_POINTER$1
+  'relative-json-pointer': RELATIVE_JSON_POINTER
 };
 
 
@@ -4586,7 +4596,7 @@ var comment = function generate_comment(it, $keyword, $ruleType) {
   var out = ' ';
   var $schema = it.schema[$keyword];
   var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
+  !it.opts.allErrors;
   var $comment = it.util.toQuotedString($schema);
   if (it.opts.$comment === true) {
     out += ' console.log(' + ($comment) + ');';
@@ -6057,7 +6067,7 @@ var pattern = function generate_pattern(it, $keyword, $ruleType) {
   return out;
 };
 
-var properties = function generate_properties(it, $keyword, $ruleType) {
+var properties$2 = function generate_properties(it, $keyword, $ruleType) {
   var out = ' ';
   var $lvl = it.level;
   var $dataLvl = it.dataLevel;
@@ -6469,7 +6479,7 @@ var propertyNames = function generate_propertyNames(it, $keyword, $ruleType) {
   return out;
 };
 
-var required = function generate_required(it, $keyword, $ruleType) {
+var required$1 = function generate_required(it, $keyword, $ruleType) {
   var out = ' ';
   var $lvl = it.level;
   var $dataLvl = it.dataLevel;
@@ -6846,16 +6856,17 @@ var dotjs = {
   not: not,
   oneOf: oneOf,
   pattern: pattern,
-  properties: properties,
+  properties: properties$2,
   propertyNames: propertyNames,
-  required: required,
+  required: required$1,
   uniqueItems: uniqueItems,
-  validate: validate
+  validate: validate$1
 };
 
-var toHash$1 = util.toHash;
+var ruleModules = dotjs
+  , toHash = util$5.toHash;
 
-var rules = function rules() {
+var rules$1 = function rules() {
   var RULES = [
     { type: 'number',
       rules: [ { 'maximum': ['exclusiveMaximum'] },
@@ -6879,8 +6890,8 @@ var rules = function rules() {
     'additionalItems', 'then', 'else'
   ];
   var TYPES = [ 'number', 'integer', 'string', 'array', 'object', 'boolean', 'null' ];
-  RULES.all = toHash$1(ALL);
-  RULES.types = toHash$1(TYPES);
+  RULES.all = toHash(ALL);
+  RULES.types = toHash(TYPES);
 
   RULES.forEach(function (group) {
     group.rules = group.rules.map(function (keyword) {
@@ -6897,7 +6908,7 @@ var rules = function rules() {
       ALL.push(keyword);
       var rule = RULES.all[keyword] = {
         keyword: keyword,
-        code: dotjs[keyword],
+        code: ruleModules[keyword],
         implements: implKeywords
       };
       return rule;
@@ -6905,13 +6916,13 @@ var rules = function rules() {
 
     RULES.all.$comment = {
       keyword: '$comment',
-      code: dotjs.$comment
+      code: ruleModules.$comment
     };
 
     if (group.type) RULES.types[group.type] = group;
   });
 
-  RULES.keywords = toHash$1(ALL.concat(KEYWORDS));
+  RULES.keywords = toHash(ALL.concat(KEYWORDS));
   RULES.custom = {};
 
   return RULES;
@@ -6965,7 +6976,7 @@ var data = function (metaSchema, keywordsJsonPointers) {
   return metaSchema;
 };
 
-var MissingRefError$1 = error_classes.MissingRef;
+var MissingRefError = error_classes.MissingRef;
 
 var async = compileAsync;
 
@@ -7018,7 +7029,7 @@ function compileAsync(schema, meta, callback) {
   function _compileAsync(schemaObj) {
     try { return self._compile(schemaObj); }
     catch(e) {
-      if (e instanceof MissingRefError$1) return loadMissingSchema(e);
+      if (e instanceof MissingRefError) return loadMissingSchema(e);
       throw e;
     }
 
@@ -7282,10 +7293,10 @@ var custom = function generate_custom(it, $keyword, $ruleType) {
   return out;
 };
 
-var $schema = "http://json-schema.org/draft-07/schema#";
-var $id = "http://json-schema.org/draft-07/schema#";
+var $schema$2 = "http://json-schema.org/draft-07/schema#";
+var $id$1 = "http://json-schema.org/draft-07/schema#";
 var title = "Core schema meta-schema";
-var definitions = {
+var definitions$1 = {
 	schemaArray: {
 		type: "array",
 		minItems: 1,
@@ -7328,7 +7339,7 @@ var definitions = {
 		]
 	}
 };
-var type = [
+var type$1 = [
 	"object",
 	"boolean"
 ];
@@ -7524,32 +7535,19 @@ var properties$1 = {
 		$ref: "#"
 	}
 };
-var jsonSchemaDraft07 = {
-	$schema: $schema,
-	$id: $id,
+var require$$13 = {
+	$schema: $schema$2,
+	$id: $id$1,
 	title: title,
-	definitions: definitions,
-	type: type,
+	definitions: definitions$1,
+	type: type$1,
 	properties: properties$1,
 	"default": true
 };
 
-var jsonSchemaDraft07$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    $schema: $schema,
-    $id: $id,
-    title: title,
-    definitions: definitions,
-    type: type,
-    properties: properties$1,
-    'default': jsonSchemaDraft07
-});
-
-var require$$2 = getCjsExportFromNamespace(jsonSchemaDraft07$1);
-
-var IDENTIFIER$1 = /^[a-z_$][a-z0-9_$-]*$/i;
-
-var metaSchema = require$$2;
+var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i;
+var customRuleCode = custom;
+var metaSchema = require$$13;
 
 var keyword = {
   add: addKeyword,
@@ -7605,7 +7603,7 @@ function addKeyword(keyword, definition) {
   if (RULES.keywords[keyword])
     throw new Error('Keyword ' + keyword + ' is already defined');
 
-  if (!IDENTIFIER$1.test(keyword))
+  if (!IDENTIFIER.test(keyword))
     throw new Error('Keyword ' + keyword + ' is not a valid identifier');
 
   if (definition) {
@@ -7655,7 +7653,7 @@ function addKeyword(keyword, definition) {
       keyword: keyword,
       definition: definition,
       custom: true,
-      code: custom,
+      code: customRuleCode,
       implements: definition.implements
     };
     ruleGroup.rules.push(rule);
@@ -7725,13 +7723,13 @@ function validateKeyword(definition, throwError) {
 }
 
 var $schema$1 = "http://json-schema.org/draft-07/schema#";
-var $id$1 = "https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#";
+var $id = "https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#";
 var description = "Meta-schema for $data reference (JSON Schema extension proposal)";
-var type$1 = "object";
-var required$1 = [
+var type = "object";
+var required = [
 	"$data"
 ];
-var properties$2 = {
+var properties = {
 	$data: {
 		type: "string",
 		anyOf: [
@@ -7745,56 +7743,52 @@ var properties$2 = {
 	}
 };
 var additionalProperties = false;
-var data$1 = {
+var require$$12 = {
 	$schema: $schema$1,
-	$id: $id$1,
+	$id: $id,
 	description: description,
-	type: type$1,
-	required: required$1,
-	properties: properties$2,
+	type: type,
+	required: required,
+	properties: properties,
 	additionalProperties: additionalProperties
 };
 
-var data$2 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    $schema: $schema$1,
-    $id: $id$1,
-    description: description,
-    type: type$1,
-    required: required$1,
-    properties: properties$2,
-    additionalProperties: additionalProperties,
-    'default': data$1
-});
-
-var require$$1 = getCjsExportFromNamespace(data$2);
-
-var ajv = Ajv;
-
-Ajv.prototype.validate = validate$1;
-Ajv.prototype.compile = compile$1;
-Ajv.prototype.addSchema = addSchema;
-Ajv.prototype.addMetaSchema = addMetaSchema;
-Ajv.prototype.validateSchema = validateSchema;
-Ajv.prototype.getSchema = getSchema;
-Ajv.prototype.removeSchema = removeSchema;
-Ajv.prototype.addFormat = addFormat;
-Ajv.prototype.errorsText = errorsText;
-
-Ajv.prototype._addSchema = _addSchema;
-Ajv.prototype._compile = _compile;
-
-Ajv.prototype.compileAsync = async;
-
-Ajv.prototype.addKeyword = keyword.add;
-Ajv.prototype.getKeyword = keyword.get;
-Ajv.prototype.removeKeyword = keyword.remove;
-Ajv.prototype.validateKeyword = keyword.validate;
-
-
-Ajv.ValidationError = error_classes.Validation;
-Ajv.MissingRefError = error_classes.MissingRef;
-Ajv.$dataMetaSchema = data;
+var compileSchema = compile_1
+  , resolve = resolve_1
+  , Cache = cache.exports
+  , SchemaObject = schema_obj
+  , stableStringify = fastJsonStableStringify
+  , formats = formats_1
+  , rules = rules$1
+  , $dataMetaSchema = data
+  , util = util$5;
+
+var ajv = Ajv$1;
+
+Ajv$1.prototype.validate = validate;
+Ajv$1.prototype.compile = compile;
+Ajv$1.prototype.addSchema = addSchema;
+Ajv$1.prototype.addMetaSchema = addMetaSchema;
+Ajv$1.prototype.validateSchema = validateSchema;
+Ajv$1.prototype.getSchema = getSchema;
+Ajv$1.prototype.removeSchema = removeSchema;
+Ajv$1.prototype.addFormat = addFormat;
+Ajv$1.prototype.errorsText = errorsText;
+
+Ajv$1.prototype._addSchema = _addSchema;
+Ajv$1.prototype._compile = _compile;
+
+Ajv$1.prototype.compileAsync = async;
+var customKeyword = keyword;
+Ajv$1.prototype.addKeyword = customKeyword.add;
+Ajv$1.prototype.getKeyword = customKeyword.get;
+Ajv$1.prototype.removeKeyword = customKeyword.remove;
+Ajv$1.prototype.validateKeyword = customKeyword.validate;
+
+var errorClasses = error_classes;
+Ajv$1.ValidationError = errorClasses.Validation;
+Ajv$1.MissingRefError = errorClasses.MissingRef;
+Ajv$1.$dataMetaSchema = $dataMetaSchema;
 
 var META_SCHEMA_ID = 'http://json-schema.org/draft-07/schema';
 
@@ -7807,16 +7801,16 @@ var META_SUPPORT_DATA = ['/properties'];
  * @param {Object} opts optional options
  * @return {Object} ajv instance
  */
-function Ajv(opts) {
-  if (!(this instanceof Ajv)) return new Ajv(opts);
+function Ajv$1(opts) {
+  if (!(this instanceof Ajv$1)) return new Ajv$1(opts);
   opts = this._opts = util.copy(opts) || {};
   setLogger(this);
   this._schemas = {};
   this._refs = {};
   this._fragments = {};
-  this._formats = formats_1(opts.format);
+  this._formats = formats(opts.format);
 
-  this._cache = opts.cache || new cache;
+  this._cache = opts.cache || new Cache;
   this._loadingSchemas = {};
   this._compilations = [];
   this.RULES = rules();
@@ -7824,7 +7818,7 @@ function Ajv(opts) {
 
   opts.loopRequired = opts.loopRequired || Infinity;
   if (opts.errorDataPath == 'property') opts._errorDataPathProperty = true;
-  if (opts.serialize === undefined) opts.serialize = fastJsonStableStringify;
+  if (opts.serialize === undefined) opts.serialize = stableStringify;
   this._metaOpts = getMetaSchemaOptions(this);
 
   if (opts.formats) addInitialFormats(this);
@@ -7844,7 +7838,7 @@ function Ajv(opts) {
  * @param  {Any} data to be validated
  * @return {Boolean} validation result. Errors from the last validation will be available in `ajv.errors` (and also in compiled schema: `schema.errors`).
  */
-function validate$1(schemaKeyRef, data) {
+function validate(schemaKeyRef, data) {
   var v;
   if (typeof schemaKeyRef == 'string') {
     v = this.getSchema(schemaKeyRef);
@@ -7867,7 +7861,7 @@ function validate$1(schemaKeyRef, data) {
  * @param  {Boolean} _meta true if schema is a meta-schema. Used internally to compile meta schemas of custom keywords.
  * @return {Function} validating function
  */
-function compile$1(schema, _meta) {
+function compile(schema, _meta) {
   var schemaObj = this._addSchema(schema, undefined, _meta);
   return schemaObj.validate || this._compile(schemaObj);
 }
@@ -7890,7 +7884,7 @@ function addSchema(schema, key, _skipValidation, _meta) {
   var id = this._getId(schema);
   if (id !== undefined && typeof id != 'string')
     throw new Error('schema id must be string');
-  key = resolve_1.normalizeId(key || id);
+  key = resolve.normalizeId(key || id);
   checkUnique(this, key);
   this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
   return this;
@@ -7967,13 +7961,13 @@ function getSchema(keyRef) {
 
 
 function _getSchemaFragment(self, ref) {
-  var res = resolve_1.schema.call(self, { schema: {} }, ref);
+  var res = resolve.schema.call(self, { schema: {} }, ref);
   if (res) {
     var schema = res.schema
       , root = res.root
       , baseId = res.baseId;
-    var v = compile_1.call(self, schema, root, undefined, baseId);
-    self._fragments[ref] = new schema_obj({
+    var v = compileSchema.call(self, schema, root, undefined, baseId);
+    self._fragments[ref] = new SchemaObject({
       ref: ref,
       fragment: true,
       schema: schema,
@@ -7987,7 +7981,7 @@ function _getSchemaFragment(self, ref) {
 
 
 function _getSchemaObj(self, keyRef) {
-  keyRef = resolve_1.normalizeId(keyRef);
+  keyRef = resolve.normalizeId(keyRef);
   return self._schemas[keyRef] || self._refs[keyRef] || self._fragments[keyRef];
 }
 
@@ -8025,7 +8019,7 @@ function removeSchema(schemaKeyRef) {
       this._cache.del(cacheKey);
       var id = this._getId(schemaKeyRef);
       if (id) {
-        id = resolve_1.normalizeId(id);
+        id = resolve.normalizeId(id);
         delete this._schemas[id];
         delete this._refs[id];
       }
@@ -8056,17 +8050,17 @@ function _addSchema(schema, skipValidation, meta, shouldAddSchema) {
 
   shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
 
-  var id = resolve_1.normalizeId(this._getId(schema));
+  var id = resolve.normalizeId(this._getId(schema));
   if (id && shouldAddSchema) checkUnique(this, id);
 
   var willValidate = this._opts.validateSchema !== false && !skipValidation;
   var recursiveMeta;
-  if (willValidate && !(recursiveMeta = id && id == resolve_1.normalizeId(schema.$schema)))
+  if (willValidate && !(recursiveMeta = id && id == resolve.normalizeId(schema.$schema)))
     this.validateSchema(schema, true);
 
-  var localRefs = resolve_1.ids.call(this, schema);
+  var localRefs = resolve.ids.call(this, schema);
 
-  var schemaObj = new schema_obj({
+  var schemaObj = new SchemaObject({
     id: id,
     schema: schema,
     localRefs: localRefs,
@@ -8103,7 +8097,7 @@ function _compile(schemaObj, root) {
   }
 
   var v;
-  try { v = compile_1.call(this, schemaObj.schema, root, schemaObj.localRefs); }
+  try { v = compileSchema.call(this, schemaObj.schema, root, schemaObj.localRefs); }
   catch(e) {
     delete schemaObj.validate;
     throw e;
@@ -8199,12 +8193,12 @@ function addFormat(name, format) {
 function addDefaultMetaSchema(self) {
   var $dataSchema;
   if (self._opts.$data) {
-    $dataSchema = require$$1;
+    $dataSchema = require$$12;
     self.addMetaSchema($dataSchema, $dataSchema.$id, true);
   }
   if (self._opts.meta === false) return;
-  var metaSchema = require$$2;
-  if (self._opts.$data) metaSchema = data(metaSchema, META_SUPPORT_DATA);
+  var metaSchema = require$$13;
+  if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA);
   self.addMetaSchema(metaSchema, META_SCHEMA_ID, true);
   self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID;
 }
@@ -8255,14 +8249,14 @@ function setLogger(self) {
 
 function noop() {}
 
-var _Ajv = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), ajv, {
-    'default': ajv,
-    __moduleExports: ajv
-}));
+var _Ajv = /*#__PURE__*/Object.freeze(/*#__PURE__*/_mergeNamespaces({
+    __proto__: null,
+    'default': ajv
+}, [ajv]));
 
 var $ref = "#/definitions/Schema";
-var $schema$2 = "http://json-schema.org/draft-07/schema#";
-var definitions$1 = {
+var $schema = "http://json-schema.org/draft-07/schema#";
+var definitions = {
 	ActivityType: {
 		anyOf: [
 			{
@@ -9905,21 +9899,21 @@ var definitions$1 = {
 		type: "string"
 	}
 };
-var v2$1 = {
+var v2 = {
 	$ref: $ref,
-	$schema: $schema$2,
-	definitions: definitions$1
+	$schema: $schema,
+	definitions: definitions
 };
 
 var _ddl2Schema = /*#__PURE__*/Object.freeze({
     __proto__: null,
     $ref: $ref,
-    $schema: $schema$2,
-    definitions: definitions$1,
-    'default': v2$1
+    $schema: $schema,
+    definitions: definitions,
+    'default': v2
 });
 
-var Ajv$1 = ajv || _Ajv;
+var Ajv = ajv || _Ajv;
 var ddl2Schema = _ddl2Schema;
 var options = {
     allErrors: false,
@@ -9927,7 +9921,7 @@ var options = {
     jsonPointers: false
 };
 function doValidate(ddl, schema) {
-    var ajv = new Ajv$1(options);
+    var ajv = new Ajv(options);
     var validate = ajv.compile(schema);
     var success = validate(ddl);
     return {
@@ -9943,5 +9937,5 @@ function isDDL2Schema(ref) {
     return ref.version !== undefined && ref.datasources !== undefined && ref.dataviews !== undefined;
 }
 
-export { BUILD_VERSION, v1 as DDL1, v2 as DDL2, PKG_NAME, PKG_VERSION, ddl2Schema, isDDL2Schema, upgrade$1 as upgrade, validate2 };
+export { BUILD_VERSION, v1 as DDL1, v2$1 as DDL2, PKG_NAME, PKG_VERSION, ddl2Schema, isDDL2Schema, upgrade, validate2 };
 //# sourceMappingURL=index.es6.js.map