@hpcc-js/ddl-shim 2.17.25 → 2.18.1

package/schema/v2.json

@@ -35,8 +35,7 @@
       ]
     },
     "Dataset": {
-      "items": {
-      },
+      "items": {},
       "type": "array"
     },
     "DatasourceType": {
@@ -74,17 +73,6 @@
         }
       ]
     },
-    "IActivityType": {
-      "enum": [
-        "filter",
-        "project",
-        "groupby",
-        "sort",
-        "limit",
-        "mappings"
-      ],
-      "type": "string"
-    },
     "IAggregate": {
       "additionalProperties": false,
       "properties": {
@@ -159,9 +147,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "count"
-          ],
+          "const": "count",
           "type": "string"
         }
       },
@@ -190,9 +176,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "databomb"
-          ],
+          "const": "databomb",
           "type": "string"
         }
       },
@@ -284,9 +268,7 @@
           "type": "array"
         },
         "type": {
-          "enum": [
-            "="
-          ],
+          "const": "=",
           "type": "string"
         }
       },
@@ -335,9 +317,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "boolean"
-          ],
+          "const": "boolean",
           "type": "string"
         }
       },
@@ -363,9 +343,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "dataset"
-          ],
+          "const": "dataset",
           "type": "string"
         }
       },
@@ -386,9 +364,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "number"
-          ],
+          "const": "number",
           "type": "string"
         }
       },
@@ -408,9 +384,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "number64"
-          ],
+          "const": "number64",
           "type": "string"
         }
       },
@@ -436,9 +410,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "object"
-          ],
+          "const": "object",
           "type": "string"
         }
       },
@@ -459,9 +431,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "range"
-          ],
+          "const": "range",
           "type": "string"
         }
       },
@@ -494,9 +464,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "set"
-          ],
+          "const": "set",
           "type": "string"
         }
       },
@@ -517,9 +485,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "string"
-          ],
+          "const": "string",
           "type": "string"
         }
       },
@@ -552,9 +518,7 @@
           "type": "array"
         },
         "type": {
-          "enum": [
-            "filter"
-          ],
+          "const": "filter",
           "type": "string"
         }
       },
@@ -619,9 +583,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "form"
-          ],
+          "const": "form",
           "type": "string"
         }
       },
@@ -648,9 +610,7 @@
           "type": "array"
         },
         "type": {
-          "enum": [
-            "groupby"
-          ],
+          "const": "groupby",
           "type": "string"
         }
       },
@@ -683,9 +643,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "hipie"
-          ],
+          "const": "hipie",
           "type": "string"
         },
         "url": {
@@ -722,9 +680,7 @@
           "type": "number"
         },
         "type": {
-          "enum": [
-            "limit"
-          ],
+          "const": "limit",
           "type": "string"
         }
       },
@@ -750,9 +706,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "logicalfile"
-          ],
+          "const": "logicalfile",
           "type": "string"
         },
         "url": {
@@ -771,8 +725,7 @@
     "IMap": {
       "additionalProperties": false,
       "properties": {
-        "default": {
-        },
+        "default": {},
         "fieldID": {
           "type": "string"
         },
@@ -786,9 +739,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "map"
-          ],
+          "const": "map",
           "type": "string"
         }
       },
@@ -804,10 +755,8 @@
     "IMapMapping": {
       "additionalProperties": false,
       "properties": {
-        "newValue": {
-        },
-        "value": {
-        }
+        "newValue": {},
+        "value": {}
       },
       "required": [
         "value",
@@ -862,9 +811,7 @@
           "type": "array"
         },
         "type": {
-          "enum": [
-            "mappings"
-          ],
+          "const": "mappings",
           "type": "string"
         }
       },
@@ -887,9 +834,7 @@
           "type": "array"
         },
         "type": {
-          "enum": [
-            "multi"
-          ],
+          "const": "multi",
           "type": "string"
         }
       },
@@ -925,9 +870,7 @@
           "type": "array"
         },
         "type": {
-          "enum": [
-            "project"
-          ],
+          "const": "project",
           "type": "string"
         }
       },
@@ -990,9 +933,7 @@
           "$ref": "#/definitions/OutputDict"
         },
         "type": {
-          "enum": [
-            "rest"
-          ],
+          "const": "rest",
           "type": "string"
         },
         "url": {
@@ -1031,9 +972,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "roxie"
-          ],
+          "const": "roxie",
           "type": "string"
         },
         "url": {
@@ -1087,9 +1026,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "scale"
-          ],
+          "const": "scale",
           "type": "string"
         }
       },
@@ -1111,9 +1048,7 @@
           "type": "array"
         },
         "type": {
-          "enum": [
-            "sort"
-          ],
+          "const": "sort",
           "type": "string"
         }
       },
@@ -1149,9 +1084,7 @@
           "type": "string"
         },
         "type": {
-          "enum": [
-            "template"
-          ],
+          "const": "template",
           "type": "string"
         }
       },
@@ -1241,9 +1174,7 @@
           "$ref": "#/definitions/OutputDict"
         },
         "type": {
-          "enum": [
-            "wuresult"
-          ],
+          "const": "wuresult",
           "type": "string"
         },
         "url": {
@@ -1297,8 +1228,7 @@
             "type": "boolean"
           },
           {
-            "not": {
-            }
+            "not": {}
           },
           {
             "$ref": "#/definitions/IWidgetProperties"
@@ -1360,20 +1290,12 @@
       ]
     },
     "Range": {
-      "items": [
-        {
-          "type": [
-            "number",
-            "string"
-          ]
-        },
-        {
-          "type": [
-            "number",
-            "string"
-          ]
-        }
-      ],
+      "items": {
+        "type": [
+          "number",
+          "string"
+        ]
+      },
       "maxItems": 2,
       "minItems": 2,
       "type": "array"
@@ -1622,9 +1544,7 @@
           "$ref": "#/definitions/IProperties"
         },
         "version": {
-          "enum": [
-            "2.2.1"
-          ],
+          "const": "2.2.1",
           "type": "string"
         }
       },
@@ -1644,4 +1564,4 @@
       "type": "string"
     }
   }
-}
+}

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/ddl-shim";
-export const PKG_VERSION = "2.17.25";
-export const BUILD_VERSION = "2.101.0";
+export const PKG_VERSION = "2.18.1";
+export const BUILD_VERSION = "2.102.1";

package/src/cli.ts

@@ -1,60 +1,60 @@
-import * as fs from "fs";
-
-// @ts-ignore
-import * as ddl2Schema from "../schema/v2.json";
-import { upgrade } from "./upgrade";
-
-const args = process.argv.slice(2);
-
-switch (args[0]) {
-    case "--echo":
-        process.stdout.write(args[1]);
-        break;
-    case "--schema":
-        process.stdout.write(JSON.stringify(ddl2Schema));
-        break;
-    case "--upgrade":
-    case "--upgradeNoLower":
-        const srcPath = args[1];
-        const destPath = args[2];
-        const baseUrl = args[3];
-        const wuid = args[4];
-        const layoutPath = args[5];
-        if (srcPath && destPath && srcPath !== destPath) {
-            let layoutJson = {};
-            if (layoutPath) {
-                try {
-                    layoutJson = JSON.parse(fs.readFileSync(layoutPath).toString());
-                } catch (e) {
-                    console.error(e);
-                }
-            }
-            fs.readFile(srcPath, "utf8", function (err, data) {
-                if (err) throw err;
-                const ddl2 = upgrade(
-                    JSON.parse(data),
-                    baseUrl || "http://localhost:8010",
-                    wuid || "WUID",
-                    args[0] === "--upgrade",
-                    layoutJson
-                );
-                fs.writeFile(destPath, JSON.stringify(ddl2), function (err) {
-                    if (err) throw err;
-                    console.log("complete");
-                });
-            });
-        }
-        break;
-    case "--help":
-        break;
-    default:
-        process.stdout.write(`
-Usage:  <command>
-
-where <command> is one of:
-    --schema:  output DDL2 schmea.
-    --upgrade ddl1 [baseUrl wuid [layout]]:  updgrade ddl and layout version 1 to ddl version 2.
-    --upgradeNoLower ddl1 [baseUrl wuid [layout]]:  updgrade ddl and layout version 1 to ddl version 2 without changing field IDs upper/lower casing.
-    --help:  this message.
-`);
-}
+import * as fs from "fs";
+
+// @ts-ignore
+import * as ddl2Schema from "../schema/v2.json";
+import { upgrade } from "./upgrade";
+
+const args = process.argv.slice(2);
+
+switch (args[0]) {
+    case "--echo":
+        process.stdout.write(args[1]);
+        break;
+    case "--schema":
+        process.stdout.write(JSON.stringify(ddl2Schema));
+        break;
+    case "--upgrade":
+    case "--upgradeNoLower":
+        const srcPath = args[1];
+        const destPath = args[2];
+        const baseUrl = args[3];
+        const wuid = args[4];
+        const layoutPath = args[5];
+        if (srcPath && destPath && srcPath !== destPath) {
+            let layoutJson = {};
+            if (layoutPath) {
+                try {
+                    layoutJson = JSON.parse(fs.readFileSync(layoutPath).toString());
+                } catch (e) {
+                    console.error(e);
+                }
+            }
+            fs.readFile(srcPath, "utf8", function (err, data) {
+                if (err) throw err;
+                const ddl2 = upgrade(
+                    JSON.parse(data),
+                    baseUrl || "http://localhost:8010",
+                    wuid || "WUID",
+                    args[0] === "--upgrade",
+                    layoutJson
+                );
+                fs.writeFile(destPath, JSON.stringify(ddl2), function (err) {
+                    if (err) throw err;
+                    console.log("complete");
+                });
+            });
+        }
+        break;
+    case "--help":
+        break;
+    default:
+        process.stdout.write(`
+Usage:  <command>
+
+where <command> is one of:
+    --schema:  output DDL2 schmea.
+    --upgrade ddl1 [baseUrl wuid [layout]]:  updgrade ddl and layout version 1 to ddl version 2.
+    --upgradeNoLower ddl1 [baseUrl wuid [layout]]:  updgrade ddl and layout version 1 to ddl version 2 without changing field IDs upper/lower casing.
+    --help:  this message.
+`);
+}