@hpcc-js/ddl-shim 2.17.23 → 2.18.1

package/dist/index.es6.js

@@ -1,48 +1,63 @@
-var PKG_NAME = "@hpcc-js/ddl-shim";
-var PKG_VERSION = "2.17.23";
-var BUILD_VERSION = "2.99.0";
-
-function isWorkunitDatasource(ref) {
-    return ref.WUID !== undefined;
-}
-function isDatabombDatasource(ref) {
-    return ref.databomb === true;
-}
-function isHipieDatasource(ref) {
-    return ref.URL !== undefined;
-}
-function isPieVisualization(viz) {
-    return viz.type === "PIE" || viz.type === "BAR";
-}
-function isLineVisualization(viz) {
-    return viz.type === "LINE";
-}
-function isChoroVisualization(viz) {
-    return viz.type === "CHORO";
-}
-function isTableVisualization(viz) {
-    return viz.type === "TABLE";
-}
-function isSliderVisualization(viz) {
-    return viz.type === "SLIDER";
-}
-function isGraphVisualization(viz) {
-    return viz.type === "GRAPH";
-}
-function isHeatMapVisualization(viz) {
-    return viz.type === "HEAT_MAP";
-}
-function isFormVisualization(viz) {
-    return viz.type === "FORM";
-}
-function isUSStateMapping(mappings) {
-    return mappings.state !== undefined;
-}
-function isUSCountyMapping(mappings) {
-    return mappings.county !== undefined;
-}
-function isGeohashMapping(mappings) {
-    return mappings.geohash !== undefined;
+function _mergeNamespaces(n, m) {
+    m.forEach(function (e) {
+        e && typeof e !== 'string' && !Array.isArray(e) && Object.keys(e).forEach(function (k) {
+            if (k !== 'default' && !(k in n)) {
+                var d = Object.getOwnPropertyDescriptor(e, k);
+                Object.defineProperty(n, k, d.get ? d : {
+                    enumerable: true,
+                    get: function () { return e[k]; }
+                });
+            }
+        });
+    });
+    return Object.freeze(n);
+}
+
+var PKG_NAME = "@hpcc-js/ddl-shim";
+var PKG_VERSION = "2.18.1";
+var BUILD_VERSION = "2.102.1";
+
+function isWorkunitDatasource(ref) {
+    return ref.WUID !== undefined;
+}
+function isDatabombDatasource(ref) {
+    return ref.databomb === true;
+}
+function isHipieDatasource(ref) {
+    return ref.URL !== undefined;
+}
+function isPieVisualization(viz) {
+    return viz.type === "PIE" || viz.type === "BAR";
+}
+function isLineVisualization(viz) {
+    return viz.type === "LINE";
+}
+function isChoroVisualization(viz) {
+    return viz.type === "CHORO";
+}
+function isTableVisualization(viz) {
+    return viz.type === "TABLE";
+}
+function isSliderVisualization(viz) {
+    return viz.type === "SLIDER";
+}
+function isGraphVisualization(viz) {
+    return viz.type === "GRAPH";
+}
+function isHeatMapVisualization(viz) {
+    return viz.type === "HEAT_MAP";
+}
+function isFormVisualization(viz) {
+    return viz.type === "FORM";
+}
+function isUSStateMapping(mappings) {
+    return mappings.state !== undefined;
+}
+function isUSCountyMapping(mappings) {
+    return mappings.county !== undefined;
+}
+function isGeohashMapping(mappings) {
+    return mappings.geohash !== undefined;
 }
 
 var v1 = /*#__PURE__*/Object.freeze({
@@ -63,39 +78,39 @@ var v1 = /*#__PURE__*/Object.freeze({
     isGeohashMapping: isGeohashMapping
 });
 
-function isDatabombRef(ref) {
-    return !isWUResultRef(ref) && !isRoxieServiceRef(ref);
-}
-function isWUResultRef(ref) {
-    return ref.output !== undefined && !isRoxieServiceRef(ref);
-}
-function isRoxieServiceRef(ref) {
-    return ref.request !== undefined;
-}
-function isIFilterCondition(fc) {
-    return !!fc.viewID;
-}
-function isFilterActivity(activity) {
-    return activity.type === "filter";
-}
-function isProjectActivity(activity) {
-    return activity.type === "project";
-}
-function isMappingsActivity(activity) {
-    return activity.type === "mappings";
-}
-function isGroupByActivity(activity) {
-    return activity.type === "groupby";
-}
-function isSortActivity(activity) {
-    return activity.type === "sort";
-}
-function isLimitActivity(activity) {
-    return activity.type === "limit";
-}
+function isDatabombRef(ref) {
+    return !isWUResultRef(ref) && !isRoxieServiceRef(ref);
+}
+function isWUResultRef(ref) {
+    return ref.output !== undefined && !isRoxieServiceRef(ref);
+}
+function isRoxieServiceRef(ref) {
+    return ref.request !== undefined;
+}
+function isIFilterCondition(fc) {
+    return !!fc.viewID;
+}
+function isFilterActivity(activity) {
+    return activity.type === "filter";
+}
+function isProjectActivity(activity) {
+    return activity.type === "project";
+}
+function isMappingsActivity(activity) {
+    return activity.type === "mappings";
+}
+function isGroupByActivity(activity) {
+    return activity.type === "groupby";
+}
+function isSortActivity(activity) {
+    return activity.type === "sort";
+}
+function isLimitActivity(activity) {
+    return activity.type === "limit";
+}
 var VisibilitySet = ["normal", "flyout"];
 
-var v2 = /*#__PURE__*/Object.freeze({
+var v2$1 = /*#__PURE__*/Object.freeze({
     __proto__: null,
     isDatabombRef: isDatabombRef,
     isWUResultRef: isWUResultRef,
@@ -143,960 +158,941 @@ function __spreadArray(to, from, pack) {
             ar[i] = from[i];
         }
     }
-    return to.concat(ar || from);
-}
-
-var classMappings = {
-    c3chart_Bar: "chart_Bar",
-    c3chart_Column: "chart_Column",
-    c3chart_Pie: "chart_Pie",
-    c3chart_Area: "chart_Area",
-    c3chart_Line: "chart_Line",
-    amchart_Bar: "chart_Bar",
-    amchart_Column: "chart_Column",
-    amchart_Pie: "chart_Pie",
-    amchart_Area: "chart_Area",
-    amchart_Line: "chart_Line",
-    google_Bar: "chart_Bar",
-    google_Column: "chart_Column",
-    google_Pie: "chart_Pie",
-    google_Area: "chart_Area",
-    google_Line: "chart_Line",
-    other_Table: "dgrid_Table"
-};
-var propertyMappings = {
-    xAxisLabelRotation: [
-        { name: "xAxisOverlapMode", transform: function (n) { return "rotate"; } },
-        { name: "xAxisLabelRotation", transform: function (n) { return n; } }
-    ],
-    tooltipLabelColor: {
-        name: "tooltipLabelColor"
-    },
-    tooltipSeriesColor: {
-        name: "tooltipSeriesColor"
-    },
-    tooltipValueColor: {
-        name: "tooltipValueColor"
-    },
-    tooltipValueFormat: {
-        name: "tooltipValueFormat"
-    },
-    timePattern: {
-        name: "xAxisTypeTimePattern"
-    },
-    smoothLines: {
-        name: "interpolate",
-        transform: function (n) {
-            if (n === false)
-                return "linear";
-            return "catmullRom";
-        }
-    },
-    holePercent: {
-        name: "innerRadius"
-    },
-    flip: {
-        name: "orientation",
-        transform: function (n) { return n ? "vertical" : "horizontal"; }
-    },
-    bottomText: {
-        name: "xAxisTitle"
-    },
-    xAxisTypeTimePattern: {
-        name: "xAxisTypeTimePattern"
-    },
-    yAxisTypeTimePattern: {
-        name: "yAxisTypeTimePattern"
-    },
-    valueFormat: {
-        name: "tooltipValueFormat"
-    },
-    stacked: {
-        name: "yAxisStacked"
-    },
-    showYGrid: {
-        name: "yAxisGuideLines"
-    },
-    showXGrid: {
-        name: "xAxisGuideLines"
-    },
-    showValueLabel: {
-        name: "showValue"
-    },
-    low: {
-        name: "yAxisDomainLow"
-    },
-    high: {
-        name: "yAxisDomainHigh"
-    },
-    fillOpacity: {
-        name: "interpolateFillOpacity"
-    },
-    areaFillOpacity: {
-        name: "interpolateFillOpacity"
-    },
-    showToolbar: {
-        name: "titleVisible"
-    },
-    showCSV: {
-        name: "downloadButtonVisible"
-    }
-};
-function findKeyVal(object, key, val) {
-    var value;
-    for (var k in object) {
-        if (k === key && object[k] === val) {
-            value = object;
-            break;
-        }
-        if (object[k] && typeof object[k] === "object") {
-            value = findKeyVal(object[k], key, val);
-            if (value !== undefined) {
-                break;
-            }
-        }
-    }
-    return value;
-}
-function apply_to_dataviews(ddl2, dermObj) {
-    ddl2.dataviews.forEach(apply_to_dataview);
-    function apply_to_dataview(dv) {
-        var widgetId = dv.id;
-        var dermPanelObj = findKeyVal(dermObj, "__id", widgetId);
-        if (dermPanelObj) {
-            var dermPanelProps = dermPanelObj.__properties;
-            var dermWidgetObj = dermPanelObj.__properties.chart ? dermPanelObj.__properties.chart : dermPanelObj.__properties.widget;
-            var dermWidgetProps = dermWidgetObj.__properties;
-            apply_class_mapping(dermWidgetObj);
-            apply_panel_property_mapping(dermPanelProps, dermWidgetProps);
-            apply_widget_property_mapping(dermPanelProps, dermWidgetProps);
-            if (dv.visualization.properties.chartType) {
-                dv.visualization.properties.charttype = dv.visualization.properties.chartType;
-            }
-        }
-        else {
-            console.warn(widgetId + " not found in dermObj");
-        }
-        function apply_class_mapping(dermWidgetObj) {
-            dv.visualization.__class = swap_with_supported_class(dermWidgetObj.__class);
-            dv.visualization.properties.__class = "marshaller_VizChartPanel";
-            if (!dv.visualization.properties.widget)
-                dv.visualization.properties.widget = {};
-            dv.visualization.properties.widget.__class = dv.visualization.__class;
-            function swap_with_supported_class(_class) {
-                return classMappings[_class] ? classMappings[_class] : _class;
-            }
-        }
-        function apply_panel_property_mapping(dermPanelProps, dermWidgetProps) {
-            dv.visualization.title = dermPanelProps.title || "";
-            dv.visualization.description = "";
-            dv.visualization.visibility = dv.visualization.visibility === "flyout" ? "flyout" : "normal";
-            dv.visualization.chartType = dv.visualization.__class.split("_")[1];
-            for (var propName in dermPanelProps) {
-                if (typeof propertyMappings[propName] !== "undefined") {
-                    var newPropName = propertyMappings[propName].name;
-                    if (typeof propertyMappings[propName].transform === "function") {
-                        dv.visualization.properties[newPropName] = propertyMappings[propName].transform(dermPanelProps[propName]);
-                    }
-                    else {
-                        dv.visualization.properties[newPropName] = dermPanelProps[propName];
-                    }
-                }
-            }
-            if (dermWidgetProps && dermWidgetProps.showLegend && dv.visualization.properties) {
-                dv.visualization.properties.legendVisible = true;
-            }
-        }
-        function apply_widget_property_mapping(dermPanelProps, dermWidgetProps) {
-            dv.visualization.title = dv.visualization.title || dermWidgetProps.title || "";
-            dv.visualization.description = ""; // TODO - should this map to anything?
-            dv.visualization.visibility = dv.visualization.visibility === "flyout" ? "flyout" : "normal";
-            dv.visualization.chartType = dv.visualization.__class.split("_")[1];
-            var _loop_1 = function (propName) {
-                if (typeof propertyMappings[propName] !== "undefined") {
-                    if (propertyMappings[propName] instanceof Array) {
-                        propertyMappings[propName].forEach(function (p) {
-                            var newPropName = p.name;
-                            dv.visualization.properties.widget[newPropName] = p.transform(dermWidgetProps[propName]);
-                            if (typeof propertyMappings[propName].transform === "function") {
-                                dv.visualization.properties.widget[newPropName] = propertyMappings[propName].transform(dermWidgetProps[propName]);
-                            }
-                            else {
-                                dv.visualization.properties.widget[newPropName] = dermWidgetProps[propName];
-                            }
-                        });
-                    }
-                    else {
-                        var newPropName = propertyMappings[propName].name;
-                        dv.visualization.properties.widget[newPropName] = propertyMappings[propName].transform(dermWidgetProps[propName]);
-                    }
-                }
-            };
-            for (var propName in dermWidgetProps) {
-                _loop_1(propName);
-            }
-        }
-    }
-}
-function apply_to_properties_layout(ddl2, dermObj) {
-    var retVal = {
-        layout: []
-    };
-    if (!dermObj || !dermObj.__properties)
-        return;
-    dermObj.__properties.content.forEach(function (cell) {
-        var cellPosition = {
-            // TODO - if "id" could be avoided then layouts could apply to any dashboard with the same number of widgets
-            id: cell.__properties.widget.__id,
-            position: [
-                cell.__properties.gridCol,
-                cell.__properties.gridRow,
-                cell.__properties.gridColSpan,
-                cell.__properties.gridRowSpan
-            ]
-        };
-        retVal.layout.push(cellPosition);
-    });
-    return retVal;
-}
-function upgrade(ddl2, dermObj) {
-    apply_to_dataviews(ddl2, dermObj);
-    return apply_to_properties_layout(ddl2, dermObj);
-}
-
-function faCharFix(faChar) {
-    return faChar;
-}
-var DDLUpgrade = /** @class */ (function () {
-    function DDLUpgrade(ddl, baseUrl, wuid, toLowerCase) {
-        if (baseUrl === void 0) { baseUrl = "http://localhost:8010"; }
-        if (wuid === void 0) { wuid = "WUID"; }
-        if (toLowerCase === void 0) { toLowerCase = true; }
-        this._datasources = {};
-        this._datasourceUpdates = {};
-        this._visualizations = {};
-        this._ddl2Datasources = {};
-        this._ddl2DatasourceFields = {};
-        this._ddl2Dataviews = {};
-        this._ddl2DataviewActivities = {};
-        this._ddl = ddl;
-        this._baseUrl = baseUrl;
-        this._wuid = wuid;
-        this._toLowerCase = toLowerCase;
-        this.indexDDL();
-        this.readDDL();
-    }
-    DDLUpgrade.prototype.toLowerCase = function (s) {
-        return this._toLowerCase ? s.toLowerCase() : s;
-    };
-    DDLUpgrade.prototype.isVizDatasourceRoxie = function (viz) {
-        if (viz.source) {
-            var ds = this._datasources[viz.source.id];
-            if (isHipieDatasource(ds)) {
-                return true;
-            }
-        }
-        return false;
-    };
-    DDLUpgrade.prototype.getDatasourceOutputs = function (dsID, vizID) {
-        var retVal = [];
-        var datasource = this._datasources[dsID];
-        for (var _i = 0, _a = datasource.outputs; _i < _a.length; _i++) {
-            var output = _a[_i];
-            if (output.notify) {
-                for (var _b = 0, _c = output.notify; _b < _c.length; _b++) {
-                    var notify = _c[_b];
-                    if (notify === vizID) {
-                        retVal.push({
-                            datasource: datasource,
-                            output: output
-                        });
-                    }
-                }
-            }
-        }
-        return retVal;
-    };
-    DDLUpgrade.prototype.getDatasourceFilters = function (dsID, vizID) {
-        var retVal = {};
-        for (var _i = 0, _a = this.getDatasourceOutputs(dsID, vizID); _i < _a.length; _i++) {
-            var dsOut = _a[_i];
-            if (dsOut.output.filter) {
-                for (var _b = 0, _c = dsOut.output.filter; _b < _c.length; _b++) {
-                    var filter = _c[_b];
-                    retVal[filter.fieldid] = {
-                        datasource: dsOut.datasource,
-                        output: dsOut.output,
-                        filter: filter
-                    };
-                }
-            }
-        }
-        return retVal;
-    };
-    DDLUpgrade.prototype.indexDDL = function () {
-        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
-            var dash = _a[_i];
-            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
-                var viz = _c[_b];
-                this._visualizations[viz.id] = viz;
-            }
-        }
-        for (var _d = 0, _e = this._ddl.datasources; _d < _e.length; _d++) {
-            var ds = _e[_d];
-            this._datasources[ds.id] = ds;
-            for (var _f = 0, _g = ds.outputs; _f < _g.length; _f++) {
-                var output = _g[_f];
-                if (output.notify) {
-                    for (var _h = 0, _j = output.notify; _h < _j.length; _h++) {
-                        var notify = _j[_h];
-                        this._datasourceUpdates[notify] = {
-                            id: ds.id,
-                            output: output.from || output.id
-                        };
-                    }
-                }
-            }
-        }
-    };
-    DDLUpgrade.prototype.readDDL = function () {
-        for (var _i = 0, _a = this._ddl.datasources; _i < _a.length; _i++) {
-            var ds = _a[_i];
-            if (isWorkunitDatasource(ds)) {
-                var ddl2DS = {
-                    type: "wuresult",
-                    id: ds.id,
-                    url: this._baseUrl,
-                    wuid: this._wuid,
-                    outputs: {}
-                };
-                for (var _b = 0, _c = ds.outputs; _b < _c.length; _b++) {
-                    var output = _c[_b];
-                    this.output2output(output, ddl2DS.outputs);
-                }
-                this._ddl2Datasources[ds.id] = ddl2DS;
-            }
-            else if (isDatabombDatasource(ds)) ;
-            else {
-                var urlParts = ds.URL.split("/WsEcl/submit/query/");
-                var hostParts = urlParts[0];
-                var roxieParts = urlParts[1].split("/");
-                var ddl2DS = {
-                    type: "hipie",
-                    id: ds.id,
-                    url: hostParts,
-                    querySet: roxieParts[0],
-                    queryID: roxieParts[1],
-                    inputs: [],
-                    outputs: {}
-                };
-                for (var _d = 0, _e = ds.outputs; _d < _e.length; _d++) {
-                    var output = _e[_d];
-                    this.output2output(output, ddl2DS.outputs);
-                }
-                this._ddl2Datasources[ds.id] = ddl2DS;
-            }
-        }
-        for (var _f = 0, _g = this._ddl.dashboards; _f < _g.length; _f++) {
-            var dash = _g[_f];
-            for (var _h = 0, _j = dash.visualizations; _h < _j.length; _h++) {
-                var viz = _j[_h];
-                if (viz.type === "FORM") {
-                    this._ddl2Datasources[viz.id] = {
-                        type: "form",
-                        id: viz.id,
-                        fields: this.formFields2field(viz.fields)
-                    };
-                    this._datasourceUpdates[viz.id] = { id: viz.id };
-                }
-                else if (viz.type === "SLIDER") {
-                    this._ddl2Datasources[viz.id] = {
-                        type: "form",
-                        id: viz.id,
-                        fields: this.formFields2field(viz.fields, true)
-                    };
-                    this._datasourceUpdates[viz.id] = { id: viz.id };
-                }
-                this._ddl2Dataviews[viz.id] = this.anyViz2view(viz);
-            }
-        }
-        this.readGroupBy();
-        this.readFilters();
-        this.readSort();
-        this.readMappings();
-    };
-    DDLUpgrade.prototype.readGroupBy = function () {
-        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
-            var dash = _a[_i];
-            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
-                var viz = _c[_b];
-                if (viz.fields) {
-                    var projectTransformations = [];
-                    var groupByColumns = [];
-                    var aggrFields = [];
-                    for (var _d = 0, _e = viz.fields; _d < _e.length; _d++) {
-                        var field = _e[_d];
-                        if (field.properties && field.properties.function) {
-                            switch (field.properties.function) {
-                                case "SUM":
-                                case "MIN":
-                                case "MAX":
-                                    aggrFields.push({
-                                        type: this.func2aggr(field.properties.function),
-                                        inFieldID: this.toLowerCase(field.properties.params.param1),
-                                        fieldID: this.toLowerCase(field.id)
-                                    });
-                                    break;
-                                case "AVE":
-                                    aggrFields.push({
-                                        type: this.func2aggr(field.properties.function),
-                                        inFieldID: this.toLowerCase(field.properties.params.param1),
-                                        baseCountFieldID: field.properties.params.param2 ? this.toLowerCase(field.properties.params.param2) : undefined,
-                                        fieldID: this.toLowerCase(field.id)
-                                    });
-                                    break;
-                                case "SCALE":
-                                    if (typeof field.properties.params.param1 === "object") {
-                                        var props = field.properties.params.param1;
-                                        switch (props.function) {
-                                            case "SUM":
-                                            case "MIN":
-                                            case "MAX":
-                                                aggrFields.push({
-                                                    type: this.func2aggr(props.function),
-                                                    inFieldID: this.toLowerCase(props.params.param1),
-                                                    fieldID: this.toLowerCase(field.id)
-                                                });
-                                                break;
-                                        }
-                                    }
-                                    projectTransformations.push({
-                                        type: "scale",
-                                        sourceFieldID: this.toLowerCase(field.id),
-                                        fieldID: this.toLowerCase(field.id),
-                                        factor: +field.properties.params.param2
-                                    });
-                                    break;
-                                default:
-                                    groupByColumns.push(this.toLowerCase(field.id));
-                                    throw new Error("Unhandled field function: " + field.properties.function);
-                            }
-                        }
-                        else {
-                            groupByColumns.push(this.toLowerCase(field.id));
-                        }
-                    }
-                    if (projectTransformations.length) {
-                        this._ddl2DataviewActivities[viz.id].project.transformations = projectTransformations;
-                    }
-                    if (aggrFields.length) {
-                        this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray([], groupByColumns);
-                        this._ddl2DataviewActivities[viz.id].groupBy.aggregates = aggrFields;
-                    }
-                }
-            }
-        }
-    };
-    DDLUpgrade.prototype.func2aggr = function (func) {
-        switch (func) {
-            case "SUM":
-                return "sum";
-            case "AVE":
-                return "mean";
-            case "MIN":
-                return "min";
-            case "MAX":
-                return "max";
-        }
-        throw new Error("Unknown DDL1 Function Type:  " + func);
-    };
-    DDLUpgrade.prototype.readMappings = function () {
-        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
-            var dash = _a[_i];
-            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
-                var viz = _c[_b];
-                if (isFormVisualization(viz)) ;
-                else if (isPieVisualization(viz)) {
-                    this.readPieMappings(viz);
-                }
-                else if (isChoroVisualization(viz)) {
-                    this.readChoroMappings(viz);
-                }
-                else if (isLineVisualization(viz)) {
-                    this.readLineMappings(viz);
-                }
-                else if (isTableVisualization(viz)) {
-                    this.readTableMappings(viz);
-                }
-                else if (isGraphVisualization(viz)) {
-                    this.readGraphMappings(viz);
-                }
-                else if (isSliderVisualization(viz)) {
-                    this.readSliderMappings(viz);
-                }
-                else {
-                    throw new Error("Unkown DDL1 mapping type:  " + viz.type);
-                }
-            }
-        }
-    };
-    DDLUpgrade.prototype.readPieMappings = function (viz) {
-        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
-        mappings.transformations.push({
-            fieldID: "label",
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.mappings.label)
-        });
-        mappings.transformations.push({
-            fieldID: "weight",
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.mappings.weight[0])
-        });
-    };
-    DDLUpgrade.prototype.readChoroMappings = function (viz) {
-        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
-        mappings.transformations.push({
-            fieldID: "label",
-            type: "=",
-            sourceFieldID: this.toLowerCase(this.anyChoroMapping2label(viz.source.mappings))
-        });
-        mappings.transformations.push({
-            fieldID: "weight",
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.mappings.weight[0])
-        });
-    };
-    DDLUpgrade.prototype.anyChoroMapping2label = function (mapping) {
-        return mapping.state || mapping.county || mapping.geohash;
-    };
-    DDLUpgrade.prototype.readLineMappings = function (viz) {
-        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
-        mappings.transformations.push({
-            fieldID: viz.source.mappings.x[0],
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.mappings.x[0])
-        });
-        for (var i = 0; i < viz.source.mappings.y.length; ++i) {
-            mappings.transformations.push({
-                fieldID: viz.source.mappings.y[i],
-                type: "=",
-                sourceFieldID: this.toLowerCase(viz.source.mappings.y[i])
-            });
-        }
-    };
-    DDLUpgrade.prototype.readTableMappings = function (viz) {
-        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
-        for (var i = 0; i < viz.label.length; ++i) {
-            mappings.transformations.push({
-                fieldID: viz.label[i],
-                type: "=",
-                sourceFieldID: this.toLowerCase(viz.source.mappings.value[i])
-            });
-        }
-    };
-    DDLUpgrade.prototype.readGraphEnums = function (valueMappings, annotation) {
-        if (annotation === void 0) { annotation = false; }
-        var retVal = [];
-        if (valueMappings) {
-            for (var value in valueMappings) {
-                var newValue = {};
-                for (var key in valueMappings[value]) {
-                    if (key === "faChar") {
-                        newValue[key] = faCharFix(valueMappings[value][key]);
-                    }
-                    else if (annotation && key.indexOf("icon_") === 0) {
-                        console.log("Deprecated flag property:  " + key);
-                        newValue[key.split("icon_")[1]] = valueMappings[value][key];
-                    }
-                    else {
-                        newValue[key] = valueMappings[value][key];
-                    }
-                }
-                //  remove v1.x "0" annotations as they equated to "nothing"  ---
-                if (!annotation || value !== "0") {
-                    retVal.push({
-                        value: value,
-                        newValue: newValue
-                    });
-                }
-            }
-        }
-        return retVal;
-    };
-    DDLUpgrade.prototype.readGraphMappings = function (viz) {
-        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
-        mappings.transformations.push({
-            fieldID: "uid",
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.mappings.uid)
-        });
-        mappings.transformations.push({
-            fieldID: "label",
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.mappings.label)
-        });
-        if (viz.icon.fieldid) {
-            mappings.transformations.push({
-                fieldID: "icon",
-                type: "map",
-                sourceFieldID: this.toLowerCase(viz.icon.fieldid),
-                default: { fachar: faCharFix(viz.icon.faChar) },
-                mappings: this.readGraphEnums(viz.icon.valuemappings)
-            });
-        }
-        var idx = 0;
-        if (viz.flag) {
-            for (var _i = 0, _a = viz.flag; _i < _a.length; _i++) {
-                var flag = _a[_i];
-                if (flag.fieldid) {
-                    mappings.transformations.push({
-                        fieldID: "annotation_" + idx++,
-                        type: "map",
-                        sourceFieldID: this.toLowerCase(flag.fieldid),
-                        default: {},
-                        mappings: this.readGraphEnums(flag.valuemappings, true)
-                    });
-                }
-            }
-        }
-        mappings.transformations.push({
-            fieldID: "links",
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.link.childfile),
-            transformations: [{
-                    fieldID: "uid",
-                    type: "=",
-                    sourceFieldID: this.toLowerCase(viz.source.link.mappings.uid)
-                }]
-        });
-    };
-    DDLUpgrade.prototype.readSliderMappings = function (viz) {
-        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
-        mappings.transformations.push({
-            fieldID: "label",
-            type: "=",
-            sourceFieldID: this.toLowerCase(viz.source.mappings.label)
-        });
-    };
-    DDLUpgrade.prototype.readFilters = function () {
-        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
-            var dash = _a[_i];
-            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
-                var viz = _c[_b];
-                if (viz.events) {
-                    for (var eventID in viz.events) {
-                        var event_1 = viz.events[eventID];
-                        for (var _d = 0, _e = event_1.updates; _d < _e.length; _d++) {
-                            var update = _e[_d];
-                            var otherViz = this._ddl2Dataviews[update.visualization];
-                            var dsFilters = this.getDatasourceFilters(update.datasource, otherViz.id);
-                            if (update.mappings) {
-                                if (isRoxieServiceRef(otherViz.datasource)) {
-                                    for (var key in update.mappings) {
-                                        otherViz.datasource.request.push({
-                                            source: viz.id,
-                                            remoteFieldID: this.toLowerCase(key),
-                                            localFieldID: this.toLowerCase(update.mappings[key])
-                                        });
-                                    }
-                                }
-                                else {
-                                    var condition = {
-                                        viewID: viz.id,
-                                        mappings: []
-                                    };
-                                    for (var key in update.mappings) {
-                                        var mapping = update.mappings[key];
-                                        var dsFilter = (mapping && dsFilters[mapping]) ? dsFilters[mapping].filter : undefined;
-                                        if (!dsFilter) {
-                                            console.warn("Select Mapping \"" + mapping + "\" in viz \"" + viz.id + "\" not found in filters for \"" + otherViz.id + "\"");
-                                        }
-                                        else {
-                                            condition.mappings.push({
-                                                remoteFieldID: this.toLowerCase(key),
-                                                localFieldID: this.toLowerCase(update.mappings[key]),
-                                                condition: this.rule2condition(dsFilter.rule),
-                                                nullable: dsFilter.nullable
-                                            });
-                                        }
-                                    }
-                                    this._ddl2DataviewActivities[otherViz.id].filters.conditions.push(condition);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    };
-    DDLUpgrade.prototype.rule2condition = function (_) {
-        switch (_) {
-            case "set":
-                return "in";
-            case "notequals":
-                return "!=";
-        }
-        return _;
-    };
-    DDLUpgrade.prototype.readSort = function () {
-        var _this = this;
-        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
-            var dash = _a[_i];
-            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
-                var viz = _c[_b];
-                if (viz.source) {
-                    if (viz.source.sort) {
-                        var vizSort = this._ddl2DataviewActivities[viz.id].sort;
-                        vizSort.conditions = viz.source.sort.map(function (s) {
-                            if (s.indexOf("-") === 0) {
-                                return {
-                                    fieldID: _this.toLowerCase(s.substr(1)),
-                                    descending: true
-                                };
-                            }
-                            return {
-                                fieldID: _this.toLowerCase(s),
-                                descending: false
-                            };
-                        });
-                    }
-                    if (viz.source.first) {
-                        var vizLimit = this._ddl2DataviewActivities[viz.id].limit;
-                        vizLimit.limit = +viz.source.first;
-                    }
-                }
-            }
-        }
-    };
-    DDLUpgrade.prototype.anyViz2view = function (viz) {
-        var project = {
-            type: "project",
-            transformations: []
-        };
-        var filters = {
-            type: "filter",
-            conditions: []
-        };
-        var groupBy = {
-            type: "groupby",
-            groupByIDs: [],
-            aggregates: []
-        };
-        var sort = {
-            type: "sort",
-            conditions: []
-        };
-        var limit = {
-            type: "limit",
-            limit: 0
-        };
-        var mappings = {
-            type: "mappings",
-            transformations: []
-        };
-        this._ddl2DataviewActivities[viz.id] = {
-            project: project,
-            filters: filters,
-            sort: sort,
-            groupBy: groupBy,
-            limit: limit,
-            mappings: mappings
-        };
-        var datasourceRef = this.isVizDatasourceRoxie(viz) ? {
-            id: this._datasourceUpdates[viz.id].id,
-            request: [],
-            output: this._datasourceUpdates[viz.id].output
-        } : {
-            id: this._datasourceUpdates[viz.id].id,
-            output: this._datasourceUpdates[viz.id].output
-        };
-        return {
-            id: viz.id,
-            datasource: datasourceRef,
-            activities: [
-                project,
-                filters,
-                sort,
-                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 || {}) })
-        };
-    };
-    DDLUpgrade.prototype.type2chartType = function (chartType) {
-        switch (chartType) {
-            case "LINE":
-                return { chartType: "Line", __class: "chart_Line" };
-            case "BUBBLE":
-                return { chartType: "Bubble", __class: "chart_Bubble" };
-            case "PIE":
-                return { chartType: "Pie", __class: "chart_Pie" };
-            case "BAR":
-                return { chartType: "Column", __class: "chart_Column" };
-            case "FORM":
-                return { chartType: "FieldForm", __class: "form_FieldForm" };
-            case "WORD_CLOUD":
-                return { chartType: "WordCloud", __class: "chart_WordCloud" };
-            case "CHORO":
-                return { chartType: "ChoroplethStates", __class: "map_ChoroplethStates" };
-            case "SUMMARY":
-                return { chartType: "Summary", __class: "chart_Summary" };
-            case "SLIDER":
-                return { chartType: "FieldForm", __class: "form_FieldForm" };
-            case "HEAT_MAP":
-                return { chartType: "HeatMap", __class: "other_HeatMap" };
-            case "2DCHART":
-                return { chartType: "Column", __class: "chart_Column" };
-            case "GRAPH":
-                return { chartType: "AdjacencyGraph", __class: "graph_AdjacencyGraph" };
-            case "TABLE":
-            default:
-                return { chartType: "Table", __class: "dgrid_Table" };
-        }
-    };
-    DDLUpgrade.prototype.formFields2field = function (fields, slider) {
-        var _this = this;
-        if (slider === void 0) { slider = false; }
-        if (!fields)
-            return [];
-        return fields.map(function (field) {
-            switch (field.properties.type) {
-                case "range":
-                    return {
-                        type: "range",
-                        id: field.id,
-                        default: (field.properties.default ? field.properties.default : undefined)
-                    };
-                case "dataset":
-                    return {
-                        type: "dataset",
-                        id: field.id,
-                        default: [],
-                        children: []
-                    };
-                default:
-                    return {
-                        type: _this.formFieldType2fieldType(field.properties.datatype, slider),
-                        id: field.id,
-                        default: field.properties.default ? field.properties.default[0] : undefined
-                    };
-            }
-        });
-    };
-    DDLUpgrade.prototype.formFieldType2fieldType = function (fieldType, slider) {
-        switch (fieldType) {
-            case "bool":
-            case "boolean":
-                return "boolean";
-            case "integer":
-            case "unsigned":
-            case "float":
-            case "double":
-            case "real":
-                return "number";
-            case "string":
-                return "string";
-            default:
-                return slider ? "number" : "string";
-        }
-    };
-    DDLUpgrade.prototype.output2output = function (output, target) {
-        target[output.from || output.id] = {
-            fields: this.filters2fields(output.filter)
-        };
-    };
-    DDLUpgrade.prototype.filters2fields = function (filters) {
-        if (!filters)
-            return [];
-        return filters.filter(function (filter) {
-            var idParts = filter.fieldid.split("-");
-            return idParts.length === 1 || idParts[1] === "range";
-        }).map(function (filter) {
-            var idParts = filter.fieldid.split("-");
-            var retVal = {
-                type: "string",
-                id: idParts[0]
-            };
-            return retVal;
-        });
-    };
-    DDLUpgrade.prototype.getVizField = function (vizID, fieldID) {
-        return {
-            type: "string",
-            id: "",
-            default: ""
-        };
-    };
-    DDLUpgrade.prototype.writeDatasources = function () {
-        var retVal = [];
-        for (var id in this._ddl2Datasources) {
-            retVal.push(this._ddl2Datasources[id]);
-        }
-        return retVal;
-    };
-    DDLUpgrade.prototype.writeDataviews = function () {
-        var retVal = [];
-        for (var id in this._ddl2Dataviews) {
-            retVal.push(this._ddl2Dataviews[id]);
-        }
-        return retVal;
-    };
-    DDLUpgrade.prototype.writeProperties = function () {
-        return {
-        //  TODO
-        };
-    };
-    DDLUpgrade.prototype.write = function () {
-        return {
-            version: "2.2.1",
-            createdBy: {
-                name: PKG_NAME,
-                version: PKG_VERSION
-            },
-            datasources: this.writeDatasources(),
-            dataviews: this.writeDataviews(),
-            properties: this.writeProperties()
-        };
-    };
-    return DDLUpgrade;
-}());
-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(retVal, dermatologyJson);
-    return retVal;
+    return to.concat(ar || Array.prototype.slice.call(from));
+}
+
+var classMappings = {
+    c3chart_Bar: "chart_Bar",
+    c3chart_Column: "chart_Column",
+    c3chart_Pie: "chart_Pie",
+    c3chart_Area: "chart_Area",
+    c3chart_Line: "chart_Line",
+    amchart_Bar: "chart_Bar",
+    amchart_Column: "chart_Column",
+    amchart_Pie: "chart_Pie",
+    amchart_Area: "chart_Area",
+    amchart_Line: "chart_Line",
+    google_Bar: "chart_Bar",
+    google_Column: "chart_Column",
+    google_Pie: "chart_Pie",
+    google_Area: "chart_Area",
+    google_Line: "chart_Line",
+    other_Table: "dgrid_Table"
+};
+var propertyMappings = {
+    xAxisLabelRotation: [
+        { name: "xAxisOverlapMode", transform: function (n) { return "rotate"; } },
+        { name: "xAxisLabelRotation", transform: function (n) { return n; } }
+    ],
+    tooltipLabelColor: {
+        name: "tooltipLabelColor"
+    },
+    tooltipSeriesColor: {
+        name: "tooltipSeriesColor"
+    },
+    tooltipValueColor: {
+        name: "tooltipValueColor"
+    },
+    tooltipValueFormat: {
+        name: "tooltipValueFormat"
+    },
+    timePattern: {
+        name: "xAxisTypeTimePattern"
+    },
+    smoothLines: {
+        name: "interpolate",
+        transform: function (n) {
+            if (n === false)
+                return "linear";
+            return "catmullRom";
+        }
+    },
+    holePercent: {
+        name: "innerRadius"
+    },
+    flip: {
+        name: "orientation",
+        transform: function (n) { return n ? "vertical" : "horizontal"; }
+    },
+    bottomText: {
+        name: "xAxisTitle"
+    },
+    xAxisTypeTimePattern: {
+        name: "xAxisTypeTimePattern"
+    },
+    yAxisTypeTimePattern: {
+        name: "yAxisTypeTimePattern"
+    },
+    valueFormat: {
+        name: "tooltipValueFormat"
+    },
+    stacked: {
+        name: "yAxisStacked"
+    },
+    showYGrid: {
+        name: "yAxisGuideLines"
+    },
+    showXGrid: {
+        name: "xAxisGuideLines"
+    },
+    showValueLabel: {
+        name: "showValue"
+    },
+    low: {
+        name: "yAxisDomainLow"
+    },
+    high: {
+        name: "yAxisDomainHigh"
+    },
+    fillOpacity: {
+        name: "interpolateFillOpacity"
+    },
+    areaFillOpacity: {
+        name: "interpolateFillOpacity"
+    },
+    showToolbar: {
+        name: "titleVisible"
+    },
+    showCSV: {
+        name: "downloadButtonVisible"
+    }
+};
+function findKeyVal(object, key, val) {
+    var value;
+    for (var k in object) {
+        if (k === key && object[k] === val) {
+            value = object;
+            break;
+        }
+        if (object[k] && typeof object[k] === "object") {
+            value = findKeyVal(object[k], key, val);
+            if (value !== undefined) {
+                break;
+            }
+        }
+    }
+    return value;
+}
+function apply_to_dataviews(ddl2, dermObj) {
+    ddl2.dataviews.forEach(apply_to_dataview);
+    function apply_to_dataview(dv) {
+        var widgetId = dv.id;
+        var dermPanelObj = findKeyVal(dermObj, "__id", widgetId);
+        if (dermPanelObj) {
+            var dermPanelProps = dermPanelObj.__properties;
+            var dermWidgetObj = dermPanelObj.__properties.chart ? dermPanelObj.__properties.chart : dermPanelObj.__properties.widget;
+            var dermWidgetProps = dermWidgetObj.__properties;
+            apply_class_mapping(dermWidgetObj);
+            apply_panel_property_mapping(dermPanelProps, dermWidgetProps);
+            apply_widget_property_mapping(dermPanelProps, dermWidgetProps);
+            if (dv.visualization.properties.chartType) {
+                dv.visualization.properties.charttype = dv.visualization.properties.chartType;
+            }
+        }
+        else {
+            console.warn(widgetId + " not found in dermObj");
+        }
+        function apply_class_mapping(dermWidgetObj) {
+            dv.visualization.__class = swap_with_supported_class(dermWidgetObj.__class);
+            dv.visualization.properties.__class = "marshaller_VizChartPanel";
+            if (!dv.visualization.properties.widget)
+                dv.visualization.properties.widget = {};
+            dv.visualization.properties.widget.__class = dv.visualization.__class;
+            function swap_with_supported_class(_class) {
+                return classMappings[_class] ? classMappings[_class] : _class;
+            }
+        }
+        function apply_panel_property_mapping(dermPanelProps, dermWidgetProps) {
+            dv.visualization.title = dermPanelProps.title || "";
+            dv.visualization.description = "";
+            dv.visualization.visibility = dv.visualization.visibility === "flyout" ? "flyout" : "normal";
+            dv.visualization.chartType = dv.visualization.__class.split("_")[1];
+            for (var propName in dermPanelProps) {
+                if (typeof propertyMappings[propName] !== "undefined") {
+                    var newPropName = propertyMappings[propName].name;
+                    if (typeof propertyMappings[propName].transform === "function") {
+                        dv.visualization.properties[newPropName] = propertyMappings[propName].transform(dermPanelProps[propName]);
+                    }
+                    else {
+                        dv.visualization.properties[newPropName] = dermPanelProps[propName];
+                    }
+                }
+            }
+            if (dermWidgetProps && dermWidgetProps.showLegend && dv.visualization.properties) {
+                dv.visualization.properties.legendVisible = true;
+            }
+        }
+        function apply_widget_property_mapping(dermPanelProps, dermWidgetProps) {
+            dv.visualization.title = dv.visualization.title || dermWidgetProps.title || "";
+            dv.visualization.description = ""; // TODO - should this map to anything?
+            dv.visualization.visibility = dv.visualization.visibility === "flyout" ? "flyout" : "normal";
+            dv.visualization.chartType = dv.visualization.__class.split("_")[1];
+            var _loop_1 = function (propName) {
+                if (typeof propertyMappings[propName] !== "undefined") {
+                    if (propertyMappings[propName] instanceof Array) {
+                        propertyMappings[propName].forEach(function (p) {
+                            var newPropName = p.name;
+                            dv.visualization.properties.widget[newPropName] = p.transform(dermWidgetProps[propName]);
+                            if (typeof propertyMappings[propName].transform === "function") {
+                                dv.visualization.properties.widget[newPropName] = propertyMappings[propName].transform(dermWidgetProps[propName]);
+                            }
+                            else {
+                                dv.visualization.properties.widget[newPropName] = dermWidgetProps[propName];
+                            }
+                        });
+                    }
+                    else {
+                        var newPropName = propertyMappings[propName].name;
+                        dv.visualization.properties.widget[newPropName] = propertyMappings[propName].transform(dermWidgetProps[propName]);
+                    }
+                }
+            };
+            for (var propName in dermWidgetProps) {
+                _loop_1(propName);
+            }
+        }
+    }
+}
+function apply_to_properties_layout(ddl2, dermObj) {
+    var retVal = {
+        layout: []
+    };
+    if (!dermObj || !dermObj.__properties)
+        return;
+    dermObj.__properties.content.forEach(function (cell) {
+        var cellPosition = {
+            // TODO - if "id" could be avoided then layouts could apply to any dashboard with the same number of widgets
+            id: cell.__properties.widget.__id,
+            position: [
+                cell.__properties.gridCol,
+                cell.__properties.gridRow,
+                cell.__properties.gridColSpan,
+                cell.__properties.gridRowSpan
+            ]
+        };
+        retVal.layout.push(cellPosition);
+    });
+    return retVal;
+}
+function upgrade$1(ddl2, dermObj) {
+    apply_to_dataviews(ddl2, dermObj);
+    return apply_to_properties_layout(ddl2, dermObj);
+}
+
+function faCharFix(faChar) {
+    return faChar;
+}
+var DDLUpgrade = /** @class */ (function () {
+    function DDLUpgrade(ddl, baseUrl, wuid, toLowerCase) {
+        if (baseUrl === void 0) { baseUrl = "http://localhost:8010"; }
+        if (wuid === void 0) { wuid = "WUID"; }
+        if (toLowerCase === void 0) { toLowerCase = true; }
+        this._datasources = {};
+        this._datasourceUpdates = {};
+        this._visualizations = {};
+        this._ddl2Datasources = {};
+        this._ddl2DatasourceFields = {};
+        this._ddl2Dataviews = {};
+        this._ddl2DataviewActivities = {};
+        this._ddl = ddl;
+        this._baseUrl = baseUrl;
+        this._wuid = wuid;
+        this._toLowerCase = toLowerCase;
+        this.indexDDL();
+        this.readDDL();
+    }
+    DDLUpgrade.prototype.toLowerCase = function (s) {
+        return this._toLowerCase ? s.toLowerCase() : s;
+    };
+    DDLUpgrade.prototype.isVizDatasourceRoxie = function (viz) {
+        if (viz.source) {
+            var ds = this._datasources[viz.source.id];
+            if (isHipieDatasource(ds)) {
+                return true;
+            }
+        }
+        return false;
+    };
+    DDLUpgrade.prototype.getDatasourceOutputs = function (dsID, vizID) {
+        var retVal = [];
+        var datasource = this._datasources[dsID];
+        for (var _i = 0, _a = datasource.outputs; _i < _a.length; _i++) {
+            var output = _a[_i];
+            if (output.notify) {
+                for (var _b = 0, _c = output.notify; _b < _c.length; _b++) {
+                    var notify = _c[_b];
+                    if (notify === vizID) {
+                        retVal.push({
+                            datasource: datasource,
+                            output: output
+                        });
+                    }
+                }
+            }
+        }
+        return retVal;
+    };
+    DDLUpgrade.prototype.getDatasourceFilters = function (dsID, vizID) {
+        var retVal = {};
+        for (var _i = 0, _a = this.getDatasourceOutputs(dsID, vizID); _i < _a.length; _i++) {
+            var dsOut = _a[_i];
+            if (dsOut.output.filter) {
+                for (var _b = 0, _c = dsOut.output.filter; _b < _c.length; _b++) {
+                    var filter = _c[_b];
+                    retVal[filter.fieldid] = {
+                        datasource: dsOut.datasource,
+                        output: dsOut.output,
+                        filter: filter
+                    };
+                }
+            }
+        }
+        return retVal;
+    };
+    DDLUpgrade.prototype.indexDDL = function () {
+        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
+            var dash = _a[_i];
+            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
+                var viz = _c[_b];
+                this._visualizations[viz.id] = viz;
+            }
+        }
+        for (var _d = 0, _e = this._ddl.datasources; _d < _e.length; _d++) {
+            var ds = _e[_d];
+            this._datasources[ds.id] = ds;
+            for (var _f = 0, _g = ds.outputs; _f < _g.length; _f++) {
+                var output = _g[_f];
+                if (output.notify) {
+                    for (var _h = 0, _j = output.notify; _h < _j.length; _h++) {
+                        var notify = _j[_h];
+                        this._datasourceUpdates[notify] = {
+                            id: ds.id,
+                            output: output.from || output.id
+                        };
+                    }
+                }
+            }
+        }
+    };
+    DDLUpgrade.prototype.readDDL = function () {
+        for (var _i = 0, _a = this._ddl.datasources; _i < _a.length; _i++) {
+            var ds = _a[_i];
+            if (isWorkunitDatasource(ds)) {
+                var ddl2DS = {
+                    type: "wuresult",
+                    id: ds.id,
+                    url: this._baseUrl,
+                    wuid: this._wuid,
+                    outputs: {}
+                };
+                for (var _b = 0, _c = ds.outputs; _b < _c.length; _b++) {
+                    var output = _c[_b];
+                    this.output2output(output, ddl2DS.outputs);
+                }
+                this._ddl2Datasources[ds.id] = ddl2DS;
+            }
+            else if (isDatabombDatasource(ds)) ;
+            else {
+                var urlParts = ds.URL.split("/WsEcl/submit/query/");
+                var hostParts = urlParts[0];
+                var roxieParts = urlParts[1].split("/");
+                var ddl2DS = {
+                    type: "hipie",
+                    id: ds.id,
+                    url: hostParts,
+                    querySet: roxieParts[0],
+                    queryID: roxieParts[1],
+                    inputs: [],
+                    outputs: {}
+                };
+                for (var _d = 0, _e = ds.outputs; _d < _e.length; _d++) {
+                    var output = _e[_d];
+                    this.output2output(output, ddl2DS.outputs);
+                }
+                this._ddl2Datasources[ds.id] = ddl2DS;
+            }
+        }
+        for (var _f = 0, _g = this._ddl.dashboards; _f < _g.length; _f++) {
+            var dash = _g[_f];
+            for (var _h = 0, _j = dash.visualizations; _h < _j.length; _h++) {
+                var viz = _j[_h];
+                if (viz.type === "FORM") {
+                    this._ddl2Datasources[viz.id] = {
+                        type: "form",
+                        id: viz.id,
+                        fields: this.formFields2field(viz.fields)
+                    };
+                    this._datasourceUpdates[viz.id] = { id: viz.id };
+                }
+                else if (viz.type === "SLIDER") {
+                    this._ddl2Datasources[viz.id] = {
+                        type: "form",
+                        id: viz.id,
+                        fields: this.formFields2field(viz.fields, true)
+                    };
+                    this._datasourceUpdates[viz.id] = { id: viz.id };
+                }
+                this._ddl2Dataviews[viz.id] = this.anyViz2view(viz);
+            }
+        }
+        this.readGroupBy();
+        this.readFilters();
+        this.readSort();
+        this.readMappings();
+    };
+    DDLUpgrade.prototype.readGroupBy = function () {
+        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
+            var dash = _a[_i];
+            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
+                var viz = _c[_b];
+                if (viz.fields) {
+                    var projectTransformations = [];
+                    var groupByColumns = [];
+                    var aggrFields = [];
+                    for (var _d = 0, _e = viz.fields; _d < _e.length; _d++) {
+                        var field = _e[_d];
+                        if (field.properties && field.properties.function) {
+                            switch (field.properties.function) {
+                                case "SUM":
+                                case "MIN":
+                                case "MAX":
+                                    aggrFields.push({
+                                        type: this.func2aggr(field.properties.function),
+                                        inFieldID: this.toLowerCase(field.properties.params.param1),
+                                        fieldID: this.toLowerCase(field.id)
+                                    });
+                                    break;
+                                case "AVE":
+                                    aggrFields.push({
+                                        type: this.func2aggr(field.properties.function),
+                                        inFieldID: this.toLowerCase(field.properties.params.param1),
+                                        baseCountFieldID: field.properties.params.param2 ? this.toLowerCase(field.properties.params.param2) : undefined,
+                                        fieldID: this.toLowerCase(field.id)
+                                    });
+                                    break;
+                                case "SCALE":
+                                    if (typeof field.properties.params.param1 === "object") {
+                                        var props = field.properties.params.param1;
+                                        switch (props.function) {
+                                            case "SUM":
+                                            case "MIN":
+                                            case "MAX":
+                                                aggrFields.push({
+                                                    type: this.func2aggr(props.function),
+                                                    inFieldID: this.toLowerCase(props.params.param1),
+                                                    fieldID: this.toLowerCase(field.id)
+                                                });
+                                                break;
+                                        }
+                                    }
+                                    projectTransformations.push({
+                                        type: "scale",
+                                        sourceFieldID: this.toLowerCase(field.id),
+                                        fieldID: this.toLowerCase(field.id),
+                                        factor: +field.properties.params.param2
+                                    });
+                                    break;
+                                default:
+                                    groupByColumns.push(this.toLowerCase(field.id));
+                                    throw new Error("Unhandled field function: ".concat(field.properties.function));
+                            }
+                        }
+                        else {
+                            groupByColumns.push(this.toLowerCase(field.id));
+                        }
+                    }
+                    if (projectTransformations.length) {
+                        this._ddl2DataviewActivities[viz.id].project.transformations = projectTransformations;
+                    }
+                    if (aggrFields.length) {
+                        this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray([], groupByColumns, true);
+                        this._ddl2DataviewActivities[viz.id].groupBy.aggregates = aggrFields;
+                    }
+                }
+            }
+        }
+    };
+    DDLUpgrade.prototype.func2aggr = function (func) {
+        switch (func) {
+            case "SUM":
+                return "sum";
+            case "AVE":
+                return "mean";
+            case "MIN":
+                return "min";
+            case "MAX":
+                return "max";
+        }
+        throw new Error("Unknown DDL1 Function Type:  ".concat(func));
+    };
+    DDLUpgrade.prototype.readMappings = function () {
+        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
+            var dash = _a[_i];
+            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
+                var viz = _c[_b];
+                if (isFormVisualization(viz)) ;
+                else if (isPieVisualization(viz)) {
+                    this.readPieMappings(viz);
+                }
+                else if (isChoroVisualization(viz)) {
+                    this.readChoroMappings(viz);
+                }
+                else if (isLineVisualization(viz)) {
+                    this.readLineMappings(viz);
+                }
+                else if (isTableVisualization(viz)) {
+                    this.readTableMappings(viz);
+                }
+                else if (isGraphVisualization(viz)) {
+                    this.readGraphMappings(viz);
+                }
+                else if (isSliderVisualization(viz)) {
+                    this.readSliderMappings(viz);
+                }
+                else {
+                    throw new Error("Unkown DDL1 mapping type:  ".concat(viz.type));
+                }
+            }
+        }
+    };
+    DDLUpgrade.prototype.readPieMappings = function (viz) {
+        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
+        mappings.transformations.push({
+            fieldID: "label",
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.mappings.label)
+        });
+        mappings.transformations.push({
+            fieldID: "weight",
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.mappings.weight[0])
+        });
+    };
+    DDLUpgrade.prototype.readChoroMappings = function (viz) {
+        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
+        mappings.transformations.push({
+            fieldID: "label",
+            type: "=",
+            sourceFieldID: this.toLowerCase(this.anyChoroMapping2label(viz.source.mappings))
+        });
+        mappings.transformations.push({
+            fieldID: "weight",
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.mappings.weight[0])
+        });
+    };
+    DDLUpgrade.prototype.anyChoroMapping2label = function (mapping) {
+        return mapping.state || mapping.county || mapping.geohash;
+    };
+    DDLUpgrade.prototype.readLineMappings = function (viz) {
+        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
+        mappings.transformations.push({
+            fieldID: viz.source.mappings.x[0],
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.mappings.x[0])
+        });
+        for (var i = 0; i < viz.source.mappings.y.length; ++i) {
+            mappings.transformations.push({
+                fieldID: viz.source.mappings.y[i],
+                type: "=",
+                sourceFieldID: this.toLowerCase(viz.source.mappings.y[i])
+            });
+        }
+    };
+    DDLUpgrade.prototype.readTableMappings = function (viz) {
+        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
+        for (var i = 0; i < viz.label.length; ++i) {
+            mappings.transformations.push({
+                fieldID: viz.label[i],
+                type: "=",
+                sourceFieldID: this.toLowerCase(viz.source.mappings.value[i])
+            });
+        }
+    };
+    DDLUpgrade.prototype.readGraphEnums = function (valueMappings, annotation) {
+        if (annotation === void 0) { annotation = false; }
+        var retVal = [];
+        if (valueMappings) {
+            for (var value in valueMappings) {
+                var newValue = {};
+                for (var key in valueMappings[value]) {
+                    if (key === "faChar") {
+                        newValue[key] = faCharFix(valueMappings[value][key]);
+                    }
+                    else if (annotation && key.indexOf("icon_") === 0) {
+                        console.log("Deprecated flag property:  " + key);
+                        newValue[key.split("icon_")[1]] = valueMappings[value][key];
+                    }
+                    else {
+                        newValue[key] = valueMappings[value][key];
+                    }
+                }
+                //  remove v1.x "0" annotations as they equated to "nothing"  ---
+                if (!annotation || value !== "0") {
+                    retVal.push({
+                        value: value,
+                        newValue: newValue
+                    });
+                }
+            }
+        }
+        return retVal;
+    };
+    DDLUpgrade.prototype.readGraphMappings = function (viz) {
+        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
+        mappings.transformations.push({
+            fieldID: "uid",
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.mappings.uid)
+        });
+        mappings.transformations.push({
+            fieldID: "label",
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.mappings.label)
+        });
+        if (viz.icon.fieldid) {
+            mappings.transformations.push({
+                fieldID: "icon",
+                type: "map",
+                sourceFieldID: this.toLowerCase(viz.icon.fieldid),
+                default: { fachar: faCharFix(viz.icon.faChar) },
+                mappings: this.readGraphEnums(viz.icon.valuemappings)
+            });
+        }
+        var idx = 0;
+        if (viz.flag) {
+            for (var _i = 0, _a = viz.flag; _i < _a.length; _i++) {
+                var flag = _a[_i];
+                if (flag.fieldid) {
+                    mappings.transformations.push({
+                        fieldID: "annotation_".concat(idx++),
+                        type: "map",
+                        sourceFieldID: this.toLowerCase(flag.fieldid),
+                        default: {},
+                        mappings: this.readGraphEnums(flag.valuemappings, true)
+                    });
+                }
+            }
+        }
+        mappings.transformations.push({
+            fieldID: "links",
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.link.childfile),
+            transformations: [{
+                    fieldID: "uid",
+                    type: "=",
+                    sourceFieldID: this.toLowerCase(viz.source.link.mappings.uid)
+                }]
+        });
+    };
+    DDLUpgrade.prototype.readSliderMappings = function (viz) {
+        var mappings = this._ddl2DataviewActivities[viz.id].mappings;
+        mappings.transformations.push({
+            fieldID: "label",
+            type: "=",
+            sourceFieldID: this.toLowerCase(viz.source.mappings.label)
+        });
+    };
+    DDLUpgrade.prototype.readFilters = function () {
+        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
+            var dash = _a[_i];
+            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
+                var viz = _c[_b];
+                if (viz.events) {
+                    for (var eventID in viz.events) {
+                        var event_1 = viz.events[eventID];
+                        for (var _d = 0, _e = event_1.updates; _d < _e.length; _d++) {
+                            var update = _e[_d];
+                            var otherViz = this._ddl2Dataviews[update.visualization];
+                            var dsFilters = this.getDatasourceFilters(update.datasource, otherViz.id);
+                            if (update.mappings) {
+                                if (isRoxieServiceRef(otherViz.datasource)) {
+                                    for (var key in update.mappings) {
+                                        otherViz.datasource.request.push({
+                                            source: viz.id,
+                                            remoteFieldID: this.toLowerCase(key),
+                                            localFieldID: this.toLowerCase(update.mappings[key])
+                                        });
+                                    }
+                                }
+                                else {
+                                    var condition = {
+                                        viewID: viz.id,
+                                        mappings: []
+                                    };
+                                    for (var key in update.mappings) {
+                                        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, "\""));
+                                        }
+                                        else {
+                                            condition.mappings.push({
+                                                remoteFieldID: this.toLowerCase(key),
+                                                localFieldID: this.toLowerCase(update.mappings[key]),
+                                                condition: this.rule2condition(dsFilter.rule),
+                                                nullable: dsFilter.nullable
+                                            });
+                                        }
+                                    }
+                                    this._ddl2DataviewActivities[otherViz.id].filters.conditions.push(condition);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    };
+    DDLUpgrade.prototype.rule2condition = function (_) {
+        switch (_) {
+            case "set":
+                return "in";
+            case "notequals":
+                return "!=";
+        }
+        return _;
+    };
+    DDLUpgrade.prototype.readSort = function () {
+        var _this = this;
+        for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
+            var dash = _a[_i];
+            for (var _b = 0, _c = dash.visualizations; _b < _c.length; _b++) {
+                var viz = _c[_b];
+                if (viz.source) {
+                    if (viz.source.sort) {
+                        var vizSort = this._ddl2DataviewActivities[viz.id].sort;
+                        vizSort.conditions = viz.source.sort.map(function (s) {
+                            if (s.indexOf("-") === 0) {
+                                return {
+                                    fieldID: _this.toLowerCase(s.substr(1)),
+                                    descending: true
+                                };
+                            }
+                            return {
+                                fieldID: _this.toLowerCase(s),
+                                descending: false
+                            };
+                        });
+                    }
+                    if (viz.source.first) {
+                        var vizLimit = this._ddl2DataviewActivities[viz.id].limit;
+                        vizLimit.limit = +viz.source.first;
+                    }
+                }
+            }
+        }
+    };
+    DDLUpgrade.prototype.anyViz2view = function (viz) {
+        var project = {
+            type: "project",
+            transformations: []
+        };
+        var filters = {
+            type: "filter",
+            conditions: []
+        };
+        var groupBy = {
+            type: "groupby",
+            groupByIDs: [],
+            aggregates: []
+        };
+        var sort = {
+            type: "sort",
+            conditions: []
+        };
+        var limit = {
+            type: "limit",
+            limit: 0
+        };
+        var mappings = {
+            type: "mappings",
+            transformations: []
+        };
+        this._ddl2DataviewActivities[viz.id] = {
+            project: project,
+            filters: filters,
+            sort: sort,
+            groupBy: groupBy,
+            limit: limit,
+            mappings: mappings
+        };
+        var datasourceRef = this.isVizDatasourceRoxie(viz) ? {
+            id: this._datasourceUpdates[viz.id].id,
+            request: [],
+            output: this._datasourceUpdates[viz.id].output
+        } : {
+            id: this._datasourceUpdates[viz.id].id,
+            output: this._datasourceUpdates[viz.id].output
+        };
+        return {
+            id: viz.id,
+            datasource: datasourceRef,
+            activities: [
+                project,
+                filters,
+                sort,
+                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 || {}) })
+        };
+    };
+    DDLUpgrade.prototype.type2chartType = function (chartType) {
+        switch (chartType) {
+            case "LINE":
+                return { chartType: "Line", __class: "chart_Line" };
+            case "BUBBLE":
+                return { chartType: "Bubble", __class: "chart_Bubble" };
+            case "PIE":
+                return { chartType: "Pie", __class: "chart_Pie" };
+            case "BAR":
+                return { chartType: "Column", __class: "chart_Column" };
+            case "FORM":
+                return { chartType: "FieldForm", __class: "form_FieldForm" };
+            case "WORD_CLOUD":
+                return { chartType: "WordCloud", __class: "chart_WordCloud" };
+            case "CHORO":
+                return { chartType: "ChoroplethStates", __class: "map_ChoroplethStates" };
+            case "SUMMARY":
+                return { chartType: "Summary", __class: "chart_Summary" };
+            case "SLIDER":
+                return { chartType: "FieldForm", __class: "form_FieldForm" };
+            case "HEAT_MAP":
+                return { chartType: "HeatMap", __class: "other_HeatMap" };
+            case "2DCHART":
+                return { chartType: "Column", __class: "chart_Column" };
+            case "GRAPH":
+                return { chartType: "AdjacencyGraph", __class: "graph_AdjacencyGraph" };
+            case "TABLE":
+            default:
+                return { chartType: "Table", __class: "dgrid_Table" };
+        }
+    };
+    DDLUpgrade.prototype.formFields2field = function (fields, slider) {
+        var _this = this;
+        if (slider === void 0) { slider = false; }
+        if (!fields)
+            return [];
+        return fields.map(function (field) {
+            switch (field.properties.type) {
+                case "range":
+                    return {
+                        type: "range",
+                        id: field.id,
+                        default: (field.properties.default ? field.properties.default : undefined)
+                    };
+                case "dataset":
+                    return {
+                        type: "dataset",
+                        id: field.id,
+                        default: [],
+                        children: []
+                    };
+                default:
+                    return {
+                        type: _this.formFieldType2fieldType(field.properties.datatype, slider),
+                        id: field.id,
+                        default: field.properties.default ? field.properties.default[0] : undefined
+                    };
+            }
+        });
+    };
+    DDLUpgrade.prototype.formFieldType2fieldType = function (fieldType, slider) {
+        switch (fieldType) {
+            case "bool":
+            case "boolean":
+                return "boolean";
+            case "integer":
+            case "unsigned":
+            case "float":
+            case "double":
+            case "real":
+                return "number";
+            case "string":
+                return "string";
+            default:
+                return slider ? "number" : "string";
+        }
+    };
+    DDLUpgrade.prototype.output2output = function (output, target) {
+        target[output.from || output.id] = {
+            fields: this.filters2fields(output.filter)
+        };
+    };
+    DDLUpgrade.prototype.filters2fields = function (filters) {
+        if (!filters)
+            return [];
+        return filters.filter(function (filter) {
+            var idParts = filter.fieldid.split("-");
+            return idParts.length === 1 || idParts[1] === "range";
+        }).map(function (filter) {
+            var idParts = filter.fieldid.split("-");
+            var retVal = {
+                type: "string",
+                id: idParts[0]
+            };
+            return retVal;
+        });
+    };
+    DDLUpgrade.prototype.getVizField = function (vizID, fieldID) {
+        return {
+            type: "string",
+            id: "",
+            default: ""
+        };
+    };
+    DDLUpgrade.prototype.writeDatasources = function () {
+        var retVal = [];
+        for (var id in this._ddl2Datasources) {
+            retVal.push(this._ddl2Datasources[id]);
+        }
+        return retVal;
+    };
+    DDLUpgrade.prototype.writeDataviews = function () {
+        var retVal = [];
+        for (var id in this._ddl2Dataviews) {
+            retVal.push(this._ddl2Dataviews[id]);
+        }
+        return retVal;
+    };
+    DDLUpgrade.prototype.writeProperties = function () {
+        return {
+        //  TODO
+        };
+    };
+    DDLUpgrade.prototype.write = function () {
+        return {
+            version: "2.2.1",
+            createdBy: {
+                name: PKG_NAME,
+                version: PKG_VERSION
+            },
+            datasources: this.writeDatasources(),
+            dataviews: this.writeDataviews(),
+            properties: this.writeProperties()
+        };
+    };
+    return DDLUpgrade;
+}());
+function upgrade(ddl, baseUrl, wuid, toLowerCase, dermatologyJson) {
+    if (toLowerCase === void 0) { toLowerCase = true; }
+    if (dermatologyJson === void 0) { dermatologyJson = {}; }
+    var ddlUp = new DDLUpgrade(ddl, baseUrl, wuid, toLowerCase);
+    var retVal = ddlUp.write();
+    retVal.properties = upgrade$1(retVal, dermatologyJson);
+    return retVal;
 }
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
-function unwrapExports (x) {
-	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
-}
-
-function createCommonjsModule(fn, basedir, module) {
-	return module = {
-	  path: basedir,
-	  exports: {},
-	  require: function (path, base) {
-      return commonjsRequire(path, (base === undefined || base === null) ? module.path : base);
-    }
-	}, fn(module, module.exports), module.exports;
-}
-
-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 = {exports: {}};
 
-var uri_all = createCommonjsModule(function (module, exports) {
 /** @license URI.js v4.4.1 (c) 2011 Gary Court. License: http://github.com/garycourt/uri-js */
+
+(function (module, exports) {
 (function (global, factory) {
-	 factory(exports) ;
+	factory(exports) ;
 }(commonjsGlobal, (function (exports) {
 function merge() {
     for (var _len = arguments.length, sets = Array(_len), _key = 0; _key < _len; _key++) {
@@ -1150,10 +1146,10 @@ function buildExps(isIRI) {
         //subset, excludes bidi control characters
     IPRIVATE$$ = isIRI ? "[\\uE000-\\uF8FF]" : "[]",
         //subset
-    UNRESERVED$$ = merge(ALPHA$$, DIGIT$$, "[\\-\\.\\_\\~]", UCSCHAR$$),
-        SCHEME$ = subexp(ALPHA$$ + merge(ALPHA$$, DIGIT$$, "[\\+\\-\\.]") + "*"),
-        USERINFO$ = subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]")) + "*"),
-        DEC_OCTET_RELAXED$ = subexp(subexp("25[0-5]") + "|" + subexp("2[0-4]" + DIGIT$$) + "|" + subexp("1" + DIGIT$$ + DIGIT$$) + "|" + subexp("0?[1-9]" + DIGIT$$) + "|0?0?" + DIGIT$$),
+    UNRESERVED$$ = merge(ALPHA$$, DIGIT$$, "[\\-\\.\\_\\~]", UCSCHAR$$);
+        subexp(ALPHA$$ + merge(ALPHA$$, DIGIT$$, "[\\+\\-\\.]") + "*");
+        subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]")) + "*");
+        var DEC_OCTET_RELAXED$ = subexp(subexp("25[0-5]") + "|" + subexp("2[0-4]" + DIGIT$$) + "|" + subexp("1" + DIGIT$$ + DIGIT$$) + "|" + subexp("0?[1-9]" + DIGIT$$) + "|0?0?" + DIGIT$$),
         //relaxed parsing rules
     IPV4ADDRESS$ = subexp(DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$ + "\\." + DEC_OCTET_RELAXED$),
         H16$ = subexp(HEXDIG$$ + "{1,4}"),
@@ -1177,14 +1173,14 @@ function buildExps(isIRI) {
     IPV6ADDRESS9$ = subexp(subexp(subexp(H16$ + "\\:") + "{0,6}" + H16$) + "?\\:\\:"),
         //[ *6( h16 ":" ) h16 ] "::"
     IPV6ADDRESS$ = subexp([IPV6ADDRESS1$, IPV6ADDRESS2$, IPV6ADDRESS3$, IPV6ADDRESS4$, IPV6ADDRESS5$, IPV6ADDRESS6$, IPV6ADDRESS7$, IPV6ADDRESS8$, IPV6ADDRESS9$].join("|")),
-        ZONEID$ = subexp(subexp(UNRESERVED$$ + "|" + PCT_ENCODED$) + "+"),
+        ZONEID$ = subexp(subexp(UNRESERVED$$ + "|" + PCT_ENCODED$) + "+");
         //RFC 6874, with relaxed parsing rules
-    IPVFUTURE$ = subexp("[vV]" + HEXDIG$$ + "+\\." + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]") + "+"),
+    subexp("[vV]" + HEXDIG$$ + "+\\." + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:]") + "+");
         //RFC 6874
-    REG_NAME$ = subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$)) + "*"),
-        PCHAR$ = subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:\\@]")),
-        SEGMENT_NZ_NC$ = subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\@]")) + "+"),
-        QUERY$ = subexp(subexp(PCHAR$ + "|" + merge("[\\/\\?]", IPRIVATE$$)) + "*");
+    subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$)) + "*");
+        var PCHAR$ = subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\:\\@]"));
+        subexp(subexp(PCT_ENCODED$ + "|" + merge(UNRESERVED$$, SUB_DELIMS$$, "[\\@]")) + "+");
+        subexp(subexp(PCHAR$ + "|" + merge("[\\/\\?]", IPRIVATE$$)) + "*");
     return {
         NOT_SCHEME: new RegExp(merge("[^]", ALPHA$$, DIGIT$$, "[\\+\\-\\.]"), "g"),
         NOT_USERINFO: new RegExp(merge("[^\\%\\:]", UNRESERVED$$, SUB_DELIMS$$), "g"),
@@ -2298,7 +2294,7 @@ var handler$3 = {
 
 var O = {};
 //RFC 3986
-var UNRESERVED$$ = "[A-Za-z0-9\\-\\.\\_\\~" + ( "\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF" ) + "]";
+var UNRESERVED$$ = "[A-Za-z0-9\\-\\.\\_\\~" + ("\\xA0-\\u200D\\u2010-\\u2029\\u202F-\\uD7FF\\uF900-\\uFDCF\\uFDF0-\\uFFEF" ) + "]";
 var HEXDIG$$ = "[0-9A-Fa-f]"; //case-insensitive
 var PCT_ENCODED$ = subexp(subexp("%[EFef]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%[89A-Fa-f]" + HEXDIG$$ + "%" + HEXDIG$$ + HEXDIG$$) + "|" + subexp("%" + HEXDIG$$ + HEXDIG$$)); //expanded
 //RFC 5322, except these symbols as per RFC 6068: @ : / ? # [ ] & ; =
@@ -2496,25 +2492,20 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 })));
 
-});
+}(uri_all, uri_all.exports));
+
+// do not edit .js files directly - edit src/index.jst
 
-unwrapExports(uri_all);
 
-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;)
@@ -2522,41 +2513,35 @@ var fastDeepEqual = function equal(a, b) {
       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 = function ucs2length(str) {
+var ucs2length$1 = function ucs2length(str) {
   var length = 0
     , len = str.length
     , pos = 0
@@ -2573,20 +2558,18 @@ var ucs2length = function ucs2length(str) {
   return length;
 };
 
-var util = {
+var util$5 = {
   copy: copy,
   checkDataType: checkDataType,
   checkDataTypes: checkDataTypes,
   coerceToTypes: coerceToTypes,
-  toHash: toHash,
+  toHash: toHash$1,
   getProperty: getProperty,
   escapeQuotes: escapeQuotes,
   equal: fastDeepEqual,
-  ucs2length: ucs2length,
+  ucs2length: ucs2length$1,
   varOccurences: varOccurences,
   varReplace: varReplace,
-  cleanUpCode: cleanUpCode,
-  finalCleanUpCode: finalCleanUpCode,
   schemaHasRules: schemaHasRules,
   schemaHasRulesExcept: schemaHasRulesExcept,
   schemaUnknownRules: schemaUnknownRules,
@@ -2608,7 +2591,7 @@ function copy(o, to) {
 }
 
 
-function checkDataType(dataType, data, negate) {
+function checkDataType(dataType, data, strictNumbers, negate) {
   var EQUAL = negate ? ' !== ' : ' === '
     , AND = negate ? ' || ' : ' && '
     , OK = negate ? '!' : ''
@@ -2621,18 +2604,21 @@ function checkDataType(dataType, data, negate) {
                           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(dataTypes);
+      var types = toHash$1(dataTypes);
       if (types.array && types.object) {
         code = types.null ? '(': '(!' + data + ' || ';
         code += 'typeof ' + data + ' !== "object")';
@@ -2642,14 +2628,14 @@ function checkDataTypes(dataTypes, data) {
       }
       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([ 'string', 'number', 'integer', 'boolean', 'null' ]);
+var COERCE_TO_TYPES = toHash$1([ 'string', 'number', 'integer', 'boolean', 'null' ]);
 function coerceToTypes(optionCoerceTypes, dataTypes) {
   if (Array.isArray(dataTypes)) {
     var types = [];
@@ -2667,19 +2653,19 @@ function coerceToTypes(optionCoerceTypes, dataTypes) {
 }
 
 
-function toHash(arr) {
+function toHash$1(arr) {
   var hash = {};
   for (var i=0; i<arr.length; i++) hash[arr[i]] = true;
   return hash;
 }
 
 
-var IDENTIFIER = /^[a-z$_][a-z$_0-9]*$/i;
+var IDENTIFIER$1 = /^[a-z$_][a-z$_0-9]*$/i;
 var SINGLE_QUOTE = /'|\\/g;
 function getProperty(key) {
   return typeof key == 'number'
           ? '[' + key + ']'
-          : IDENTIFIER.test(key)
+          : IDENTIFIER$1.test(key)
             ? '.' + key
             : "['" + escapeQuotes(key) + "']";
 }
@@ -2708,42 +2694,6 @@ function varReplace(str, dataVar, expr) {
 }
 
 
-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;
@@ -2783,17 +2733,17 @@ function getPath(currentPath, prop, jsonPointers) {
 }
 
 
-var JSON_POINTER = /^\/(?:[^~]|~0|~1)*$/;
-var RELATIVE_JSON_POINTER = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
+var JSON_POINTER$1 = /^\/(?:[^~]|~0|~1)*$/;
+var RELATIVE_JSON_POINTER$1 = /^([0-9]+)(#|\/(?:[^~]|~0|~1)*)?$/;
 function getData($data, lvl, paths) {
   var up, jsonPointer, data, matches;
   if ($data === '') return 'rootData';
   if ($data[0] == '/') {
-    if (!JSON_POINTER.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
+    if (!JSON_POINTER$1.test($data)) throw new Error('Invalid JSON-pointer: ' + $data);
     jsonPointer = $data;
     data = 'rootData';
   } else {
-    matches = $data.match(RELATIVE_JSON_POINTER);
+    matches = $data.match(RELATIVE_JSON_POINTER$1);
     if (!matches) throw new Error('Invalid JSON-pointer: ' + $data);
     up = +matches[1];
     jsonPointer = matches[2];
@@ -2822,7 +2772,7 @@ function getData($data, lvl, paths) {
 
 function joinPaths (a, b) {
   if (a == '""') return b;
-  return (a + ' + ' + b).replace(/' \+ '/g, '');
+  return (a + ' + ' + b).replace(/([^\\])' \+ '/g, '$1');
 }
 
 
@@ -2845,15 +2795,17 @@ function unescapeJsonPointer(str) {
   return str.replace(/~1/g, '/').replace(/~0/g, '~');
 }
 
-var schema_obj = SchemaObject;
+var util$4 = util$5;
+
+var schema_obj = SchemaObject$2;
 
-function SchemaObject(obj) {
-  util.copy(obj, this);
+function SchemaObject$2(obj) {
+  util$4.copy(obj, this);
 }
 
-var jsonSchemaTraverse = createCommonjsModule(function (module) {
+var jsonSchemaTraverse = {exports: {}};
 
-var traverse = module.exports = function (schema, opts, cb) {
+var traverse$1 = jsonSchemaTraverse.exports = function (schema, opts, cb) {
   // Legacy support for v0.3.1 and earlier.
   if (typeof opts == 'function') {
     cb = opts;
@@ -2868,7 +2820,7 @@ var traverse = module.exports = function (schema, opts, cb) {
 };
 
 
-traverse.keywords = {
+traverse$1.keywords = {
   additionalItems: true,
   items: true,
   contains: true,
@@ -2877,21 +2829,21 @@ traverse.keywords = {
   not: true
 };
 
-traverse.arrayKeywords = {
+traverse$1.arrayKeywords = {
   items: true,
   allOf: true,
   anyOf: true,
   oneOf: true
 };
 
-traverse.propsKeywords = {
+traverse$1.propsKeywords = {
   definitions: true,
   properties: true,
   patternProperties: true,
   dependencies: true
 };
 
-traverse.skipKeywords = {
+traverse$1.skipKeywords = {
   default: true,
   enum: true,
   const: true,
@@ -2919,16 +2871,16 @@ function _traverse(opts, pre, post, schema, jsonPtr, rootSchema, parentJsonPtr,
     for (var key in schema) {
       var sch = schema[key];
       if (Array.isArray(sch)) {
-        if (key in traverse.arrayKeywords) {
+        if (key in traverse$1.arrayKeywords) {
           for (var i=0; i<sch.length; i++)
             _traverse(opts, pre, post, sch[i], jsonPtr + '/' + key + '/' + i, rootSchema, jsonPtr, key, schema, i);
         }
-      } else if (key in traverse.propsKeywords) {
+      } else if (key in traverse$1.propsKeywords) {
         if (sch && typeof sch == 'object') {
           for (var prop in sch)
             _traverse(opts, pre, post, sch[prop], jsonPtr + '/' + key + '/' + escapeJsonPtr(prop), rootSchema, jsonPtr, key, schema, prop);
         }
-      } else if (key in traverse.keywords || (opts.allKeys && !(key in traverse.skipKeywords))) {
+      } else if (key in traverse$1.keywords || (opts.allKeys && !(key in traverse$1.skipKeywords))) {
         _traverse(opts, pre, post, sch, jsonPtr + '/' + key, rootSchema, jsonPtr, key, schema);
       }
     }
@@ -2940,16 +2892,21 @@ function _traverse(opts, pre, post, schema, jsonPtr, rootSchema, parentJsonPtr,
 function escapeJsonPtr(str) {
   return str.replace(/~/g, '~0').replace(/\//g, '~1');
 }
-});
 
-var resolve_1 = resolve;
+var URI$1 = uri_all.exports
+  , equal$1 = fastDeepEqual
+  , util$3 = util$5
+  , SchemaObject$1 = schema_obj
+  , traverse = jsonSchemaTraverse.exports;
+
+var resolve_1 = resolve$3;
 
-resolve.normalizeId = normalizeId;
-resolve.fullPath = getFullPath;
-resolve.url = resolveUrl;
-resolve.ids = resolveIds;
-resolve.inlineRef = inlineRef;
-resolve.schema = resolveSchema;
+resolve$3.normalizeId = normalizeId;
+resolve$3.fullPath = getFullPath;
+resolve$3.url = resolveUrl;
+resolve$3.ids = resolveIds;
+resolve$3.inlineRef = inlineRef;
+resolve$3.schema = resolveSchema;
 
 /**
  * [resolve and compile the references ($ref)]
@@ -2959,16 +2916,16 @@ resolve.schema = resolveSchema;
  * @param  {String} ref reference to resolve
  * @return {Object|Function} schema object (if the schema can be inlined) or validation function
  */
-function resolve(compile, root, ref) {
+function resolve$3(compile, root, ref) {
   /* jshint validthis: true */
   var refVal = this._refs[ref];
   if (typeof refVal == 'string') {
     if (this._refs[refVal]) refVal = this._refs[refVal];
-    else return resolve.call(this, compile, root, refVal);
+    else return resolve$3.call(this, compile, root, refVal);
   }
 
   refVal = refVal || this._schemas[ref];
-  if (refVal instanceof schema_obj) {
+  if (refVal instanceof SchemaObject$1) {
     return inlineRef(refVal.schema, this._opts.inlineRefs)
             ? refVal.schema
             : refVal.validate || this._compile(refVal);
@@ -2982,7 +2939,7 @@ function resolve(compile, root, ref) {
     baseId = res.baseId;
   }
 
-  if (schema instanceof schema_obj) {
+  if (schema instanceof SchemaObject$1) {
     v = schema.validate || compile.call(this, schema.schema, root, undefined, baseId);
   } else if (schema !== undefined) {
     v = inlineRef(schema, this._opts.inlineRefs)
@@ -3003,7 +2960,7 @@ function resolve(compile, root, ref) {
  */
 function resolveSchema(root, ref) {
   /* jshint validthis: true */
-  var p = uri_all.parse(ref)
+  var p = URI$1.parse(ref)
     , refPath = _getFullPath(p)
     , baseId = getFullPath(this._getId(root.schema));
   if (Object.keys(root.schema).length === 0 || refPath !== baseId) {
@@ -3011,12 +2968,12 @@ function resolveSchema(root, ref) {
     var refVal = this._refs[id];
     if (typeof refVal == 'string') {
       return resolveRecursive.call(this, root, refVal, p);
-    } else if (refVal instanceof schema_obj) {
+    } else if (refVal instanceof SchemaObject$1) {
       if (!refVal.validate) this._compile(refVal);
       root = refVal;
     } else {
       refVal = this._schemas[id];
-      if (refVal instanceof schema_obj) {
+      if (refVal instanceof SchemaObject$1) {
         if (!refVal.validate) this._compile(refVal);
         if (id == normalizeId(ref))
           return { schema: refVal, root: root, baseId: baseId };
@@ -3047,7 +3004,7 @@ function resolveRecursive(root, ref, parsedRef) {
 }
 
 
-var PREVENT_SCOPE_CHANGE = util.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
+var PREVENT_SCOPE_CHANGE = util$3.toHash(['properties', 'patternProperties', 'enum', 'dependencies', 'definitions']);
 /* @this Ajv */
 function getJsonPointer(parsedRef, baseId, schema, root) {
   /* jshint validthis: true */
@@ -3058,7 +3015,7 @@ function getJsonPointer(parsedRef, baseId, schema, root) {
   for (var i = 1; i < parts.length; i++) {
     var part = parts[i];
     if (part) {
-      part = util.unescapeFragment(part);
+      part = util$3.unescapeFragment(part);
       schema = schema[part];
       if (schema === undefined) break;
       var id;
@@ -3082,7 +3039,7 @@ function getJsonPointer(parsedRef, baseId, schema, root) {
 }
 
 
-var SIMPLE_INLINED = util.toHash([
+var SIMPLE_INLINED = util$3.toHash([
   'type', 'format', 'pattern',
   'maxLength', 'minLength',
   'maxProperties', 'minProperties',
@@ -3142,13 +3099,13 @@ function countKeys(schema) {
 
 function getFullPath(id, normalize) {
   if (normalize !== false) id = normalizeId(id);
-  var p = uri_all.parse(id);
+  var p = URI$1.parse(id);
   return _getFullPath(p);
 }
 
 
 function _getFullPath(p) {
-  return uri_all.serialize(p).split('#')[0] + '#';
+  return URI$1.serialize(p).split('#')[0] + '#';
 }
 
 
@@ -3160,7 +3117,7 @@ function normalizeId(id) {
 
 function resolveUrl(baseId, id) {
   id = normalizeId(id);
-  return uri_all.resolve(baseId, id);
+  return URI$1.resolve(baseId, id);
 }
 
 
@@ -3172,25 +3129,25 @@ function resolveIds(schema) {
   var localRefs = {};
   var self = this;
 
-  jsonSchemaTraverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
+  traverse(schema, {allKeys: true}, function(sch, jsonPtr, rootSchema, parentJsonPtr, parentKeyword, parentSchema, keyIndex) {
     if (jsonPtr === '') return;
     var id = self._getId(sch);
     var baseId = baseIds[parentJsonPtr];
     var fullPath = fullPaths[parentJsonPtr] + '/' + parentKeyword;
     if (keyIndex !== undefined)
-      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util.escapeFragment(keyIndex));
+      fullPath += '/' + (typeof keyIndex == 'number' ? keyIndex : util$3.escapeFragment(keyIndex));
 
     if (typeof id == 'string') {
-      id = baseId = normalizeId(baseId ? uri_all.resolve(baseId, id) : id);
+      id = baseId = normalizeId(baseId ? URI$1.resolve(baseId, id) : id);
 
       var refVal = self._refs[id];
       if (typeof refVal == 'string') refVal = self._refs[refVal];
       if (refVal && refVal.schema) {
-        if (!fastDeepEqual(sch, refVal.schema))
+        if (!equal$1(sch, refVal.schema))
           throw new Error('id "' + id + '" resolves to more than one schema');
       } else if (id != normalizeId(fullPath)) {
         if (id[0] == '#') {
-          if (localRefs[id] && !fastDeepEqual(sch, localRefs[id]))
+          if (localRefs[id] && !equal$1(sch, localRefs[id]))
             throw new Error('id "' + id + '" resolves to more than one schema');
           localRefs[id] = sch;
         } else {
@@ -3205,28 +3162,30 @@ function resolveIds(schema) {
   return localRefs;
 }
 
+var resolve$2 = resolve_1;
+
 var error_classes = {
-  Validation: errorSubclass(ValidationError),
-  MissingRef: errorSubclass(MissingRefError)
+  Validation: errorSubclass(ValidationError$1),
+  MissingRef: errorSubclass(MissingRefError$1)
 };
 
 
-function ValidationError(errors) {
+function ValidationError$1(errors) {
   this.message = 'validation failed';
   this.errors = errors;
   this.ajv = this.validation = true;
 }
 
 
-MissingRefError.message = function (baseId, ref) {
+MissingRefError$1.message = function (baseId, ref) {
   return 'can\'t resolve reference ' + ref + ' from id ' + baseId;
 };
 
 
-function MissingRefError(baseId, ref, message) {
-  this.message = message || MissingRefError.message(baseId, ref);
-  this.missingRef = resolve_1.url(baseId, ref);
-  this.missingSchema = resolve_1.normalizeId(resolve_1.fullPath(this.missingRef));
+function MissingRefError$1(baseId, ref, message) {
+  this.message = message || MissingRefError$1.message(baseId, ref);
+  this.missingRef = resolve$2.url(baseId, ref);
+  this.missingSchema = resolve$2.normalizeId(resolve$2.fullPath(this.missingRef));
 }
 
 
@@ -3294,7 +3253,7 @@ var fastJsonStableStringify = function (data, opts) {
     })(data);
 };
 
-var validate = function generate_validate(it, $keyword, $ruleType) {
+var validate$1 = function generate_validate(it, $keyword, $ruleType) {
   var out = '';
   var $async = it.schema.$async === true,
     $refKeywords = it.util.schemaHasRulesExcept(it.schema, it.RULES.all, '$ref'),
@@ -3386,7 +3345,7 @@ var validate = function generate_validate(it, $keyword, $ruleType) {
     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);
@@ -3444,47 +3403,39 @@ var validate = function generate_validate(it, $keyword, $ruleType) {
       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 */
@@ -3524,7 +3475,7 @@ var validate = function generate_validate(it, $keyword, $ruleType) {
         } 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) + '; ';
@@ -3597,7 +3548,7 @@ var validate = function generate_validate(it, $keyword, $ruleType) {
         $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) {
@@ -3765,10 +3716,6 @@ var validate = function generate_validate(it, $keyword, $ruleType) {
   } 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;
@@ -3788,17 +3735,24 @@ var validate = function generate_validate(it, $keyword, $ruleType) {
   return out;
 };
 
+var resolve$1 = resolve_1
+  , util$2 = util$5
+  , errorClasses$1 = error_classes
+  , stableStringify$1 = fastJsonStableStringify;
+
+var validateGenerator = validate$1;
+
 /**
  * Functions below are used inside compiled validations function
  */
 
-var ucs2length$1 = util.ucs2length;
-
+var ucs2length = util$2.ucs2length;
+var equal = fastDeepEqual;
 
 // this error is thrown by async schemas to return validation errors via exception
-var ValidationError$1 = error_classes.Validation;
+var ValidationError = errorClasses$1.Validation;
 
-var compile_1 = compile;
+var compile_1 = compile$1;
 
 
 /**
@@ -3810,7 +3764,7 @@ var compile_1 = compile;
  * @param  {String} baseId base ID for IDs in the schema
  * @return {Function} validation function
  */
-function compile(schema, root, localRefs, baseId) {
+function compile$1(schema, root, localRefs, baseId) {
   /* jshint validthis: true, evil: true */
   /* eslint no-shadow: 0 */
   var self = this
@@ -3862,11 +3816,11 @@ function compile(schema, root, localRefs, baseId) {
   function localCompile(_schema, _root, localRefs, baseId) {
     var isRoot = !_root || (_root && _root.schema == _schema);
     if (_root.schema != root.schema)
-      return compile.call(self, _schema, _root, localRefs, baseId);
+      return compile$1.call(self, _schema, _root, localRefs, baseId);
 
     var $async = _schema.$async === true;
 
-    var sourceCode = validate({
+    var sourceCode = validateGenerator({
       isTop: true,
       schema: _schema,
       isRoot: isRoot,
@@ -3875,11 +3829,11 @@ function compile(schema, root, localRefs, baseId) {
       schemaPath: '',
       errSchemaPath: '#',
       errorPath: '""',
-      MissingRefError: error_classes.MissingRef,
+      MissingRefError: errorClasses$1.MissingRef,
       RULES: RULES,
-      validate: validate,
-      util: util,
-      resolve: resolve_1,
+      validate: validateGenerator,
+      util: util$2,
+      resolve: resolve$1,
       resolveRef: resolveRef,
       usePattern: usePattern,
       useDefault: useDefault,
@@ -3891,12 +3845,12 @@ function compile(schema, root, localRefs, baseId) {
     });
 
     sourceCode = vars(refVal, refValCode) + vars(patterns, patternCode)
-                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode)
+                   + vars(defaults, defaultCode) + vars(customRules, customRuleCode$1)
                    + sourceCode;
 
-    if (opts.processCode) sourceCode = opts.processCode(sourceCode);
+    if (opts.processCode) sourceCode = opts.processCode(sourceCode, _schema);
     // console.log('\n\n\n *** \n', JSON.stringify(sourceCode));
-    var validate$1;
+    var validate;
     try {
       var makeValidate = new Function(
         'self',
@@ -3912,7 +3866,7 @@ function compile(schema, root, localRefs, baseId) {
         sourceCode
       );
 
-      validate$1 = makeValidate(
+      validate = makeValidate(
         self,
         RULES,
         formats,
@@ -3920,36 +3874,36 @@ function compile(schema, root, localRefs, baseId) {
         refVal,
         defaults,
         customRules,
-        fastDeepEqual,
-        ucs2length$1,
-        ValidationError$1
+        equal,
+        ucs2length,
+        ValidationError
       );
 
-      refVal[0] = validate$1;
+      refVal[0] = validate;
     } catch(e) {
       self.logger.error('Error compiling schema, function code:', sourceCode);
       throw e;
     }
 
-    validate$1.schema = _schema;
-    validate$1.errors = null;
-    validate$1.refs = refs;
-    validate$1.refVal = refVal;
-    validate$1.root = isRoot ? validate$1 : _root;
-    if ($async) validate$1.$async = true;
+    validate.schema = _schema;
+    validate.errors = null;
+    validate.refs = refs;
+    validate.refVal = refVal;
+    validate.root = isRoot ? validate : _root;
+    if ($async) validate.$async = true;
     if (opts.sourceCode === true) {
-      validate$1.source = {
+      validate.source = {
         code: sourceCode,
         patterns: patterns,
         defaults: defaults
       };
     }
 
-    return validate$1;
+    return validate;
   }
 
   function resolveRef(baseId, ref, isRoot) {
-    ref = resolve_1.url(baseId, ref);
+    ref = resolve$1.url(baseId, ref);
     var refIndex = refs[ref];
     var _refVal, refCode;
     if (refIndex !== undefined) {
@@ -3967,13 +3921,13 @@ function compile(schema, root, localRefs, baseId) {
     }
 
     refCode = addLocalRef(ref);
-    var v = resolve_1.call(self, localCompile, root, ref);
+    var v = resolve$1.call(self, localCompile, root, ref);
     if (v === undefined) {
       var localSchema = localRefs && localRefs[ref];
       if (localSchema) {
-        v = resolve_1.inlineRef(localSchema, opts.inlineRefs)
+        v = resolve$1.inlineRef(localSchema, opts.inlineRefs)
             ? localSchema
-            : compile.call(self, localSchema, root, localRefs, baseId);
+            : compile$1.call(self, localSchema, root, localRefs, baseId);
       }
     }
 
@@ -4022,10 +3976,10 @@ function compile(schema, root, localRefs, baseId) {
       case 'number':
         return '' + value;
       case 'string':
-        return util.toQuotedString(value);
+        return util$2.toQuotedString(value);
       case 'object':
         if (value === null) return 'null';
-        var valueStr = fastJsonStableStringify(value);
+        var valueStr = stableStringify$1(value);
         var index = defaultsHash[valueStr];
         if (index === undefined) {
           index = defaultsHash[valueStr] = defaults.length;
@@ -4140,7 +4094,7 @@ function compIndex(schema, root, baseId) {
 
 
 function patternCode(i, patterns) {
-  return 'var pattern' + i + ' = new RegExp(' + util.toQuotedString(patterns[i]) + ');';
+  return 'var pattern' + i + ' = new RegExp(' + util$2.toQuotedString(patterns[i]) + ');';
 }
 
 
@@ -4154,7 +4108,7 @@ function refValCode(i, refVal) {
 }
 
 
-function customRuleCode(i) {
+function customRuleCode$1(i) {
   return 'var customRule' + i + ' = customRules[' + i + '];';
 }
 
@@ -4167,38 +4121,38 @@ function vars(arr, statement) {
   return code;
 }
 
-var cache = createCommonjsModule(function (module) {
-
+var cache = {exports: {}};
 
-var Cache = module.exports = function Cache() {
+var Cache$1 = cache.exports = function Cache() {
   this._cache = {};
 };
 
 
-Cache.prototype.put = function Cache_put(key, value) {
+Cache$1.prototype.put = function Cache_put(key, value) {
   this._cache[key] = value;
 };
 
 
-Cache.prototype.get = function Cache_get(key) {
+Cache$1.prototype.get = function Cache_get(key) {
   return this._cache[key];
 };
 
 
-Cache.prototype.del = function Cache_del(key) {
+Cache$1.prototype.del = function Cache_del(key) {
   delete this._cache[key];
 };
 
 
-Cache.prototype.clear = function Cache_clear() {
+Cache$1.prototype.clear = function Cache_clear() {
   this._cache = {};
 };
-});
+
+var util$1 = util$5;
 
 var DATE = /^(\d\d\d\d)-(\d\d)-(\d\d)$/;
 var DAYS = [0,31,28,31,30,31,30,31,31,30,31,30,31];
-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
@@ -4206,31 +4160,31 @@ var URITEMPLATE = /^(?:(?:[^\x00-\x20"'<>%\\^`{|}]|%[0-9a-f]{2})|\{[+#./;?&=,!@|
 // 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$1 = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
+var JSON_POINTER = /^(?:\/(?:[^~/]|~0|~1)*)*$/;
 var JSON_POINTER_URI_FRAGMENT = /^#(?:\/(?:[a-z0-9_\-.!$&'()*+,;:=@]|%[0-9a-f]{2}|~0|~1)*)*$/i;
-var RELATIVE_JSON_POINTER$1 = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
+var RELATIVE_JSON_POINTER = /^(?:0|[1-9][0-9]*)(?:#|(?:\/(?:[^~/]|~0|~1)*)*)$/;
 
 
-var formats_1 = formats;
+var formats_1 = formats$1;
 
-function formats(mode) {
+function formats$1(mode) {
   mode = mode == 'full' ? 'full' : 'fast';
-  return util.copy(formats[mode]);
+  return util$1.copy(formats$1[mode]);
 }
 
 
-formats.fast = {
+formats$1.fast = {
   // date: http://tools.ietf.org/html/rfc3339#section-5.6
   date: /^\d\d\d\d-[0-1]\d-[0-3]\d$/,
   // date-time: http://tools.ietf.org/html/rfc3339#section-5.6
-  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):
@@ -4247,14 +4201,14 @@ formats.fast = {
   uuid: UUID,
   // JSON-pointer: https://tools.ietf.org/html/rfc6901
   // uri fragment: https://tools.ietf.org/html/rfc3986#appendix-A
-  'json-pointer': JSON_POINTER$1,
+  'json-pointer': JSON_POINTER,
   'json-pointer-uri-fragment': JSON_POINTER_URI_FRAGMENT,
   // relative JSON-pointer: http://tools.ietf.org/html/draft-luff-relative-json-pointer-00
-  'relative-json-pointer': RELATIVE_JSON_POINTER$1
+  'relative-json-pointer': RELATIVE_JSON_POINTER
 };
 
 
-formats.full = {
+formats$1.full = {
   date: date,
   time: time,
   'date-time': date_time,
@@ -4263,14 +4217,14 @@ formats.full = {
   '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$1,
+  'json-pointer': JSON_POINTER,
   'json-pointer-uri-fragment': JSON_POINTER_URI_FRAGMENT,
-  'relative-json-pointer': RELATIVE_JSON_POINTER$1
+  'relative-json-pointer': RELATIVE_JSON_POINTER
 };
 
 
@@ -4316,13 +4270,6 @@ function date_time(str) {
 }
 
 
-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 "."
@@ -4483,7 +4430,7 @@ var allOf = function generate_allOf(it, $keyword, $ruleType) {
       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 + ']';
@@ -4504,7 +4451,6 @@ var allOf = function generate_allOf(it, $keyword, $ruleType) {
       out += ' ' + ($closingBraces.slice(0, -1)) + ' ';
     }
   }
-  out = it.util.cleanUpCode(out);
   return out;
 };
 
@@ -4524,7 +4470,7 @@ var anyOf = function generate_anyOf(it, $keyword, $ruleType) {
   $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;
@@ -4573,7 +4519,6 @@ var anyOf = function generate_anyOf(it, $keyword, $ruleType) {
     if (it.opts.allErrors) {
       out += ' } ';
     }
-    out = it.util.cleanUpCode(out);
   } else {
     if ($breakOnError) {
       out += ' if (true) { ';
@@ -4586,7 +4531,7 @@ var comment = function generate_comment(it, $keyword, $ruleType) {
   var out = ' ';
   var $schema = it.schema[$keyword];
   var $errSchemaPath = it.errSchemaPath + '/' + $keyword;
-  var $breakOnError = !it.opts.allErrors;
+  !it.opts.allErrors;
   var $comment = it.util.toQuotedString($schema);
   if (it.opts.$comment === true) {
     out += ' console.log(' + ($comment) + ');';
@@ -4667,7 +4612,7 @@ var contains = function generate_contains(it, $keyword, $ruleType) {
     $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;
@@ -4726,7 +4671,6 @@ var contains = function generate_contains(it, $keyword, $ruleType) {
   if (it.opts.allErrors) {
     out += ' } ';
   }
-  out = it.util.cleanUpCode(out);
   return out;
 };
 
@@ -4748,6 +4692,7 @@ var dependencies = function generate_dependencies(it, $keyword, $ruleType) {
     $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;
@@ -4873,7 +4818,7 @@ var dependencies = function generate_dependencies(it, $keyword, $ruleType) {
   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)) + '\') ';
@@ -4894,7 +4839,6 @@ var dependencies = function generate_dependencies(it, $keyword, $ruleType) {
   if ($breakOnError) {
     out += '   ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
   }
-  out = it.util.cleanUpCode(out);
   return out;
 };
 
@@ -5126,8 +5070,8 @@ var _if = function generate_if(it, $keyword, $ruleType) {
   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;
@@ -5205,7 +5149,6 @@ var _if = function generate_if(it, $keyword, $ruleType) {
     if ($breakOnError) {
       out += ' else { ';
     }
-    out = it.util.cleanUpCode(out);
   } else {
     if ($breakOnError) {
       out += ' if (true) { ';
@@ -5281,7 +5224,7 @@ var items = function generate_items(it, $keyword, $ruleType) {
         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;
@@ -5304,7 +5247,7 @@ var items = function generate_items(it, $keyword, $ruleType) {
         }
       }
     }
-    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';
@@ -5328,7 +5271,7 @@ var items = function generate_items(it, $keyword, $ruleType) {
         $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;
@@ -5351,7 +5294,6 @@ var items = function generate_items(it, $keyword, $ruleType) {
   if ($breakOnError) {
     out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
   }
-  out = it.util.cleanUpCode(out);
   return out;
 };
 
@@ -5380,6 +5322,12 @@ var _limit = function generate__limit(it, $keyword, $ruleType) {
     $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,
@@ -5530,6 +5478,9 @@ var _limitItems = function generate__limitItems(it, $keyword, $ruleType) {
   } else {
     $schemaValue = $schema;
   }
+  if (!($isData || typeof $schema == 'number')) {
+    throw new Error($keyword + ' must be number');
+  }
   var $op = $keyword == 'maxItems' ? '>' : '<';
   out += 'if ( ';
   if ($isData) {
@@ -5607,6 +5558,9 @@ var _limitLength = function generate__limitLength(it, $keyword, $ruleType) {
   } else {
     $schemaValue = $schema;
   }
+  if (!($isData || typeof $schema == 'number')) {
+    throw new Error($keyword + ' must be number');
+  }
   var $op = $keyword == 'maxLength' ? '>' : '<';
   out += 'if ( ';
   if ($isData) {
@@ -5689,6 +5643,9 @@ var _limitProperties = function generate__limitProperties(it, $keyword, $ruleTyp
   } else {
     $schemaValue = $schema;
   }
+  if (!($isData || typeof $schema == 'number')) {
+    throw new Error($keyword + ' must be number');
+  }
   var $op = $keyword == 'maxProperties' ? '>' : '<';
   out += 'if ( ';
   if ($isData) {
@@ -5765,6 +5722,9 @@ var multipleOf = function generate_multipleOf(it, $keyword, $ruleType) {
   } 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\' || ';
@@ -5838,7 +5798,7 @@ var not = function generate_not(it, $keyword, $ruleType) {
   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;
@@ -5936,7 +5896,7 @@ var oneOf = function generate_oneOf(it, $keyword, $ruleType) {
       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;
@@ -6057,7 +6017,7 @@ var pattern = function generate_pattern(it, $keyword, $ruleType) {
   return out;
 };
 
-var properties = function generate_properties(it, $keyword, $ruleType) {
+var properties$2 = function generate_properties(it, $keyword, $ruleType) {
   var out = ' ';
   var $lvl = it.level;
   var $dataLvl = it.dataLevel;
@@ -6076,9 +6036,9 @@ var properties = function generate_properties(it, $keyword, $ruleType) {
     $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,
@@ -6088,7 +6048,13 @@ var properties = function generate_properties(it, $keyword, $ruleType) {
     $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;';
@@ -6241,7 +6207,7 @@ var properties = function generate_properties(it, $keyword, $ruleType) {
       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;
@@ -6344,7 +6310,7 @@ var properties = function generate_properties(it, $keyword, $ruleType) {
       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);
@@ -6383,7 +6349,6 @@ var properties = function generate_properties(it, $keyword, $ruleType) {
   if ($breakOnError) {
     out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
   }
-  out = it.util.cleanUpCode(out);
   return out;
 };
 
@@ -6402,7 +6367,7 @@ var propertyNames = function generate_propertyNames(it, $keyword, $ruleType) {
   $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;
@@ -6465,11 +6430,10 @@ var propertyNames = function generate_propertyNames(it, $keyword, $ruleType) {
   if ($breakOnError) {
     out += ' ' + ($closingBraces) + ' if (' + ($errs) + ' == errors) {';
   }
-  out = it.util.cleanUpCode(out);
   return out;
 };
 
-var required = function generate_required(it, $keyword, $ruleType) {
+var required$1 = function generate_required(it, $keyword, $ruleType) {
   var out = ' ';
   var $lvl = it.level;
   var $dataLvl = it.dataLevel;
@@ -6494,7 +6458,7 @@ var required = function generate_required(it, $keyword, $ruleType) {
         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;
           }
         }
@@ -6765,7 +6729,7 @@ var uniqueItems = function generate_uniqueItems(it, $keyword, $ruleType) {
     } 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; ';
       }
@@ -6846,16 +6810,17 @@ var dotjs = {
   not: not,
   oneOf: oneOf,
   pattern: pattern,
-  properties: properties,
+  properties: properties$2,
   propertyNames: propertyNames,
-  required: required,
+  required: required$1,
   uniqueItems: uniqueItems,
-  validate: validate
+  validate: validate$1
 };
 
-var toHash$1 = util.toHash;
+var ruleModules = dotjs
+  , toHash = util$5.toHash;
 
-var rules = function rules() {
+var rules$1 = function rules() {
   var RULES = [
     { type: 'number',
       rules: [ { 'maximum': ['exclusiveMaximum'] },
@@ -6879,8 +6844,8 @@ var rules = function rules() {
     'additionalItems', 'then', 'else'
   ];
   var TYPES = [ 'number', 'integer', 'string', 'array', 'object', 'boolean', 'null' ];
-  RULES.all = toHash$1(ALL);
-  RULES.types = toHash$1(TYPES);
+  RULES.all = toHash(ALL);
+  RULES.types = toHash(TYPES);
 
   RULES.forEach(function (group) {
     group.rules = group.rules.map(function (keyword) {
@@ -6897,7 +6862,7 @@ var rules = function rules() {
       ALL.push(keyword);
       var rule = RULES.all[keyword] = {
         keyword: keyword,
-        code: dotjs[keyword],
+        code: ruleModules[keyword],
         implements: implKeywords
       };
       return rule;
@@ -6905,13 +6870,13 @@ var rules = function rules() {
 
     RULES.all.$comment = {
       keyword: '$comment',
-      code: dotjs.$comment
+      code: ruleModules.$comment
     };
 
     if (group.type) RULES.types[group.type] = group;
   });
 
-  RULES.keywords = toHash$1(ALL.concat(KEYWORDS));
+  RULES.keywords = toHash(ALL.concat(KEYWORDS));
   RULES.custom = {};
 
   return RULES;
@@ -6955,7 +6920,7 @@ var data = function (metaSchema, keywordsJsonPointers) {
         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#' }
           ]
         };
       }
@@ -6965,7 +6930,7 @@ var data = function (metaSchema, keywordsJsonPointers) {
   return metaSchema;
 };
 
-var MissingRefError$1 = error_classes.MissingRef;
+var MissingRefError = error_classes.MissingRef;
 
 var async = compileAsync;
 
@@ -7018,7 +6983,7 @@ function compileAsync(schema, meta, callback) {
   function _compileAsync(schemaObj) {
     try { return self._compile(schemaObj); }
     catch(e) {
-      if (e instanceof MissingRefError$1) return loadMissingSchema(e);
+      if (e instanceof MissingRefError) return loadMissingSchema(e);
       throw e;
     }
 
@@ -7282,10 +7247,10 @@ var custom = function generate_custom(it, $keyword, $ruleType) {
   return out;
 };
 
-var $schema = "http://json-schema.org/draft-07/schema#";
-var $id = "http://json-schema.org/draft-07/schema#";
+var $schema$2 = "http://json-schema.org/draft-07/schema#";
+var $id$1 = "http://json-schema.org/draft-07/schema#";
 var title = "Core schema meta-schema";
-var definitions = {
+var definitions$1 = {
 	schemaArray: {
 		type: "array",
 		minItems: 1,
@@ -7328,7 +7293,7 @@ var definitions = {
 		]
 	}
 };
-var type = [
+var type$1 = [
 	"object",
 	"boolean"
 ];
@@ -7524,41 +7489,20 @@ var properties$1 = {
 		$ref: "#"
 	}
 };
-var jsonSchemaDraft07 = {
-	$schema: $schema,
-	$id: $id,
+var require$$13 = {
+	$schema: $schema$2,
+	$id: $id$1,
 	title: title,
-	definitions: definitions,
-	type: type,
+	definitions: definitions$1,
+	type: type$1,
 	properties: properties$1,
 	"default": true
 };
 
-var jsonSchemaDraft07$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    $schema: $schema,
-    $id: $id,
-    title: title,
-    definitions: definitions,
-    type: type,
-    properties: properties$1,
-    'default': jsonSchemaDraft07
-});
-
-var require$$2 = getCjsExportFromNamespace(jsonSchemaDraft07$1);
-
-var IDENTIFIER$1 = /^[a-z_$][a-z0-9_$-]*$/i;
-
-var metaSchema = require$$2;
-
-var keyword = {
-  add: addKeyword,
-  get: getKeyword,
-  remove: removeKeyword,
-  validate: validateKeyword
-};
+var metaSchema = require$$13;
 
-var definitionSchema = {
+var definition_schema = {
+  $id: 'https://github.com/ajv-validator/ajv/blob/master/lib/definition_schema.js',
   definitions: {
     simpleTypes: metaSchema.definitions.simpleTypes
   },
@@ -7591,6 +7535,18 @@ var definitionSchema = {
   }
 };
 
+var IDENTIFIER = /^[a-z_$][a-z0-9_$-]*$/i;
+var customRuleCode = custom;
+var definitionSchema = definition_schema;
+
+var keyword = {
+  add: addKeyword,
+  get: getKeyword,
+  remove: removeKeyword,
+  validate: validateKeyword
+};
+
+
 /**
  * Define custom keyword
  * @this  Ajv
@@ -7605,7 +7561,7 @@ function addKeyword(keyword, definition) {
   if (RULES.keywords[keyword])
     throw new Error('Keyword ' + keyword + ' is already defined');
 
-  if (!IDENTIFIER$1.test(keyword))
+  if (!IDENTIFIER.test(keyword))
     throw new Error('Keyword ' + keyword + ' is not a valid identifier');
 
   if (definition) {
@@ -7625,7 +7581,7 @@ function addKeyword(keyword, definition) {
         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#' }
           ]
         };
       }
@@ -7655,7 +7611,7 @@ function addKeyword(keyword, definition) {
       keyword: keyword,
       definition: definition,
       custom: true,
-      code: custom,
+      code: customRuleCode,
       implements: definition.implements
     };
     ruleGroup.rules.push(rule);
@@ -7725,13 +7681,13 @@ function validateKeyword(definition, throwError) {
 }
 
 var $schema$1 = "http://json-schema.org/draft-07/schema#";
-var $id$1 = "https://raw.githubusercontent.com/epoberezkin/ajv/master/lib/refs/data.json#";
+var $id = "https://raw.githubusercontent.com/ajv-validator/ajv/master/lib/refs/data.json#";
 var description = "Meta-schema for $data reference (JSON Schema extension proposal)";
-var type$1 = "object";
-var required$1 = [
+var type = "object";
+var required = [
 	"$data"
 ];
-var properties$2 = {
+var properties = {
 	$data: {
 		type: "string",
 		anyOf: [
@@ -7745,56 +7701,52 @@ var properties$2 = {
 	}
 };
 var additionalProperties = false;
-var data$1 = {
+var require$$12 = {
 	$schema: $schema$1,
-	$id: $id$1,
+	$id: $id,
 	description: description,
-	type: type$1,
-	required: required$1,
-	properties: properties$2,
+	type: type,
+	required: required,
+	properties: properties,
 	additionalProperties: additionalProperties
 };
 
-var data$2 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    $schema: $schema$1,
-    $id: $id$1,
-    description: description,
-    type: type$1,
-    required: required$1,
-    properties: properties$2,
-    additionalProperties: additionalProperties,
-    'default': data$1
-});
-
-var require$$1 = getCjsExportFromNamespace(data$2);
-
-var ajv = Ajv;
-
-Ajv.prototype.validate = validate$1;
-Ajv.prototype.compile = compile$1;
-Ajv.prototype.addSchema = addSchema;
-Ajv.prototype.addMetaSchema = addMetaSchema;
-Ajv.prototype.validateSchema = validateSchema;
-Ajv.prototype.getSchema = getSchema;
-Ajv.prototype.removeSchema = removeSchema;
-Ajv.prototype.addFormat = addFormat;
-Ajv.prototype.errorsText = errorsText;
-
-Ajv.prototype._addSchema = _addSchema;
-Ajv.prototype._compile = _compile;
-
-Ajv.prototype.compileAsync = async;
-
-Ajv.prototype.addKeyword = keyword.add;
-Ajv.prototype.getKeyword = keyword.get;
-Ajv.prototype.removeKeyword = keyword.remove;
-Ajv.prototype.validateKeyword = keyword.validate;
-
-
-Ajv.ValidationError = error_classes.Validation;
-Ajv.MissingRefError = error_classes.MissingRef;
-Ajv.$dataMetaSchema = data;
+var compileSchema = compile_1
+  , resolve = resolve_1
+  , Cache = cache.exports
+  , SchemaObject = schema_obj
+  , stableStringify = fastJsonStableStringify
+  , formats = formats_1
+  , rules = rules$1
+  , $dataMetaSchema = data
+  , util = util$5;
+
+var ajv = Ajv$1;
+
+Ajv$1.prototype.validate = validate;
+Ajv$1.prototype.compile = compile;
+Ajv$1.prototype.addSchema = addSchema;
+Ajv$1.prototype.addMetaSchema = addMetaSchema;
+Ajv$1.prototype.validateSchema = validateSchema;
+Ajv$1.prototype.getSchema = getSchema;
+Ajv$1.prototype.removeSchema = removeSchema;
+Ajv$1.prototype.addFormat = addFormat;
+Ajv$1.prototype.errorsText = errorsText;
+
+Ajv$1.prototype._addSchema = _addSchema;
+Ajv$1.prototype._compile = _compile;
+
+Ajv$1.prototype.compileAsync = async;
+var customKeyword = keyword;
+Ajv$1.prototype.addKeyword = customKeyword.add;
+Ajv$1.prototype.getKeyword = customKeyword.get;
+Ajv$1.prototype.removeKeyword = customKeyword.remove;
+Ajv$1.prototype.validateKeyword = customKeyword.validate;
+
+var errorClasses = error_classes;
+Ajv$1.ValidationError = errorClasses.Validation;
+Ajv$1.MissingRefError = errorClasses.MissingRef;
+Ajv$1.$dataMetaSchema = $dataMetaSchema;
 
 var META_SCHEMA_ID = 'http://json-schema.org/draft-07/schema';
 
@@ -7807,16 +7759,16 @@ var META_SUPPORT_DATA = ['/properties'];
  * @param {Object} opts optional options
  * @return {Object} ajv instance
  */
-function Ajv(opts) {
-  if (!(this instanceof Ajv)) return new Ajv(opts);
+function Ajv$1(opts) {
+  if (!(this instanceof Ajv$1)) return new Ajv$1(opts);
   opts = this._opts = util.copy(opts) || {};
   setLogger(this);
   this._schemas = {};
   this._refs = {};
   this._fragments = {};
-  this._formats = formats_1(opts.format);
+  this._formats = formats(opts.format);
 
-  this._cache = opts.cache || new cache;
+  this._cache = opts.cache || new Cache;
   this._loadingSchemas = {};
   this._compilations = [];
   this.RULES = rules();
@@ -7824,10 +7776,11 @@ function Ajv(opts) {
 
   opts.loopRequired = opts.loopRequired || Infinity;
   if (opts.errorDataPath == 'property') opts._errorDataPathProperty = true;
-  if (opts.serialize === undefined) opts.serialize = fastJsonStableStringify;
+  if (opts.serialize === undefined) opts.serialize = stableStringify;
   this._metaOpts = getMetaSchemaOptions(this);
 
   if (opts.formats) addInitialFormats(this);
+  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'}});
@@ -7844,7 +7797,7 @@ function Ajv(opts) {
  * @param  {Any} data to be validated
  * @return {Boolean} validation result. Errors from the last validation will be available in `ajv.errors` (and also in compiled schema: `schema.errors`).
  */
-function validate$1(schemaKeyRef, data) {
+function validate(schemaKeyRef, data) {
   var v;
   if (typeof schemaKeyRef == 'string') {
     v = this.getSchema(schemaKeyRef);
@@ -7867,7 +7820,7 @@ function validate$1(schemaKeyRef, data) {
  * @param  {Boolean} _meta true if schema is a meta-schema. Used internally to compile meta schemas of custom keywords.
  * @return {Function} validating function
  */
-function compile$1(schema, _meta) {
+function compile(schema, _meta) {
   var schemaObj = this._addSchema(schema, undefined, _meta);
   return schemaObj.validate || this._compile(schemaObj);
 }
@@ -7890,7 +7843,7 @@ function addSchema(schema, key, _skipValidation, _meta) {
   var id = this._getId(schema);
   if (id !== undefined && typeof id != 'string')
     throw new Error('schema id must be string');
-  key = resolve_1.normalizeId(key || id);
+  key = resolve.normalizeId(key || id);
   checkUnique(this, key);
   this._schemas[key] = this._addSchema(schema, _skipValidation, _meta, true);
   return this;
@@ -7967,13 +7920,13 @@ function getSchema(keyRef) {
 
 
 function _getSchemaFragment(self, ref) {
-  var res = resolve_1.schema.call(self, { schema: {} }, ref);
+  var res = resolve.schema.call(self, { schema: {} }, ref);
   if (res) {
     var schema = res.schema
       , root = res.root
       , baseId = res.baseId;
-    var v = compile_1.call(self, schema, root, undefined, baseId);
-    self._fragments[ref] = new schema_obj({
+    var v = compileSchema.call(self, schema, root, undefined, baseId);
+    self._fragments[ref] = new SchemaObject({
       ref: ref,
       fragment: true,
       schema: schema,
@@ -7987,7 +7940,7 @@ function _getSchemaFragment(self, ref) {
 
 
 function _getSchemaObj(self, keyRef) {
-  keyRef = resolve_1.normalizeId(keyRef);
+  keyRef = resolve.normalizeId(keyRef);
   return self._schemas[keyRef] || self._refs[keyRef] || self._fragments[keyRef];
 }
 
@@ -8025,7 +7978,7 @@ function removeSchema(schemaKeyRef) {
       this._cache.del(cacheKey);
       var id = this._getId(schemaKeyRef);
       if (id) {
-        id = resolve_1.normalizeId(id);
+        id = resolve.normalizeId(id);
         delete this._schemas[id];
         delete this._refs[id];
       }
@@ -8056,17 +8009,17 @@ function _addSchema(schema, skipValidation, meta, shouldAddSchema) {
 
   shouldAddSchema = shouldAddSchema || this._opts.addUsedSchema !== false;
 
-  var id = resolve_1.normalizeId(this._getId(schema));
+  var id = resolve.normalizeId(this._getId(schema));
   if (id && shouldAddSchema) checkUnique(this, id);
 
   var willValidate = this._opts.validateSchema !== false && !skipValidation;
   var recursiveMeta;
-  if (willValidate && !(recursiveMeta = id && id == resolve_1.normalizeId(schema.$schema)))
+  if (willValidate && !(recursiveMeta = id && id == resolve.normalizeId(schema.$schema)))
     this.validateSchema(schema, true);
 
-  var localRefs = resolve_1.ids.call(this, schema);
+  var localRefs = resolve.ids.call(this, schema);
 
-  var schemaObj = new schema_obj({
+  var schemaObj = new SchemaObject({
     id: id,
     schema: schema,
     localRefs: localRefs,
@@ -8103,7 +8056,7 @@ function _compile(schemaObj, root) {
   }
 
   var v;
-  try { v = compile_1.call(this, schemaObj.schema, root, schemaObj.localRefs); }
+  try { v = compileSchema.call(this, schemaObj.schema, root, schemaObj.localRefs); }
   catch(e) {
     delete schemaObj.validate;
     throw e;
@@ -8199,12 +8152,12 @@ function addFormat(name, format) {
 function addDefaultMetaSchema(self) {
   var $dataSchema;
   if (self._opts.$data) {
-    $dataSchema = require$$1;
+    $dataSchema = require$$12;
     self.addMetaSchema($dataSchema, $dataSchema.$id, true);
   }
   if (self._opts.meta === false) return;
-  var metaSchema = require$$2;
-  if (self._opts.$data) metaSchema = data(metaSchema, META_SUPPORT_DATA);
+  var metaSchema = require$$13;
+  if (self._opts.$data) metaSchema = $dataMetaSchema(metaSchema, META_SUPPORT_DATA);
   self.addMetaSchema(metaSchema, META_SCHEMA_ID, true);
   self._refs['http://json-schema.org/schema'] = META_SCHEMA_ID;
 }
@@ -8226,6 +8179,14 @@ function addInitialFormats(self) {
 }
 
 
+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');
@@ -8255,14 +8216,14 @@ function setLogger(self) {
 
 function noop() {}
 
-var _Ajv = /*#__PURE__*/Object.freeze(/*#__PURE__*/Object.assign(/*#__PURE__*/Object.create(null), ajv, {
-    'default': ajv,
-    __moduleExports: ajv
-}));
+var _Ajv = /*#__PURE__*/_mergeNamespaces({
+    __proto__: null,
+    'default': ajv
+}, [ajv]);
 
 var $ref = "#/definitions/Schema";
-var $schema$2 = "http://json-schema.org/draft-07/schema#";
-var definitions$1 = {
+var $schema = "http://json-schema.org/draft-07/schema#";
+var definitions = {
 	ActivityType: {
 		anyOf: [
 			{
@@ -8335,17 +8296,6 @@ var definitions$1 = {
 			}
 		]
 	},
-	IActivityType: {
-		"enum": [
-			"filter",
-			"project",
-			"groupby",
-			"sort",
-			"limit",
-			"mappings"
-		],
-		type: "string"
-	},
 	IAggregate: {
 		additionalProperties: false,
 		properties: {
@@ -8420,9 +8370,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"count"
-				],
+				"const": "count",
 				type: "string"
 			}
 		},
@@ -8451,9 +8399,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"databomb"
-				],
+				"const": "databomb",
 				type: "string"
 			}
 		},
@@ -8545,9 +8491,7 @@ var definitions$1 = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"="
-				],
+				"const": "=",
 				type: "string"
 			}
 		},
@@ -8596,9 +8540,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"boolean"
-				],
+				"const": "boolean",
 				type: "string"
 			}
 		},
@@ -8624,9 +8566,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"dataset"
-				],
+				"const": "dataset",
 				type: "string"
 			}
 		},
@@ -8647,9 +8587,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"number"
-				],
+				"const": "number",
 				type: "string"
 			}
 		},
@@ -8669,9 +8607,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"number64"
-				],
+				"const": "number64",
 				type: "string"
 			}
 		},
@@ -8697,9 +8633,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"object"
-				],
+				"const": "object",
 				type: "string"
 			}
 		},
@@ -8720,9 +8654,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"range"
-				],
+				"const": "range",
 				type: "string"
 			}
 		},
@@ -8755,9 +8687,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"set"
-				],
+				"const": "set",
 				type: "string"
 			}
 		},
@@ -8778,9 +8708,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"string"
-				],
+				"const": "string",
 				type: "string"
 			}
 		},
@@ -8813,9 +8741,7 @@ var definitions$1 = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"filter"
-				],
+				"const": "filter",
 				type: "string"
 			}
 		},
@@ -8880,9 +8806,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"form"
-				],
+				"const": "form",
 				type: "string"
 			}
 		},
@@ -8909,9 +8833,7 @@ var definitions$1 = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"groupby"
-				],
+				"const": "groupby",
 				type: "string"
 			}
 		},
@@ -8944,9 +8866,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"hipie"
-				],
+				"const": "hipie",
 				type: "string"
 			},
 			url: {
@@ -8983,9 +8903,7 @@ var definitions$1 = {
 				type: "number"
 			},
 			type: {
-				"enum": [
-					"limit"
-				],
+				"const": "limit",
 				type: "string"
 			}
 		},
@@ -9011,9 +8929,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"logicalfile"
-				],
+				"const": "logicalfile",
 				type: "string"
 			},
 			url: {
@@ -9047,9 +8963,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"map"
-				],
+				"const": "map",
 				type: "string"
 			}
 		},
@@ -9123,9 +9037,7 @@ var definitions$1 = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"mappings"
-				],
+				"const": "mappings",
 				type: "string"
 			}
 		},
@@ -9148,9 +9060,7 @@ var definitions$1 = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"multi"
-				],
+				"const": "multi",
 				type: "string"
 			}
 		},
@@ -9186,9 +9096,7 @@ var definitions$1 = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"project"
-				],
+				"const": "project",
 				type: "string"
 			}
 		},
@@ -9251,9 +9159,7 @@ var definitions$1 = {
 				$ref: "#/definitions/OutputDict"
 			},
 			type: {
-				"enum": [
-					"rest"
-				],
+				"const": "rest",
 				type: "string"
 			},
 			url: {
@@ -9292,9 +9198,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"roxie"
-				],
+				"const": "roxie",
 				type: "string"
 			},
 			url: {
@@ -9348,9 +9252,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"scale"
-				],
+				"const": "scale",
 				type: "string"
 			}
 		},
@@ -9372,9 +9274,7 @@ var definitions$1 = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"sort"
-				],
+				"const": "sort",
 				type: "string"
 			}
 		},
@@ -9410,9 +9310,7 @@ var definitions$1 = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"template"
-				],
+				"const": "template",
 				type: "string"
 			}
 		},
@@ -9502,9 +9400,7 @@ var definitions$1 = {
 				$ref: "#/definitions/OutputDict"
 			},
 			type: {
-				"enum": [
-					"wuresult"
-				],
+				"const": "wuresult",
 				type: "string"
 			},
 			url: {
@@ -9621,20 +9517,12 @@ var definitions$1 = {
 		]
 	},
 	Range: {
-		items: [
-			{
-				type: [
-					"number",
-					"string"
-				]
-			},
-			{
-				type: [
-					"number",
-					"string"
-				]
-			}
-		],
+		items: {
+			type: [
+				"number",
+				"string"
+			]
+		},
 		maxItems: 2,
 		minItems: 2,
 		type: "array"
@@ -9883,9 +9771,7 @@ var definitions$1 = {
 				$ref: "#/definitions/IProperties"
 			},
 			version: {
-				"enum": [
-					"2.2.1"
-				],
+				"const": "2.2.1",
 				type: "string"
 			}
 		},
@@ -9905,43 +9791,43 @@ var definitions$1 = {
 		type: "string"
 	}
 };
-var v2$1 = {
+var v2 = {
 	$ref: $ref,
-	$schema: $schema$2,
-	definitions: definitions$1
+	$schema: $schema,
+	definitions: definitions
 };
 
 var _ddl2Schema = /*#__PURE__*/Object.freeze({
     __proto__: null,
     $ref: $ref,
-    $schema: $schema$2,
-    definitions: definitions$1,
-    'default': v2$1
+    $schema: $schema,
+    definitions: definitions,
+    'default': v2
 });
 
-var Ajv$1 = ajv || _Ajv;
-var ddl2Schema = _ddl2Schema;
-var options = {
-    allErrors: false,
-    verbose: true,
-    jsonPointers: false
-};
-function doValidate(ddl, schema) {
-    var ajv = new Ajv$1(options);
-    var validate = ajv.compile(schema);
-    var success = validate(ddl);
-    return {
-        success: success,
-        errors: validate.errors
-    };
-}
-function validate2(ddl) {
-    return doValidate(ddl, _ddl2Schema);
+var Ajv = ajv || _Ajv;
+var ddl2Schema = _ddl2Schema;
+var options = {
+    allErrors: false,
+    verbose: true,
+    jsonPointers: false
+};
+function doValidate(ddl, schema) {
+    var ajv = new Ajv(options);
+    var validate = ajv.compile(schema);
+    var success = validate(ddl);
+    return {
+        success: success,
+        errors: validate.errors
+    };
+}
+function validate2(ddl) {
+    return doValidate(ddl, _ddl2Schema);
 }
 
-function isDDL2Schema(ref) {
-    return ref.version !== undefined && ref.datasources !== undefined && ref.dataviews !== undefined;
+function isDDL2Schema(ref) {
+    return ref.version !== undefined && ref.datasources !== undefined && ref.dataviews !== undefined;
 }
 
-export { BUILD_VERSION, v1 as DDL1, v2 as DDL2, PKG_NAME, PKG_VERSION, ddl2Schema, isDDL2Schema, upgrade$1 as upgrade, validate2 };
+export { BUILD_VERSION, v1 as DDL1, v2$1 as DDL2, PKG_NAME, PKG_VERSION, ddl2Schema, isDDL2Schema, upgrade, validate2 };
 //# sourceMappingURL=index.es6.js.map