@hpcc-js/graph 2.72.0 → 2.73.0

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/graph",
-    "version": "2.72.0",
+    "version": "2.73.0",
     "description": "hpcc-js - Viz Graph",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -51,11 +51,11 @@
         "ddd": "downlevel-dts . ts3.4"
     },
     "dependencies": {
-        "@hpcc-js/api": "^2.8.54",
-        "@hpcc-js/common": "^2.59.0",
-        "@hpcc-js/html": "^2.34.0",
-        "@hpcc-js/react": "^2.42.0",
-        "@hpcc-js/util": "^2.40.0"
+        "@hpcc-js/api": "^2.8.55",
+        "@hpcc-js/common": "^2.60.0",
+        "@hpcc-js/html": "^2.35.0",
+        "@hpcc-js/react": "^2.43.0",
+        "@hpcc-js/util": "^2.41.0"
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.10.20",
@@ -82,6 +82,7 @@
         "downlevel-dts": "0.6.0",
         "es6-promise": "4.2.8",
         "eslint": "7.32.0",
+        "eslint-plugin-react-hooks": "^4.3.0",
         "npm-run-all": "4.1.5",
         "rimraf": "2.6.3",
         "rollup": "2.10.7",
@@ -103,5 +104,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "b19e2b0815817fa434b4ce7696f6ed7680c0e95c"
+    "gitHead": "61f20bb45f0d3baae7366f041ee87ee58ff7bb13"
 }

package/src/Sankey.ts

@@ -68,7 +68,6 @@ export class Sankey extends SVGWidget {
     constructor() {
         super();
         Utility.SimpleSelectionMixin.call(this);
-
         this._drawStartPos = "origin";
     }
 
@@ -79,6 +78,7 @@ export class Sankey extends SVGWidget {
         };
         if (this.data().length === 0) return retVal;
         const vertexIndex = {};
+        const valueIdx = 2;
         const mappings = this.mappings().filter(mapping => mapping.valid());
         mappings.forEach(function (mapping, idx) {
             const view = this._db.rollupView([mapping.column()]);
@@ -89,7 +89,8 @@ export class Sankey extends SVGWidget {
                         __id: id,
                         __category: mapping.column(),
                         name: row.key,
-                        origRow: row.values
+                        origRow: row.value,
+                        value: row.value[idx][valueIdx]
                     });
                     vertexIndex[id] = retVal.vertices.length - 1;
                 }
@@ -107,7 +108,7 @@ export class Sankey extends SVGWidget {
                             __id: sourceID + "_" + targetID,
                             source: vertexIndex[sourceID],
                             target: vertexIndex[targetID],
-                            value: mapping2.aggregate(value.value)
+                            value: value.value[0][valueIdx]
                         });
                     });
                 });
@@ -116,7 +117,6 @@ export class Sankey extends SVGWidget {
 
         return retVal;
     }
-
     enter(domNode, element) {
         super.enter(domNode, element);
 
@@ -129,14 +129,22 @@ export class Sankey extends SVGWidget {
 
         this._palette = this._palette.switch(this.paletteID());
 
+        const strokeWidth = this.vertexStrokeWidth();
+
         const sankeyData = this.sankeyData();
+        const sw2 = strokeWidth * 2;
         this._d3Sankey
-            .extent([[0, 0], [this.width(), this.height()]])
+            .extent([
+                [strokeWidth, strokeWidth],
+                [this.width() - sw2, this.height() - sw2]
+            ])
             .nodeWidth(this.vertexWidth())
             .nodePadding(this.vertexPadding())
             ;
-
-        this._d3Sankey({ nodes: sankeyData.vertices, links: sankeyData.edges });
+        this._d3Sankey({
+            nodes: sankeyData.vertices,
+            links: sankeyData.edges
+        });
         const context = this;
 
         // Links ---
@@ -150,15 +158,16 @@ export class Sankey extends SVGWidget {
             })
             .merge(link)
             .attr("d", d3SankeyLinkHorizontal())
-            .style("stroke-width", function (d) { return Math.max(1, d.dy); })
-            .sort(function (a, b) { return b.dy - a.dy; })
+            .style("stroke-width", function (d) {
+                return Math.max(1, d.width);
+            })
+            .sort(function (a, b) { return b.width - a.width; })
             .select("title")
             .text(function (d) {
                 return d.source.name + " → " + d.target.name + "\n" + d.value;
             })
             ;
         link.exit().remove();
-
         // Nodes ---
         const node = element.selectAll(".node").data(sankeyData.vertices);
         node.enter().append("g")
@@ -186,24 +195,32 @@ export class Sankey extends SVGWidget {
             */
             .merge(node)
             .attr("transform", function (d) {
-                return "translate(" + d.x + "," + d.y + ")";
+                let _x = 0;
+                let _y = 0;
+                if(d.x0)_x=d.x0;
+                if(d.y0)_y=d.y0;
+                return "translate(" + (_x+strokeWidth) + "," + (_y+strokeWidth) + ")";
             })
             .each(function () {
                 const n = d3Select(this);
                 n.select("rect")
-                    .attr("height", function (d: any) { return d.dy; })
+                    .attr("height", function (d: any) { return d.y1 - d.y0; })
                     .attr("width", context._d3Sankey.nodeWidth())
                     .style("fill", function (d: any) { return context._palette(d.name); })
+                    .style("stroke", function (d: any) { return context.vertexStrokeColor(); })
+                    .style("stroke-width", function (d: any) { return strokeWidth; })
                     .style("cursor", (context.xAxisMovement() || context.yAxisMovement()) ? null : "default")
                     ;
                 n.select("text")
                     .attr("x", -6)
-                    .attr("y", function (d: any) { return d.dy / 2; })
+                    .attr("y", function (d: any) {
+                        return (d.y1 - d.y0)/2;
+                    })
                     .attr("dy", ".35em")
                     .attr("text-anchor", "end")
                     .attr("transform", null)
                     .text(function (d: any) { return d.name; })
-                    .filter(function (d: any) { return d.x < context.width() / 2; })
+                    .filter(function (d: any) { return d.x0 < context.width() / 2; })
                     .attr("x", 6 + context._d3Sankey.nodeWidth())
                     .attr("text-anchor", "start")
                     ;
@@ -240,6 +257,8 @@ export class Sankey extends SVGWidget {
 
     paletteID: { (): string; (_: string): Sankey; };
     mappings: { (): SankeyColumn[]; (_: SankeyColumn[]): Sankey; };
+    vertexStrokeWidth: { (): number; (_: number): Sankey; };
+    vertexStrokeColor: { (): string; (_: string): Sankey; };
     vertexWidth: { (): number; (_: number): Sankey; };
     vertexPadding: { (): number; (_: number): Sankey; };
     xAxisMovement: { (): boolean; (_: boolean): Sankey; };
@@ -266,6 +285,8 @@ Sankey.prototype._palette = Palette.ordinal("default");
 
 Sankey.prototype.publish("paletteID", "default", "set", "Color palette for this widget", Sankey.prototype._palette.switch());
 Sankey.prototype.publish("mappings", [], "propertyArray", "Source Columns", null, { autoExpand: SankeyColumn });
+Sankey.prototype.publish("vertexStrokeWidth", 1, "number", "Vertex Stroke Width");
+Sankey.prototype.publish("vertexStrokeColor", "darkgray", "string", "Vertex Stroke Color");
 Sankey.prototype.publish("vertexWidth", 36, "number", "Vertex Width");
 Sankey.prototype.publish("vertexPadding", 40, "number", "Vertex Padding");
 Sankey.prototype.publish("xAxisMovement", false, "boolean", "Enable x-axis movement");

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/graph";
-export const PKG_VERSION = "2.72.0";
-export const BUILD_VERSION = "2.93.0";
+export const PKG_VERSION = "2.73.0";
+export const BUILD_VERSION = "2.94.0";

package/src/graph2/dataGraph.ts

@@ -126,26 +126,31 @@ export class DataGraph extends Graph2 {
         return retVal >= 0 ? retVal : columns.indexOf(defColumn);
     }
 
-    private _prevSubgraphs: Array<Array<string | number | boolean>> = [];
+    private _prevSubgraphs: readonly ISubgraph[] = [];
     private _masterSubgraphs: ISubgraph[] = [];
     private _masterSubgraphsMap: { [key: string]: ISubgraph } = {};
     mergeSubgraphs() {
         const columns = this.subgraphColumns();
         const idIdx = this.indexOf(columns, this.subgraphIDColumn(), "id");
         const labelIdx = this.indexOf(columns, this.subgraphLabelColumn(), "label");
-        const subgraphs = this.subgraphs();
-        const diff = compare2(this._prevSubgraphs, subgraphs, d => d[idIdx] as string);
+        const subgraphs = this.subgraphs().map((sg): ISubgraph => {
+            return {
+                id: "" + sg[idIdx],
+                text: "" + sg[labelIdx],
+                origData: toJsonObj(sg, columns)
+            };
+        });
+        const diff = compare2(this._prevSubgraphs, subgraphs, d => d.id);
         diff.exit.forEach(item => {
-            this._masterSubgraphs = this._masterSubgraphs.filter(i => i.id !== item[idIdx]);
+            this._masterSubgraphs = this._masterSubgraphs.filter(i => i.id !== item.id);
+            delete this._masterSubgraphsMap[item.id];
         });
         diff.enter.forEach(item => {
-            const sg: ISubgraph = {
-                id: "" + item[idIdx],
-                text: "" + item[labelIdx],
-                origData: toJsonObj(item, columns)
-            };
-            this._masterSubgraphs.push(sg);
-            this._masterSubgraphsMap[sg.id] = sg;
+            this._masterSubgraphs.push(item);
+            this._masterSubgraphsMap[item.id] = item;
+        });
+        diff.update.forEach(item => {
+            this._masterSubgraphsMap[item.id].origData = item.origData;
         });
         this._prevSubgraphs = subgraphs;
     }
@@ -180,16 +185,21 @@ export class DataGraph extends Graph2 {
         const diff = compare2(this._prevVertices, vertices, d => d.id);
         diff.exit.forEach(item => {
             this._masterVertices = this._masterVertices.filter(i => i.id !== item.id);
+            delete this._masterVerticesMap[item.id];
         });
         diff.enter.forEach(item => {
             this._masterVertices.push(item);
             this._masterVerticesMap[item.id] = item;
         });
+        diff.update.forEach(item => {
+            this._masterVerticesMap[item.id].origData = item.origData;
+        });
         this._prevVertices = vertices;
     }
 
     protected _prevEdges: readonly IEdge[] = [];
     protected _masterEdges: IEdge[] = [];
+    private _masterEdgesMap: { [key: string]: IEdge } = {};
     mergeEdges() {
         const columns = this.edgeColumns();
         const idIdx = this.indexOf(columns, this.edgeIDColumn(), "id");
@@ -217,9 +227,15 @@ export class DataGraph extends Graph2 {
         const diff = compare2(this._masterEdges, edges, d => d.id);
         diff.exit.forEach(item => {
             this._masterEdges = this._masterEdges.filter(i => i.id !== item.id);
+            delete this._masterEdgesMap[item.id];
         });
         diff.enter.forEach(item => {
             this._masterEdges.push(item);
+            this._masterEdgesMap[item.id] = item;
+
+        });
+        diff.update.forEach(item => {
+            this._masterEdgesMap[item.id].origData = item.origData;
         });
         this._prevEdges = edges;
     }
@@ -241,6 +257,7 @@ export class DataGraph extends Graph2 {
         const diff = compare2(this._prevHierarchy, hierarchy, d => d.id);
         diff.exit.forEach(item => {
             this._masterHierarchy = this._masterHierarchy.filter(i => i.id !== item.id);
+            delete this._masterHierarchyMap[item.id];
         });
         diff.enter.forEach(item => {
             this._masterHierarchy.push(item);

package/src/graph2/sankeyGraph.css

@@ -0,0 +1,45 @@
+.graph_SankeyGraph .node rect {
+  cursor: move;
+  fill-opacity: .9;
+  shape-rendering: crispEdges;
+  stroke: darkgray;
+}
+
+.graph_SankeyGraph .node.selected rect {
+    stroke: red;
+}
+
+.graph_SankeyGraph .node.over rect {
+    stroke: orange;
+}
+
+.graph_SankeyGraph .node.selected.over rect {
+    stroke: red;
+}
+
+.graph_SankeyGraph .node text {
+  pointer-events: none;
+  text-shadow: 0 1px 0 #fff;
+}
+
+.graph_SankeyGraph .node.selected text {
+    fill: red;
+}
+
+.graph_SankeyGraph .node.over text {
+    fill: orange;
+}
+
+.graph_SankeyGraph .node.selected.over text {
+    fill: red;
+}
+
+.graph_SankeyGraph .link {
+  fill: none;
+  stroke: #000;
+  stroke-opacity: .2;
+}
+
+.graph_SankeyGraph .link:hover {
+  stroke-opacity: .5;
+}

package/src/graph2/sankeyGraph.ts

@@ -1,11 +1,11 @@
 import { Palette, publish, SVGWidget, Utility } from "@hpcc-js/common";
+import { compare2 } from "@hpcc-js/util";
 import { sankey as d3Sankey, sankeyLinkHorizontal as d3SankeyLinkHorizontal } from "d3-sankey";
 import { select as d3Select } from "d3-selection";
 import { AnnotationColumn, toJsonObj } from "./dataGraph";
-
-import "../../src/Sankey.css";
 import { IEdge, IVertex } from "./graph";
-import { compare2 } from "@hpcc-js/util";
+
+import "../../src/graph2/sankeyGraph.css";
 
 export class SankeyGraph extends SVGWidget {
     @publish([], "any", "Vertex Columns", null, { internal: true })
@@ -166,10 +166,12 @@ export class SankeyGraph extends SVGWidget {
             // .nodeWidth(this.vertexWidth())
             // .nodePadding(this.vertexPadding())
             ;
-        this._d3Sankey({
-            nodes: sankeyData.vertices,
-            links: sankeyData.edges
-        });
+        if (sankeyData.vertices.length > 0) {
+            this._d3Sankey({
+                nodes: sankeyData.vertices,
+                links: sankeyData.edges
+            });
+        }
         const context = this;
 
         // Links --- 
@@ -198,10 +200,10 @@ export class SankeyGraph extends SVGWidget {
             .attr("class", "node")
             .call(this._selection.enter.bind(this._selection))
             .on("click", function (d) {
-                context.click(context.rowToObj(d.origRow), "", context._selection.selected(this));
+                context.click(d.origData, "", context._selection.selected(this));
             })
             .on("dblclick", function (d) {
-                context.dblclick(context.rowToObj(d.origRow[0]), "", context._selection.selected(this));
+                context.dblclick(d.origData, "", context._selection.selected(this));
             })
             .each(function () {
                 const gElement = d3Select(this);

package/src/test.ts

@@ -3,6 +3,9 @@ import { Graph } from "./Graph";
 import { Vertex } from "./Vertex";
 import { Edge } from "./Edge";
 import { DataGraph } from "./graph2/dataGraph";
+import { SankeyGraph } from "./graph2/sankeyGraph";
+
+export { Test3 as Test };
 
 export class Test1 extends Graph {
 
@@ -19,7 +22,7 @@ export class Test1 extends Graph {
     }
 }
 
-export class Test extends DataGraph {
+export class Test2 extends DataGraph {
 
     constructor() {
         super();
@@ -33,13 +36,11 @@ export class Test extends DataGraph {
             .hierarchyDigraph(false)
 
             .centroidColor("#777777")
-            // .vertexRenderer(Vertex3)
-            // .centroidRenderer(Vertex3)
 
             .selectionGlowColor("#555555")
             .highlightOnMouseOverEdge(true)
             .highlightOnMouseOverVertex(true)
-            .showVertexLabels(false)
+            .showVertexLabels(true)
 
             .applyScaleOnLayout(true)
             .zoomToFitLimit(1)
@@ -100,6 +101,50 @@ export class Test extends DataGraph {
     }
 }
 
+export class Test3 extends SankeyGraph {
+
+    constructor() {
+        super();
+        this
+            .vertexColumns(["category", "id", "label"])
+            .vertices([
+                [0, 0, "A"],
+                [0, 1, "B"],
+                [0, 2, "C"],
+                [0, 3, "D"],
+                [0, 4, "F"],
+                [1, 5, "Math"],
+                [2, 6, "English"],
+                [3, 7, "Geometry"],
+                [4, 8, "Science"],
+            ])
+            .edgeColumns(["source", "target", "weight"])
+            .edges([
+                [0, 5, 48],
+                [0, 6, 28],
+                [0, 7, 26],
+                [0, 8, 38],
+                [1, 5, 63],
+                [1, 6, 39],
+                [1, 7, 36],
+                [1, 8, 58],
+                [2, 5, 42],
+                [2, 6, 36],
+                [2, 7, 27],
+                [2, 8, 68],
+                [3, 5, 90],
+                [3, 6, 59],
+                [3, 7, 15],
+                [3, 8, 35],
+                [4, 5, 10],
+                [4, 6, 3],
+                [4, 7, 6],
+                [4, 8, 4],
+            ])
+            ;
+    }
+}
+
 // 8
 let seed = 8;
 function random() {

package/types/Sankey.d.ts

@@ -41,6 +41,14 @@ export declare class Sankey extends SVGWidget {
         (): SankeyColumn[];
         (_: SankeyColumn[]): Sankey;
     };
+    vertexStrokeWidth: {
+        (): number;
+        (_: number): Sankey;
+    };
+    vertexStrokeColor: {
+        (): string;
+        (_: string): Sankey;
+    };
     vertexWidth: {
         (): number;
         (_: number): Sankey;

package/types/Sankey.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Sankey.d.ts","sourceRoot":"","sources":["../src/Sankey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAE,SAAS,EAAW,MAAM,iBAAiB,CAAC;AAK3E,OAAO,mBAAmB,CAAC;AAU3B,qBAAa,YAAa,SAAQ,WAAW;IACzC,MAAM,EAAE,MAAM,CAAC;;IAMf,KAAK,IAAI,MAAM;IACf,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAOtB,KAAK,IAAI,OAAO;IAIhB,SAAS,CAAC,MAAM,KAAA;IAehB,MAAM,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KAAE,CAAC;IACnD,QAAQ,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KAAE,CAAC;IACrD,UAAU,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KAAE,CAAC;CAE1D;AAOD,qBAAa,MAAO,SAAQ,SAAS;IACjC,MAAM,MAAC;IACP,QAAQ,MAAC;IACT,SAAS,MAAC;IACV,aAAa,MAAC;IACd,UAAU,MAAC;;IASX,UAAU;;;;IA6CV,KAAK,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAOtB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAkHvB,SAAS,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IAChD,QAAQ,EAAE;QAAE,IAAI,YAAY,EAAE,CAAC;QAAC,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;KAAE,CAAC;IAC/D,WAAW,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IAClD,aAAa,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IACpD,aAAa,EAAE;QAAE,IAAI,OAAO,CAAC;QAAC,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;KAAE,CAAC;IACtD,aAAa,EAAE;QAAE,IAAI,OAAO,CAAC;QAAC,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;KAAE,CAAC;IAEtD,IAAI,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAKrB,KAAK,CAAC,GAAG,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,KAAA;IAI3B,QAAQ,CAAC,GAAG,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,KAAA;CAGjC"}
+{"version":3,"file":"Sankey.d.ts","sourceRoot":"","sources":["../src/Sankey.ts"],"names":[],"mappings":"AAAA,OAAO,EAAW,WAAW,EAAE,SAAS,EAAW,MAAM,iBAAiB,CAAC;AAK3E,OAAO,mBAAmB,CAAC;AAU3B,qBAAa,YAAa,SAAQ,WAAW;IACzC,MAAM,EAAE,MAAM,CAAC;;IAMf,KAAK,IAAI,MAAM;IACf,KAAK,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI;IAOtB,KAAK,IAAI,OAAO;IAIhB,SAAS,CAAC,MAAM,KAAA;IAehB,MAAM,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KAAE,CAAC;IACnD,QAAQ,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KAAE,CAAC;IACrD,UAAU,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,YAAY,CAAC;KAAE,CAAC;CAE1D;AAOD,qBAAa,MAAO,SAAQ,SAAS;IACjC,MAAM,MAAC;IACP,QAAQ,MAAC;IACT,SAAS,MAAC;IACV,aAAa,MAAC;IACd,UAAU,MAAC;;IAQX,UAAU;;;;IA8CV,KAAK,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAOtB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAmIvB,SAAS,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IAChD,QAAQ,EAAE;QAAE,IAAI,YAAY,EAAE,CAAC;QAAC,CAAC,CAAC,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;KAAE,CAAC;IAC/D,iBAAiB,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IACxD,iBAAiB,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IACxD,WAAW,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IAClD,aAAa,EAAE;QAAE,IAAI,MAAM,CAAC;QAAC,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;KAAE,CAAC;IACpD,aAAa,EAAE;QAAE,IAAI,OAAO,CAAC;QAAC,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;KAAE,CAAC;IACtD,aAAa,EAAE;QAAE,IAAI,OAAO,CAAC;QAAC,CAAC,CAAC,EAAE,OAAO,GAAG,MAAM,CAAC;KAAE,CAAC;IAEtD,IAAI,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAKrB,KAAK,CAAC,GAAG,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,KAAA;IAI3B,QAAQ,CAAC,GAAG,KAAA,EAAE,MAAM,KAAA,EAAE,QAAQ,KAAA;CAGjC"}

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/graph";
-export declare const PKG_VERSION = "2.72.0";
-export declare const BUILD_VERSION = "2.93.0";
+export declare const PKG_VERSION = "2.73.0";
+export declare const BUILD_VERSION = "2.94.0";
 //# sourceMappingURL=__package__.d.ts.map

package/types/graph2/dataGraph.d.ts

@@ -50,6 +50,7 @@ export declare class DataGraph extends Graph2 {
     mergeVertices(): void;
     protected _prevEdges: readonly IEdge[];
     protected _masterEdges: IEdge[];
+    private _masterEdgesMap;
     mergeEdges(): void;
     private _prevHierarchy;
     private _masterHierarchy;

package/types/graph2/dataGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"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"}

package/types/graph2/sankeyGraph.d.ts

@@ -1,7 +1,7 @@
 import { publish, SVGWidget } from "@hpcc-js/common";
 import { AnnotationColumn } from "./dataGraph";
-import "../../src/Sankey.css";
 import { IEdge, IVertex } from "./graph";
+import "../../src/graph2/sankeyGraph.css";
 export declare class SankeyGraph extends SVGWidget {
     vertexColumns: publish<this, string[]>;
     vertices: publish<this, Array<Array<string | number | boolean>>>;

package/types/graph2/sankeyGraph.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sankeyGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/sankeyGraph.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sankeyGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/sankeyGraph.ts"],"names":[],"mappings":"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"}

package/types/test.d.ts

@@ -1,9 +1,14 @@
 import { Graph } from "./Graph";
 import { DataGraph } from "./graph2/dataGraph";
+import { SankeyGraph } from "./graph2/sankeyGraph";
+export { Test3 as Test };
 export declare class Test1 extends Graph {
     constructor();
 }
-export declare class Test extends DataGraph {
+export declare class Test2 extends DataGraph {
+    constructor();
+}
+export declare class Test3 extends SankeyGraph {
     constructor();
 }
 //# sourceMappingURL=test.d.ts.map

package/types/test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAE/C,qBAAa,KAAM,SAAQ,KAAK;;CAa/B;AAED,qBAAa,IAAK,SAAQ,SAAS;;CA+ElC"}
+{"version":3,"file":"test.d.ts","sourceRoot":"","sources":["../src/test.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAGhC,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAEnD,OAAO,EAAE,KAAK,IAAI,IAAI,EAAE,CAAC;AAEzB,qBAAa,KAAM,SAAQ,KAAK;;CAa/B;AAED,qBAAa,KAAM,SAAQ,SAAS;;CA6EnC;AAED,qBAAa,KAAM,SAAQ,WAAW;;CA0CrC"}

package/types-3.4/Sankey.d.ts

@@ -41,6 +41,14 @@ export declare class Sankey extends SVGWidget {
         (): SankeyColumn[];
         (_: SankeyColumn[]): Sankey;
     };
+    vertexStrokeWidth: {
+        (): number;
+        (_: number): Sankey;
+    };
+    vertexStrokeColor: {
+        (): string;
+        (_: string): Sankey;
+    };
     vertexWidth: {
         (): number;
         (_: number): Sankey;

package/types-3.4/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/graph";
-export declare const PKG_VERSION = "2.72.0";
-export declare const BUILD_VERSION = "2.93.0";
+export declare const PKG_VERSION = "2.73.0";
+export declare const BUILD_VERSION = "2.94.0";
 //# sourceMappingURL=__package__.d.ts.map

package/types-3.4/graph2/dataGraph.d.ts

@@ -50,6 +50,7 @@ export declare class DataGraph extends Graph2 {
     mergeVertices(): void;
     protected _prevEdges: readonly IEdge[];
     protected _masterEdges: IEdge[];
+    private _masterEdgesMap;
     mergeEdges(): void;
     private _prevHierarchy;
     private _masterHierarchy;

package/types-3.4/graph2/sankeyGraph.d.ts

@@ -1,7 +1,7 @@
 import { publish, SVGWidget } from "@hpcc-js/common";
 import { AnnotationColumn } from "./dataGraph";
-import "../../src/Sankey.css";
 import { IEdge, IVertex } from "./graph";
+import "../../src/graph2/sankeyGraph.css";
 export declare class SankeyGraph extends SVGWidget {
     vertexColumns: publish<this, string[]>;
     vertices: publish<this, Array<Array<string | number | boolean>>>;

package/types-3.4/test.d.ts

@@ -1,9 +1,14 @@
 import { Graph } from "./Graph";
 import { DataGraph } from "./graph2/dataGraph";
+import { SankeyGraph } from "./graph2/sankeyGraph";
+export { Test3 as Test };
 export declare class Test1 extends Graph {
     constructor();
 }
-export declare class Test extends DataGraph {
+export declare class Test2 extends DataGraph {
+    constructor();
+}
+export declare class Test3 extends SankeyGraph {
     constructor();
 }
 //# sourceMappingURL=test.d.ts.map