@hpcc-js/marshaller 2.23.103 → 2.23.107

package/dist/index.js

@@ -1,12 +1,12 @@
 (function (global, factory) {
     typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@hpcc-js/comms'), require('@hpcc-js/common'), require('@hpcc-js/util'), require('@hpcc-js/chart'), require('@hpcc-js/dgrid'), require('@hpcc-js/form'), require('@hpcc-js/graph'), require('@hpcc-js/map'), require('@hpcc-js/layout'), require('@hpcc-js/phosphor'), require('@hpcc-js/codemirror'), require('@hpcc-js/other')) :
     typeof define === 'function' && define.amd ? define(['exports', '@hpcc-js/comms', '@hpcc-js/common', '@hpcc-js/util', '@hpcc-js/chart', '@hpcc-js/dgrid', '@hpcc-js/form', '@hpcc-js/graph', '@hpcc-js/map', '@hpcc-js/layout', '@hpcc-js/phosphor', '@hpcc-js/codemirror', '@hpcc-js/other'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/marshaller"] = {}, global["@hpcc-js/comms"], global["@hpcc-js/common"], global["@hpcc-js/util"], global["@hpcc-js/chart"], global["@hpcc-js/dgrid"], global["@hpcc-js/form"], global["@hpcc-js/graph"], global["@hpcc-js/map"], global["@hpcc-js/layout"], global["@hpcc-js/phosphor"], global["@hpcc-js/codemirror"], global["@hpcc-js/other"]));
-})(this, (function (exports, comms, common, util$6, chart, dgrid, form, graph, map, layout, phosphor, codemirror, other) { 'use strict';
+    (global = global || self, factory(global['@hpcc-js/marshaller'] = {}, global['@hpcc-js/comms'], global['@hpcc-js/common'], global['@hpcc-js/util'], global['@hpcc-js/chart'], global['@hpcc-js/dgrid'], global['@hpcc-js/form'], global['@hpcc-js/graph'], global['@hpcc-js/map'], global['@hpcc-js/layout'], global['@hpcc-js/phosphor'], global['@hpcc-js/codemirror'], global['@hpcc-js/other']));
+}(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.23.103";
-    var BUILD_VERSION = "2.97.0";
+    var PKG_NAME = "@hpcc-js/marshaller";
+    var PKG_VERSION = "2.23.107";
+    var BUILD_VERSION = "2.101.0";
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -39,15 +39,15 @@
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     }
 
-    var __assign$1 = function() {
-        __assign$1 = Object.assign || function __assign(t) {
+    var __assign = function() {
+        __assign = Object.assign || function __assign(t) {
             for (var s, i = 1, n = arguments.length; i < n; i++) {
                 s = arguments[i];
                 for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
             }
             return t;
         };
-        return __assign$1.apply(this, arguments);
+        return __assign.apply(this, arguments);
     };
 
     function __decorate(decorators, target, key, desc) {
@@ -99,14 +99,14 @@
         }
     }
 
-    function __spreadArray$1(to, from, pack) {
+    function __spreadArray(to, from, pack) {
         if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
             if (ar || !(i in from)) {
                 if (!ar) ar = Array.prototype.slice.call(from, 0, i);
                 ar[i] = from[i];
             }
         }
-        return to.concat(ar || Array.prototype.slice.call(from));
+        return to.concat(ar || from);
     }
 
     function stringify(obj_from_json) {
@@ -122,9 +122,9 @@
         // but without quotes around the keys.
         var props = Object
             .keys(obj_from_json)
-            .map(function (key) { return "".concat(key, ": ").concat(stringify(obj_from_json[key])); })
+            .map(function (key) { return key + ": " + stringify(obj_from_json[key]); })
             .join(", ");
-        return "{ ".concat(props, " }");
+        return "{ " + props + " }";
     }
     function schemaType2IFieldType(type) {
         switch (type) {
@@ -223,7 +223,7 @@
         };
         Activity.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({}, more));
+            return util$1.hashSum(__assign({}, more));
         };
         Activity.prototype.refreshMeta = function () {
             return this._sourceActivity ? this._sourceActivity.refreshMeta() : Promise.resolve();
@@ -296,7 +296,7 @@
             if (this._prevDataHash !== hash || this._prevInData !== inData) {
                 this._prevDataHash = hash;
                 this._prevInData = inData;
-                this._prevData = util$6.update(this._prevData, this.computeData());
+                this._prevData = util$1.update(this._prevData, this.computeData());
             }
             return this._prevData;
         };
@@ -379,7 +379,7 @@
         //  Activity overrides ---
         ActivityPipeline.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({ activities: [this.activities().map(function (activity) { return activity.hash(); })] }, more));
+            return util$1.hashSum(__assign({ activities: [this.activities().map(function (activity) { return activity.hash(); })] }, more));
         };
         ActivityPipeline.prototype.refreshMeta = function () {
             return this.last().refreshMeta();
@@ -443,7 +443,7 @@
         //  Activity overrides ---
         ActivitySelection.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({ selection: this.selection().hash() }, more));
+            return util$1.hashSum(__assign({ selection: this.selection().hash() }, more));
         };
         ActivitySelection.prototype.label = function () {
             return this.selection().label();
@@ -490,7 +490,7 @@
         __extends(Datasource, _super);
         function Datasource() {
             var _this = _super.call(this) || this;
-            _this._id = "ds_".concat(++datasourceID);
+            _this._id = "ds_" + ++datasourceID;
             return _this;
         }
         return Datasource;
@@ -509,7 +509,7 @@
         };
         DatasourceRef.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return _super.prototype.hash.call(this, __assign$1({ datasource: this._datasource ? this._datasource.hash(more) : undefined }, more));
+            return _super.prototype.hash.call(this, __assign({ datasource: this._datasource ? this._datasource.hash(more) : undefined }, more));
         };
         DatasourceRef.prototype.toDDL = function () {
             return {
@@ -622,7 +622,7 @@
         };
         Form.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return _super.prototype.hash.call(this, __assign$1({ ddl: this.toDDL() }, more));
+            return _super.prototype.hash.call(this, __assign({ ddl: this.toDDL() }, more));
         };
         Form.prototype.refreshMeta = function () {
             return Promise.resolve();
@@ -657,7 +657,7 @@
     Form.prototype._class += " Form";
 
     function fieldType(field) {
-        if (util$6.isArray(field)) {
+        if (util$1.isArray(field)) {
             return "dataset";
         }
         var type = typeof field;
@@ -767,7 +767,7 @@
             }
         };
         Databomb.prototype.hash = function (more) {
-            return _super.prototype.hash.call(this, __assign$1({ ddl: this.toDDL(true) }, more)) + this.payload();
+            return _super.prototype.hash.call(this, __assign({ ddl: this.toDDL(true) }, more)) + this.payload();
         };
         Databomb.prototype.refreshMeta = function () {
             return Promise.resolve();
@@ -874,7 +874,7 @@
             _this._schema = [];
             _this._meta = [];
             _this._data = [];
-            _this._exec = util$6.debounce(function () {
+            _this._exec = util$1.debounce(function () {
                 if (_this._prevExecHash !== _this.hash()) {
                     _this._prevExecHash = _this.hash();
                     return _super.prototype.exec.call(_this).then(function () {
@@ -889,8 +889,8 @@
                     return Promise.resolve();
                 }
             });
-            _this._fetchQ = new util$6.AsyncOrderedQueue();
-            _this.sample = util$6.debounce(function (samples, sampleSize) {
+            _this._fetchQ = new util$1.AsyncOrderedQueue();
+            _this.sample = util$1.debounce(function (samples, sampleSize) {
                 if (samples === void 0) { samples = _this.samples(); }
                 if (sampleSize === void 0) { sampleSize = _this.sampleSize(); }
                 var pages = [];
@@ -919,7 +919,7 @@
         }
         ESPResult.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({ samples: this.samples(), sampleSize: this.sampleSize() }, more));
+            return util$1.hashSum(__assign({ samples: this.samples(), sampleSize: this.sampleSize() }, more));
         };
         ESPResult.prototype.refreshMeta = function () {
             var _this = this;
@@ -1071,7 +1071,7 @@
             });
         };
         WUResult.prototype.label = function () {
-            return "".concat(this.wuid(), "\n").concat(this.resultName());
+            return this.wuid() + "\n" + this.resultName();
         };
         __decorate([
             common.publish(null, "widget", "Workunit"),
@@ -1141,7 +1141,7 @@
             return new WU(elementContainer).fromDDL(ddl, skipID);
         };
         WU.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 url: this.url(),
                 wuid: this.wuid()
             });
@@ -1265,7 +1265,7 @@
             });
         };
         LogicalFile.prototype.label = function () {
-            return "".concat(this.logicalFile());
+            return "" + this.logicalFile();
         };
         __decorate([
             common.publish("", "string", "ESP Url (http://x.x.x.x:8010)"),
@@ -1322,7 +1322,7 @@
             var _this = _super.call(this) || this;
             _this._ec = _ec;
             _this._responseFields = {};
-            _this._submitQ = new util$6.AsyncOrderedQueue();
+            _this._submitQ = new util$1.AsyncOrderedQueue();
             return _this;
         }
         RestService.prototype.toDDL = function () {
@@ -1354,7 +1354,7 @@
         };
         RestService.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({ url: this.url(), action: this.action(), mode: this.mode() }, more));
+            return util$1.hashSum(__assign({ url: this.url(), action: this.action(), mode: this.mode() }, more));
         };
         RestService.prototype.label = function () {
             return this.action();
@@ -1369,7 +1369,7 @@
             return this.requestFields().filter(function (f) { return f.valid(); });
         };
         RestService.prototype.submit = function (request) {
-            var requestHash = util$6.hashSum(request);
+            var requestHash = util$1.hashSum(request);
             if (!this._prevPromise || this._prevRequestHash !== requestHash) {
                 this._prevRequestHash = requestHash;
                 var conn = comms.createConnection({ baseUrl: this.url(), type: this.mode() });
@@ -1441,12 +1441,12 @@
         };
         RestResult.fromDDL = function (ec, rs, resultName) {
             return new RestResult(ec)
-                .id("".concat(rs.id(), "_").concat(resultName))
+                .id(rs.id() + "_" + resultName)
                 .service(rs)
                 .resultName(resultName);
         };
         RestResult.prototype.serviceID = function () {
-            return "".concat(this.service().url(), "/").concat(this.service().action(), "}");
+            return this.service().url() + "/" + this.service().action() + "}";
         };
         RestResult.prototype.sourceHash = function () {
             return this.service().hash();
@@ -1462,10 +1462,10 @@
         };
         RestResult.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({ source: this.sourceHash(), resultName: this.resultName() }, more));
+            return util$1.hashSum(__assign({ source: this.sourceHash(), resultName: this.resultName() }, more));
         };
         RestResult.prototype.label = function () {
-            return "".concat(this.service().label(), "\n").concat(this.resultName());
+            return this.service().label() + "\n" + this.resultName();
         };
         RestResult.prototype.jsonDataFields = function () {
             if (!this._jsonData || !this._jsonData.length)
@@ -1526,22 +1526,22 @@
             var retVal = [];
             if (!this.source_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".source.").concat(this.source()),
-                    msg: "Invalid source:  \"".concat(this.source(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.visualizationIDs()))
+                    source: prefix + ".source." + this.source(),
+                    msg: "Invalid source:  \"" + this.source() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.visualizationIDs())
                 });
             }
             if (!this.remoteField_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".remoteField"),
-                    msg: "Invalid remoteField:  \"".concat(this.remoteField(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.sourceOutFields()))
+                    source: prefix + ".remoteField",
+                    msg: "Invalid remoteField:  \"" + this.remoteField() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.sourceOutFields())
                 });
             }
             if (!this.value_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".value"),
-                    msg: "Invalid value:  \"".concat(this.value(), "\""),
+                    source: prefix + ".value",
+                    msg: "Invalid value:  \"" + this.value() + "\"",
                     hint: "expected:  any value."
                 });
             }
@@ -1566,7 +1566,7 @@
             return new Param(ec).fromDDL(ddl);
         };
         Param.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 label: this.localField(),
                 source: this.source(),
                 sourceField: this.remoteField()
@@ -1707,7 +1707,7 @@
             });
         };
         RestResultRef.prototype.label = function () {
-            return "".concat(this.datasource().label(), "\n").concat(this.datasource().resultName());
+            return this.datasource().label() + "\n" + this.datasource().resultName();
         };
         RestResultRef.prototype.elementIDs = function () {
             return this._ec.elementIDs();
@@ -1736,7 +1736,7 @@
             var _this = this;
             return this.datasource().refreshMeta().then(function () {
                 var oldParams = _this.request();
-                var diffs = util$6.compare(oldParams.map(function (p) { return p.localField(); }), _this.datasource().validRequestFields().map(function (ff) { return ff.fieldID(); }));
+                var diffs = util$1.compare(oldParams.map(function (p) { return p.localField(); }), _this.datasource().validRequestFields().map(function (ff) { return ff.fieldID(); }));
                 var newParams = oldParams.filter(function (op) { return diffs.update.indexOf(op.localField()) >= 0; });
                 _this.request(newParams.concat(diffs.enter.map(function (label) { return new Param(_this._ec).localField(label); })));
             });
@@ -1759,7 +1759,7 @@
         RestResultRef.prototype.exec = function () {
             var _this = this;
             var request = this.formatRequest();
-            var requestHash = util$6.hashSum({ hash: this.hash(), request: request });
+            var requestHash = util$1.hashSum({ hash: this.hash(), request: request });
             if (this._prevRequestHash !== requestHash) {
                 this._prevRequestHash = requestHash;
                 this._prevRequestPromise = this.datasource().submit(request).then(function (response) {
@@ -1787,15 +1787,15 @@
         // "http://10.241.100.157:8002/WsEcl/submit/query/roxie/carmigjx_govbisgsavi.Ins4621360_Service_00000006/json",
         var parts = _.split("/WsEcl/submit/query/");
         if (parts.length < 2)
-            throw new Error("Invalid roxie URL:  ".concat(_));
+            throw new Error("Invalid roxie URL:  " + _);
         var urlParts = parts[0].split(":");
         if (urlParts.length < 3)
-            throw new Error("Invalid roxie URL:  ".concat(_));
+            throw new Error("Invalid roxie URL:  " + _);
         var roxieParts = parts[1].split("/");
         if (roxieParts.length < 2)
-            throw new Error("Invalid roxie URL:  ".concat(_));
+            throw new Error("Invalid roxie URL:  " + _);
         return {
-            url: "".concat(urlParts[0], ":").concat(urlParts[1], ":").concat(urlParts[2] === "18002" ? "18010" : "8010"),
+            url: urlParts[0] + ":" + urlParts[1] + ":" + (urlParts[2] === "18002" ? "18010" : "8010"),
             querySet: roxieParts[0],
             queryID: roxieParts[1]
         };
@@ -1814,7 +1814,7 @@
             _this._ec = _ec;
             _this._responseFields = {};
             _this._type = "roxie";
-            _this._submitQ = new util$6.AsyncOrderedQueue();
+            _this._submitQ = new util$1.AsyncOrderedQueue();
             return _this;
         }
         RoxieService.prototype.toDDL = function () {
@@ -1849,7 +1849,7 @@
         };
         RoxieService.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({ url: this.url(), querySet: this.querySet(), queryId: this.queryID(), ignoreHipieRequest: this.ignoreHipieRequest(), ignoreHipieResponse: this.ignoreHipieResponse() }, more));
+            return util$1.hashSum(__assign({ url: this.url(), querySet: this.querySet(), queryId: this.queryID(), ignoreHipieRequest: this.ignoreHipieRequest(), ignoreHipieResponse: this.ignoreHipieResponse() }, more));
         };
         RoxieService.prototype.label = function () {
             return this.queryID();
@@ -1895,7 +1895,7 @@
             return this;
         };
         RoxieService.prototype.submit = function (request) {
-            var requestHash = util$6.hashSum(request);
+            var requestHash = util$1.hashSum(request);
             if (!this._prevPromise || this._prevRequestHash !== requestHash) {
                 this._prevRequestHash = requestHash;
                 this._prevPromise = this._submitQ.push(this._query.submit(request));
@@ -1966,12 +1966,12 @@
         };
         RoxieResult.fromDDL = function (ec, rs, resultName) {
             return new RoxieResult(ec)
-                .id("".concat(rs.id(), "_").concat(resultName))
+                .id(rs.id() + "_" + resultName)
                 .service(rs)
                 .resultName(resultName);
         };
         RoxieResult.prototype.serviceID = function () {
-            return "".concat(this.service().url(), "/").concat(this.service().querySet(), "/").concat(this.service().queryID());
+            return this.service().url() + "/" + this.service().querySet() + "/" + this.service().queryID();
         };
         RoxieResult.prototype.sourceHash = function () {
             return this.service().hash();
@@ -1987,10 +1987,10 @@
         };
         RoxieResult.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return util$6.hashSum(__assign$1({ source: this.sourceHash(), resultName: this.resultName() }, more));
+            return util$1.hashSum(__assign({ source: this.sourceHash(), resultName: this.resultName() }, more));
         };
         RoxieResult.prototype.label = function () {
-            return "".concat(this.service().label(), "\n").concat(this.resultName());
+            return this.service().label() + "\n" + this.resultName();
         };
         RoxieResult.prototype.computeFields = function (inFields) {
             var _this = this;
@@ -2093,7 +2093,7 @@
             });
         };
         RoxieResultRef.prototype.label = function () {
-            return "".concat(this.datasource().label(), "\n").concat(this.datasource().resultName());
+            return this.datasource().label() + "\n" + this.datasource().resultName();
         };
         RoxieResultRef.prototype.elementIDs = function () {
             return this._ec.elementIDs();
@@ -2123,7 +2123,7 @@
             var _this = this;
             return this.datasource().refreshMeta().then(function () {
                 var oldParams = _this.request();
-                var diffs = util$6.compare(oldParams.map(function (p) { return p.localField(); }), _this.datasource().requestFields().map(function (ff) { return ff.id; }));
+                var diffs = util$1.compare(oldParams.map(function (p) { return p.localField(); }), _this.datasource().requestFields().map(function (ff) { return ff.id; }));
                 var newParams = oldParams.filter(function (op) { return diffs.update.indexOf(op.localField()) >= 0; });
                 _this.request(newParams.concat(diffs.enter.map(function (label) { return new Param(_this._ec).localField(label); })));
             });
@@ -2169,7 +2169,7 @@
             var _this = this;
             return _super.prototype.exec.call(this).then(function () {
                 var request = _this.formatRequest();
-                var requestHash = util$6.hashSum({ hash: _this.hash(), request: request });
+                var requestHash = util$1.hashSum({ hash: _this.hash(), request: request });
                 if (_this._prevRequestHash !== requestHash) {
                     _this._prevRequestHash = requestHash;
                     _this._prevRequestPromise = _this.datasource().submit(request).then(function (response) {
@@ -2218,7 +2218,7 @@
             var request = {};
             for (var key in _request) {
                 request[key] = _request[key];
-                request["".concat(key, "_changed")] = true;
+                request[key + "_changed"] = true;
             }
             return request;
         };
@@ -2233,7 +2233,7 @@
             var _this = _super.call(this) || this;
             _this._ec = _ec;
             _this._nullDatasource = emptyDatabomb;
-            _this._id = "ds_".concat(++dsPickerID);
+            _this._id = "ds_" + ++dsPickerID;
             var ds = _this._ec.datasources()[0];
             _this.datasourceID(ds.id());
             return _this;
@@ -2290,18 +2290,18 @@
             return this.selection().validate();
         };
         DSPicker.prototype.toDDL = function () {
-            return __assign$1(__assign$1({}, this.datasourceRef().toDDL()), { id: this.datasourceID() });
+            return __assign(__assign({}, this.datasourceRef().toDDL()), { id: this.datasourceID() });
         };
         //  Activity overrides ---
         DSPicker.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return _super.prototype.hash.call(this, __assign$1({}, more));
+            return _super.prototype.hash.call(this, __assign({}, more));
         };
         DSPicker.prototype.datasourceIDs = function () {
             return this._ec.datasources().map(function (ds) {
                 return {
                     value: ds.id(),
-                    text: "".concat(ds.label(), " ").concat(ds.id() !== ds.label() ? " (".concat(ds.id(), ")") : "")
+                    text: ds.label() + " " + (ds.id() !== ds.label() ? " (" + ds.id() + ")" : "")
                 };
             });
         };
@@ -2317,23 +2317,8 @@
     }(ActivitySelection));
     DSPicker.prototype._class += " DSPicker";
 
-    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)) {
-                    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.21";
+    var PKG_NAME$1 = "@hpcc-js/ddl-shim";
+    var PKG_VERSION$1 = "2.17.25";
 
     function isWorkunitDatasource(ref) {
         return ref.WUID !== undefined;
@@ -2398,7 +2383,7 @@
     }
     var VisibilitySet = ["normal", "flyout"];
 
-    var v2$1 = /*#__PURE__*/Object.freeze({
+    var v2 = /*#__PURE__*/Object.freeze({
         __proto__: null,
         isDatabombRef: isDatabombRef,
         isWUResultRef: isWUResultRef,
@@ -2428,25 +2413,25 @@
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
 
-    var __assign = function() {
-        __assign = Object.assign || function __assign(t) {
+    var __assign$1 = function() {
+        __assign$1 = Object.assign || function __assign(t) {
             for (var s, i = 1, n = arguments.length; i < n; i++) {
                 s = arguments[i];
                 for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
             }
             return t;
         };
-        return __assign.apply(this, arguments);
+        return __assign$1.apply(this, arguments);
     };
 
-    function __spreadArray(to, from, pack) {
+    function __spreadArray$1(to, from, pack) {
         if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
             if (ar || !(i in from)) {
                 if (!ar) ar = Array.prototype.slice.call(from, 0, i);
                 ar[i] = from[i];
             }
         }
-        return to.concat(ar || Array.prototype.slice.call(from));
+        return to.concat(ar || from);
     }
 
     var classMappings = {
@@ -2662,7 +2647,7 @@
         });
         return retVal;
     }
-    function upgrade$1(ddl2, dermObj) {
+    function upgrade(ddl2, dermObj) {
         apply_to_dataviews(ddl2, dermObj);
         return apply_to_properties_layout(ddl2, dermObj);
     }
@@ -2882,7 +2867,7 @@
                                         break;
                                     default:
                                         groupByColumns.push(this.toLowerCase(field.id));
-                                        throw new Error("Unhandled field function: ".concat(field.properties.function));
+                                        throw new Error("Unhandled field function: " + field.properties.function);
                                 }
                             }
                             else {
@@ -2893,7 +2878,7 @@
                             this._ddl2DataviewActivities[viz.id].project.transformations = projectTransformations;
                         }
                         if (aggrFields.length) {
-                            this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray([], groupByColumns, true);
+                            this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray$1([], groupByColumns);
                             this._ddl2DataviewActivities[viz.id].groupBy.aggregates = aggrFields;
                         }
                     }
@@ -2911,7 +2896,7 @@
                 case "MAX":
                     return "max";
             }
-            throw new Error("Unknown DDL1 Function Type:  ".concat(func));
+            throw new Error("Unknown DDL1 Function Type:  " + func);
         };
         DDLUpgrade.prototype.readMappings = function () {
             for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
@@ -2938,7 +2923,7 @@
                         this.readSliderMappings(viz);
                     }
                     else {
-                        throw new Error("Unkown DDL1 mapping type:  ".concat(viz.type));
+                        throw new Error("Unkown DDL1 mapping type:  " + viz.type);
                     }
                 }
             }
@@ -3053,7 +3038,7 @@
                     var flag = _a[_i];
                     if (flag.fieldid) {
                         mappings.transformations.push({
-                            fieldID: "annotation_".concat(idx++),
+                            fieldID: "annotation_" + idx++,
                             type: "map",
                             sourceFieldID: this.toLowerCase(flag.fieldid),
                             default: {},
@@ -3112,7 +3097,7 @@
                                             var mapping = update.mappings[key];
                                             var dsFilter = (mapping && dsFilters[mapping]) ? dsFilters[mapping].filter : undefined;
                                             if (!dsFilter) {
-                                                console.warn("Select Mapping \"".concat(mapping, "\" in viz \"").concat(viz.id, "\" not found in filters for \"").concat(otherViz.id, "\""));
+                                                console.warn("Select Mapping \"" + mapping + "\" in viz \"" + viz.id + "\" not found in filters for \"" + otherViz.id + "\"");
                                             }
                                             else {
                                                 condition.mappings.push({
@@ -3223,7 +3208,7 @@
                     groupBy,
                     limit
                 ],
-                visualization: __assign(__assign({ id: viz.id, title: viz.title || "", description: "", visibility: viz.properties && viz.properties.flyout === true ? "flyout" : "normal" }, this.type2chartType(viz.type)), { mappings: mappings, properties: (viz.properties || {}) })
+                visualization: __assign$1(__assign$1({ id: viz.id, title: viz.title || "", description: "", visibility: viz.properties && viz.properties.flyout === true ? "flyout" : "normal" }, this.type2chartType(viz.type)), { mappings: mappings, properties: (viz.properties || {}) })
             };
         };
         DDLUpgrade.prototype.type2chartType = function (chartType) {
@@ -3353,8 +3338,8 @@
             return {
                 version: "2.2.1",
                 createdBy: {
-                    name: PKG_NAME,
-                    version: PKG_VERSION
+                    name: PKG_NAME$1,
+                    version: PKG_VERSION$1
                 },
                 datasources: this.writeDatasources(),
                 dataviews: this.writeDataviews(),
@@ -3363,24 +3348,43 @@
         };
         return DDLUpgrade;
     }());
-    function upgrade(ddl, baseUrl, wuid, toLowerCase, dermatologyJson) {
+    function upgrade$1(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$1(retVal, dermatologyJson);
+        retVal.properties = upgrade(retVal, dermatologyJson);
         return retVal;
     }
 
     var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-    var uri_all = {exports: {}};
+    function unwrapExports (x) {
+    	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
+    }
 
-    /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
+    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;
+    }
 
-    (function (module, 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 (global, factory) {
-    	factory(exports) ;
+    	 factory(exports) ;
     }(commonjsGlobal, (function (exports) {
     function merge() {
         for (var _len = arguments.length, sets = Array(_len), _key = 0; _key < _len; _key++) {
@@ -3434,10 +3438,10 @@
             //subset, excludes bidi control characters
         IPRIVATE$$ = isIRI ? "[\\uE000-\\uF8FF]" : "[]",
             //subset
-        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$$),
+        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$$),
             //relaxed parsing rules
         IPV4ADDRESS$ = subexp(DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$),
             H16$ = subexp(HEXDIG$$ + "{1,4}"),
@@ -3461,14 +3465,14 @@
         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
-        subexp("[vV]" + HEXDIG$$ + "+\\." + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]") + "+");
+        IPVFUTURE$ = subexp("[vV]" + HEXDIG$$ + "+\\." + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]") + "+"),
             //RFC 6874
-        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$$)) + "*");
+        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$$)) + "*");
         return {
             NOT_SCHEME: new RegExp(merge("[^]", ALPHA$$, DIGIT$$, "[\\+\\-\\.]"), "g"),
             NOT_USERINFO: new RegExp(merge("[^\\%\\:]", UNRESERVED$$, SUB_DELIMS$$), "g"),
@@ -4582,7 +4586,7 @@
 
     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: @ : / ? # [ ] & ; =
@@ -4780,23 +4784,22 @@
 
     })));
 
-    }(uri_all, uri_all.exports));
+    });
+
+    unwrapExports(uri_all);
+
+    // do not edit .js files directly - edit src/index.jst
+
 
-    var isArray = Array.isArray;
-    var keyList = Object.keys;
-    var hasProp = Object.prototype.hasOwnProperty;
 
     var fastDeepEqual = function equal(a, b) {
       if (a === b) return true;
 
       if (a && b && typeof a == 'object' && typeof b == 'object') {
-        var arrA = isArray(a)
-          , arrB = isArray(b)
-          , i
-          , length
-          , key;
+        if (a.constructor !== b.constructor) return false;
 
-        if (arrA && arrB) {
+        var length, i, keys;
+        if (Array.isArray(a)) {
           length = a.length;
           if (length != b.length) return false;
           for (i = length; i-- !== 0;)
@@ -4804,41 +4807,35 @@
           return true;
         }
 
-        if (arrA != arrB) return false;
 
-        var dateA = a instanceof Date
-          , dateB = b instanceof Date;
-        if (dateA != dateB) return false;
-        if (dateA && dateB) return a.getTime() == b.getTime();
 
-        var regexpA = a instanceof RegExp
-          , regexpB = b instanceof RegExp;
-        if (regexpA != regexpB) return false;
-        if (regexpA && regexpB) return a.toString() == b.toString();
+        if (a.constructor === RegExp) return a.source === b.source && a.flags === b.flags;
+        if (a.valueOf !== Object.prototype.valueOf) return a.valueOf() === b.valueOf();
+        if (a.toString !== Object.prototype.toString) return a.toString() === b.toString();
 
-        var keys = keyList(a);
+        keys = Object.keys(a);
         length = keys.length;
-
-        if (length !== keyList(b).length)
-          return false;
+        if (length !== Object.keys(b).length) return false;
 
         for (i = length; i-- !== 0;)
-          if (!hasProp.call(b, keys[i])) return false;
+          if (!Object.prototype.hasOwnProperty.call(b, keys[i])) return false;
 
         for (i = length; i-- !== 0;) {
-          key = keys[i];
+          var key = keys[i];
+
           if (!equal(a[key], b[key])) return false;
         }
 
         return true;
       }
 
+      // true if both NaN, false otherwise
       return a!==a && b!==b;
     };
 
     // https://mathiasbynens.be/notes/javascript-encoding
     // https://github.com/bestiejs/punycode.js - punycode.ucs2.decode
-    var ucs2length$1 = function ucs2length(str) {
+    var ucs2length = function ucs2length(str) {
       var length = 0
         , len = str.length
         , pos = 0
@@ -4855,20 +4852,18 @@
       return length;
     };
 
-    var util$5 = {
+    var util = {
       copy: copy,
       checkDataType: checkDataType,
       checkDataTypes: checkDataTypes,
       coerceToTypes: coerceToTypes,
-      toHash: toHash$1,
+      toHash: toHash,
       getProperty: getProperty,
       escapeQuotes: escapeQuotes,
       equal: fastDeepEqual,
-      ucs2length: ucs2length$1,
+      ucs2length: ucs2length,
       varOccurences: varOccurences,
       varReplace: varReplace,
-      cleanUpCode: cleanUpCode,
-      finalCleanUpCode: finalCleanUpCode,
       schemaHasRules: schemaHasRules,
       schemaHasRulesExcept: schemaHasRulesExcept,
       schemaUnknownRules: schemaUnknownRules,
@@ -4890,7 +4885,7 @@
     }
 
 
-    function checkDataType(dataType, data, negate) {
+    function checkDataType(dataType, data, strictNumbers, negate) {
       var EQUAL = negate ? ' !== ' : ' === '
         , AND = negate ? ' || ' : ' && '
         , OK = negate ? '!' : ''
@@ -4903,18 +4898,21 @@
                               NOT + 'Array.isArray(' + data + '))';
         case 'integer': return '(typeof ' + data + EQUAL + '"number"' + AND +
                                NOT + '(' + data + ' % 1)' +
-                               AND + data + EQUAL + data + ')';
+                               AND + data + EQUAL + data +
+                               (strictNumbers ? (AND + OK + 'isFinite(' + data + ')') : '') + ')';
+        case 'number': return '(typeof ' + data + EQUAL + '"' + dataType + '"' +
+                              (strictNumbers ? (AND + OK + 'isFinite(' + data + ')') : '') + ')';
         default: return 'typeof ' + data + EQUAL + '"' + dataType + '"';
       }
     }
 
 
-    function checkDataTypes(dataTypes, data) {
+    function checkDataTypes(dataTypes, data, strictNumbers) {
       switch (dataTypes.length) {
-        case 1: return checkDataType(dataTypes[0], data, true);
+        case 1: return checkDataType(dataTypes[0], data, strictNumbers, true);
         default:
           var code = '';
-          var types = toHash$1(dataTypes);
+          var types = toHash(dataTypes);
           if (types.array && types.object) {
             code = types.null ? '(': '(!' + data + ' || ';
             code += 'typeof ' + data + ' !== "object")';
@@ -4924,14 +4922,14 @@
           }
           if (types.number) delete types.integer;
           for (var t in types)
-            code += (code ? ' && ' : '' ) + checkDataType(t, data, true);
+            code += (code ? ' && ' : '' ) + checkDataType(t, data, strictNumbers, true);
 
           return code;
       }
     }
 
 
-    var COERCE_TO_TYPES = toHash$1([ 'string', 'number', 'integer', 'boolean', 'null' ]);
+    var COERCE_TO_TYPES = toHash([ 'string', 'number', 'integer', 'boolean', 'null' ]);
     function coerceToTypes(optionCoerceTypes, dataTypes) {
       if (Array.isArray(dataTypes)) {
         var types = [];
@@ -4949,19 +4947,19 @@
     }
 
 
-    function toHash$1(arr) {
+    function toHash(arr) {
       var hash = {};
       for (var i=0; i<arr.length; i++) hash[arr[i]] = true;
       return hash;
     }
 
 
-    var IDENTIFIER$1 = /^[a-z$_][a-z$_0-9]*$/i;
+    var IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
     var SINGLE_QUOTE = /'|\\/g;
     function getProperty(key) {
       return typeof key == 'number'
               ? '[' + key + ']'
-              : IDENTIFIER$1.test(key)
+              : IDENTIFIER.test(key)
                 ? '.' + key
                 : "['" + escapeQuotes(key) + "']";
     }
@@ -4990,42 +4988,6 @@
     }
 
 
-    var EMPTY_ELSE = /else\s*{\s*}/g
-      , EMPTY_IF_NO_ELSE = /if\s*\([^)]+\)\s*\{\s*\}(?!\s*else)/g
-      , EMPTY_IF_WITH_ELSE = /if\s*\(([^)]+)\)\s*\{\s*\}\s*else(?!\s*if)/g;
-    function cleanUpCode(out) {
-      return out.replace(EMPTY_ELSE, '')
-                .replace(EMPTY_IF_NO_ELSE, '')
-                .replace(EMPTY_IF_WITH_ELSE, 'if (!($1))');
-    }
-
-
-    var ERRORS_REGEXP = /[^v.]errors/g
-      , REMOVE_ERRORS = /var errors = 0;|var vErrors = null;|validate.errors = vErrors;/g
-      , REMOVE_ERRORS_ASYNC = /var errors = 0;|var vErrors = null;/g
-      , RETURN_VALID = 'return errors === 0;'
-      , RETURN_TRUE = 'validate.errors = null; return true;'
-      , RETURN_ASYNC = /if \(errors === 0\) return data;\s*else throw new ValidationError\(vErrors\);/
-      , RETURN_DATA_ASYNC = 'return data;'
-      , ROOTDATA_REGEXP = /[^A-Za-z_$]rootData[^A-Za-z0-9_$]/g
-      , REMOVE_ROOTDATA = /if \(rootData === undefined\) rootData = data;/;
-
-    function finalCleanUpCode(out, async) {
-      var matches = out.match(ERRORS_REGEXP);
-      if (matches && matches.length == 2) {
-        out = async
-              ? out.replace(REMOVE_ERRORS_ASYNC, '')
-                   .replace(RETURN_ASYNC, RETURN_DATA_ASYNC)
-              : out.replace(REMOVE_ERRORS, '')
-                   .replace(RETURN_VALID, RETURN_TRUE);
-      }
-
-      matches = out.match(ROOTDATA_REGEXP);
-      if (!matches || matches.length !== 3) return out;
-      return out.replace(REMOVE_ROOTDATA, '');
-    }
-
-
     function schemaHasRules(schema, rules) {
       if (typeof schema == 'boolean') return !schema;
       for (var key in schema) if (rules[key]) return true;
@@ -5065,17 +5027,17 @@
     }
 
 
-    var JSON_POINTER$1 = /^\/(?:[^~]|~0|~1)*$/;
-    var RELATIVE_JSON_POINTER$1 = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
+    var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
+    var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
     function getData($data, lvl, paths) {
       var up, jsonPointer, data, matches;
       if ($data === '') return 'rootData';
       if ($data[0] == '/') {
-        if (!JSON_POINTER$1.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
+        if (!JSON_POINTER.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
         jsonPointer = $data;
         data = 'rootData';
       } else {
-        matches = $data.match(RELATIVE_JSON_POINTER$1);
+        matches = $data.match(RELATIVE_JSON_POINTER);
         if (!matches) throw new Error('Invalid JSON-pointer: ' + $data);
         up = +matches[1];
         jsonPointer = matches[2];
@@ -5104,7 +5066,7 @@
 
     function joinPaths (a, b) {
       if (a == '""') return b;
-      return (a + ' + ' + b).replace(/' \+ '/g, '');
+      return (a + ' + ' + b).replace(/([^\\])' \+ '/g, '$1');
     }
 
 
@@ -5127,17 +5089,15 @@
       return str.replace(/~1/g, '/').replace(/~0/g, '~');
     }
 
-    var util$4 = util$5;
+    var schema_obj = SchemaObject;
 
-    var schema_obj = SchemaObject$2;
-
-    function SchemaObject$2(obj) {
-      util$4.copy(obj, this);
+    function SchemaObject(obj) {
+      util.copy(obj, this);
     }
 
-    var jsonSchemaTraverse = {exports: {}};
+    var jsonSchemaTraverse = createCommonjsModule(function (module) {
 
-    var traverse$1 = jsonSchemaTraverse.exports = function (schema, opts, cb) {
+    var traverse = module.exports = function (schema, opts, cb) {
       // Legacy support for v0.3.1 and earlier.
       if (typeof opts == 'function') {
         cb = opts;
@@ -5152,7 +5112,7 @@
     };
 
 
-    traverse$1.keywords = {
+    traverse.keywords = {
       additionalItems: true,
       items: true,
       contains: true,
@@ -5161,21 +5121,21 @@
       not: true
     };
 
-    traverse$1.arrayKeywords = {
+    traverse.arrayKeywords = {
       items: true,
       allOf: true,
       anyOf: true,
       oneOf: true
     };
 
-    traverse$1.propsKeywords = {
+    traverse.propsKeywords = {
       definitions: true,
       properties: true,
       patternProperties: true,
       dependencies: true
     };
 
-    traverse$1.skipKeywords = {
+    traverse.skipKeywords = {
       default: true,
       enum: true,
       const: true,
@@ -5203,16 +5163,16 @@
         for (var key in schema) {
           var sch = schema[key];
           if (Array.isArray(sch)) {
-            if (key in traverse$1.arrayKeywords) {
+            if (key in traverse.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$1.propsKeywords) {
+          } else if (key in traverse.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$1.keywords || (opts.allKeys && !(key in traverse$1.skipKeywords))) {
+          } else if (key in traverse.keywords || (opts.allKeys && !(key in traverse.skipKeywords))) {
             _traverse(opts, pre, post, sch, jsonPtr + '/' + key, rootSchema, jsonPtr, key, schema);
           }
         }
@@ -5224,21 +5184,16 @@
     function escapeJsonPtr(str) {
       return str.replace(/~/g, '~0').replace(/\//g, '~1');
     }
+    });
 
-    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;
+    var resolve_1 = resolve;
 
-    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.normalizeId = normalizeId;
+    resolve.fullPath = getFullPath;
+    resolve.url = resolveUrl;
+    resolve.ids = resolveIds;
+    resolve.inlineRef = inlineRef;
+    resolve.schema = resolveSchema;
 
     /**
      * [resolve and compile the references ($ref)]
@@ -5248,16 +5203,16 @@
      * @param  {String} ref reference to resolve
      * @return {Object|Function} schema object (if the schema can be inlined) or validation function
      */
-    function resolve$3(compile, root, ref) {
+    function resolve(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$3.call(this, compile, root, refVal);
+        else return resolve.call(this, compile, root, refVal);
       }
 
       refVal = refVal || this._schemas[ref];
-      if (refVal instanceof SchemaObject$1) {
+      if (refVal instanceof schema_obj) {
         return inlineRef(refVal.schema, this._opts.inlineRefs)
                 ? refVal.schema
                 : refVal.validate || this._compile(refVal);
@@ -5271,7 +5226,7 @@
         baseId = res.baseId;
       }
 
-      if (schema instanceof SchemaObject$1) {
+      if (schema instanceof schema_obj) {
         v = schema.validate || compile.call(this, schema.schema, root, undefined, baseId);
       } else if (schema !== undefined) {
         v = inlineRef(schema, this._opts.inlineRefs)
@@ -5292,7 +5247,7 @@
      */
     function resolveSchema(root, ref) {
       /* jshint validthis: true */
-      var p = URI$1.parse(ref)
+      var p = uri_all.parse(ref)
         , refPath = _getFullPath(p)
         , baseId = getFullPath(this._getId(root.schema));
       if (Object.keys(root.schema).length === 0 || refPath !== baseId) {
@@ -5300,12 +5255,12 @@
         var refVal = this._refs[id];
         if (typeof refVal == 'string') {
           return resolveRecursive.call(this, root, refVal, p);
-        } else if (refVal instanceof SchemaObject$1) {
+        } else if (refVal instanceof schema_obj) {
           if (!refVal.validate) this._compile(refVal);
           root = refVal;
         } else {
           refVal = this._schemas[id];
-          if (refVal instanceof SchemaObject$1) {
+          if (refVal instanceof schema_obj) {
             if (!refVal.validate) this._compile(refVal);
             if (id == normalizeId(ref))
               return { schema: refVal, root: root, baseId: baseId };
@@ -5336,7 +5291,7 @@
     }
 
 
-    var PREVENT_SCOPE_CHANGE = util$3.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
+    var PREVENT_SCOPE_CHANGE = util.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
     /* @this Ajv */
     function getJsonPointer(parsedRef, baseId, schema, root) {
       /* jshint validthis: true */
@@ -5347,7 +5302,7 @@
       for (var i = 1; i < parts.length; i++) {
         var part = parts[i];
         if (part) {
-          part = util$3.unescapeFragment(part);
+          part = util.unescapeFragment(part);
           schema = schema[part];
           if (schema === undefined) break;
           var id;
@@ -5371,7 +5326,7 @@
     }
 
 
-    var SIMPLE_INLINED = util$3.toHash([
+    var SIMPLE_INLINED = util.toHash([
       'type', 'format', 'pattern',
       'maxLength', 'minLength',
       'maxProperties', 'minProperties',
@@ -5431,13 +5386,13 @@
 
     function getFullPath(id, normalize) {
       if (normalize !== false) id = normalizeId(id);
-      var p = URI$1.parse(id);
+      var p = uri_all.parse(id);
       return _getFullPath(p);
     }
 
 
     function _getFullPath(p) {
-      return URI$1.serialize(p).split('#')[0] + '#';
+      return uri_all.serialize(p).split('#')[0] + '#';
     }
 
 
@@ -5449,7 +5404,7 @@
 
     function resolveUrl(baseId, id) {
       id = normalizeId(id);
-      return URI$1.resolve(baseId, id);
+      return uri_all.resolve(baseId, id);
     }
 
 
@@ -5461,25 +5416,25 @@
       var localRefs = {};
       var self = this;
 
-      traverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
+      jsonSchemaTraverse(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$3.escapeFragment(keyIndex));
+          fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util.escapeFragment(keyIndex));
 
         if (typeof id == 'string') {
-          id = baseId = normalizeId(baseId ? URI$1.resolve(baseId, id) : id);
+          id = baseId = normalizeId(baseId ? uri_all.resolve(baseId, id) : id);
 
           var refVal = self._refs[id];
           if (typeof refVal == 'string') refVal = self._refs[refVal];
           if (refVal && refVal.schema) {
-            if (!equal$1(sch, refVal.schema))
+            if (!fastDeepEqual(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] && !equal$1(sch, localRefs[id]))
+              if (localRefs[id] && !fastDeepEqual(sch, localRefs[id]))
                 throw new Error('id "' + id + '" resolves to more than one schema');
               localRefs[id] = sch;
             } else {
@@ -5494,30 +5449,28 @@
       return localRefs;
     }
 
-    var resolve$2 = resolve_1;
-
     var error_classes = {
-      Validation: errorSubclass(ValidationError$1),
-      MissingRef: errorSubclass(MissingRefError$1)
+      Validation: errorSubclass(ValidationError),
+      MissingRef: errorSubclass(MissingRefError)
     };
 
 
-    function ValidationError$1(errors) {
+    function ValidationError(errors) {
       this.message = 'validation failed';
       this.errors = errors;
       this.ajv = this.validation = true;
     }
 
 
-    MissingRefError$1.message = function (baseId, ref) {
+    MissingRefError.message = function (baseId, ref) {
       return 'can\'t resolve reference ' + ref + ' from id ' + baseId;
     };
 
 
-    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));
+    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));
     }
 
 
@@ -5585,7 +5538,7 @@
         })(data);
     };
 
-    var validate$1 = function generate_validate(it, $keyword, $ruleType) {
+    var validate = function generate_validate(it, $keyword, $ruleType) {
       var out = '';
       var $async = it.schema.$async === true,
         $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref'),
@@ -5677,7 +5630,7 @@
         it.rootId = it.resolve.fullPath(it.self._getId(it.root.schema));
         it.baseId = it.baseId || it.rootId;
         delete it.isTop;
-        it.dataPathArr = [undefined];
+        it.dataPathArr = [""];
         if (it.schema.default !== undefined && it.opts.useDefaults && it.opts.strictDefaults) {
           var $defaultMsg = 'default is ignored in the schema root';
           if (it.opts.strictDefaults === 'log') it.logger.warn($defaultMsg);
@@ -5735,47 +5688,39 @@
           var $schemaPath = it.schemaPath + '.type',
             $errSchemaPath = it.errSchemaPath + '/type',
             $method = $typeIsArray ? 'checkDataTypes' : 'checkDataType';
-          out += ' if (' + (it.util[$method]($typeSchema, $data, true)) + ') { ';
+          out += ' if (' + (it.util[$method]($typeSchema, $data, it.opts.strictNumbers, true)) + ') { ';
           if ($coerceToTypes) {
             var $dataType = 'dataType' + $lvl,
               $coerced = 'coerced' + $lvl;
-            out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; ';
+            out += ' var ' + ($dataType) + ' = typeof ' + ($data) + '; var ' + ($coerced) + ' = undefined; ';
             if (it.opts.coerceTypes == 'array') {
-              out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ')) ' + ($dataType) + ' = \'array\'; ';
+              out += ' if (' + ($dataType) + ' == \'object\' && Array.isArray(' + ($data) + ') && ' + ($data) + '.length == 1) { ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + '; if (' + (it.util.checkDataType(it.schema.type, $data, it.opts.strictNumbers)) + ') ' + ($coerced) + ' = ' + ($data) + '; } ';
             }
-            out += ' var ' + ($coerced) + ' = undefined; ';
-            var $bracesCoercion = '';
+            out += ' if (' + ($coerced) + ' !== undefined) ; ';
             var arr1 = $coerceToTypes;
             if (arr1) {
               var $type, $i = -1,
                 l1 = arr1.length - 1;
               while ($i < l1) {
                 $type = arr1[$i += 1];
-                if ($i) {
-                  out += ' if (' + ($coerced) + ' === undefined) { ';
-                  $bracesCoercion += '}';
-                }
-                if (it.opts.coerceTypes == 'array' && $type != 'array') {
-                  out += ' if (' + ($dataType) + ' == \'array\' && ' + ($data) + '.length == 1) { ' + ($coerced) + ' = ' + ($data) + ' = ' + ($data) + '[0]; ' + ($dataType) + ' = typeof ' + ($data) + ';  } ';
-                }
                 if ($type == 'string') {
-                  out += ' if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
+                  out += ' else if (' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\') ' + ($coerced) + ' = \'\' + ' + ($data) + '; else if (' + ($data) + ' === null) ' + ($coerced) + ' = \'\'; ';
                 } else if ($type == 'number' || $type == 'integer') {
-                  out += ' if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
+                  out += ' else if (' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' === null || (' + ($dataType) + ' == \'string\' && ' + ($data) + ' && ' + ($data) + ' == +' + ($data) + ' ';
                   if ($type == 'integer') {
                     out += ' && !(' + ($data) + ' % 1)';
                   }
                   out += ')) ' + ($coerced) + ' = +' + ($data) + '; ';
                 } else if ($type == 'boolean') {
-                  out += ' if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
+                  out += ' else if (' + ($data) + ' === \'false\' || ' + ($data) + ' === 0 || ' + ($data) + ' === null) ' + ($coerced) + ' = false; else if (' + ($data) + ' === \'true\' || ' + ($data) + ' === 1) ' + ($coerced) + ' = true; ';
                 } else if ($type == 'null') {
-                  out += ' if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
+                  out += ' else if (' + ($data) + ' === \'\' || ' + ($data) + ' === 0 || ' + ($data) + ' === false) ' + ($coerced) + ' = null; ';
                 } else if (it.opts.coerceTypes == 'array' && $type == 'array') {
-                  out += ' if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
+                  out += ' else if (' + ($dataType) + ' == \'string\' || ' + ($dataType) + ' == \'number\' || ' + ($dataType) + ' == \'boolean\' || ' + ($data) + ' == null) ' + ($coerced) + ' = [' + ($data) + ']; ';
                 }
               }
             }
-            out += ' ' + ($bracesCoercion) + ' if (' + ($coerced) + ' === undefined) {   ';
+            out += ' else {   ';
             var $$outStack = $$outStack || [];
             $$outStack.push(out);
             out = ''; /* istanbul ignore else */
@@ -5815,7 +5760,7 @@
             } else {
               out += ' var err = ' + (__err) + ';  if (vErrors === null) vErrors = [err]; else vErrors.push(err); errors++; ';
             }
-            out += ' } else {  ';
+            out += ' } if (' + ($coerced) + ' !== undefined) {  ';
             var $parentData = $dataLvl ? 'data' + (($dataLvl - 1) || '') : 'parentData',
               $parentDataProperty = $dataLvl ? it.dataPathArr[$dataLvl] : 'parentDataProperty';
             out += ' ' + ($data) + ' = ' + ($coerced) + '; ';
@@ -5888,7 +5833,7 @@
             $rulesGroup = arr2[i2 += 1];
             if ($shouldUseGroup($rulesGroup)) {
               if ($rulesGroup.type) {
-                out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data)) + ') { ';
+                out += ' if (' + (it.util.checkDataType($rulesGroup.type, $data, it.opts.strictNumbers)) + ') { ';
               }
               if (it.opts.useDefaults) {
                 if ($rulesGroup.type == 'object' && it.schema.properties) {
@@ -6056,10 +6001,6 @@
       } else {
         out += ' var ' + ($valid) + ' = errors === errs_' + ($lvl) + ';';
       }
-      out = it.util.cleanUpCode(out);
-      if ($top) {
-        out = it.util.finalCleanUpCode(out, $async);
-      }
 
       function $shouldUseGroup($rulesGroup) {
         var rules = $rulesGroup.rules;
@@ -6079,24 +6020,17 @@
       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 = util$2.ucs2length;
-    var equal = fastDeepEqual;
+    var ucs2length$1 = util.ucs2length;
+
 
     // this error is thrown by async schemas to return validation errors via exception
-    var ValidationError = errorClasses$1.Validation;
+    var ValidationError$1 = error_classes.Validation;
 
-    var compile_1 = compile$1;
+    var compile_1 = compile;
 
 
     /**
@@ -6108,7 +6042,7 @@
      * @param  {String} baseId base ID for IDs in the schema
      * @return {Function} validation function
      */
-    function compile$1(schema, root, localRefs, baseId) {
+    function compile(schema, root, localRefs, baseId) {
       /* jshint validthis: true, evil: true */
       /* eslint no-shadow: 0 */
       var self = this
@@ -6160,11 +6094,11 @@
       function localCompile(_schema, _root, localRefs, baseId) {
         var isRoot = !_root || (_root && _root.schema == _schema);
         if (_root.schema != root.schema)
-          return compile$1.call(self, _schema, _root, localRefs, baseId);
+          return compile.call(self, _schema, _root, localRefs, baseId);
 
         var $async = _schema.$async === true;
 
-        var sourceCode = validateGenerator({
+        var sourceCode = validate({
           isTop: true,
           schema: _schema,
           isRoot: isRoot,
@@ -6173,11 +6107,11 @@
           schemaPath: '',
           errSchemaPath: '#',
           errorPath: '""',
-          MissingRefError: errorClasses$1.MissingRef,
+          MissingRefError: error_classes.MissingRef,
           RULES: RULES,
-          validate: validateGenerator,
-          util: util$2,
-          resolve: resolve$1,
+          validate: validate,
+          util: util,
+          resolve: resolve_1,
           resolveRef: resolveRef,
           usePattern: usePattern,
           useDefault: useDefault,
@@ -6189,12 +6123,12 @@
         });
 
         sourceCode = vars(refVal, refValCode) + vars(patterns, patternCode)
-                       + vars(defaults, defaultCode) + vars(customRules, customRuleCode$1)
+                       + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
                        + sourceCode;
 
-        if (opts.processCode) sourceCode = opts.processCode(sourceCode);
+        if (opts.processCode) sourceCode = opts.processCode(sourceCode, _schema);
         // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
-        var validate;
+        var validate$1;
         try {
           var makeValidate = new Function(
             'self',
@@ -6210,7 +6144,7 @@
             sourceCode
           );
 
-          validate = makeValidate(
+          validate$1 = makeValidate(
             self,
             RULES,
             formats,
@@ -6218,36 +6152,36 @@
             refVal,
             defaults,
             customRules,
-            equal,
-            ucs2length,
-            ValidationError
+            fastDeepEqual,
+            ucs2length$1,
+            ValidationError$1
           );
 
-          refVal[0] = validate;
+          refVal[0] = validate$1;
         } catch(e) {
           self.logger.error('Error compiling schema, function code:', sourceCode);
           throw e;
         }
 
-        validate.schema = _schema;
-        validate.errors = null;
-        validate.refs = refs;
-        validate.refVal = refVal;
-        validate.root = isRoot ? validate : _root;
-        if ($async) validate.$async = true;
+        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;
         if (opts.sourceCode === true) {
-          validate.source = {
+          validate$1.source = {
             code: sourceCode,
             patterns: patterns,
             defaults: defaults
           };
         }
 
-        return validate;
+        return validate$1;
       }
 
       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) {
@@ -6265,13 +6199,13 @@
         }
 
         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$1.call(self, localSchema, root, localRefs, baseId);
+                : compile.call(self, localSchema, root, localRefs, baseId);
           }
         }
 
@@ -6320,10 +6254,10 @@
           case 'number':
             return '' + value;
           case 'string':
-            return util$2.toQuotedString(value);
+            return util.toQuotedString(value);
           case 'object':
             if (value === null) return 'null';
-            var valueStr = stableStringify$1(value);
+            var valueStr = fastJsonStableStringify(value);
             var index = defaultsHash[valueStr];
             if (index === undefined) {
               index = defaultsHash[valueStr] = defaults.length;
@@ -6438,7 +6372,7 @@
 
 
     function patternCode(i, patterns) {
-      return 'var pattern' + i + ' = new RegExp(' + util$2.toQuotedString(patterns[i]) + ');';
+      return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
     }
 
 
@@ -6452,7 +6386,7 @@
     }
 
 
-    function customRuleCode$1(i) {
+    function customRuleCode(i) {
       return 'var customRule' + i + ' = customRules[' + i + '];';
     }
 
@@ -6465,38 +6399,38 @@
       return code;
     }
 
-    var cache = {exports: {}};
+    var cache = createCommonjsModule(function (module) {
+
 
-    var Cache$1 = cache.exports = function Cache() {
+    var Cache = module.exports = function Cache() {
       this._cache = {};
     };
 
 
-    Cache$1.prototype.put = function Cache_put(key, value) {
+    Cache.prototype.put = function Cache_put(key, value) {
       this._cache[key] = value;
     };
 
 
-    Cache$1.prototype.get = function Cache_get(key) {
+    Cache.prototype.get = function Cache_get(key) {
       return this._cache[key];
     };
 
 
-    Cache$1.prototype.del = function Cache_del(key) {
+    Cache.prototype.del = function Cache_del(key) {
       delete this._cache[key];
     };
 
 
-    Cache$1.prototype.clear = function Cache_clear() {
+    Cache.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];
-    var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d:\d\d)?$/i;
-    var HOSTNAME = /^[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*$/i;
+    var TIME = /^(\d\d):(\d\d):(\d\d)(\.\d+)?(z|[+-]\d\d(?::?\d\d)?)?$/i;
+    var HOSTNAME = /^(?=.{1,253}\.?$)[a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?(?:\.[a-z0-9](?:[-0-9a-z]{0,61}[0-9a-z])?)*\.?$/i;
     var URI = /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'()*+,;=:@]|%[0-9a-f]{2})*)*)(?:\?(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
     var URIREF = /^(?:[a-z][a-z0-9+\-.]*:)?(?:\/?\/(?:(?:[a-z0-9\-._~!$&'()*+,;=:]|%[0-9a-f]{2})*@)?(?:\[(?:(?:(?:(?:[0-9a-f]{1,4}:){6}|::(?:[0-9a-f]{1,4}:){5}|(?:[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){4}|(?:(?:[0-9a-f]{1,4}:){0,1}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){3}|(?:(?:[0-9a-f]{1,4}:){0,2}[0-9a-f]{1,4})?::(?:[0-9a-f]{1,4}:){2}|(?:(?:[0-9a-f]{1,4}:){0,3}[0-9a-f]{1,4})?::[0-9a-f]{1,4}:|(?:(?:[0-9a-f]{1,4}:){0,4}[0-9a-f]{1,4})?::)(?:[0-9a-f]{1,4}:[0-9a-f]{1,4}|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?))|(?:(?:[0-9a-f]{1,4}:){0,5}[0-9a-f]{1,4})?::[0-9a-f]{1,4}|(?:(?:[0-9a-f]{1,4}:){0,6}[0-9a-f]{1,4})?::)|[Vv][0-9a-f]+\.[a-z0-9\-._~!$&'()*+,;=:]+)\]|(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)|(?:[a-z0-9\-._~!$&'"()*+,;=]|%[0-9a-f]{2})*)(?::\d*)?(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*|\/(?:(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?|(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})+(?:\/(?:[a-z0-9\-._~!$&'"()*+,;=:@]|%[0-9a-f]{2})*)*)?(?:\?(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?(?:#(?:[a-z0-9\-._~!$&'"()*+,;=:@/?]|%[0-9a-f]{2})*)?$/i;
     // uri-template: https://tools.ietf.org/html/rfc6570
@@ -6504,31 +6438,31 @@
     // For the source: https://gist.github.com/dperini/729294
     // For test cases: https://mathiasbynens.be/demo/url-regex
     // @todo Delete current URL in favour of the commented out URL rule when this issue is fixed https://github.com/eslint/eslint/issues/7983.
-    // 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 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-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-)*(?:[0-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)(?:\.(?:(?:[0-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+-)*(?:[0-9a-z\xA1-\uD7FF\uE000-\uFFFF]|[\uD800-\uDBFF](?![\uDC00-\uDFFF])|(?:[^\uD800-\uDBFF]|^)[\uDC00-\uDFFF])+)*(?:\.(?:(?:[a-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 = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
+    var JSON_POINTER$1 = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
     var JSON_POINTER_URI_FRAGMENT = /^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
-    var RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
+    var RELATIVE_JSON_POINTER$1 = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
 
 
-    var formats_1 = formats$1;
+    var formats_1 = formats;
 
-    function formats$1(mode) {
+    function formats(mode) {
       mode = mode == 'full' ? 'full' : 'fast';
-      return util$1.copy(formats$1[mode]);
+      return util.copy(formats[mode]);
     }
 
 
-    formats$1.fast = {
+    formats.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
-      time: /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)?$/i,
-      'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d:\d\d)$/i,
+      time: /^(?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)?$/i,
+      'date-time': /^\d\d\d\d-[0-1]\d-[0-3]\d[t\s](?:[0-2]\d:[0-5]\d:[0-5]\d|23:59:60)(?:\.\d+)?(?:z|[+-]\d\d(?::?\d\d)?)$/i,
       // uri: https://github.com/mafintosh/is-my-json-valid/blob/master/formats.js
-      uri: /^(?:[a-z][a-z0-9+-.]*:)(?:\/?\/)?[^\s]*$/i,
-      'uri-reference': /^(?:(?:[a-z][a-z0-9+-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i,
+      uri: /^(?:[a-z][a-z0-9+\-.]*:)(?:\/?\/)?[^\s]*$/i,
+      'uri-reference': /^(?:(?:[a-z][a-z0-9+\-.]*:)?\/?\/)?(?:[^\\\s#][^\s#]*)?(?:#[^\\\s]*)?$/i,
       'uri-template': URITEMPLATE,
       url: URL,
       // email (sources from jsen validator):
@@ -6545,14 +6479,14 @@
       uuid: UUID,
       // JSON-pointer: https://tools.ietf.org/html/rfc6901
       // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A
-      'json-pointer': JSON_POINTER,
+      'json-pointer': JSON_POINTER$1,
       '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
+      'relative-json-pointer': RELATIVE_JSON_POINTER$1
     };
 
 
-    formats$1.full = {
+    formats.full = {
       date: date,
       time: time,
       'date-time': date_time,
@@ -6561,14 +6495,14 @@
       'uri-template': URITEMPLATE,
       url: URL,
       email: /^[a-z0-9!#$%&'*+/=?^_`{|}~-]+(?:\.[a-z0-9!#$%&'*+/=?^_`{|}~-]+)*@(?:[a-z0-9](?:[a-z0-9-]*[a-z0-9])?\.)+[a-z0-9](?:[a-z0-9-]*[a-z0-9])?$/i,
-      hostname: hostname,
+      hostname: HOSTNAME,
       ipv4: /^(?:(?:25[0-5]|2[0-4]\d|[01]?\d\d?)\.){3}(?:25[0-5]|2[0-4]\d|[01]?\d\d?)$/,
       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,
+      'json-pointer': JSON_POINTER$1,
       'json-pointer-uri-fragment': JSON_POINTER_URI_FRAGMENT,
-      'relative-json-pointer': RELATIVE_JSON_POINTER
+      'relative-json-pointer': RELATIVE_JSON_POINTER$1
     };
 
 
@@ -6614,13 +6548,6 @@
     }
 
 
-    function hostname(str) {
-      // https://tools.ietf.org/html/rfc1034#section-3.5
-      // https://tools.ietf.org/html/rfc1123#section-2
-      return str.length <= 255 && HOSTNAME.test(str);
-    }
-
-
     var NOT_URI_FRAGMENT = /\/|:/;
     function uri(str) {
       // http://jmrware.com/articles/2009/uri_regexp/URI_regex.html + optional protocol + required "."
@@ -6781,7 +6708,7 @@
           l1 = arr1.length - 1;
         while ($i < l1) {
           $sch = arr1[$i += 1];
-          if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
             $allSchemasEmpty = false;
             $it.schema = $sch;
             $it.schemaPath = $schemaPath + '[' + $i + ']';
@@ -6802,7 +6729,6 @@
           out += ' ' + ($closingBraces.slice(0, -1)) + ' ';
         }
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -6822,7 +6748,7 @@
       $it.level++;
       var $nextValid = 'valid' + $it.level;
       var $noEmptySchema = $schema.every(function($sch) {
-        return it.util.schemaHasRules($sch, it.RULES.all);
+        return (it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all));
       });
       if ($noEmptySchema) {
         var $currentBaseId = $it.baseId;
@@ -6871,7 +6797,6 @@
         if (it.opts.allErrors) {
           out += ' } ';
         }
-        out = it.util.cleanUpCode(out);
       } else {
         if ($breakOnError) {
           out += ' if (true) { ';
@@ -6884,7 +6809,7 @@
       var out = ' ';
       var $schema = it.schema[$keyword];
       var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-      !it.opts.allErrors;
+      var $breakOnError = !it.opts.allErrors;
       var $comment = it.util.toQuotedString($schema);
       if (it.opts.$comment === true) {
         out += ' console.log(' + ($comment) + ');';
@@ -6965,7 +6890,7 @@
         $dataNxt = $it.dataLevel = it.dataLevel + 1,
         $nextData = 'data' + $dataNxt,
         $currentBaseId = it.baseId,
-        $nonEmptySchema = it.util.schemaHasRules($schema, it.RULES.all);
+        $nonEmptySchema = (it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all));
       out += 'var ' + ($errs) + ' = errors;var ' + ($valid) + ';';
       if ($nonEmptySchema) {
         var $wasComposite = it.compositeRule;
@@ -7024,7 +6949,6 @@
       if (it.opts.allErrors) {
         out += ' } ';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -7046,6 +6970,7 @@
         $propertyDeps = {},
         $ownProperties = it.opts.ownProperties;
       for ($property in $schema) {
+        if ($property == '__proto__') continue;
         var $sch = $schema[$property];
         var $deps = Array.isArray($sch) ? $propertyDeps : $schemaDeps;
         $deps[$property] = $sch;
@@ -7171,7 +7096,7 @@
       var $currentBaseId = $it.baseId;
       for (var $property in $schemaDeps) {
         var $sch = $schemaDeps[$property];
-        if (it.util.schemaHasRules($sch, it.RULES.all)) {
+        if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
           out += ' ' + ($nextValid) + ' = true; if ( ' + ($data) + (it.util.getProperty($property)) + ' !== undefined ';
           if ($ownProperties) {
             out += ' && Object.prototype.hasOwnProperty.call(' + ($data) + ', \'' + (it.util.escapeQuotes($property)) + '\') ';
@@ -7192,7 +7117,6 @@
       if ($breakOnError) {
         out += '   ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -7424,8 +7348,8 @@
       var $nextValid = 'valid' + $it.level;
       var $thenSch = it.schema['then'],
         $elseSch = it.schema['else'],
-        $thenPresent = $thenSch !== undefined && it.util.schemaHasRules($thenSch, it.RULES.all),
-        $elsePresent = $elseSch !== undefined && it.util.schemaHasRules($elseSch, it.RULES.all),
+        $thenPresent = $thenSch !== undefined && (it.opts.strictKeywords ? (typeof $thenSch == 'object' && Object.keys($thenSch).length > 0) || $thenSch === false : it.util.schemaHasRules($thenSch, it.RULES.all)),
+        $elsePresent = $elseSch !== undefined && (it.opts.strictKeywords ? (typeof $elseSch == 'object' && Object.keys($elseSch).length > 0) || $elseSch === false : it.util.schemaHasRules($elseSch, it.RULES.all)),
         $currentBaseId = $it.baseId;
       if ($thenPresent || $elsePresent) {
         var $ifClause;
@@ -7503,7 +7427,6 @@
         if ($breakOnError) {
           out += ' else { ';
         }
-        out = it.util.cleanUpCode(out);
       } else {
         if ($breakOnError) {
           out += ' if (true) { ';
@@ -7579,7 +7502,7 @@
             l1 = arr1.length - 1;
           while ($i < l1) {
             $sch = arr1[$i += 1];
-            if (it.util.schemaHasRules($sch, it.RULES.all)) {
+            if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
               out += ' ' + ($nextValid) + ' = true; if (' + ($data) + '.length > ' + ($i) + ') { ';
               var $passData = $data + '[' + $i + ']';
               $it.schema = $sch;
@@ -7602,7 +7525,7 @@
             }
           }
         }
-        if (typeof $additionalItems == 'object' && it.util.schemaHasRules($additionalItems, it.RULES.all)) {
+        if (typeof $additionalItems == 'object' && (it.opts.strictKeywords ? (typeof $additionalItems == 'object' && Object.keys($additionalItems).length > 0) || $additionalItems === false : it.util.schemaHasRules($additionalItems, it.RULES.all))) {
           $it.schema = $additionalItems;
           $it.schemaPath = it.schemaPath + '.additionalItems';
           $it.errSchemaPath = it.errSchemaPath + '/additionalItems';
@@ -7626,7 +7549,7 @@
             $closingBraces += '}';
           }
         }
-      } else if (it.util.schemaHasRules($schema, it.RULES.all)) {
+      } else if ((it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all))) {
         $it.schema = $schema;
         $it.schemaPath = $schemaPath;
         $it.errSchemaPath = $errSchemaPath;
@@ -7649,7 +7572,6 @@
       if ($breakOnError) {
         out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -7678,6 +7600,12 @@
         $op = $isMax ? '<' : '>',
         $notOp = $isMax ? '>' : '<',
         $errorKeyword = undefined;
+      if (!($isData || typeof $schema == 'number' || $schema === undefined)) {
+        throw new Error($keyword + ' must be number');
+      }
+      if (!($isDataExcl || $schemaExcl === undefined || typeof $schemaExcl == 'number' || typeof $schemaExcl == 'boolean')) {
+        throw new Error($exclusiveKeyword + ' must be number or boolean');
+      }
       if ($isDataExcl) {
         var $schemaValueExcl = it.util.getData($schemaExcl.$data, $dataLvl, it.dataPathArr),
           $exclusive = 'exclusive' + $lvl,
@@ -7828,6 +7756,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       var $op = $keyword == 'maxItems' ? '>' : '<';
       out += 'if ( ';
       if ($isData) {
@@ -7905,6 +7836,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       var $op = $keyword == 'maxLength' ? '>' : '<';
       out += 'if ( ';
       if ($isData) {
@@ -7987,6 +7921,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       var $op = $keyword == 'maxProperties' ? '>' : '<';
       out += 'if ( ';
       if ($isData) {
@@ -8063,6 +8000,9 @@
       } else {
         $schemaValue = $schema;
       }
+      if (!($isData || typeof $schema == 'number')) {
+        throw new Error($keyword + ' must be number');
+      }
       out += 'var division' + ($lvl) + ';if (';
       if ($isData) {
         out += ' ' + ($schemaValue) + ' !== undefined && ( typeof ' + ($schemaValue) + ' != \'number\' || ';
@@ -8136,7 +8076,7 @@
       var $it = it.util.copy(it);
       $it.level++;
       var $nextValid = 'valid' + $it.level;
-      if (it.util.schemaHasRules($schema, it.RULES.all)) {
+      if ((it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all))) {
         $it.schema = $schema;
         $it.schemaPath = $schemaPath;
         $it.errSchemaPath = $errSchemaPath;
@@ -8234,7 +8174,7 @@
           l1 = arr1.length - 1;
         while ($i < l1) {
           $sch = arr1[$i += 1];
-          if (it.util.schemaHasRules($sch, it.RULES.all)) {
+          if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
             $it.schema = $sch;
             $it.schemaPath = $schemaPath + '[' + $i + ']';
             $it.errSchemaPath = $errSchemaPath + '/' + $i;
@@ -8355,7 +8295,7 @@
       return out;
     };
 
-    var properties$2 = function generate_properties(it, $keyword, $ruleType) {
+    var properties = function generate_properties(it, $keyword, $ruleType) {
       var out = ' ';
       var $lvl = it.level;
       var $dataLvl = it.dataLevel;
@@ -8374,9 +8314,9 @@
         $dataNxt = $it.dataLevel = it.dataLevel + 1,
         $nextData = 'data' + $dataNxt,
         $dataProperties = 'dataProperties' + $lvl;
-      var $schemaKeys = Object.keys($schema || {}),
+      var $schemaKeys = Object.keys($schema || {}).filter(notProto),
         $pProperties = it.schema.patternProperties || {},
-        $pPropertyKeys = Object.keys($pProperties),
+        $pPropertyKeys = Object.keys($pProperties).filter(notProto),
         $aProperties = it.schema.additionalProperties,
         $someProperties = $schemaKeys.length || $pPropertyKeys.length,
         $noAdditional = $aProperties === false,
@@ -8386,7 +8326,13 @@
         $ownProperties = it.opts.ownProperties,
         $currentBaseId = it.baseId;
       var $required = it.schema.required;
-      if ($required && !(it.opts.$data && $required.$data) && $required.length < it.opts.loopRequired) var $requiredHash = it.util.toHash($required);
+      if ($required && !(it.opts.$data && $required.$data) && $required.length < it.opts.loopRequired) {
+        var $requiredHash = it.util.toHash($required);
+      }
+
+      function notProto(p) {
+        return p !== '__proto__';
+      }
       out += 'var ' + ($errs) + ' = errors;var ' + ($nextValid) + ' = true;';
       if ($ownProperties) {
         out += ' var ' + ($dataProperties) + ' = undefined;';
@@ -8539,7 +8485,7 @@
           while (i3 < l3) {
             $propertyKey = arr3[i3 += 1];
             var $sch = $schema[$propertyKey];
-            if (it.util.schemaHasRules($sch, it.RULES.all)) {
+            if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
               var $prop = it.util.getProperty($propertyKey),
                 $passData = $data + $prop,
                 $hasDefault = $useDefaults && $sch.default !== undefined;
@@ -8642,7 +8588,7 @@
           while (i4 < l4) {
             $pProperty = arr4[i4 += 1];
             var $sch = $pProperties[$pProperty];
-            if (it.util.schemaHasRules($sch, it.RULES.all)) {
+            if ((it.opts.strictKeywords ? (typeof $sch == 'object' && Object.keys($sch).length > 0) || $sch === false : it.util.schemaHasRules($sch, it.RULES.all))) {
               $it.schema = $sch;
               $it.schemaPath = it.schemaPath + '.patternProperties' + it.util.getProperty($pProperty);
               $it.errSchemaPath = it.errSchemaPath + '/patternProperties/' + it.util.escapeFragment($pProperty);
@@ -8681,7 +8627,6 @@
       if ($breakOnError) {
         out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
@@ -8700,7 +8645,7 @@
       $it.level++;
       var $nextValid = 'valid' + $it.level;
       out += 'var ' + ($errs) + ' = errors;';
-      if (it.util.schemaHasRules($schema, it.RULES.all)) {
+      if ((it.opts.strictKeywords ? (typeof $schema == 'object' && Object.keys($schema).length > 0) || $schema === false : it.util.schemaHasRules($schema, it.RULES.all))) {
         $it.schema = $schema;
         $it.schemaPath = $schemaPath;
         $it.errSchemaPath = $errSchemaPath;
@@ -8763,11 +8708,10 @@
       if ($breakOnError) {
         out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
       }
-      out = it.util.cleanUpCode(out);
       return out;
     };
 
-    var required$1 = function generate_required(it, $keyword, $ruleType) {
+    var required = function generate_required(it, $keyword, $ruleType) {
       var out = ' ';
       var $lvl = it.level;
       var $dataLvl = it.dataLevel;
@@ -8792,7 +8736,7 @@
             while (i1 < l1) {
               $property = arr1[i1 += 1];
               var $propertySch = it.schema.properties[$property];
-              if (!($propertySch && it.util.schemaHasRules($propertySch, it.RULES.all))) {
+              if (!($propertySch && (it.opts.strictKeywords ? (typeof $propertySch == 'object' && Object.keys($propertySch).length > 0) || $propertySch === false : it.util.schemaHasRules($propertySch, it.RULES.all)))) {
                 $required[$required.length] = $property;
               }
             }
@@ -9063,7 +9007,7 @@
         } else {
           out += ' var itemIndices = {}, item; for (;i--;) { var item = ' + ($data) + '[i]; ';
           var $method = 'checkDataType' + ($typeIsArray ? 's' : '');
-          out += ' if (' + (it.util[$method]($itemType, 'item', true)) + ') continue; ';
+          out += ' if (' + (it.util[$method]($itemType, 'item', it.opts.strictNumbers, true)) + ') continue; ';
           if ($typeIsArray) {
             out += ' if (typeof item == \'string\') item = \'"\' + item; ';
           }
@@ -9144,17 +9088,16 @@
       not: not,
       oneOf: oneOf,
       pattern: pattern,
-      properties: properties$2,
+      properties: properties,
       propertyNames: propertyNames,
-      required: required$1,
+      required: required,
       uniqueItems: uniqueItems,
-      validate: validate$1
+      validate: validate
     };
 
-    var ruleModules = dotjs
-      , toHash = util$5.toHash;
+    var toHash$1 = util.toHash;
 
-    var rules$1 = function rules() {
+    var rules = function rules() {
       var RULES = [
         { type: 'number',
           rules: [ { 'maximum': ['exclusiveMaximum'] },
@@ -9178,8 +9121,8 @@
         'additionalItems', 'then', 'else'
       ];
       var TYPES = [ 'number', 'integer', 'string', 'array', 'object', 'boolean', 'null' ];
-      RULES.all = toHash(ALL);
-      RULES.types = toHash(TYPES);
+      RULES.all = toHash$1(ALL);
+      RULES.types = toHash$1(TYPES);
 
       RULES.forEach(function (group) {
         group.rules = group.rules.map(function (keyword) {
@@ -9196,7 +9139,7 @@
           ALL.push(keyword);
           var rule = RULES.all[keyword] = {
             keyword: keyword,
-            code: ruleModules[keyword],
+            code: dotjs[keyword],
             implements: implKeywords
           };
           return rule;
@@ -9204,13 +9147,13 @@
 
         RULES.all.$comment = {
           keyword: '$comment',
-          code: ruleModules.$comment
+          code: dotjs.$comment
         };
 
         if (group.type) RULES.types[group.type] = group;
       });
 
-      RULES.keywords = toHash(ALL.concat(KEYWORDS));
+      RULES.keywords = toHash$1(ALL.concat(KEYWORDS));
       RULES.custom = {};
 
       return RULES;
@@ -9254,7 +9197,7 @@
             keywords[key] = {
               anyOf: [
                 schema,
-                { $ref: 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#' }
+                { $ref: 'https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#' }
               ]
             };
           }
@@ -9264,7 +9207,7 @@
       return metaSchema;
     };
 
-    var MissingRefError = error_classes.MissingRef;
+    var MissingRefError$1 = error_classes.MissingRef;
 
     var async = compileAsync;
 
@@ -9317,7 +9260,7 @@
       function _compileAsync(schemaObj) {
         try { return self._compile(schemaObj); }
         catch(e) {
-          if (e instanceof MissingRefError) return loadMissingSchema(e);
+          if (e instanceof MissingRefError$1) return loadMissingSchema(e);
           throw e;
         }
 
@@ -9581,10 +9524,10 @@
       return out;
     };
 
-    var $schema$2 = "http://json-schema.org/draft-07/schema#";
-    var $id$1 = "http://json-schema.org/draft-07/schema#";
+    var $schema = "http://json-schema.org/draft-07/schema#";
+    var $id = "http://json-schema.org/draft-07/schema#";
     var title = "Core schema meta-schema";
-    var definitions$1 = {
+    var definitions = {
     	schemaArray: {
     		type: "array",
     		minItems: 1,
@@ -9627,7 +9570,7 @@
     		]
     	}
     };
-    var type$1 = [
+    var type = [
     	"object",
     	"boolean"
     ];
@@ -9823,30 +9766,33 @@
     		$ref: "#"
     	}
     };
-    var require$$13 = {
-    	$schema: $schema$2,
-    	$id: $id$1,
+    var jsonSchemaDraft07 = {
+    	$schema: $schema,
+    	$id: $id,
     	title: title,
-    	definitions: definitions$1,
-    	type: type$1,
+    	definitions: definitions,
+    	type: type,
     	properties: properties$1,
     	"default": true
     };
 
-    var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i;
-    var customRuleCode = custom;
-    var metaSchema = require$$13;
+    var jsonSchemaDraft07$1 = /*#__PURE__*/Object.freeze({
+        __proto__: null,
+        $schema: $schema,
+        $id: $id,
+        title: title,
+        definitions: definitions,
+        type: type,
+        properties: properties$1,
+        'default': jsonSchemaDraft07
+    });
 
-    var keyword = {
-      add: addKeyword,
-      get: getKeyword,
-      remove: removeKeyword,
-      validate: validateKeyword
-    };
+    var require$$2 = getCjsExportFromNamespace(jsonSchemaDraft07$1);
 
-    var definitionSchema = {
+    var definition_schema = {
+      $id: 'https://github.com/ajv-validator/ajv/blob/master/lib/definition_schema.js',
       definitions: {
-        simpleTypes: metaSchema.definitions.simpleTypes
+        simpleTypes: require$$2.definitions.simpleTypes
       },
       type: 'object',
       dependencies: {
@@ -9856,7 +9802,7 @@
         valid: {not: {required: ['macro']}}
       },
       properties: {
-        type: metaSchema.properties.type,
+        type: require$$2.properties.type,
         schema: {type: 'boolean'},
         statements: {type: 'boolean'},
         dependencies: {
@@ -9877,6 +9823,18 @@
       }
     };
 
+    var IDENTIFIER$1 = /^[a-z_$][a-z0-9_$-]*$/i;
+
+
+
+    var keyword = {
+      add: addKeyword,
+      get: getKeyword,
+      remove: removeKeyword,
+      validate: validateKeyword
+    };
+
+
     /**
      * Define custom keyword
      * @this  Ajv
@@ -9891,7 +9849,7 @@
       if (RULES.keywords[keyword])
         throw new Error('Keyword ' + keyword + ' is already defined');
 
-      if (!IDENTIFIER.test(keyword))
+      if (!IDENTIFIER$1.test(keyword))
         throw new Error('Keyword ' + keyword + ' is not a valid identifier');
 
       if (definition) {
@@ -9911,7 +9869,7 @@
             metaSchema = {
               anyOf: [
                 metaSchema,
-                { '$ref': 'https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#' }
+                { '$ref': 'https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#' }
               ]
             };
           }
@@ -9941,7 +9899,7 @@
           keyword: keyword,
           definition: definition,
           custom: true,
-          code: customRuleCode,
+          code: custom,
           implements: definition.implements
         };
         ruleGroup.rules.push(rule);
@@ -10000,7 +9958,7 @@
     function validateKeyword(definition, throwError) {
       validateKeyword.errors = null;
       var v = this._validateKeyword = this._validateKeyword
-                                      || this.compile(definitionSchema, true);
+                                      || this.compile(definition_schema, true);
 
       if (v(definition)) return true;
       validateKeyword.errors = v.errors;
@@ -10011,13 +9969,13 @@
     }
 
     var $schema$1 = "http://json-schema.org/draft-07/schema#";
-    var $id = "https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#";
+    var $id$1 = "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#";
     var description = "Meta-schema for $data reference (JSON Schema extension proposal)";
-    var type = "object";
-    var required = [
+    var type$1 = "object";
+    var required$1 = [
     	"$data"
     ];
-    var properties = {
+    var properties$2 = {
     	$data: {
     		type: "string",
     		anyOf: [
@@ -10031,52 +9989,56 @@
     	}
     };
     var additionalProperties = false;
-    var require$$12 = {
+    var data$1 = {
     	$schema: $schema$1,
-    	$id: $id,
+    	$id: $id$1,
     	description: description,
-    	type: type,
-    	required: required,
-    	properties: properties,
+    	type: type$1,
+    	required: required$1,
+    	properties: properties$2,
     	additionalProperties: additionalProperties
     };
 
-    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 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 META_SCHEMA_ID = 'http://json-schema.org/draft-07/schema';
 
@@ -10089,16 +10051,16 @@
      * @param {Object} opts optional options
      * @return {Object} ajv instance
      */
-    function Ajv$1(opts) {
-      if (!(this instanceof Ajv$1)) return new Ajv$1(opts);
+    function Ajv(opts) {
+      if (!(this instanceof Ajv)) return new Ajv(opts);
       opts = this._opts = util.copy(opts) || {};
       setLogger(this);
       this._schemas = {};
       this._refs = {};
       this._fragments = {};
-      this._formats = formats(opts.format);
+      this._formats = formats_1(opts.format);
 
-      this._cache = opts.cache || new Cache;
+      this._cache = opts.cache || new cache;
       this._loadingSchemas = {};
       this._compilations = [];
       this.RULES = rules();
@@ -10106,10 +10068,11 @@
 
       opts.loopRequired = opts.loopRequired || Infinity;
       if (opts.errorDataPath == 'property') opts._errorDataPathProperty = true;
-      if (opts.serialize === undefined) opts.serialize = stableStringify;
+      if (opts.serialize === undefined) opts.serialize = fastJsonStableStringify;
       this._metaOpts = getMetaSchemaOptions(this);
 
       if (opts.formats) addInitialFormats(this);
+      if (opts.keywords) addInitialKeywords(this);
       addDefaultMetaSchema(this);
       if (typeof opts.meta == 'object') this.addMetaSchema(opts.meta);
       if (opts.nullable) this.addKeyword('nullable', {metaSchema: {type: 'boolean'}});
@@ -10126,7 +10089,7 @@
      * @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(schemaKeyRef, data) {
+    function validate$1(schemaKeyRef, data) {
       var v;
       if (typeof schemaKeyRef == 'string') {
         v = this.getSchema(schemaKeyRef);
@@ -10149,7 +10112,7 @@
      * @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(schema, _meta) {
+    function compile$1(schema, _meta) {
       var schemaObj = this._addSchema(schema, undefined, _meta);
       return schemaObj.validate || this._compile(schemaObj);
     }
@@ -10172,7 +10135,7 @@
       var id = this._getId(schema);
       if (id !== undefined && typeof id != 'string')
         throw new Error('schema id must be string');
-      key = resolve.normalizeId(key || id);
+      key = resolve_1.normalizeId(key || id);
       checkUnique(this, key);
       this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
       return this;
@@ -10249,13 +10212,13 @@
 
 
     function _getSchemaFragment(self, ref) {
-      var res = resolve.schema.call(self, { schema: {} }, ref);
+      var res = resolve_1.schema.call(self, { schema: {} }, ref);
       if (res) {
         var schema = res.schema
           , root = res.root
           , baseId = res.baseId;
-        var v = compileSchema.call(self, schema, root, undefined, baseId);
-        self._fragments[ref] = new SchemaObject({
+        var v = compile_1.call(self, schema, root, undefined, baseId);
+        self._fragments[ref] = new schema_obj({
           ref: ref,
           fragment: true,
           schema: schema,
@@ -10269,7 +10232,7 @@
 
 
     function _getSchemaObj(self, keyRef) {
-      keyRef = resolve.normalizeId(keyRef);
+      keyRef = resolve_1.normalizeId(keyRef);
       return self._schemas[keyRef] || self._refs[keyRef] || self._fragments[keyRef];
     }
 
@@ -10307,7 +10270,7 @@
           this._cache.del(cacheKey);
           var id = this._getId(schemaKeyRef);
           if (id) {
-            id = resolve.normalizeId(id);
+            id = resolve_1.normalizeId(id);
             delete this._schemas[id];
             delete this._refs[id];
           }
@@ -10338,17 +10301,17 @@
 
       shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
 
-      var id = resolve.normalizeId(this._getId(schema));
+      var id = resolve_1.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.normalizeId(schema.$schema)))
+      if (willValidate && !(recursiveMeta = id && id == resolve_1.normalizeId(schema.$schema)))
         this.validateSchema(schema, true);
 
-      var localRefs = resolve.ids.call(this, schema);
+      var localRefs = resolve_1.ids.call(this, schema);
 
-      var schemaObj = new SchemaObject({
+      var schemaObj = new schema_obj({
         id: id,
         schema: schema,
         localRefs: localRefs,
@@ -10385,7 +10348,7 @@
       }
 
       var v;
-      try { v = compileSchema.call(this, schemaObj.schema, root, schemaObj.localRefs); }
+      try { v = compile_1.call(this, schemaObj.schema, root, schemaObj.localRefs); }
       catch(e) {
         delete schemaObj.validate;
         throw e;
@@ -10481,12 +10444,12 @@
     function addDefaultMetaSchema(self) {
       var $dataSchema;
       if (self._opts.$data) {
-        $dataSchema = require$$12;
+        $dataSchema = require$$1;
         self.addMetaSchema($dataSchema, $dataSchema.$id, true);
       }
       if (self._opts.meta === false) return;
-      var metaSchema = require$$13;
-      if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA);
+      var metaSchema = require$$2;
+      if (self._opts.$data) metaSchema = data(metaSchema, META_SUPPORT_DATA);
       self.addMetaSchema(metaSchema, META_SCHEMA_ID, true);
       self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID;
     }
@@ -10508,6 +10471,14 @@
     }
 
 
+    function addInitialKeywords(self) {
+      for (var name in self._opts.keywords) {
+        var keyword = self._opts.keywords[name];
+        self.addKeyword(name, keyword);
+      }
+    }
+
+
     function checkUnique(self, id) {
       if (self._schemas[id] || self._refs[id])
         throw new Error('schema with key or id "' + id + '" already exists');
@@ -10537,14 +10508,14 @@
 
     function noop() {}
 
-    var _Ajv = /*#__PURE__*/Object.freeze(/*#__PURE__*/_mergeNamespaces$1({
-        __proto__: null,
-        'default': ajv
-    }, [ajv]));
+    var _Ajv = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), ajv, {
+        'default': ajv,
+        __moduleExports: ajv
+    }));
 
     var $ref = "#/definitions/Schema";
-    var $schema = "http://json-schema.org/draft-07/schema#";
-    var definitions = {
+    var $schema$2 = "http://json-schema.org/draft-07/schema#";
+    var definitions$1 = {
     	ActivityType: {
     		anyOf: [
     			{
@@ -12187,21 +12158,21 @@
     		type: "string"
     	}
     };
-    var v2 = {
+    var v2$1 = {
     	$ref: $ref,
-    	$schema: $schema,
-    	definitions: definitions
+    	$schema: $schema$2,
+    	definitions: definitions$1
     };
 
     var _ddl2Schema = /*#__PURE__*/Object.freeze({
         __proto__: null,
         $ref: $ref,
-        $schema: $schema,
-        definitions: definitions,
-        'default': v2
+        $schema: $schema$2,
+        definitions: definitions$1,
+        'default': v2$1
     });
 
-    var Ajv = ajv || _Ajv;
+    var Ajv$1 = ajv || _Ajv;
     var ddl2Schema = _ddl2Schema;
     var options = {
         allErrors: false,
@@ -12209,7 +12180,7 @@
         jsonPointers: false
     };
     function doValidate(ddl, schema) {
-        var ajv = new Ajv(options);
+        var ajv = new Ajv$1(options);
         var validate = ajv.compile(schema);
         var success = validate(ddl);
         return {
@@ -12241,7 +12212,7 @@
             case ">=":
                 return function (localRow) { return localRow[lf] >= val; };
             default:
-                throw new Error("Unknown filter condition:  ".concat(condition));
+                throw new Error("Unknown filter condition:  " + condition);
         }
     }
     var ColumnMapping = /** @class */ (function (_super) {
@@ -12253,16 +12224,16 @@
             var retVal = [];
             if (!this.remoteField_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".remoteField"),
-                    msg: "Invalid remoteField:  \"".concat(this.remoteField(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.sourceOutFields()))
+                    source: prefix + ".remoteField",
+                    msg: "Invalid remoteField:  \"" + this.remoteField() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.sourceOutFields())
                 });
             }
             if (!this.localField_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".localField"),
-                    msg: "Invalid localField:  \"".concat(this.localField(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.localFields()))
+                    source: prefix + ".localField",
+                    msg: "Invalid localField:  \"" + this.localField() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.localFields())
                 });
             }
             return retVal;
@@ -12295,7 +12266,7 @@
             return new ColumnMapping().fromDDL(ddl);
         };
         ColumnMapping.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 remoteField: this.remoteField(),
                 localField: this.localField(),
                 condition: this.condition(),
@@ -12322,9 +12293,9 @@
             switch (this.condition()) {
                 case "in":
                 case "range":
-                    return "".concat(this.localField(), " ").concat(this.condition(), " [").concat(this.remoteValues(filterSelection).join(", "), "]");
+                    return this.localField() + " " + this.condition() + " [" + this.remoteValues(filterSelection).join(", ") + "]";
                 default:
-                    return "".concat(this.localField(), " ").concat(this.condition(), " ").concat(this.remoteValues(filterSelection)[0]);
+                    return this.localField() + " " + this.condition() + " " + this.remoteValues(filterSelection)[0];
             }
         };
         ColumnMapping.prototype.createFilter = function (filterSelection) {
@@ -12385,21 +12356,21 @@
             var retVal = [];
             if (!this.source_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".source.").concat(this.source()),
-                    msg: "Invalid source:  \"".concat(this.source(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.visualizationIDs()))
+                    source: prefix + ".source." + this.source(),
+                    msg: "Invalid source:  \"" + this.source() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.visualizationIDs())
                 });
             }
             if (this.source_exists() && this.validMappings().length === 0) {
                 retVal.push({
-                    source: "".concat(prefix, ".source.").concat(this.source()),
-                    msg: "Invalid mappings:  \"".concat(this.source(), "\""),
+                    source: prefix + ".source." + this.source(),
+                    msg: "Invalid mappings:  \"" + this.source() + "\"",
                     hint: "expected minimum of 1 mapping"
                 });
             }
             for (var _i = 0, _a = this.validMappings(); _i < _a.length; _i++) {
                 var mapping = _a[_i];
-                retVal = retVal.concat(mapping.validate("".concat(prefix, ".").concat(this.source(), ".mappings")));
+                retVal = retVal.concat(mapping.validate(prefix + "." + this.source() + ".mappings"));
             }
             return retVal;
         };
@@ -12436,7 +12407,7 @@
             return this._owner.visualizationIDs();
         };
         RemoteFilter.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 source: this.source(),
                 mappings: this.validMappings().map(function (mapping) { return mapping.hash(); }),
                 selection: this.sourceSelection()
@@ -12501,9 +12472,9 @@
             var retVal = [];
             if (!this.localField_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".localField"),
-                    msg: "Invalid localField:  \"".concat(this.localField(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.localFields()))
+                    source: prefix + ".localField",
+                    msg: "Invalid localField:  \"" + this.localField() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.localFields())
                 });
             }
             return retVal;
@@ -12553,7 +12524,7 @@
             return new StaticFilter().fromDDL(ddl);
         };
         StaticFilter.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 localField: this.localField(),
                 condition: this.condition(),
                 value: this.value(),
@@ -12564,7 +12535,7 @@
             return this._owner.inFields().map(function (field) { return field.id; });
         };
         StaticFilter.prototype.createFilterDescription = function () {
-            return "".concat(this.localField(), " ").concat(this.condition(), " ").concat(this.coerceValue());
+            return this.localField() + " " + this.condition() + " " + this.coerceValue();
         };
         StaticFilter.prototype.createFilter = function () {
             return createFilter(this.condition(), this.localField(), this.coerceValue());
@@ -12625,7 +12596,7 @@
             var remoteFilters = [];
             var staticFilters = [];
             _.forEach(function (fc) {
-                if (v2$1.isIFilterCondition(fc)) {
+                if (v2.isIFilterCondition(fc)) {
                     remoteFilters.push(RemoteFilter.fromDDL(fc));
                 }
                 else {
@@ -12644,7 +12615,7 @@
         };
         //  Activity overrides  ---
         Filters.prototype.hash = function () {
-            return util$6.hashSum(this.validFilters().map(function (f) {
+            return util$1.hashSum(this.validFilters().map(function (f) {
                 return {
                     filter: f.hash()
                 };
@@ -12692,7 +12663,7 @@
             return this.staticFilter().filter(function (filter) { return filter.valid(); });
         };
         Filters.prototype.validFilters = function () {
-            return __spreadArray$1(__spreadArray$1([], this.validRemoteFilters(), true), this.validStaticFilters(), true);
+            return __spreadArray(__spreadArray([], this.validRemoteFilters()), this.validStaticFilters());
         };
         Filters.Filter = RemoteFilter;
         Filters.Mapping = ColumnMapping;
@@ -12717,9 +12688,9 @@
             var retVal = [];
             if (!this.label_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".label"),
-                    msg: "Invalid label:  \"".concat(this.label(), "\""),
-                    hint: "expected ".concat(JSON.stringify(this.columns()))
+                    source: prefix + ".label",
+                    msg: "Invalid label:  \"" + this.label() + "\"",
+                    hint: "expected " + JSON.stringify(this.columns())
                 });
             }
             return retVal;
@@ -12744,7 +12715,7 @@
             return new GroupByColumn().fromDDL(label);
         };
         GroupByColumn.prototype.hash = function () {
-            return util$6.hashSum(this.label());
+            return util$1.hashSum(this.label());
         };
         GroupByColumn.prototype.columns = function () {
             return this._owner.inFieldIDs();
@@ -12787,16 +12758,16 @@
             var retVal = [];
             if (!this.aggrColumn_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".").concat(this.fieldID(), ".aggrColumn"),
-                    msg: "Invalid aggrColumn:  \"".concat(this.aggrColumn(), "\""),
-                    hint: "expected ".concat(JSON.stringify(this.columns()))
+                    source: prefix + "." + this.fieldID() + ".aggrColumn",
+                    msg: "Invalid aggrColumn:  \"" + this.aggrColumn() + "\"",
+                    hint: "expected " + JSON.stringify(this.columns())
                 });
             }
             if (!this.baseCountColumn_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".").concat(this.fieldID(), ".aggrColumn"),
-                    msg: "Invalid baseCountColumn:  \"".concat(this.baseCountColumn(), "\""),
-                    hint: "expected ".concat(JSON.stringify(this.columns()))
+                    source: prefix + "." + this.fieldID() + ".aggrColumn",
+                    msg: "Invalid baseCountColumn:  \"" + this.baseCountColumn() + "\"",
+                    hint: "expected " + JSON.stringify(this.columns())
                 });
             }
             return retVal;
@@ -12838,7 +12809,7 @@
             return new AggregateField().fromDDL(ddl);
         };
         AggregateField.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 label: this.fieldID(),
                 aggrType: this.aggrType(),
                 aggrColumn: this.aggrColumn()
@@ -12943,7 +12914,7 @@
         };
         //  Activity
         GroupBy.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 groupBy: this.column().map(function (gb) { return gb.hash(); }),
                 computedFields: this.computedFields().map(function (cf) { return cf.hash(); })
             });
@@ -13132,7 +13103,7 @@
             return new Limit().fromDDL(ddl);
         };
         Limit.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 limit: this.rows()
             });
         };
@@ -13162,15 +13133,15 @@
             var retVal = [];
             if (!this.value_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".value"),
-                    msg: "Invalid value:  \"".concat(this.value(), "\""),
+                    source: prefix + ".value",
+                    msg: "Invalid value:  \"" + this.value() + "\"",
                     hint: 'expected:  "any"'
                 });
             }
             if (!this.newValue_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".newValue"),
-                    msg: "Invalid value:  \"".concat(this.newValue(), "\""),
+                    source: prefix + ".newValue",
+                    msg: "Invalid value:  \"" + this.newValue() + "\"",
                     hint: 'expected:  "any"'
                 });
             }
@@ -13235,23 +13206,23 @@
             var retVal = [];
             if (!this.column1_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".").concat(this.label()),
-                    msg: "Invalid column1:  \"".concat(this.column1(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.columns()))
+                    source: prefix + "." + this.label(),
+                    msg: "Invalid column1:  \"" + this.column1() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.columns())
                 });
             }
             if (!this.column2_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".").concat(this.label()),
-                    msg: "Invalid column2: \"".concat(this.column2(), "\""),
-                    hint: "expected:  ".concat(JSON.stringify(this.columns()))
+                    source: prefix + "." + this.label(),
+                    msg: "Invalid column2: \"" + this.column2() + "\"",
+                    hint: "expected:  " + JSON.stringify(this.columns())
                 });
             }
             if (!this.disableMapping()) {
-                this.validComputedMappings().forEach(function (cm) { return cm.validate("".concat(prefix, ".mapping")); });
+                this.validComputedMappings().forEach(function (cm) { return cm.validate(prefix + ".mapping"); });
             }
             if (!this.disableChildField()) {
-                this.validChildFields().forEach(function (cf) { return cf.validate("".concat(prefix, ".childField")); });
+                this.validChildFields().forEach(function (cf) { return cf.validate(prefix + ".childField"); });
             }
             return retVal;
         };
@@ -13369,7 +13340,7 @@
             return new ComputedField().fromDDL(ddl);
         };
         ComputedField.prototype.hash = function () {
-            return util$6.hashSum(this.toDDL());
+            return util$1.hashSum(this.toDDL());
         };
         ComputedField.prototype.columns = function () {
             return this._owner.fieldIDs();
@@ -13389,7 +13360,7 @@
                                 .column1(child.id);
                         });
                     }
-                    return __assign$1(__assign$1({}, this._owner.field(this.column1())), { id: this.label(), children: validChildFields.length ? validChildFields.map(function (cf) { return cf.computedField(); }) : undefined });
+                    return __assign(__assign({}, this._owner.field(this.column1())), { id: this.label(), children: validChildFields.length ? validChildFields.map(function (cf) { return cf.computedField(); }) : undefined });
                 case "*":
                 case "/":
                 case "+":
@@ -13412,7 +13383,7 @@
                 };
             });
             return function (row) {
-                var retVal = trim && hasComputedFields ? {} : __assign$1({}, row);
+                var retVal = trim && hasComputedFields ? {} : __assign({}, row);
                 for (var _i = 0, computedFields_1 = computedFields; _i < computedFields_1.length; _i++) {
                     var cf = computedFields_1[_i];
                     retVal[cf.label] = cf.func(row);
@@ -13432,7 +13403,7 @@
                     if (this.hasChildFields()) {
                         return function (row) {
                             //  TODO Move to function factory  ---
-                            var r = row[column1].Row && util$6.isArray(row[column1].Row) ? row[column1].Row : row[column1];
+                            var r = row[column1].Row && util$1.isArray(row[column1].Row) ? row[column1].Row : row[column1];
                             return r.map(_this.projection(trim));
                         };
                     }
@@ -13566,7 +13537,7 @@
             return _super.call(this) || this;
         }
         MultiField.prototype.hash = function () {
-            return util$6.hashSum(this.toDDL());
+            return util$1.hashSum(this.toDDL());
         };
         MultiField.prototype.owner = function (_) {
             if (!arguments.length)
@@ -13581,7 +13552,7 @@
             var retVal = [];
             for (var _i = 0, _a = this.validMultiFields(); _i < _a.length; _i++) {
                 var cf = _a[_i];
-                retVal = retVal.concat(cf.validate("".concat(prefix, ".computedFields")));
+                retVal = retVal.concat(cf.validate(prefix + ".computedFields"));
             }
             return retVal;
         };
@@ -13640,7 +13611,7 @@
             var retVal = [];
             for (var _i = 0, _a = this.validComputedFields(); _i < _a.length; _i++) {
                 var cf = _a[_i];
-                retVal = retVal.concat(cf.validate("".concat(this.classID(), ".computedFields")));
+                retVal = retVal.concat(cf.validate(this.classID() + ".computedFields"));
             }
             return retVal;
         };
@@ -13788,7 +13759,7 @@
                 }
             }
             return function (row) {
-                var retVal = trim && hasComputedFields ? {} : __assign$1({}, row);
+                var retVal = trim && hasComputedFields ? {} : __assign({}, row);
                 for (var _i = 0, computedFields_3 = computedFields; _i < computedFields_3.length; _i++) {
                     var cf = computedFields_3[_i];
                     retVal[cf.label] = cf.func(row);
@@ -13833,7 +13804,7 @@
         };
         Project.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return _super.prototype.hash.call(this, __assign$1({ ddl: this.toDDL() }, more));
+            return _super.prototype.hash.call(this, __assign({ ddl: this.toDDL() }, more));
         };
         return Project;
     }(ProjectBase));
@@ -13862,7 +13833,7 @@
         };
         Mappings.prototype.hash = function (more) {
             if (more === void 0) { more = {}; }
-            return _super.prototype.hash.call(this, __assign$1({ ddl: this.toDDL() }, more));
+            return _super.prototype.hash.call(this, __assign({ ddl: this.toDDL() }, more));
         };
         Mappings.prototype.referencedFields = function (refs) {
             if (this.hasComputedFields()) {
@@ -13883,9 +13854,9 @@
             var retVal = [];
             if (!this.fieldID_valid()) {
                 retVal.push({
-                    source: "".concat(prefix, ".fieldID"),
-                    msg: "Invalid fieldID:  ".concat(this.fieldID()),
-                    hint: "expected ".concat(JSON.stringify(this.fieldIDs()))
+                    source: prefix + ".fieldID",
+                    msg: "Invalid fieldID:  " + this.fieldID(),
+                    hint: "expected " + JSON.stringify(this.fieldIDs())
                 });
             }
             return retVal;
@@ -13914,7 +13885,7 @@
             return new SortColumn().fromDDL(ddl);
         };
         SortColumn.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 sortColumn: this.fieldID(),
                 descending: this.descending()
             });
@@ -13976,7 +13947,7 @@
         };
         //  Activitiy  ---
         Sort.prototype.hash = function () {
-            return util$6.hashSum({
+            return util$1.hashSum({
                 Sort: this.column().map(function (sb) { return sb.hash(); })
             });
         };
@@ -14004,7 +13975,7 @@
                 });
             }
             if (sortByArr.length) {
-                return __spreadArray$1([], data, true).sort(function (l, r) {
+                return __spreadArray([], data).sort(function (l, r) {
                     for (var _i = 0, sortByArr_1 = sortByArr; _i < sortByArr_1.length; _i++) {
                         var item = sortByArr_1[_i];
                         var retVal2 = item.compare(l[item.id], r[item.id]);
@@ -14227,7 +14198,7 @@
                 });
             });
             _this._origButtons = _this.buttons();
-            _this._filterButtons = __spreadArray$1([_this._togglePopup, new common.Spacer()], _this._origButtons, true);
+            _this._filterButtons = __spreadArray([_this._togglePopup, new common.Spacer()], _this._origButtons);
             return _this;
         }
         VizChartPanel.prototype.popup = function (_) {
@@ -14449,7 +14420,7 @@
                 }
             }
             else {
-                console.log("***".concat(this.id(), " Immutable Fields***"));
+                console.log("***" + this.id() + " Immutable Fields***");
             }
             var data = mappings.outData();
             var dataChanged = this._prevData !== data;
@@ -14470,7 +14441,7 @@
                 }
             }
             else {
-                console.log("".concat(this.id(), " Immutable Data!"));
+                console.log(this.id() + " Immutable Data!");
             }
             if (fieldsChanged || dataChanged) {
                 return this.chartPanel().renderPromise().then(function () { });
@@ -14509,7 +14480,7 @@
         };
         Visualization.prototype.toDBData = function (fields, data) {
             var _this = this;
-            var _data = util$6.isArray(data) ? data : [data];
+            var _data = util$1.isArray(data) ? data : [data];
             return _data.map(function (row) {
                 var retVal = [];
                 for (var _i = 0, fields_1 = fields; _i < fields_1.length; _i++) {
@@ -14562,7 +14533,7 @@
             __metadata("design:type", Function)
         ], Visualization.prototype, "description", void 0);
         __decorate([
-            common.publish(v2$1.VisibilitySet[0], "set", "Type", v2$1.VisibilitySet),
+            common.publish(v2.VisibilitySet[0], "set", "Type", v2.VisibilitySet),
             __metadata("design:type", String)
         ], Visualization.prototype, "_visibility", void 0);
         __decorate([
@@ -14593,8 +14564,8 @@
             return _this;
         }
         State.prototype.set = function (_) {
-            var currSelHash = util$6.hashSum(this.selection());
-            var newSelHash = util$6.hashSum(_);
+            var currSelHash = util$1.hashSum(this.selection());
+            var newSelHash = util$1.hashSum(_);
             if (currSelHash !== newSelHash) {
                 this.selection(_);
                 return true;
@@ -14605,7 +14576,7 @@
             var currSelection = this.selection();
             var newSelection = [];
             var _loop_1 = function (selRow) {
-                if (util$6.find(data, function (row, index) {
+                if (util$1.find(data, function (row, index) {
                     for (var column in selRow) {
                         if (selRow[column] !== row[column]) {
                             return false;
@@ -14640,7 +14611,7 @@
             _this._initialized = false;
             while (true) {
                 vizID++;
-                _this._id = "e_".concat(vizID);
+                _this._id = "e_" + vizID;
                 if (!_this._ec.elementExists(_this._id)) {
                     break;
                 }
@@ -14648,9 +14619,9 @@
             var view = new HipiePipeline(_this._ec, _this._id);
             _this.hipiePipeline(view);
             _this._vizChartPanel = new Visualization(_this._ec, _this.hipiePipeline())
-                .id("viz_".concat(vizID))
-                .title("Element ".concat(vizID));
-            _this._vizChartPanel.chartPanel().id("cp_".concat(vizID));
+                .id("viz_" + vizID)
+                .title("Element " + vizID);
+            _this._vizChartPanel.chartPanel().id("cp_" + vizID);
             _this.visualization(_this._vizChartPanel);
             _this.state(new State());
             return _this;
@@ -14666,12 +14637,12 @@
                     _this.selection(sel ? more.selection.map(function (r) { return r.__lparam || r; }) : []);
                 }
                 else {
-                    var row = util$6.isArray(_row) ? _row : [_row];
+                    var row = util$1.isArray(_row) ? _row : [_row];
                     _this.selection(sel ? row.map(function (r) { return r.__lparam || r; }) : []);
                 }
             })
                 .on("vertex_click", function (_row, col, sel) {
-                var row = util$6.isArray(_row) ? _row : [_row];
+                var row = util$1.isArray(_row) ? _row : [_row];
                 _this.selection(sel ? row.map(function (r) { return r.__lparam || r; }) : []);
             });
             return this;
@@ -14731,11 +14702,11 @@
             }
             this._errors = [];
             var pipeline = this.hipiePipeline();
-            for (var _i = 0, _a = __spreadArray$1(__spreadArray$1([], pipeline.activities(), true), [this.mappings()], false); _i < _a.length; _i++) {
+            for (var _i = 0, _a = __spreadArray(__spreadArray([], pipeline.activities()), [this.mappings()]); _i < _a.length; _i++) {
                 var activity = _a[_i];
                 for (var _b = 0, _c = activity.validate(); _b < _c.length; _b++) {
                     var error = _c[_b];
-                    this._errors.push(__assign$1({ elementID: this.id() }, error));
+                    this._errors.push(__assign({ elementID: this.id() }, error));
                 }
             }
             return this._errors;
@@ -14749,7 +14720,7 @@
                 _this._initialized = true;
                 var data = _this.hipiePipeline().outData();
                 if (_this.visualization().chartType() === "FieldForm") {
-                    if (_this.state().set(__spreadArray$1([], data, true))) {
+                    if (_this.state().set(__spreadArray([], data))) {
                         _this.selectionChanged();
                     }
                 }
@@ -14835,7 +14806,7 @@
             return this;
         };
         ElementContainer.prototype.elements = function () {
-            return __spreadArray$1([], this._elements, true);
+            return __spreadArray([], this._elements);
         };
         ElementContainer.prototype.element = function (w) {
             var retVal;
@@ -14998,7 +14969,7 @@
         };
         PopupManager.prototype.syncPopups = function () {
             var prevPopups = this.popupChartPanels();
-            var diffPopups = util$6.compare(prevPopups, this._ec.elements()
+            var diffPopups = util$1.compare(prevPopups, this._ec.elements()
                 .filter(function (e) { return e.visualization().visibility() === "flyout"; })
                 .map(function (elem) { return elem.visualization().chartPanel(); }));
             for (var _i = 0, _a = diffPopups.exit; _i < _a.length; _i++) {
@@ -15045,7 +15016,7 @@
             var errors = element.validate();
             wa.title.label = this.tabTitle(element);
             this.titleClassed(wa, "error", errors.length > 0);
-            wa.title.caption = errors.map(function (err) { return "".concat(err.source, ":  ").concat(err.msg); }).join("\n");
+            wa.title.caption = errors.map(function (err) { return err.source + ":  " + err.msg; }).join("\n");
         };
         DashboardDockPanel.prototype.activate = function (element) {
             var wa = this.getWidgetAdapter(element.visualization().chartPanel());
@@ -15057,15 +15028,15 @@
             if (w.minWidth_exists() || w.minHeight_exists()) {
                 var wa = this.getWidgetAdapter(w);
                 common.select(wa.node)
-                    .style("min-width", "".concat(w.minWidth(), "px"))
-                    .style("min-height", "".concat(w.minHeight(), "px"));
+                    .style("min-width", w.minWidth() + "px")
+                    .style("min-height", w.minHeight() + "px");
                 return true;
             }
             return false;
         };
         DashboardDockPanel.prototype.syncWidgets = function () {
             var prevWidgets = this.widgets();
-            var diffWidgets = util$6.compare(prevWidgets, this._ec.elements().filter(function (e) { return e.visualization().visibility() === "normal"; }).map(function (viz) { return viz.visualization().chartPanel(); }));
+            var diffWidgets = util$1.compare(prevWidgets, this._ec.elements().filter(function (e) { return e.visualization().visibility() === "normal"; }).map(function (viz) { return viz.visualization().chartPanel(); }));
             var refit = false;
             for (var _i = 0, _a = diffWidgets.exit; _i < _a.length; _i++) {
                 var w = _a[_i];
@@ -15110,7 +15081,7 @@
         //  IClosable  ---
         DashboardDockPanel.prototype.canClose = function (w, wa) {
             var id = this._ec.element(w).id();
-            var retVal = window.confirm("Remove Widget \"".concat(id, "\"?"));
+            var retVal = window.confirm("Remove Widget \"" + id + "\"?");
             if (retVal) {
                 this._ec.clear(id);
                 this.syncWidgets();
@@ -15241,8 +15212,8 @@
             if (w.minWidth_exists() || w.minHeight_exists()) {
                 var cell = this.getWidgetCell(w.id());
                 cell.element()
-                    .style("min-width", "".concat(w.minWidth(), "px"))
-                    .style("min-height", "".concat(w.minHeight(), "px"));
+                    .style("min-width", w.minWidth() + "px")
+                    .style("min-height", w.minHeight() + "px");
                 return true;
             }
             return false;
@@ -15250,7 +15221,7 @@
         DashboardGrid.prototype.syncWidgets = function () {
             var _this = this;
             var prevWidgets = this.widgets();
-            var diffWidgets = util$6.compare(prevWidgets, this._ec.elements().filter(function (e) { return e.visualization().visibility() === "normal"; }).map(function (viz) { return viz.visualization().chartPanel(); }));
+            var diffWidgets = util$1.compare(prevWidgets, this._ec.elements().filter(function (e) { return e.visualization().visibility() === "normal"; }).map(function (viz) { return viz.visualization().chartPanel(); }));
             for (var _i = 0, _a = diffWidgets.exit; _i < _a.length; _i++) {
                 var w = _a[_i];
                 this.removeWidget(w);
@@ -15305,7 +15276,7 @@
         //  IClosable  ---
         DashboardGrid.prototype.canClose = function (w, wa) {
             var id = this._ec.element(w).id();
-            var retVal = window.confirm("Remove Widget \"".concat(id, "\"?"));
+            var retVal = window.confirm("Remove Widget \"" + id + "\"?");
             if (retVal) {
                 this._ec.clear(id);
                 this.syncWidgets();
@@ -15319,7 +15290,7 @@
     DashboardGrid.prototype._class += " marshaller_DashboardGrid";
     DashboardGrid.prototype.mixin(PopupManager);
 
-    var logger$1 = util$6.scopedLogger("marshaller/ddl2/ddl");
+    var logger = util$1.scopedLogger("marshaller/ddl2/ddl");
     var DDLDatasourceAdapter = /** @class */ (function () {
         function DDLDatasourceAdapter() {
         }
@@ -15328,13 +15299,13 @@
         };
         DDLDatasourceAdapter.prototype.id = function (dsT) {
             if (dsT instanceof WU) {
-                return "".concat(dsT.url(), "/").concat(dsT.wuid());
+                return dsT.url() + "/" + dsT.wuid();
             }
             else if (dsT instanceof RoxieService) {
-                return "".concat(dsT.url(), "/").concat(dsT.querySet(), "/").concat(dsT.queryID());
+                return dsT.url() + "/" + dsT.querySet() + "/" + dsT.queryID();
             }
             else if (dsT instanceof RestService) {
-                return "".concat(dsT.url(), "/").concat(dsT.action());
+                return dsT.url() + "/" + dsT.action();
             }
             return dsT.id();
         };
@@ -15492,12 +15463,12 @@
         };
         DDLAdapter.prototype.readDatasourceRef = function (ddlDSRef, dsPicker, elementContainer) {
             var _this = this;
-            if (v2$1.isWUResultRef(ddlDSRef)) {
+            if (v2.isWUResultRef(ddlDSRef)) {
                 var wu = this._dsReadDedup[ddlDSRef.id];
                 dsPicker.datasourceID(wu.output(ddlDSRef.output).id());
             }
-            else if (v2$1.isRoxieServiceRef(ddlDSRef)) {
-                dsPicker.datasourceID("".concat(ddlDSRef.id, "_").concat(ddlDSRef.output));
+            else if (v2.isRoxieServiceRef(ddlDSRef)) {
+                dsPicker.datasourceID(ddlDSRef.id + "_" + ddlDSRef.output);
                 var dsRef = dsPicker.datasourceRef();
                 dsRef
                     .request(ddlDSRef.request.map(function (rf) {
@@ -15532,7 +15503,7 @@
                 }
                 else if (activity instanceof DSPicker) ;
                 else {
-                    logger$1.warning("Unknown activity type: ".concat(activity.classID()));
+                    logger.warning("Unknown activity type: " + activity.classID());
                 }
             }).filter(function (activity) { return !!activity; });
         };
@@ -15593,8 +15564,8 @@
         };
         DDLAdapter.prototype.writeProperties = function () {
             return {
-                name: PKG_NAME$1,
-                version: PKG_VERSION$1,
+                name: PKG_NAME,
+                version: PKG_VERSION,
                 buildVersion: BUILD_VERSION,
                 layout: this._dashboard.layout()
             };
@@ -15608,23 +15579,23 @@
                 this.readDatasourceRef(ddlView.datasource, hipiePipeline.datasource(), this._ec);
                 for (var _a = 0, _b = ddlView.activities; _a < _b.length; _a++) {
                     var activity = _b[_a];
-                    if (v2$1.isProjectActivity(activity)) {
+                    if (v2.isProjectActivity(activity)) {
                         var project = this.readProject(activity);
                         hipiePipeline.project(project);
                     }
-                    if (v2$1.isFilterActivity(activity)) {
+                    if (v2.isFilterActivity(activity)) {
                         var filters = this.readFilters(activity, this._ec);
                         hipiePipeline.filters(filters);
                     }
-                    if (v2$1.isGroupByActivity(activity)) {
+                    if (v2.isGroupByActivity(activity)) {
                         var groupBy = this.readGroupBy(activity);
                         hipiePipeline.groupBy(groupBy);
                     }
-                    if (v2$1.isSortActivity(activity)) {
+                    if (v2.isSortActivity(activity)) {
                         var sort = this.readSort(activity);
                         hipiePipeline.sort(sort);
                     }
-                    if (v2$1.isLimitActivity(activity)) {
+                    if (v2.isLimitActivity(activity)) {
                         var limit = this.readLimit(activity);
                         hipiePipeline.limit(limit);
                     }
@@ -15642,8 +15613,8 @@
             var retVal = {
                 version: "2.2.1",
                 createdBy: {
-                    name: PKG_NAME$1,
-                    version: PKG_VERSION$1
+                    name: PKG_NAME,
+                    version: PKG_VERSION
                 },
                 datasources: this.writeDatasources(),
                 dataviews: this.writeDDLViews(),
@@ -15689,7 +15660,7 @@
                         }
                         break;
                     default:
-                        logger$1.warning("Unknown ddl datasource type: ".concat(ddlDS.type, " "));
+                        logger.warning("Unknown ddl datasource type: " + ddlDS.type + " ");
                 }
             }
             this.readDDLViews(ddl.dataviews);
@@ -15717,7 +15688,7 @@
                     classIDs.push(classID);
                 }
                 classIDs.sort();
-                importJS.push("import { ".concat(classIDs.join(", "), " } from \"").concat(moduleID, "\";"));
+                importJS.push("import { " + classIDs.join(", ") + " } from \"" + moduleID + "\";");
             }
             return importJS.join("\n");
         };
@@ -15760,18 +15731,18 @@
                     switch (meta.type) {
                         case "string":
                         case "set":
-                            retVal.push("".concat(prefix, ".").concat(meta.id, "(\"").concat(pe[meta.id](), "\")").concat(postfix, ";"));
+                            retVal.push(prefix + "." + meta.id + "(\"" + pe[meta.id]() + "\")" + postfix + ";");
                             break;
                         case "number":
                         case "boolean":
-                            retVal.push("".concat(prefix, ".").concat(meta.id, "(").concat(pe[meta.id](), ")").concat(postfix, ";"));
+                            retVal.push(prefix + "." + meta.id + "(" + pe[meta.id]() + ")" + postfix + ";");
                             break;
                         case "widget":
-                            retVal = retVal.concat(this.createProps("".concat(prefix, ".").concat(meta.id, "()"), pe[meta.id]()));
+                            retVal = retVal.concat(this.createProps(prefix + "." + meta.id + "()", pe[meta.id]()));
                             break;
                         case "propertyArray":
                             if (meta.ext)
-                                retVal.push("".concat(prefix, ".").concat(meta.id, "([").concat(pe[meta.id](), "])").concat(postfix, ";"));
+                                retVal.push(prefix + "." + meta.id + "([" + pe[meta.id]() + "])" + postfix + ";");
                             break;
                     }
                 }
@@ -15788,13 +15759,13 @@
         };
         JavaScriptAdapter.prototype.datasourceRefID = function (view) {
             var datasourceRef = view.datasource;
-            if (v2$1.isRoxieServiceRef(datasourceRef)) {
-                return "".concat(this.safeID(datasourceRef.id), "_").concat(this.safeID(datasourceRef.output), "_").concat(this.safeID(view.id));
+            if (v2.isRoxieServiceRef(datasourceRef)) {
+                return this.safeID(datasourceRef.id) + "_" + this.safeID(datasourceRef.output) + "_" + this.safeID(view.id);
             }
-            else if (v2$1.isWUResultRef(datasourceRef)) {
-                return "".concat(this.safeID(datasourceRef.id), "_").concat(this.safeID(datasourceRef.output));
+            else if (v2.isWUResultRef(datasourceRef)) {
+                return this.safeID(datasourceRef.id) + "_" + this.safeID(datasourceRef.output);
             }
-            return "".concat(this.safeID(datasourceRef.id));
+            return "" + this.safeID(datasourceRef.id);
         };
         JavaScriptAdapter.prototype.writeDatasource = function (view) {
             var datasourceRef = view.datasource;
@@ -15809,30 +15780,30 @@
                         var wuID = this.safeID(view.datasource.id);
                         if (!this._dedup[wuID]) {
                             this._dedup[wuID] = true;
-                            retVal.push("    export const ".concat(wuID, " = new marshaller.WU()\n        .url(\"").concat(datasource.url, "\")\n        .wuid(\"").concat(datasource.wuid, "\")\n        ;"));
+                            retVal.push("    export const " + wuID + " = new marshaller.WU()\n        .url(\"" + datasource.url + "\")\n        .wuid(\"" + datasource.wuid + "\")\n        ;");
                         }
-                        retVal.push("    export const ".concat(id, " = new marshaller.WUResult()\n        .wu(").concat(wuID, ")\n        .resultName(\"").concat(outputID, "\")\n        .responseFields(").concat(stringify(datasource.outputs[outputID].fields), ")\n        ;"));
+                        retVal.push("    export const " + id + " = new marshaller.WUResult()\n        .wu(" + wuID + ")\n        .resultName(\"" + outputID + "\")\n        .responseFields(" + stringify(datasource.outputs[outputID].fields) + ")\n        ;");
                         break;
                     case "logicalfile":
-                        retVal.push("    export const ".concat(id, " = new marshaller.LogicalFile()\n        .url(\"").concat(datasource.url, "\")\n        .logicalFile(\"").concat(datasource.logicalFile, "\")\n        .responseFields(").concat(stringify(datasource.fields), ")\n        ;"));
+                        retVal.push("    export const " + id + " = new marshaller.LogicalFile()\n        .url(\"" + datasource.url + "\")\n        .logicalFile(\"" + datasource.logicalFile + "\")\n        .responseFields(" + stringify(datasource.fields) + ")\n        ;");
                         break;
                     case "hipie":
                     case "roxie":
                         var serviceID = this.safeID(view.datasource.id);
                         if (!this._dedup[serviceID]) {
                             this._dedup[serviceID] = true;
-                            retVal.push("    export const ".concat(serviceID, " = new marshaller.RoxieService(ec)\n        .url(\"").concat(datasource.url, "\")\n        .querySet(\"").concat(datasource.querySet, "\")\n        .queryID(\"").concat(datasource.queryID, "\")\n        .requestFields(").concat(stringify(datasource.inputs), ")\n        ;"));
+                            retVal.push("    export const " + serviceID + " = new marshaller.RoxieService(ec)\n        .url(\"" + datasource.url + "\")\n        .querySet(\"" + datasource.querySet + "\")\n        .queryID(\"" + datasource.queryID + "\")\n        .requestFields(" + stringify(datasource.inputs) + ")\n        ;");
                         }
                         var resultID = serviceID + "_" + this.safeID(outputID);
                         if (!this._dedup[resultID]) {
                             this._dedup[resultID] = true;
-                            retVal.push("    export const ".concat(resultID, " = new marshaller.RoxieResult(ec)\n        .service(").concat(serviceID, ")\n        .resultName(\"").concat(outputID, "\")\n        .responseFields(").concat(stringify(datasource.outputs[outputID].fields), ")\n        ;"));
+                            retVal.push("    export const " + resultID + " = new marshaller.RoxieResult(ec)\n        .service(" + serviceID + ")\n        .resultName(\"" + outputID + "\")\n        .responseFields(" + stringify(datasource.outputs[outputID].fields) + ")\n        ;");
                         }
-                        retVal.push("    export const ".concat(id, " = new marshaller.HipieResultRef(ec)\n        .datasource(").concat(resultID, ")\n        .requestFieldRefs(").concat(stringify(datasourceRef.request), ")\n        ;"));
+                        retVal.push("    export const " + id + " = new marshaller.HipieResultRef(ec)\n        .datasource(" + resultID + ")\n        .requestFieldRefs(" + stringify(datasourceRef.request) + ")\n        ;");
                         break;
                     case "databomb":
                         {
-                            retVal.push("    export const ".concat(id, " = new marshaller.Databomb()\n        .format(\"").concat(datasource.format, "\")\n        .payload(").concat(JSON.stringify(datasource.payload), ")\n        ;"));
+                            retVal.push("    export const " + id + " = new marshaller.Databomb()\n        .format(\"" + datasource.format + "\")\n        .payload(" + JSON.stringify(datasource.payload) + ")\n        ;");
                         }
                         break;
                     case "form":
@@ -15840,9 +15811,9 @@
                             var fromFields = [];
                             for (var _i = 0, _a = datasource.fields; _i < _a.length; _i++) {
                                 var field = _a[_i];
-                                fromFields.push("new marshaller.FormField().fieldID(\"".concat(field.id, "\").default(\"").concat(field.default || "", "\")"));
+                                fromFields.push("new marshaller.FormField().fieldID(\"" + field.id + "\").default(\"" + (field.default || "") + "\")");
                             }
-                            retVal.push("    export const ".concat(id, " = new marshaller.Form()\n        .formFields([\n            ").concat(fromFields.join(",\n            "), "\n        ])\n        ;"));
+                            retVal.push("    export const " + id + " = new marshaller.Form()\n        .formFields([\n            " + fromFields.join(",\n            ") + "\n        ])\n        ;");
                         }
                         break;
                 }
@@ -15852,17 +15823,17 @@
         JavaScriptAdapter.prototype.writeActivity = function (activity) {
             switch (activity.type) {
                 case "filter":
-                    return "new marshaller.Filters(ec).conditions(".concat(stringify(activity.conditions), ")");
+                    return "new marshaller.Filters(ec).conditions(" + stringify(activity.conditions) + ")";
                 case "project":
-                    return "new marshaller.Project().transformations(".concat(stringify(activity.transformations), ")");
+                    return "new marshaller.Project().transformations(" + stringify(activity.transformations) + ")";
                 case "groupby":
-                    return "new marshaller.GroupBy().fieldIDs(".concat(JSON.stringify(activity.groupByIDs), ").aggregates(").concat(stringify(activity.aggregates), ")");
+                    return "new marshaller.GroupBy().fieldIDs(" + JSON.stringify(activity.groupByIDs) + ").aggregates(" + stringify(activity.aggregates) + ")";
                 case "sort":
-                    return "new marshaller.Sort().conditions(".concat(stringify(activity.conditions), ")");
+                    return "new marshaller.Sort().conditions(" + stringify(activity.conditions) + ")";
                 case "limit":
-                    return "new marshaller.Limit().rows(".concat(activity.limit, ")");
+                    return "new marshaller.Limit().rows(" + activity.limit + ")";
                 case "mappings":
-                    return "new marshaller.Mappings().transformations(".concat(stringify(activity.transformations), ")");
+                    return "new marshaller.Mappings().transformations(" + stringify(activity.transformations) + ")";
             }
         };
         JavaScriptAdapter.prototype.writeWidgetProps = function (pe) {
@@ -15870,7 +15841,7 @@
             for (var _i = 0, _a = pe.publishedProperties(); _i < _a.length; _i++) {
                 var meta = _a[_i];
                 if (pe[meta.id + "_modified"]() && meta.id !== "fields") {
-                    retVal.push(".".concat(meta.id, "(").concat(JSON.stringify(pe[meta.id]()), ")"));
+                    retVal.push("." + meta.id + "(" + JSON.stringify(pe[meta.id]()) + ")");
                 }
             }
             return retVal;
@@ -15880,29 +15851,29 @@
             var retVal = "";
             var meta;
             if (props.__class) {
-                meta = util$6.classID2Meta(props.__class);
+                meta = util$1.classID2Meta(props.__class);
                 imports.append(meta);
-                retVal += "new ".concat(meta.class, "()");
+                retVal += "new " + meta.class + "()";
             }
             for (var prop in props) {
                 if (prop === "__class") ;
-                else if (util$6.isArray(props[prop])) {
-                    var arr = "".concat(props[prop].map(function (item) { return _this.joinWithPrefix(item, imports, joinStr + "        ", ""); }).join(",".concat(joinStr, "        ")));
+                else if (util$1.isArray(props[prop])) {
+                    var arr = "" + props[prop].map(function (item) { return _this.joinWithPrefix(item, imports, joinStr + "        ", ""); }).join("," + joinStr + "        ");
                     if (arr) {
-                        retVal += "".concat(joinStr, "    .").concat(prop, "([").concat(joinStr, "        ").concat(arr).concat(joinStr, "    ])").concat(postFix);
+                        retVal += joinStr + "    ." + prop + "([" + joinStr + "        " + arr + joinStr + "    ])" + postFix;
                     }
                 }
                 else {
-                    retVal += "".concat(joinStr, "    .").concat(prop, "(").concat(JSON.stringify(props[prop]), ")").concat(postFix);
+                    retVal += joinStr + "    ." + prop + "(" + JSON.stringify(props[prop]) + ")" + postFix;
                 }
             }
             return retVal;
         };
         JavaScriptAdapter.prototype.writeWidget = function (dataview, imports) {
-            return "    export const ".concat(dataview.visualization.id, " = new marshaller.VizChartPanel()\n        .id(\"").concat(dataview.visualization.id, "\")\n        .title(\"").concat(dataview.visualization.title, "\")\n        .widget(").concat(this.joinWithPrefix(dataview.visualization.properties["widget"], imports, "\n        ", ""), ")\n        ;");
+            return "    export const " + dataview.visualization.id + " = new marshaller.VizChartPanel()\n        .id(\"" + dataview.visualization.id + "\")\n        .title(\"" + dataview.visualization.title + "\")\n        .widget(" + this.joinWithPrefix(dataview.visualization.properties["widget"], imports, "\n        ", "") + ")\n        ;";
         };
         JavaScriptAdapter.prototype.writeElement = function (dataview) {
-            var activities = ["data.".concat(this.datasourceRefID(dataview))];
+            var activities = ["data." + this.datasourceRefID(dataview)];
             for (var _i = 0, _a = dataview.activities; _i < _a.length; _i++) {
                 var activity = _a[_i];
                 activities.push(this.writeActivity(activity));
@@ -15910,9 +15881,9 @@
             var updates = [];
             for (var _b = 0, _c = this._ec.filteredBy(dataview.id); _b < _c.length; _b++) {
                 var filteredViz = _c[_b];
-                updates.push("".concat(filteredViz.id(), ".refresh();"));
+                updates.push(filteredViz.id() + ".refresh();");
             }
-            return "\nconst ".concat(dataview.id, " = new marshaller.Element(ec)\n    .id(\"").concat(dataview.id, "\")\n    .pipeline([\n        ").concat(activities.join(",\n        "), "\n    ])\n    .mappings(new marshaller.Mappings().transformations(").concat(stringify(dataview.visualization.mappings.transformations), "))\n    .chartPanel(viz.").concat(dataview.visualization.id, ")\n    .on(\"selectionChanged\", () => {\n        ").concat(updates.join("\n        "), "\n    }, true)\n    ;\n").concat(dataview.id, ".visualization()\n    .visibility(\"").concat(dataview.visualization.visibility, "\")\n    .secondaryDataviewID(\"").concat(dataview.visualization.secondaryDataviewID || "", "\")\n    ;\nec.append(").concat(dataview.id, ");\n");
+            return "\nconst " + dataview.id + " = new marshaller.Element(ec)\n    .id(\"" + dataview.id + "\")\n    .pipeline([\n        " + activities.join(",\n        ") + "\n    ])\n    .mappings(new marshaller.Mappings().transformations(" + stringify(dataview.visualization.mappings.transformations) + "))\n    .chartPanel(viz." + dataview.visualization.id + ")\n    .on(\"selectionChanged\", () => {\n        " + updates.join("\n        ") + "\n    }, true)\n    ;\n" + dataview.id + ".visualization()\n    .visibility(\"" + dataview.visualization.visibility + "\")\n    .secondaryDataviewID(\"" + (dataview.visualization.secondaryDataviewID || "") + "\")\n    ;\nec.append(" + dataview.id + ");\n";
         };
         JavaScriptAdapter.prototype.writeDatasources = function () {
             var retVal = [];
@@ -15944,7 +15915,7 @@
         };
         JavaScriptAdapter.prototype.createJavaScript = function () {
             var widgets = this.writeWidgets();
-            return "".concat(widgets.widgetImports, "\nimport * as marshaller from \"@hpcc-js/marshaller\";\n\n//  Dashboard Element Container (Model)  ---\nconst ec = new marshaller.ElementContainer();\n\nnamespace data {\n").concat(this.writeDatasources().join("\n"), "\n}\n\nnamespace viz {\n").concat(widgets.widgetDefs, "\n}\n\n//  Dashboard Elements  (Controller) ---\n").concat(this.writeElements().trim(), "\n\nec.refresh();\n\n//  Optional  ---\nconst errors = ec.validate();\nfor (const error of errors) {\n    console.error(error.elementID + \" (\" + error.source + \"):  \" + error.msg);\n}\n\nexport const dashboard = new marshaller.Dashboard(ec)\n    .target(\"placeholder\")\n    .titleVisible(false)\n    .hideSingleTabs(true)\n    .layoutObj(").concat(stringify(this._dashboard.layout()), ")\n    .render()\n    ;\n\n// @ts-ignore\nconst ddl = ").concat(JSON.stringify(this._ddlSchema), ";\n");
+            return widgets.widgetImports + "\nimport * as marshaller from \"@hpcc-js/marshaller\";\n\n//  Dashboard Element Container (Model)  ---\nconst ec = new marshaller.ElementContainer();\n\nnamespace data {\n" + this.writeDatasources().join("\n") + "\n}\n\nnamespace viz {\n" + widgets.widgetDefs + "\n}\n\n//  Dashboard Elements  (Controller) ---\n" + this.writeElements().trim() + "\n\nec.refresh();\n\n//  Optional  ---\nconst errors = ec.validate();\nfor (const error of errors) {\n    console.error(error.elementID + \" (\" + error.source + \"):  \" + error.msg);\n}\n\nexport const dashboard = new marshaller.Dashboard(ec)\n    .target(\"placeholder\")\n    .titleVisible(false)\n    .hideSingleTabs(true)\n    .layoutObj(" + stringify(this._dashboard.layout()) + ")\n    .render()\n    ;\n\n// @ts-ignore\nconst ddl = " + JSON.stringify(this._ddlSchema) + ";\n";
         };
         return JavaScriptAdapter;
     }());
@@ -15976,8 +15947,8 @@
       }
     }
 
-    var css_248z$3 = ".p-Widget.phosphor_WidgetAdapter.p-DockPanel-widget.active{border-color:#5589ff;box-shadow:0 -1px 0 #5589ff,1px 1px 2px rgba(0,0,0,.2)}.p-TabBar-tab.p-mod-current.active{border-color:#5589ff}.p-TabBar-tab.p-mod-current.error{background:red;background:linear-gradient(180deg,rgba(255,0,0,.5),#fff)}";
-    styleInject(css_248z$3);
+    var css_248z = ".p-Widget.phosphor_WidgetAdapter.p-DockPanel-widget.active{border-color:#5589ff;box-shadow:0 -1px 0 #5589ff,1px 1px 2px rgba(0,0,0,.2)}.p-TabBar-tab.p-mod-current.active{border-color:#5589ff}.p-TabBar-tab.p-mod-current.error{background:red;background:linear-gradient(180deg,rgba(255,0,0,.5),#fff)}";
+    styleInject(css_248z);
 
     var Dashboard = /** @class */ (function (_super) {
         __extends(Dashboard, _super);
@@ -16007,7 +15978,7 @@
                 .enabled(false)
                 .on("click", function () {
                 var elem = _this._prevActive;
-                if (elem && window.confirm("Remove Widget \"".concat(elem.id(), "\"?"))) {
+                if (elem && window.confirm("Remove Widget \"" + elem.id() + "\"?")) {
                     _this._ec.clear(elem.id());
                     _this.renderPromise().then(function () {
                         _this.vizActivation(undefined);
@@ -16203,7 +16174,7 @@
         };
         Dashboard.prototype.importDDL = function (ddl, baseUrl, wuid, dermatologyJson) {
             if (dermatologyJson === void 0) { dermatologyJson = {}; }
-            var ddl2 = isDDL2Schema(ddl) ? ddl : upgrade(ddl, baseUrl, wuid, true, dermatologyJson);
+            var ddl2 = isDDL2Schema(ddl) ? ddl : upgrade$1(ddl, baseUrl, wuid, true, dermatologyJson);
             return this.restore(ddl2, true);
         };
         Dashboard.prototype.javascript = function () {
@@ -16252,8 +16223,8 @@
     }(layout.ChartPanel));
     Dashboard.prototype._class += " dashboard_dashboard";
 
-    var css_248z$2 = "";
-    styleInject(css_248z$2);
+    var css_248z$1 = "";
+    styleInject(css_248z$1);
 
     var DDLEditor = /** @class */ (function (_super) {
         __extends(DDLEditor, _super);
@@ -16339,7 +16310,7 @@
                 this.subgraphMap[id] = retVal;
             }
             this.vertices.push(retVal);
-            retVal.title("".concat(label));
+            retVal.title("" + label);
             retVal.getBBox(true);
             return retVal;
         };
@@ -16357,13 +16328,13 @@
             this.vertices.push(retVal);
             retVal
                 .textbox_shape_colorFill(fillColor)
-                .text(tooltip ? "".concat(label, "\n").concat(tooltip) : "".concat(label))
+                .text(tooltip ? label + "\n" + tooltip : "" + label)
                 .tooltip(tooltip);
             retVal.getBBox(true);
             return retVal;
         };
         GraphAdapter.prototype.createEdge = function (sourceID, targetID) {
-            var edgeID = "".concat(sourceID, "->").concat(targetID);
+            var edgeID = sourceID + "->" + targetID;
             var retVal = this.edgeMap[edgeID];
             if (!retVal) {
                 retVal = new graph.Edge()
@@ -16379,27 +16350,27 @@
                 dsDetails = dsDetails.selection().datasource();
             }
             if (dsDetails instanceof WUResult) {
-                var serverID = "".concat(dsDetails.url());
-                var server = this.createSubgraph(serverID, "".concat(serverID));
-                var wuID = "".concat(dsDetails.url(), "/").concat(dsDetails.wuid());
-                var wu = this.createSubgraph(wuID, "".concat(dsDetails.wuid()));
+                var serverID = "" + dsDetails.url();
+                var server = this.createSubgraph(serverID, "" + serverID);
+                var wuID = dsDetails.url() + "/" + dsDetails.wuid();
+                var wu = this.createSubgraph(wuID, "" + dsDetails.wuid());
                 this.hierarchy.push({ parent: server, child: wu });
-                var resultID = "".concat(wuID, "/").concat(dsDetails.resultName());
+                var resultID = wuID + "/" + dsDetails.resultName();
                 var result = this.createVertex(resultID, dsDetails.resultName(), { activity: dsDetails });
                 this.hierarchy.push({ parent: wu, child: result });
                 return resultID;
             }
             else if (dsDetails instanceof LogicalFile) {
-                var serverID = "".concat(dsDetails.url());
-                var server = this.createSubgraph(serverID, "".concat(serverID));
-                var lfID = "".concat(serverID, "/").concat(dsDetails.logicalFile());
+                var serverID = "" + dsDetails.url();
+                var server = this.createSubgraph(serverID, "" + serverID);
+                var lfID = serverID + "/" + dsDetails.logicalFile();
                 var lf = this.createVertex(lfID, dsDetails.logicalFile(), { activity: dsDetails });
                 this.hierarchy.push({ parent: server, child: lf });
                 return lfID;
             }
             else if (dsDetails instanceof RoxieResultRef) {
-                var serverID = "".concat(dsDetails.url());
-                var server = this.createSubgraph(serverID, "".concat(serverID));
+                var serverID = "" + dsDetails.url();
+                var server = this.createSubgraph(serverID, "" + serverID);
                 var surfaceID = dsDetails.serviceID(); // `${dsDetails.url()}/${dsDetails.querySet()}`;
                 var surface = this.createSubgraph(surfaceID, dsDetails.querySet());
                 this.hierarchy.push({ parent: server, child: surface });
@@ -16408,7 +16379,7 @@
                     parent: surface,
                     child: this.createVertex(roxieID, dsDetails.queryID())
                 });
-                var roxieResultID = "".concat(surfaceID, "/").concat(dsDetails.resultName());
+                var roxieResultID = surfaceID + "/" + dsDetails.resultName();
                 this.hierarchy.push({
                     parent: surface,
                     child: this.createVertex(roxieResultID, dsDetails.resultName(), { activity: dsDetails })
@@ -16417,15 +16388,15 @@
                 return roxieResultID;
             }
             else if (dsDetails instanceof RoxieResult) {
-                var serverID = "".concat(dsDetails.service().url());
-                var server = this.createSubgraph(serverID, "".concat(serverID));
+                var serverID = "" + dsDetails.service().url();
+                var server = this.createSubgraph(serverID, "" + serverID);
                 var querySetID = dsDetails.serviceID();
                 var querySet = this.createSubgraph(querySetID, dsDetails.service().querySet());
                 this.hierarchy.push({ parent: server, child: querySet });
-                var queryID = "".concat(querySetID, "/").concat(dsDetails.service().queryID());
+                var queryID = querySetID + "/" + dsDetails.service().queryID();
                 var query = this.createSubgraph(queryID, dsDetails.service().queryID());
                 this.hierarchy.push({ parent: querySet, child: query });
-                var resultID = "".concat(queryID, "/").concat(dsDetails.resultName());
+                var resultID = queryID + "/" + dsDetails.resultName();
                 this.hierarchy.push({
                     parent: query,
                     child: this.createVertex(resultID, dsDetails.resultName(), { activity: dsDetails })
@@ -16434,8 +16405,8 @@
                 return resultID;
             }
             else if (dsDetails instanceof RestResultRef) {
-                var serverID = "".concat(dsDetails.url());
-                var server = this.createSubgraph(serverID, "".concat(serverID));
+                var serverID = "" + dsDetails.url();
+                var server = this.createSubgraph(serverID, "" + serverID);
                 var surfaceID = dsDetails.serviceID();
                 var surface = this.createSubgraph(surfaceID, dsDetails.action());
                 this.hierarchy.push({ parent: server, child: surface });
@@ -16444,7 +16415,7 @@
                     parent: surface,
                     child: this.createVertex(roxieID, dsDetails.action())
                 });
-                var roxieResultID = "".concat(surfaceID, "/").concat(dsDetails.resultName());
+                var roxieResultID = surfaceID + "/" + dsDetails.resultName();
                 this.hierarchy.push({
                     parent: surface,
                     child: this.createVertex(roxieResultID, dsDetails.resultName(), { activity: dsDetails })
@@ -16453,13 +16424,13 @@
                 return roxieResultID;
             }
             else if (dsDetails instanceof RestResult) {
-                var serverID = "".concat(dsDetails.service().url());
-                var server = this.createSubgraph(serverID, "".concat(serverID));
+                var serverID = "" + dsDetails.service().url();
+                var server = this.createSubgraph(serverID, "" + serverID);
                 var serviceID = dsDetails.serviceID();
-                var actionID = "".concat(serverID, "/").concat(dsDetails.service().action());
+                var actionID = serverID + "/" + dsDetails.service().action();
                 var action = this.createSubgraph(serviceID, dsDetails.service().action());
                 this.hierarchy.push({ parent: server, child: action });
-                var resultID = "".concat(actionID, "/").concat(dsDetails.resultName());
+                var resultID = actionID + "/" + dsDetails.resultName();
                 this.hierarchy.push({
                     parent: action,
                     child: this.createVertex(resultID, dsDetails.resultName(), { activity: dsDetails })
@@ -16484,20 +16455,20 @@
             }
         };
         GraphAdapter.prototype.createActivity = function (sourceID, view, activity, label) {
-            var surface = this.createSubgraph(view.id(), "".concat(view.id()), { view: view });
+            var surface = this.createSubgraph(view.id(), "" + view.id(), { view: view });
             var fillColor = null;
             var tooltip = "";
             if (activity.exists()) {
                 var errors = activity.validate();
                 if (errors.length) {
                     fillColor = "pink";
-                    tooltip = errors.map(function (error) { return "".concat(error.source, ":  ").concat(error.msg); }).join("\n");
+                    tooltip = errors.map(function (error) { return error.source + ":  " + error.msg; }).join("\n");
                 }
             }
             else {
                 fillColor = "lightgrey";
             }
-            var vertex = this.createVertex(activity.id(), label || "".concat(activity.classID()), { view: view, activity: activity }, tooltip, fillColor);
+            var vertex = this.createVertex(activity.id(), label || "" + activity.classID(), { view: view, activity: activity }, tooltip, fillColor);
             if (sourceID) {
                 this.createEdge(sourceID, activity.id());
             }
@@ -16524,7 +16495,7 @@
                 var visualization = view.visualization();
                 var mappings = visualization.mappings();
                 var mappingVertexID = this.createActivity(prevID, view, mappings, "Mappings");
-                var vizSubgraphID = "".concat(visualization.id(), "-sg");
+                var vizSubgraphID = visualization.id() + "-sg";
                 var surface = this.createSubgraph(vizSubgraphID, "Visualization", { visualization: visualization });
                 this.hierarchy.push({
                     parent: this.subgraphMap[view.id()],
@@ -16534,14 +16505,14 @@
                     parent: surface,
                     child: this.vertexMap[mappings.id()]
                 });
-                var vizVertexID = "".concat(visualization.id(), "-viz");
+                var vizVertexID = visualization.id() + "-viz";
                 var widgetVertex = this.createVertex(vizVertexID, visualization.chartPanel().widget().classID(), { view: view, chartPanel: visualization.chartPanel() });
                 this.createEdge(mappingVertexID, vizVertexID);
                 this.hierarchy.push({
                     parent: surface,
                     child: widgetVertex
                 });
-                var stateVertexID = "".concat(visualization.id(), "-state");
+                var stateVertexID = visualization.id() + "-state";
                 var stateVertex = this.createVertex(stateVertexID, "Selection", { view: view, state: view.state() });
                 this.createEdge(vizVertexID, stateVertexID)
                     .weight(10)
@@ -16562,7 +16533,7 @@
                 var secondaryElement = this._ec.element(visualization.secondaryDataviewID());
                 if (secondaryElement) {
                     var mappings = secondaryElement.visualization().mappings();
-                    this.createEdge(mappings.id(), "".concat(visualization.id(), "-viz"));
+                    this.createEdge(mappings.id(), visualization.id() + "-viz");
                 }
             }
             for (var _f = 0, _g = this._ec.elements(); _f < _g.length; _f++) {
@@ -16803,7 +16774,7 @@
             var data = this._ec.elements().map(function (elem) {
                 return [elem.id(), elem.visualization().title(), elem];
             });
-            var dataID = util$6.hashSum(data.map(function (row) { return row[0]; }));
+            var dataID = util$1.hashSum(data.map(function (row) { return row[0]; }));
             if (this._prevDataID !== dataID) {
                 this._prevDataID = dataID;
                 this.data(data);
@@ -16813,8 +16784,8 @@
         return DVTable;
     }(layout.ChartPanel));
 
-    var css_248z$1 = ".common_SelectionButton.error{background:red;background:linear-gradient(180deg,rgba(255,0,0,.5),hsla(0,0%,100%,0) 80%)}";
-    styleInject(css_248z$1);
+    var css_248z$2 = ".common_SelectionButton.error{background:red;background:linear-gradient(180deg,rgba(255,0,0,.5),hsla(0,0%,100%,0) 80%)}";
+    styleInject(css_248z$2);
 
     var PipelineSelectionButton = /** @class */ (function (_super) {
         __extends(PipelineSelectionButton, _super);
@@ -16840,7 +16811,7 @@
                 this.tooltip(_.map(function (err) {
                     var errSourceParts = err.source.split(".");
                     errSourceParts.splice(0, 1);
-                    return "".concat(errSourceParts.join("."), ":  ").concat(err.msg);
+                    return errSourceParts.join(".") + ":  " + err.msg;
                 }).join("\n"));
             }
             else {
@@ -17119,7 +17090,7 @@
         return PipelinePanel;
     }(layout.ChartPanel));
     PipelinePanel.prototype._class += " marshaller_PipelinePanel";
-    var DDLPreview$1 = /** @class */ (function (_super) {
+    var DDLPreview = /** @class */ (function (_super) {
         __extends(DDLPreview, _super);
         function DDLPreview() {
             var _this = _super.call(this) || this;
@@ -17186,7 +17157,7 @@
                 _this.propChanged(id, newValue, oldValue, source);
             });
             _this._previewPanel = new phosphor.TabPanel();
-            _this._rhsDDLPreview = new DDLPreview$1();
+            _this._rhsDDLPreview = new DDLPreview();
             _this._rhsDataPreview = new dgrid.DatasourceTable().pagination(true);
             _this._previewPanel
                 .addWidget(_this._rhsDataPreview, "Data")
@@ -17237,11 +17208,11 @@
         return PipelineSplitPanel;
     }(phosphor.SplitPanel));
 
-    var css_248z = ".graph_Graph .graphVertex>.subgraph .title rect{fill:#dcf1ff;border-bottom-width:0}.graph_Graph .graphVertex>.subgraph .title text{fill:#000}.graph_Graph .graphVertex>.subgraph rect{fill:none}.graph_Graph .graphVertex .graph_Vertex.selected .common_Shape,.graph_Graph .graphVertex>.subgraph.selected rect{stroke:red!important}.graph_Graph .common_Surface .common_Menu{visibility:hidden}.p-MenuBar{background:#fafafa;border-bottom:1px solid #ddd;color:rgba(0,0,0,.87);font:13px Helvetica,Arial,sans-serif;padding-left:5px}.p-MenuBar-menu{transform:translateY(-1px)}.p-MenuBar-item{border-left:1px solid transparent;border-right:1px solid transparent;padding:4px 8px}.p-MenuBar-item.p-mod-active{background:#e5e5e5}.p-MenuBar.p-mod-active .p-MenuBar-item.p-mod-active{background:#fff;border-left:1px solid silver;border-right:1px solid silver;box-shadow:0 0 6px rgba(0,0,0,.2);z-index:10001}.p-Menu{background:#fff;border:1px solid silver;box-shadow:0 1px 6px rgba(0,0,0,.2);color:rgba(0,0,0,.87);font:12px Helvetica,Arial,sans-serif;padding:3px 0}.p-Menu-item.p-mod-active{background:#e5e5e5}.p-Menu-item.p-mod-disabled{color:rgba(0,0,0,.25)}.p-Menu-itemIcon{padding:4px 2px;width:21px}.p-Menu-itemLabel{padding:4px 35px 4px 2px}.p-Menu-itemMnemonic{text-decoration:underline}.p-Menu-itemShortcut{padding:4px 0}.p-Menu-itemSubmenuIcon{padding:4px 0;width:16px}.p-Menu-item[data-type=separator]>div{height:9px;padding:0}.p-Menu-item[data-type=separator]>div:after{border-top:1px solid #ddd;content:\"\";display:block;position:relative;top:4px}.p-Menu-itemIcon:before,.p-Menu-itemSubmenuIcon:before{font-family:FontAwesome}.p-Menu-item.p-mod-toggled>.p-Menu-itemIcon:before{content:\"\\f00c\"}.p-Menu-item[data-type=submenu]>.p-Menu-itemSubmenuIcon:before{content:\"\\f0da\"}.p-CommandPalette{background:#f5f5f5;font-family:sans-serif}.p-CommandPalette-search{padding:8px}.p-CommandPalette-wrapper{background:#fff;border:1px solid #e0e0e0;padding:4px 6px}.p-CommandPalette-input{border:none;font-size:16px;outline:none;width:100%}.p-CommandPalette-header{background:#e1e1e1;color:#757575;cursor:pointer;font-size:12px;font-weight:600;padding:4px}.p-CommandPalette-header:hover:before{content:\"\\2026\";float:right;margin-right:4px}.p-CommandPalette-header>mark{background-color:transparent;font-weight:700}.p-CommandPalette-item{color:#757575;font-size:13px;font-weight:500;padding:4px 8px}.p-CommandPalette-emptyMessage{color:#757575;font-size:12px;font-weight:600;padding:4px;text-align:center}.p-CommandPalette-item.p-mod-disabled{color:rgba(0,0,0,.25)}.p-CommandPalette-item.p-mod-active{background:#7fdbff}.p-CommandPalette-item:hover:not(.p-mod-active):not(.p-mod-disabled){background:#e5e5e5}.p-CommandPalette-itemLabel>mark{background-color:transparent;font-weight:700}.p-CommandPalette-item.p-mod-disabled mark{color:rgba(0,0,0,.4)}.p-CommandPalette-itemCaption{color:#9e9e9e;font-size:11px;font-weight:400}";
-    styleInject(css_248z);
+    var css_248z$3 = ".graph_Graph .graphVertex>.subgraph .title rect{fill:#dcf1ff;border-bottom-width:0}.graph_Graph .graphVertex>.subgraph .title text{fill:#000}.graph_Graph .graphVertex>.subgraph rect{fill:none}.graph_Graph .graphVertex .graph_Vertex.selected .common_Shape,.graph_Graph .graphVertex>.subgraph.selected rect{stroke:red!important}.graph_Graph .common_Surface .common_Menu{visibility:hidden}.p-MenuBar{padding-left:5px;background:#fafafa;color:rgba(0,0,0,.87);border-bottom:1px solid #ddd;font:13px Helvetica,Arial,sans-serif}.p-MenuBar-menu{transform:translateY(-1px)}.p-MenuBar-item{padding:4px 8px;border-left:1px solid transparent;border-right:1px solid transparent}.p-MenuBar-item.p-mod-active{background:#e5e5e5}.p-MenuBar.p-mod-active .p-MenuBar-item.p-mod-active{z-index:10001;background:#fff;border-left:1px solid silver;border-right:1px solid silver;box-shadow:0 0 6px rgba(0,0,0,.2)}.p-Menu{padding:3px 0;background:#fff;color:rgba(0,0,0,.87);border:1px solid silver;font:12px Helvetica,Arial,sans-serif;box-shadow:0 1px 6px rgba(0,0,0,.2)}.p-Menu-item.p-mod-active{background:#e5e5e5}.p-Menu-item.p-mod-disabled{color:rgba(0,0,0,.25)}.p-Menu-itemIcon{width:21px;padding:4px 2px}.p-Menu-itemLabel{padding:4px 35px 4px 2px}.p-Menu-itemMnemonic{text-decoration:underline}.p-Menu-itemShortcut{padding:4px 0}.p-Menu-itemSubmenuIcon{width:16px;padding:4px 0}.p-Menu-item[data-type=separator]>div{padding:0;height:9px}.p-Menu-item[data-type=separator]>div:after{content:\"\";display:block;position:relative;top:4px;border-top:1px solid #ddd}.p-Menu-itemIcon:before,.p-Menu-itemSubmenuIcon:before{font-family:FontAwesome}.p-Menu-item.p-mod-toggled>.p-Menu-itemIcon:before{content:\"\\f00c\"}.p-Menu-item[data-type=submenu]>.p-Menu-itemSubmenuIcon:before{content:\"\\f0da\"}.p-CommandPalette{font-family:sans-serif;background:#f5f5f5}.p-CommandPalette-search{padding:8px}.p-CommandPalette-wrapper{padding:4px 6px;background:#fff;border:1px solid #e0e0e0}.p-CommandPalette-input{width:100%;border:none;outline:none;font-size:16px}.p-CommandPalette-header{padding:4px;color:#757575;font-size:12px;font-weight:600;background:#e1e1e1;cursor:pointer}.p-CommandPalette-header:hover:before{content:\"\\2026\";float:right;margin-right:4px}.p-CommandPalette-header>mark{background-color:transparent;font-weight:700}.p-CommandPalette-item{padding:4px 8px;color:#757575;font-size:13px;font-weight:500}.p-CommandPalette-emptyMessage{padding:4px;color:#757575;font-size:12px;font-weight:600;text-align:center}.p-CommandPalette-item.p-mod-disabled{color:rgba(0,0,0,.25)}.p-CommandPalette-item.p-mod-active{background:#7fdbff}.p-CommandPalette-item:hover:not(.p-mod-active):not(.p-mod-disabled){background:#e5e5e5}.p-CommandPalette-itemLabel>mark{background-color:transparent;font-weight:700}.p-CommandPalette-item.p-mod-disabled mark{color:rgba(0,0,0,.4)}.p-CommandPalette-itemCaption{color:#9e9e9e;font-size:11px;font-weight:400}";
+    styleInject(css_248z$3);
 
-    var logger = util$6.scopedLogger("marshaller/dashy");
-    var DDLPreview = /** @class */ (function (_super) {
+    var logger$1 = util$1.scopedLogger("marshaller/dashy");
+    var DDLPreview$1 = /** @class */ (function (_super) {
         __extends(DDLPreview, _super);
         function DDLPreview(_dashy) {
             var _this = _super.call(this) || this;
@@ -17326,7 +17297,7 @@
                 .on("vertex_contextmenu", function (row, col, sel, ext) {
             });
             _this._lhsDebugSheet = new phosphor.TabPanel();
-            _this._lhsDebugDDLEditor = new DDLPreview(_this);
+            _this._lhsDebugDDLEditor = new DDLPreview$1(_this);
             _this._lhsDebugDDLSchema = new codemirror.JSONEditor().json(ddl2Schema);
             _this._lhsDebugJSEditor = new codemirror.JSEditor();
             _this._lhsDebugCloneEC = new ElementContainer();
@@ -17390,7 +17361,7 @@
                     for (var _i = 0, _a = _this._elementContainer.validate(); _i < _a.length; _i++) {
                         var error = _a[_i];
                         hasError = true;
-                        logger.warning(error.elementID + " (" + error.source + "):  " + error.msg);
+                        logger$1.warning(error.elementID + " (" + error.source + "):  " + error.msg);
                     }
                     if (hasError) {
                         //  Re-render to highlight errrors  ---
@@ -17401,7 +17372,7 @@
         };
         Dashy.prototype.importDDL = function (ddl, baseUrl, wuid, dermatologyJson) {
             if (dermatologyJson === void 0) { dermatologyJson = {}; }
-            var ddl2 = isDDL2Schema(ddl) ? ddl : upgrade(ddl, baseUrl, wuid, true, dermatologyJson);
+            var ddl2 = isDDL2Schema(ddl) ? ddl : upgrade$1(ddl, baseUrl, wuid, true, dermatologyJson);
             var retVal = this.restore(ddl2);
             if (isDDL2Schema(ddl)) {
                 this._lhsDebugDDLv2.json(ddl2);
@@ -17464,7 +17435,7 @@
         };
         Dashy.prototype.loadGraph = function () {
             this._lhsPipeline
-                .data(__assign$1({}, this._graphAdapter.createGraph()), true);
+                .data(__assign({}, this._graphAdapter.createGraph()), true);
             if (this.activeLHS() === this._lhsPipeline) {
                 this._lhsPipeline
                     .lazyRender();
@@ -17497,7 +17468,7 @@
                 }).then(function () {
                     for (var _i = 0, _a = _this._lhsDebugCloneEC.validate(); _i < _a.length; _i++) {
                         var error = _a[_i];
-                        logger.warning(error.elementID + " (" + error.source + "):  " + error.msg);
+                        logger$1.warning(error.elementID + " (" + error.source + "):  " + error.msg);
                     }
                 });
             });
@@ -17545,11 +17516,11 @@
             palette.addItem({ command: "remove", category: "Notebook" });
             palette.id = "palette";
             var contextMenu = new phosphor.ContextMenu({ commands: commands });
-            contextMenu.addItem({ command: "dash_add", selector: "#".concat(this._lhsDashboard.id()) });
-            contextMenu.addItem({ command: "dash_clear", selector: "#".concat(this._lhsDashboard.id()) });
-            contextMenu.addItem({ type: "separator", selector: "#".concat(this._lhsDashboard.id()) });
-            contextMenu.addItem({ command: "dash_load", selector: "#".concat(this.id()) });
-            contextMenu.addItem({ command: "dash_save", selector: "#".concat(this.id()) });
+            contextMenu.addItem({ command: "dash_add", selector: "#" + this._lhsDashboard.id() });
+            contextMenu.addItem({ command: "dash_clear", selector: "#" + this._lhsDashboard.id() });
+            contextMenu.addItem({ type: "separator", selector: "#" + this._lhsDashboard.id() });
+            contextMenu.addItem({ command: "dash_load", selector: "#" + this.id() });
+            contextMenu.addItem({ command: "dash_save", selector: "#" + this.id() });
             document.addEventListener("contextmenu", function (event) {
                 if (contextMenu.open(event)) {
                     event.preventDefault();
@@ -17693,7 +17664,9 @@
 
     Object.defineProperty(exports, 'hookSend', {
         enumerable: true,
-        get: function () { return comms.hookSend; }
+        get: function () {
+            return comms.hookSend;
+        }
     });
     exports.Activity = Activity;
     exports.ActivityArray = ActivityArray;
@@ -17730,8 +17703,8 @@
     exports.Mappings = Mappings;
     exports.MultiField = MultiField;
     exports.NullView = NullView;
-    exports.PKG_NAME = PKG_NAME$1;
-    exports.PKG_VERSION = PKG_VERSION$1;
+    exports.PKG_NAME = PKG_NAME;
+    exports.PKG_VERSION = PKG_VERSION;
     exports.Project = Project;
     exports.ProjectBase = ProjectBase;
     exports.RemoteFilter = RemoteFilter;
@@ -17759,5 +17732,5 @@
 
     Object.defineProperty(exports, '__esModule', { value: true });
 
-}));
+})));
 //# sourceMappingURL=index.js.map