@hpcc-js/ddl-shim 2.18.1 → 2.20.0

package/dist/index.js

@@ -19,51 +19,51 @@
         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 PKG_NAME = "@hpcc-js/ddl-shim";
+    var PKG_VERSION = "2.20.0";
+    var BUILD_VERSION = "2.104.2";
+
+    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({
@@ -84,36 +84,36 @@
         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$1 = /*#__PURE__*/Object.freeze({
@@ -131,7 +131,7 @@
         VisibilitySet: VisibilitySet
     });
 
-    /*! *****************************************************************************
+    /******************************************************************************
     Copyright (c) Microsoft Corporation.
 
     Permission to use, copy, modify, and/or distribute this software for any
@@ -167,927 +167,927 @@
         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 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.warn("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 : {};
@@ -9811,28 +9811,28 @@
         'default': v2
     });
 
-    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);
+    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;
     }
 
     exports.BUILD_VERSION = BUILD_VERSION;