@hpcc-js/marshaller 2.28.7 → 2.28.8

package/src/ddl2/ddleditor.ts

@@ -1,60 +1,60 @@
-import { JSONEditor } from "@hpcc-js/codemirror";
-import { DDL2, validate2 } from "@hpcc-js/ddl-shim";
-import { Table } from "@hpcc-js/dgrid";
-import { SplitPanel } from "@hpcc-js/phosphor";
-
-import "../../src/ddl2/ddleditor.css";
-
-export class DDLEditor extends SplitPanel {
-    summary: string = "0 Errors";
-    _ddlEditor = new JSONEditor().on("changes", (changes) => {
-        this.checkSyntax();
-    });
-    _errorTable = new Table()
-        .columns(["dataPath", "keyword", "message", "params"])
-        ;
-
-    ddl(): object;
-    ddl(_: object): this;
-    ddl(_?: object): object | this {
-        if (!arguments.length) return this._ddlEditor.json();
-        this._ddlEditor.json(_);
-        this.checkSyntax();
-        return this;
-    }
-
-    checkSyntax() {
-        try {
-            const json = this.ddl();
-            try {
-                const { success, errors } = validate2(json as DDL2.Schema);
-                if (success) {
-                    this._errorTable.data([]);
-                } else {
-                    this._errorTable.data(errors.map(error => [error.dataPath, error.keyword, error.message, JSON.stringify(error.params)]));
-                }
-            } catch (e) {
-                this._errorTable.data([["", "Validation Failed", "", ""]]);
-            }
-        } catch (e) {
-            this._errorTable.data([["ALL", "Invalid JSON", "", ""]]);
-        }
-        if (this._renderCount) {
-            this._errorTable.lazyRender();
-        }
-    }
-
-    enter(domNode, element) {
-        super.enter(domNode, element);
-        this
-            .addWidget(this._ddlEditor)
-            .addWidget(this._errorTable)
-            ;
-    }
-
-    update(domNode, _element) {
-        super.update(domNode, _element);
-    }
-
-}
-DDLEditor.prototype._class += " codemirror_DDLEditor";
+import { JSONEditor } from "@hpcc-js/codemirror";
+import { DDL2, validate2 } from "@hpcc-js/ddl-shim";
+import { Table } from "@hpcc-js/dgrid";
+import { SplitPanel } from "@hpcc-js/phosphor";
+
+import "../../src/ddl2/ddleditor.css";
+
+export class DDLEditor extends SplitPanel {
+    summary: string = "0 Errors";
+    _ddlEditor = new JSONEditor().on("changes", (changes) => {
+        this.checkSyntax();
+    });
+    _errorTable = new Table()
+        .columns(["dataPath", "keyword", "message", "params"])
+        ;
+
+    ddl(): object;
+    ddl(_: object): this;
+    ddl(_?: object): object | this {
+        if (!arguments.length) return this._ddlEditor.json();
+        this._ddlEditor.json(_);
+        this.checkSyntax();
+        return this;
+    }
+
+    checkSyntax() {
+        try {
+            const json = this.ddl();
+            try {
+                const { success, errors } = validate2(json as DDL2.Schema);
+                if (success) {
+                    this._errorTable.data([]);
+                } else {
+                    this._errorTable.data(errors.map(error => [error.dataPath, error.keyword, error.message, JSON.stringify(error.params)]));
+                }
+            } catch (e) {
+                this._errorTable.data([["", "Validation Failed", "", ""]]);
+            }
+        } catch (e) {
+            this._errorTable.data([["ALL", "Invalid JSON", "", ""]]);
+        }
+        if (this._renderCount) {
+            this._errorTable.lazyRender();
+        }
+    }
+
+    enter(domNode, element) {
+        super.enter(domNode, element);
+        this
+            .addWidget(this._ddlEditor)
+            .addWidget(this._errorTable)
+            ;
+    }
+
+    update(domNode, _element) {
+        super.update(domNode, _element);
+    }
+
+}
+DDLEditor.prototype._class += " codemirror_DDLEditor";

package/src/ddl2/dsTable.ts

@@ -1,238 +1,238 @@
-import { Button, Spacer } from "@hpcc-js/common";
-import { Table } from "@hpcc-js/dgrid";
-import { ChartPanel } from "@hpcc-js/layout";
-import { CommandRegistry, ContextMenu } from "@hpcc-js/phosphor";
-import { text as d3Text } from "d3-fetch";
-import { Databomb } from "./activities/databomb";
-import { DatasourceRefType } from "./activities/datasource";
-import { DSPicker } from "./activities/dspicker";
-import { Form, FormField } from "./activities/form";
-import { LogicalFile } from "./activities/logicalfile";
-import { RestField, RestResult, RestService } from "./activities/rest";
-import { RoxieResult, RoxieService } from "./activities/roxie";
-import { WU, WUResult } from "./activities/wuresult";
-import { ElementContainer } from "./model/element";
-
-export class DSTable extends ChartPanel {
-
-    private _addButton = new Button().faChar("fa-plus").tooltip("Add...")
-        .on("click", () => {
-            const node = this._addButton.element().node();
-            const rect = node.getBoundingClientRect();
-            if (this._contextMenu.open({
-                target: node,
-                currentTarget: node,
-                clientX: rect.left,
-                clientY: rect.bottom
-            })) {
-            }
-        });
-
-    private _removeButton = new Button().faChar("fa-minus").tooltip("Remove...")
-        .enabled(false)
-        .on("click", () => {
-            this.remove();
-        });
-
-    private _cloneButton = new Button().faChar("fa-clone").tooltip("Clone...")
-        .enabled(false)
-        .on("click", () => {
-            if (this._selectedDS2) {
-                if (this._selectedDS2 instanceof Databomb) {
-                    this.add(Databomb.fromDDL(this._selectedDS2.toDDL(), true));
-                } else if (this._selectedDS2 instanceof Form) {
-                    this.add(Form.fromDDL(this._selectedDS2.toDDL(), true));
-                } else if (this._selectedDS2 instanceof LogicalFile) {
-                    this.add(LogicalFile.fromDDL(this._ec, this._selectedDS2.toDDL(), true));
-                } else if (this._selectedDS2 instanceof RestResult) {
-                    this.add(new RestResult(this._ec)
-                        .service(RestService.fromDDL(this._ec, this._selectedDS2.service().toDDL(), true))
-                        .resultName(this._selectedDS2.resultName())
-                    );
-                } else if (this._selectedDS2 instanceof WUResult) {
-                    this.add(new WUResult(this._ec)
-                        .wu(WU.fromDDL(this._ec, this._selectedDS2.wu().toDDL(), true))
-                        .resultName(this._selectedDS2.resultName())
-                    );
-                } else if (this._selectedDS2 instanceof RoxieResult) {
-                    this.add(new RoxieResult(this._ec)
-                        .service(RoxieService.fromDDL(this._ec, this._selectedDS2.service().toDDL(), true))
-                        .resultName(this._selectedDS2.resultName())
-                    );
-                } else {
-                    console.warn("Unknown datasoure type");
-                }
-            }
-        });
-
-    private _addSamples = new Button().faChar("fa-database").tooltip("Add Samples")
-        .on("click", () => {
-            d3Text("https://raw.githubusercontent.com/hpcc-systems/Visualization/trunk/utils/data/data/airports.csv").then(csv => {
-                this.add(new Databomb().format("csv").payload(csv));
-            });
-            d3Text("https://raw.githubusercontent.com/hpcc-systems/Visualization/trunk/utils/data/data/carriers.csv").then(csv => {
-                this.add(new Databomb().format("csv").payload(csv));
-            });
-            d3Text("https://raw.githubusercontent.com/hpcc-systems/Visualization/trunk/utils/data/data/stats.csv").then(csv => {
-                this.add(new Databomb().format("csv").payload(csv));
-            });
-            this.add(new RestResult(this._ec)
-                .service(new RestService(this._ec)
-                    .url("https://cmsapi.pulselive.com/")
-                    .action("rugby/rankings/mru")
-                    .requestFields([
-                        new RestField().fieldID("xxx"),
-                        new RestField().fieldID("date")
-                    ]))
-                .resultName("entries")
-            );
-            this.add(new WUResult(this._ec)
-                .wu(new WU(this._ec).url("https://play.hpccsystems.com:18010").wuid("W20200206-140840"))
-                .resultName("Result 1")
-            );
-            this.add(new LogicalFile(this._ec)
-                .url("https://play.hpccsystems.com:18010")
-                .logicalFile("yelp::lc::clean::review")
-            );
-            const vmRoxie = new RoxieService(this._ec)
-                .url("https://play.hpccsystems.com:18002")
-                .querySet("roxie")
-                .queryID("h3testcities")
-                ;
-            this.add(new RoxieResult(this._ec)
-                .service(vmRoxie)
-                .resultName("Result")
-            );
-            this.add(new Form()
-                .formFields([
-                    new FormField().type("number").fieldID("id").value(8),
-                    new FormField().fieldID("first_name").value("John"),
-                    new FormField().fieldID("last_name").value("Doe"),
-                    new FormField().fieldID("gender").default("M"),
-                    new FormField().type("number").fieldID("age")
-                ])
-            );
-            this.render();
-        });
-
-    private _dstable = new Table();
-    private _selectedDS;
-    private _selectedDS2;
-
-    private _contextMenu;
-
-    constructor(private _ec: ElementContainer) {
-        super();
-        this
-            .buttons([this._addButton, this._removeButton, new Spacer(), this._cloneButton, new Spacer(), this._addSamples])
-            .widget(this._dstable)
-            .columns(["ID", "Type", "References"])
-            .on("click", (row, col, sel) => {
-                this._selectedDS2 = row.__lparam;
-                if (sel && row.References === 0 && row.ID !== "Empty") {
-                    this._selectedDS = row.__lparam;
-                } else {
-                    delete this._selectedDS;
-                }
-                this._removeButton.enabled(this._selectedDS !== undefined).render();
-                this._cloneButton.enabled(this._selectedDS2 !== undefined).render();
-            })
-            ;
-
-        this.initMenu();
-    }
-
-    initMenu() {
-        const commands = new CommandRegistry();
-
-        //  Dashboard  Commands  ---
-        commands.addCommand("add_wu_result", {
-            label: "Workunit Result",
-            execute: () => {
-                this.add(new WUResult(this._ec));
-            }
-        });
-
-        commands.addCommand("add_logicalfile", {
-            label: "Logical File",
-            execute: () => {
-                this.add(new LogicalFile(this._ec));
-            }
-        });
-
-        commands.addCommand("add_roxie", {
-            label: "Roxie Service",
-            execute: () => {
-                this.add(new RoxieResult(this._ec));
-            }
-        });
-
-        commands.addCommand("add_rest", {
-            label: "Rest",
-            execute: () => {
-                this.add(new RestResult(this._ec));
-            }
-        });
-
-        commands.addCommand("add_databomb", {
-            label: "Databomb",
-            execute: () => {
-                this.add(new Databomb());
-            }
-        });
-
-        commands.addCommand("add_form", {
-            label: "Form",
-            execute: () => {
-                this.add(new Form());
-            }
-        });
-
-        this._contextMenu = new ContextMenu({ commands });
-        this._contextMenu.addItem({ command: "add_wu_result", selector: ".common_Button" });
-        this._contextMenu.addItem({ command: "add_logicalfile", selector: ".common_Button" });
-        this._contextMenu.addItem({ command: "add_roxie", selector: ".common_Button" });
-        this._contextMenu.addItem({ command: "add_rest", selector: ".common_Button" });
-        this._contextMenu.addItem({ command: "add_databomb", selector: ".common_Button" });
-        this._contextMenu.addItem({ command: "add_form", selector: ".common_Button" });
-    }
-
-    add(ds: DatasourceRefType) {
-        this._ec.appendDatasource(ds);
-        this.render();
-    }
-
-    remove() {
-        if (this._selectedDS) {
-            this._ec.removeDatasource(this._selectedDS);
-            this.render();
-        }
-    }
-
-    private _prevDataID;
-    render(callback?) {
-        const refs = {};
-        this._ec.elements().forEach(e => {
-            let ds = e.hipiePipeline().datasource();
-            if (ds instanceof DSPicker) {
-                ds = ds.datasource();
-            }
-            if (refs[ds.id()] === undefined) {
-                refs[ds.id()] = 0;
-            }
-            refs[ds.id()]++;
-        });
-        const data = this._ec.datasources().filter(ds => ds.id() !== "Empty").map(ds => {
-            if (refs[ds.id()] === undefined) {
-                refs[ds.id()] = 0;
-            }
-            return [ds.id(), ds.classID(), refs[ds.id()] || 0, ds];
-        });
-        const dataID = JSON.stringify(refs);
-        if (this._prevDataID !== dataID) {
-            this._prevDataID = dataID;
-            this.data(data);
-        }
-        return super.render(callback);
-    }
-}
+import { Button, Spacer } from "@hpcc-js/common";
+import { Table } from "@hpcc-js/dgrid";
+import { ChartPanel } from "@hpcc-js/layout";
+import { CommandRegistry, ContextMenu } from "@hpcc-js/phosphor";
+import { text as d3Text } from "d3-fetch";
+import { Databomb } from "./activities/databomb";
+import { DatasourceRefType } from "./activities/datasource";
+import { DSPicker } from "./activities/dspicker";
+import { Form, FormField } from "./activities/form";
+import { LogicalFile } from "./activities/logicalfile";
+import { RestField, RestResult, RestService } from "./activities/rest";
+import { RoxieResult, RoxieService } from "./activities/roxie";
+import { WU, WUResult } from "./activities/wuresult";
+import { ElementContainer } from "./model/element";
+
+export class DSTable extends ChartPanel {
+
+    private _addButton = new Button().faChar("fa-plus").tooltip("Add...")
+        .on("click", () => {
+            const node = this._addButton.element().node();
+            const rect = node.getBoundingClientRect();
+            if (this._contextMenu.open({
+                target: node,
+                currentTarget: node,
+                clientX: rect.left,
+                clientY: rect.bottom
+            })) {
+            }
+        });
+
+    private _removeButton = new Button().faChar("fa-minus").tooltip("Remove...")
+        .enabled(false)
+        .on("click", () => {
+            this.remove();
+        });
+
+    private _cloneButton = new Button().faChar("fa-clone").tooltip("Clone...")
+        .enabled(false)
+        .on("click", () => {
+            if (this._selectedDS2) {
+                if (this._selectedDS2 instanceof Databomb) {
+                    this.add(Databomb.fromDDL(this._selectedDS2.toDDL(), true));
+                } else if (this._selectedDS2 instanceof Form) {
+                    this.add(Form.fromDDL(this._selectedDS2.toDDL(), true));
+                } else if (this._selectedDS2 instanceof LogicalFile) {
+                    this.add(LogicalFile.fromDDL(this._ec, this._selectedDS2.toDDL(), true));
+                } else if (this._selectedDS2 instanceof RestResult) {
+                    this.add(new RestResult(this._ec)
+                        .service(RestService.fromDDL(this._ec, this._selectedDS2.service().toDDL(), true))
+                        .resultName(this._selectedDS2.resultName())
+                    );
+                } else if (this._selectedDS2 instanceof WUResult) {
+                    this.add(new WUResult(this._ec)
+                        .wu(WU.fromDDL(this._ec, this._selectedDS2.wu().toDDL(), true))
+                        .resultName(this._selectedDS2.resultName())
+                    );
+                } else if (this._selectedDS2 instanceof RoxieResult) {
+                    this.add(new RoxieResult(this._ec)
+                        .service(RoxieService.fromDDL(this._ec, this._selectedDS2.service().toDDL(), true))
+                        .resultName(this._selectedDS2.resultName())
+                    );
+                } else {
+                    console.warn("Unknown datasoure type");
+                }
+            }
+        });
+
+    private _addSamples = new Button().faChar("fa-database").tooltip("Add Samples")
+        .on("click", () => {
+            d3Text("https://raw.githubusercontent.com/hpcc-systems/Visualization/trunk/utils/data/data/airports.csv").then(csv => {
+                this.add(new Databomb().format("csv").payload(csv));
+            });
+            d3Text("https://raw.githubusercontent.com/hpcc-systems/Visualization/trunk/utils/data/data/carriers.csv").then(csv => {
+                this.add(new Databomb().format("csv").payload(csv));
+            });
+            d3Text("https://raw.githubusercontent.com/hpcc-systems/Visualization/trunk/utils/data/data/stats.csv").then(csv => {
+                this.add(new Databomb().format("csv").payload(csv));
+            });
+            this.add(new RestResult(this._ec)
+                .service(new RestService(this._ec)
+                    .url("https://cmsapi.pulselive.com/")
+                    .action("rugby/rankings/mru")
+                    .requestFields([
+                        new RestField().fieldID("xxx"),
+                        new RestField().fieldID("date")
+                    ]))
+                .resultName("entries")
+            );
+            this.add(new WUResult(this._ec)
+                .wu(new WU(this._ec).url("https://play.hpccsystems.com:18010").wuid("W20200206-140840"))
+                .resultName("Result 1")
+            );
+            this.add(new LogicalFile(this._ec)
+                .url("https://play.hpccsystems.com:18010")
+                .logicalFile("yelp::lc::clean::review")
+            );
+            const vmRoxie = new RoxieService(this._ec)
+                .url("https://play.hpccsystems.com:18002")
+                .querySet("roxie")
+                .queryID("h3testcities")
+                ;
+            this.add(new RoxieResult(this._ec)
+                .service(vmRoxie)
+                .resultName("Result")
+            );
+            this.add(new Form()
+                .formFields([
+                    new FormField().type("number").fieldID("id").value(8),
+                    new FormField().fieldID("first_name").value("John"),
+                    new FormField().fieldID("last_name").value("Doe"),
+                    new FormField().fieldID("gender").default("M"),
+                    new FormField().type("number").fieldID("age")
+                ])
+            );
+            this.render();
+        });
+
+    private _dstable = new Table();
+    private _selectedDS;
+    private _selectedDS2;
+
+    private _contextMenu;
+
+    constructor(private _ec: ElementContainer) {
+        super();
+        this
+            .buttons([this._addButton, this._removeButton, new Spacer(), this._cloneButton, new Spacer(), this._addSamples])
+            .widget(this._dstable)
+            .columns(["ID", "Type", "References"])
+            .on("click", (row, col, sel) => {
+                this._selectedDS2 = row.__lparam;
+                if (sel && row.References === 0 && row.ID !== "Empty") {
+                    this._selectedDS = row.__lparam;
+                } else {
+                    delete this._selectedDS;
+                }
+                this._removeButton.enabled(this._selectedDS !== undefined).render();
+                this._cloneButton.enabled(this._selectedDS2 !== undefined).render();
+            })
+            ;
+
+        this.initMenu();
+    }
+
+    initMenu() {
+        const commands = new CommandRegistry();
+
+        //  Dashboard  Commands  ---
+        commands.addCommand("add_wu_result", {
+            label: "Workunit Result",
+            execute: () => {
+                this.add(new WUResult(this._ec));
+            }
+        });
+
+        commands.addCommand("add_logicalfile", {
+            label: "Logical File",
+            execute: () => {
+                this.add(new LogicalFile(this._ec));
+            }
+        });
+
+        commands.addCommand("add_roxie", {
+            label: "Roxie Service",
+            execute: () => {
+                this.add(new RoxieResult(this._ec));
+            }
+        });
+
+        commands.addCommand("add_rest", {
+            label: "Rest",
+            execute: () => {
+                this.add(new RestResult(this._ec));
+            }
+        });
+
+        commands.addCommand("add_databomb", {
+            label: "Databomb",
+            execute: () => {
+                this.add(new Databomb());
+            }
+        });
+
+        commands.addCommand("add_form", {
+            label: "Form",
+            execute: () => {
+                this.add(new Form());
+            }
+        });
+
+        this._contextMenu = new ContextMenu({ commands });
+        this._contextMenu.addItem({ command: "add_wu_result", selector: ".common_Button" });
+        this._contextMenu.addItem({ command: "add_logicalfile", selector: ".common_Button" });
+        this._contextMenu.addItem({ command: "add_roxie", selector: ".common_Button" });
+        this._contextMenu.addItem({ command: "add_rest", selector: ".common_Button" });
+        this._contextMenu.addItem({ command: "add_databomb", selector: ".common_Button" });
+        this._contextMenu.addItem({ command: "add_form", selector: ".common_Button" });
+    }
+
+    add(ds: DatasourceRefType) {
+        this._ec.appendDatasource(ds);
+        this.render();
+    }
+
+    remove() {
+        if (this._selectedDS) {
+            this._ec.removeDatasource(this._selectedDS);
+            this.render();
+        }
+    }
+
+    private _prevDataID;
+    render(callback?) {
+        const refs = {};
+        this._ec.elements().forEach(e => {
+            let ds = e.hipiePipeline().datasource();
+            if (ds instanceof DSPicker) {
+                ds = ds.datasource();
+            }
+            if (refs[ds.id()] === undefined) {
+                refs[ds.id()] = 0;
+            }
+            refs[ds.id()]++;
+        });
+        const data = this._ec.datasources().filter(ds => ds.id() !== "Empty").map(ds => {
+            if (refs[ds.id()] === undefined) {
+                refs[ds.id()] = 0;
+            }
+            return [ds.id(), ds.classID(), refs[ds.id()] || 0, ds];
+        });
+        const dataID = JSON.stringify(refs);
+        if (this._prevDataID !== dataID) {
+            this._prevDataID = dataID;
+            this.data(data);
+        }
+        return super.render(callback);
+    }
+}

package/src/ddl2/dvTable.ts

@@ -1,31 +1,31 @@
-import { Table } from "@hpcc-js/dgrid";
-import { ChartPanel } from "@hpcc-js/layout";
-import { hashSum } from "@hpcc-js/util";
-import { ElementContainer } from "./model/element";
-
-export class DVTable extends ChartPanel {
-
-    private _dvtable = new Table();
-
-    constructor(private _ec: ElementContainer) {
-        super();
-        this
-            .titleVisible(false)
-            .widget(this._dvtable)
-            .columns(["ID", "Title"])
-            ;
-    }
-
-    private _prevDataID;
-    render(callback?) {
-        const data = this._ec.elements().map(elem => {
-            return [elem.id(), elem.visualization().title(), elem];
-        });
-        const dataID = hashSum(data.map(row => row[0]));
-        if (this._prevDataID !== dataID) {
-            this._prevDataID = dataID;
-            this.data(data);
-        }
-        return super.render(callback);
-    }
-}
+import { Table } from "@hpcc-js/dgrid";
+import { ChartPanel } from "@hpcc-js/layout";
+import { hashSum } from "@hpcc-js/util";
+import { ElementContainer } from "./model/element";
+
+export class DVTable extends ChartPanel {
+
+    private _dvtable = new Table();
+
+    constructor(private _ec: ElementContainer) {
+        super();
+        this
+            .titleVisible(false)
+            .widget(this._dvtable)
+            .columns(["ID", "Title"])
+            ;
+    }
+
+    private _prevDataID;
+    render(callback?) {
+        const data = this._ec.elements().map(elem => {
+            return [elem.id(), elem.visualization().title(), elem];
+        });
+        const dataID = hashSum(data.map(row => row[0]));
+        if (this._prevDataID !== dataID) {
+            this._prevDataID = dataID;
+            this.data(data);
+        }
+        return super.render(callback);
+    }
+}