@hpcc-js/marshaller 3.1.0 → 3.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/marshaller",
-    "version": "3.1.0",
+    "version": "3.2.0",
     "description": "hpcc-js - Viz Marshaller",
     "type": "module",
     "main": "./dist/index.umd.cjs",
@@ -39,23 +39,23 @@
         "update-major": "npx --yes npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/chart": "^3.7.5",
-        "@hpcc-js/codemirror": "^3.7.5",
-        "@hpcc-js/common": "^3.7.6",
-        "@hpcc-js/comms": "^3.15.6",
-        "@hpcc-js/composite": "^3.5.7",
-        "@hpcc-js/ddl-shim": "^3.3.5",
-        "@hpcc-js/dgrid": "^3.7.6",
-        "@hpcc-js/form": "^3.4.5",
-        "@hpcc-js/graph": "^3.7.5",
-        "@hpcc-js/layout": "^3.5.11",
-        "@hpcc-js/map": "^3.5.5",
-        "@hpcc-js/other": "^3.5.5",
-        "@hpcc-js/phosphor": "^3.6.0",
-        "@hpcc-js/util": "^3.5.5"
+        "@hpcc-js/chart": "^3.7.7",
+        "@hpcc-js/codemirror": "^3.7.7",
+        "@hpcc-js/common": "^3.7.8",
+        "@hpcc-js/comms": "^3.15.8",
+        "@hpcc-js/composite": "^3.5.9",
+        "@hpcc-js/ddl-shim": "^3.3.7",
+        "@hpcc-js/dgrid": "^3.7.8",
+        "@hpcc-js/form": "^3.4.7",
+        "@hpcc-js/graph": "^3.7.7",
+        "@hpcc-js/layout": "^3.5.13",
+        "@hpcc-js/map": "^3.5.7",
+        "@hpcc-js/other": "^3.5.7",
+        "@hpcc-js/phosphor": "^3.6.2",
+        "@hpcc-js/util": "^3.5.7"
     },
     "devDependencies": {
-        "@hpcc-js/esbuild-plugins": "^1.8.7",
+        "@hpcc-js/esbuild-plugins": "^1.8.9",
         "d3-array": "^1",
         "d3-collection": "^1",
         "d3-dsv": "^1",
@@ -73,5 +73,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "5fcd2df494c2f457cf07c9100d6101b123e3ab40"
+    "gitHead": "6695c9be7e44c9a4dd50e36fad2044b287685e2e"
 }

package/src/dashy.ts

@@ -170,6 +170,14 @@ export class Dashy extends SplitPanel {
         return this._lhsDashboard.save();
     }
 
+    serializeDDL(): string {
+        return JSON.stringify(this.save());
+    }
+
+    deserializeDDL(json: string): Promise<void> {
+        return this.restore(JSON.parse(json) as DDL2.Schema);
+    }
+
     restore(json: DDL2.Schema): Promise<void> {
         this._lhsSheet.active(this._lhsDashboard);
         return this.clear().then(() => {

package/src/ddl2/dashboard.ts

@@ -256,8 +256,17 @@ export class Dashboard extends ChartPanel {
         return ddlAdapter.write();
     }
 
+    serializeDDL(): string {
+        return JSON.stringify(this.save());
+    }
+
+    deserializeDDL(json: string): this {
+        return this.restore(JSON.parse(json) as DDL2.Schema);
+    }
+
     restore(_: DDL2.Schema, render: boolean = false): this {
         this.ensureDockPanel(_ && _.properties && _.properties.layout instanceof Array ? "grid" : "dock");
+        this._ec.clear();
         const ddlAdapter = new DDLAdapter(this);
         ddlAdapter.read(_);
         if (render) {

package/src/ddl2/model/visualization.ts

@@ -339,7 +339,7 @@ Visualization.prototype.chartType = function (this: Visualization, _?, props?) {
     if (_ !== undefined && VizTypeSet.indexOf(_) === -1) {
         _ = "Table";
     }
-    const retVal = Visualization.prototype._origChartType.call(this, _);
+    const retVal = Visualization.prototype._origChartType.apply(this, arguments);
     if (_ !== undefined) {
         this.typeChanged();
         if (props) {

package/types/dashy.d.ts

@@ -30,6 +30,8 @@ export declare class Dashy extends SplitPanel {
     elementContainer(): ElementContainer;
     clear(): Promise<void>;
     save(): DDL2.Schema;
+    serializeDDL(): string;
+    deserializeDDL(json: string): Promise<void>;
     restore(json: DDL2.Schema): Promise<void>;
     importDDL(ddl: DDL1.DDLSchema | DDL2.Schema, baseUrl?: string, wuid?: string, dermatologyJson?: object): Promise<void>;
     activeLHS(): Widget;

package/types/ddl2/dashboard.d.ts

@@ -35,6 +35,8 @@ export declare class Dashboard extends ChartPanel {
     ddl(_: DDL2.Schema): this;
     layoutObj(_: object | null): this;
     save(): DDL2.Schema;
+    serializeDDL(): string;
+    deserializeDDL(json: string): this;
     restore(_: DDL2.Schema, render?: boolean): this;
     importDDL(ddl: DDL1.DDLSchema | DDL2.Schema, baseUrl?: string, wuid?: string, dermatologyJson?: object): this;
     javascript(): string;