@hpcc-js/ddl-shim 2.17.25 → 2.19.1

package/dist/cli.js

@@ -4,6 +4,26 @@
 
 var fs = require('fs');
 
+function _interopNamespace(e) {
+  if (e && e.__esModule) return e;
+  var n = Object.create(null);
+  if (e) {
+    Object.keys(e).forEach(function (k) {
+      if (k !== 'default') {
+        var d = Object.getOwnPropertyDescriptor(e, k);
+        Object.defineProperty(n, k, d.get ? d : {
+          enumerable: true,
+          get: function () { return e[k]; }
+        });
+      }
+    });
+  }
+  n["default"] = e;
+  return Object.freeze(n);
+}
+
+var fs__namespace = /*#__PURE__*/_interopNamespace(fs);
+
 var $ref = "#/definitions/Schema";
 var $schema = "http://json-schema.org/draft-07/schema#";
 var definitions = {
@@ -79,17 +99,6 @@ var definitions = {
 			}
 		]
 	},
-	IActivityType: {
-		"enum": [
-			"filter",
-			"project",
-			"groupby",
-			"sort",
-			"limit",
-			"mappings"
-		],
-		type: "string"
-	},
 	IAggregate: {
 		additionalProperties: false,
 		properties: {
@@ -164,9 +173,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"count"
-				],
+				"const": "count",
 				type: "string"
 			}
 		},
@@ -195,9 +202,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"databomb"
-				],
+				"const": "databomb",
 				type: "string"
 			}
 		},
@@ -289,9 +294,7 @@ var definitions = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"="
-				],
+				"const": "=",
 				type: "string"
 			}
 		},
@@ -340,9 +343,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"boolean"
-				],
+				"const": "boolean",
 				type: "string"
 			}
 		},
@@ -368,9 +369,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"dataset"
-				],
+				"const": "dataset",
 				type: "string"
 			}
 		},
@@ -391,9 +390,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"number"
-				],
+				"const": "number",
 				type: "string"
 			}
 		},
@@ -413,9 +410,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"number64"
-				],
+				"const": "number64",
 				type: "string"
 			}
 		},
@@ -441,9 +436,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"object"
-				],
+				"const": "object",
 				type: "string"
 			}
 		},
@@ -464,9 +457,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"range"
-				],
+				"const": "range",
 				type: "string"
 			}
 		},
@@ -499,9 +490,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"set"
-				],
+				"const": "set",
 				type: "string"
 			}
 		},
@@ -522,9 +511,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"string"
-				],
+				"const": "string",
 				type: "string"
 			}
 		},
@@ -557,9 +544,7 @@ var definitions = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"filter"
-				],
+				"const": "filter",
 				type: "string"
 			}
 		},
@@ -624,9 +609,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"form"
-				],
+				"const": "form",
 				type: "string"
 			}
 		},
@@ -653,9 +636,7 @@ var definitions = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"groupby"
-				],
+				"const": "groupby",
 				type: "string"
 			}
 		},
@@ -688,9 +669,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"hipie"
-				],
+				"const": "hipie",
 				type: "string"
 			},
 			url: {
@@ -727,9 +706,7 @@ var definitions = {
 				type: "number"
 			},
 			type: {
-				"enum": [
-					"limit"
-				],
+				"const": "limit",
 				type: "string"
 			}
 		},
@@ -755,9 +732,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"logicalfile"
-				],
+				"const": "logicalfile",
 				type: "string"
 			},
 			url: {
@@ -791,9 +766,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"map"
-				],
+				"const": "map",
 				type: "string"
 			}
 		},
@@ -867,9 +840,7 @@ var definitions = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"mappings"
-				],
+				"const": "mappings",
 				type: "string"
 			}
 		},
@@ -892,9 +863,7 @@ var definitions = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"multi"
-				],
+				"const": "multi",
 				type: "string"
 			}
 		},
@@ -930,9 +899,7 @@ var definitions = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"project"
-				],
+				"const": "project",
 				type: "string"
 			}
 		},
@@ -995,9 +962,7 @@ var definitions = {
 				$ref: "#/definitions/OutputDict"
 			},
 			type: {
-				"enum": [
-					"rest"
-				],
+				"const": "rest",
 				type: "string"
 			},
 			url: {
@@ -1036,9 +1001,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"roxie"
-				],
+				"const": "roxie",
 				type: "string"
 			},
 			url: {
@@ -1092,9 +1055,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"scale"
-				],
+				"const": "scale",
 				type: "string"
 			}
 		},
@@ -1116,9 +1077,7 @@ var definitions = {
 				type: "array"
 			},
 			type: {
-				"enum": [
-					"sort"
-				],
+				"const": "sort",
 				type: "string"
 			}
 		},
@@ -1154,9 +1113,7 @@ var definitions = {
 				type: "string"
 			},
 			type: {
-				"enum": [
-					"template"
-				],
+				"const": "template",
 				type: "string"
 			}
 		},
@@ -1246,9 +1203,7 @@ var definitions = {
 				$ref: "#/definitions/OutputDict"
 			},
 			type: {
-				"enum": [
-					"wuresult"
-				],
+				"const": "wuresult",
 				type: "string"
 			},
 			url: {
@@ -1365,20 +1320,12 @@ var definitions = {
 		]
 	},
 	Range: {
-		items: [
-			{
-				type: [
-					"number",
-					"string"
-				]
-			},
-			{
-				type: [
-					"number",
-					"string"
-				]
-			}
-		],
+		items: {
+			type: [
+				"number",
+				"string"
+			]
+		},
 		maxItems: 2,
 		minItems: 2,
 		type: "array"
@@ -1627,9 +1574,7 @@ var definitions = {
 				$ref: "#/definitions/IProperties"
 			},
 			version: {
-				"enum": [
-					"2.2.1"
-				],
+				"const": "2.2.1",
 				type: "string"
 			}
 		},
@@ -1696,11 +1641,11 @@ function __spreadArray(to, from, pack) {
             ar[i] = from[i];
         }
     }
-    return to.concat(ar || from);
+    return to.concat(ar || Array.prototype.slice.call(from));
 }
 
 var PKG_NAME = "@hpcc-js/ddl-shim";
-var PKG_VERSION = "2.17.25";
+var PKG_VERSION = "2.19.1";
 
 function isWorkunitDatasource(ref) {
     return ref.WUID !== undefined;
@@ -1950,7 +1895,7 @@ function apply_to_properties_layout(ddl2, dermObj) {
     });
     return retVal;
 }
-function upgrade(ddl2, dermObj) {
+function upgrade$1(ddl2, dermObj) {
     apply_to_dataviews(ddl2, dermObj);
     return apply_to_properties_layout(ddl2, dermObj);
 }
@@ -2170,7 +2115,7 @@ var DDLUpgrade = /** @class */ (function () {
                                     break;
                                 default:
                                     groupByColumns.push(this.toLowerCase(field.id));
-                                    throw new Error("Unhandled field function: " + field.properties.function);
+                                    throw new Error("Unhandled field function: ".concat(field.properties.function));
                             }
                         }
                         else {
@@ -2181,7 +2126,7 @@ var DDLUpgrade = /** @class */ (function () {
                         this._ddl2DataviewActivities[viz.id].project.transformations = projectTransformations;
                     }
                     if (aggrFields.length) {
-                        this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray([], groupByColumns);
+                        this._ddl2DataviewActivities[viz.id].groupBy.groupByIDs = __spreadArray([], groupByColumns, true);
                         this._ddl2DataviewActivities[viz.id].groupBy.aggregates = aggrFields;
                     }
                 }
@@ -2199,7 +2144,7 @@ var DDLUpgrade = /** @class */ (function () {
             case "MAX":
                 return "max";
         }
-        throw new Error("Unknown DDL1 Function Type:  " + func);
+        throw new Error("Unknown DDL1 Function Type:  ".concat(func));
     };
     DDLUpgrade.prototype.readMappings = function () {
         for (var _i = 0, _a = this._ddl.dashboards; _i < _a.length; _i++) {
@@ -2226,7 +2171,7 @@ var DDLUpgrade = /** @class */ (function () {
                     this.readSliderMappings(viz);
                 }
                 else {
-                    throw new Error("Unkown DDL1 mapping type:  " + viz.type);
+                    throw new Error("Unkown DDL1 mapping type:  ".concat(viz.type));
                 }
             }
         }
@@ -2296,7 +2241,7 @@ var DDLUpgrade = /** @class */ (function () {
                         newValue[key] = faCharFix(valueMappings[value][key]);
                     }
                     else if (annotation && key.indexOf("icon_") === 0) {
-                        console.log("Deprecated flag property:  " + key);
+                        console.warn("Deprecated flag property:  " + key);
                         newValue[key.split("icon_")[1]] = valueMappings[value][key];
                     }
                     else {
@@ -2341,7 +2286,7 @@ var DDLUpgrade = /** @class */ (function () {
                 var flag = _a[_i];
                 if (flag.fieldid) {
                     mappings.transformations.push({
-                        fieldID: "annotation_" + idx++,
+                        fieldID: "annotation_".concat(idx++),
                         type: "map",
                         sourceFieldID: this.toLowerCase(flag.fieldid),
                         default: {},
@@ -2400,7 +2345,7 @@ var DDLUpgrade = /** @class */ (function () {
                                         var mapping = update.mappings[key];
                                         var dsFilter = (mapping && dsFilters[mapping]) ? dsFilters[mapping].filter : undefined;
                                         if (!dsFilter) {
-                                            console.warn("Select Mapping \"" + mapping + "\" in viz \"" + viz.id + "\" not found in filters for \"" + otherViz.id + "\"");
+                                            console.warn("Select Mapping \"".concat(mapping, "\" in viz \"").concat(viz.id, "\" not found in filters for \"").concat(otherViz.id, "\""));
                                         }
                                         else {
                                             condition.mappings.push({
@@ -2651,12 +2596,12 @@ var DDLUpgrade = /** @class */ (function () {
     };
     return DDLUpgrade;
 }());
-function upgrade$1(ddl, baseUrl, wuid, toLowerCase, dermatologyJson) {
+function upgrade(ddl, baseUrl, wuid, toLowerCase, dermatologyJson) {
     if (toLowerCase === void 0) { toLowerCase = true; }
     if (dermatologyJson === void 0) { dermatologyJson = {}; }
     var ddlUp = new DDLUpgrade(ddl, baseUrl, wuid, toLowerCase);
     var retVal = ddlUp.write();
-    retVal.properties = upgrade(retVal, dermatologyJson);
+    retVal.properties = upgrade$1(retVal, dermatologyJson);
     return retVal;
 }
 
@@ -2679,20 +2624,20 @@ switch (args[0]) {
             var layoutJson_1 = {};
             if (layoutPath) {
                 try {
-                    layoutJson_1 = JSON.parse(fs.readFileSync(layoutPath).toString());
+                    layoutJson_1 = JSON.parse(fs__namespace.readFileSync(layoutPath).toString());
                 }
                 catch (e) {
                     console.error(e);
                 }
             }
-            fs.readFile(srcPath, "utf8", function (err, data) {
+            fs__namespace.readFile(srcPath, "utf8", function (err, data) {
                 if (err)
                     throw err;
-                var ddl2 = upgrade$1(JSON.parse(data), baseUrl_1 || "http://localhost:8010", wuid_1 || "WUID", args[0] === "--upgrade", layoutJson_1);
-                fs.writeFile(destPath_1, JSON.stringify(ddl2), function (err) {
+                var ddl2 = upgrade(JSON.parse(data), baseUrl_1 || "http://localhost:8010", wuid_1 || "WUID", args[0] === "--upgrade", layoutJson_1);
+                fs__namespace.writeFile(destPath_1, JSON.stringify(ddl2), function (err) {
                     if (err)
                         throw err;
-                    console.log("complete");
+                    console.info("complete");
                 });
             });
         }