@hpcc-js/graph 2.70.0 → 2.74.0

package/src/graph2/sankeyGraph.ts

@@ -0,0 +1,322 @@
+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 { IEdge, IVertex } from "./graph";
+
+import "../../src/graph2/sankeyGraph.css";
+
+export class SankeyGraph extends SVGWidget {
+    @publish([], "any", "Vertex Columns", null, { internal: true })
+    vertexColumns: publish<this, string[]>;
+    @publish([], "any", "Vertices (Nodes)", null, { internal: true })
+    vertices: publish<this, Array<Array<string | number | boolean>>>;
+    @publish("", "set", "Vertex Category ID column", function (this: SankeyGraph) { return this.vertexColumns(); }, { optional: true })
+    vertexCategoryColumn: publish<this, string>;
+    @publish("", "set", "Vertex ID column", function (this: SankeyGraph) { return this.vertexColumns(); }, { optional: true })
+    vertexIDColumn: publish<this, string>;
+    @publish("", "set", "Vertex label column", function (this: SankeyGraph) { return this.vertexColumns(); }, { optional: true })
+    vertexLabelColumn: publish<this, string>;
+    @publish("", "set", "Vertex centroid column (boolean)", function (this: SankeyGraph) { return this.vertexColumns(); }, { optional: true })
+    vertexCentroidColumn: publish<this, string>;
+    @publish("?", "string", "Vertex default FAChar")
+    vertexFAChar: publish<this, string>;
+    @publish("", "set", "Vertex FAChar column", function (this: SankeyGraph) { return this.vertexColumns(); }, { optional: true })
+    vertexFACharColumn: publish<this, string>;
+    @publish("", "set", "Vertex tooltip column", function (this: SankeyGraph) { return this.vertexColumns(); }, { optional: true })
+    vertexTooltipColumn: publish<this, string>;
+    @publish([], "propertyArray", "Annotations", null, { autoExpand: AnnotationColumn })
+    vertexAnnotationColumns: publish<this, AnnotationColumn[]>;
+
+    @publish([], "any", "Edge columns", null, { internal: true })
+    edgeColumns: publish<this, string[]>;
+    @publish([], "any", "Edges (Edges)", null, { internal: true })
+    edges: publish<this, Array<Array<string | number | boolean>>>;
+    @publish("", "set", "Edge ID column", function (this: SankeyGraph) { return this.edgeColumns(); }, { optional: true })
+    edgeIDColumn: publish<this, string>;
+    @publish("", "set", "Edge label column", function (this: SankeyGraph) { return this.edgeColumns(); }, { optional: true })
+    edgeLabelColumn: publish<this, string>;
+    @publish("", "set", "Edge source ID column", function (this: SankeyGraph) { return this.edgeColumns(); }, { optional: true })
+    edgeSourceColumn: publish<this, string>;
+    @publish("", "set", "Edge target ID column", function (this: SankeyGraph) { return this.edgeColumns(); }, { optional: true })
+    edgeTargetColumn: publish<this, string>;
+    @publish("", "set", "Edge target ID column", function (this: SankeyGraph) { return this.edgeColumns(); }, { optional: true })
+    edgeWeightColumn: publish<this, string>;
+
+    protected _d3Sankey: any;
+    protected _selection: any;
+    _palette: any;
+
+    constructor() {
+        super();
+        Utility.SimpleSelectionMixin.call(this);
+
+        this._drawStartPos = "origin";
+    }
+
+    private _prevVertices: readonly IVertex[] = [];
+    private _masterVertices: IVertex[] = [];
+    private _masterVerticesMap: { [key: string]: IVertex } = {};
+    mergeVertices() {
+        const columns = this.vertexColumns();
+        const annotationColumns = this.vertexAnnotationColumns();
+        const catIdx = this.indexOf(columns, this.vertexCategoryColumn(), "category");
+        const idIdx = this.indexOf(columns, this.vertexIDColumn(), "id");
+        const labelIdx = this.indexOf(columns, this.vertexLabelColumn(), "label");
+        const centroidIdx = this.indexOf(columns, this.vertexCentroidColumn(), "centroid");
+        const faCharIdx = this.indexOf(columns, this.vertexFACharColumn(), "faChar");
+        const vertexTooltipIdx = this.indexOf(columns, this.vertexTooltipColumn(), "tooltip");
+        const annotationIdxs = annotationColumns.map(ac => this.indexOf(columns, ac.columnID(), ""));
+        const vertices: IVertex[] = this.vertices().map((v): IVertex => {
+            return {
+                categoryID: "" + v[catIdx],
+                id: "" + v[idIdx],
+                text: "" + v[labelIdx],
+                tooltip: "" + v[vertexTooltipIdx],
+                origData: toJsonObj(v, columns),
+                centroid: !!v[centroidIdx],
+                icon: {
+                    imageChar: "" + (v[faCharIdx] || this.vertexFAChar())
+                },
+                annotationIDs: annotationIdxs.map((ai, i) => !!v[ai] ? annotationColumns[i].annotationID() : undefined).filter(a => !!a)
+            };
+        });
+        const diff = compare2(this._prevVertices, vertices, d => d.id);
+        diff.exit.forEach(item => {
+            this._masterVertices = this._masterVertices.filter(i => i.id !== item.id);
+        });
+        diff.enter.forEach(item => {
+            this._masterVertices.push(item);
+            this._masterVerticesMap[item.id] = item;
+        });
+        this._prevVertices = vertices;
+    }
+
+    indexOf(columns: readonly string[], column: string, defColumn: string = ""): number {
+        const retVal = columns.indexOf(column);
+        return retVal >= 0 ? retVal : columns.indexOf(defColumn);
+    }
+
+    protected _prevEdges: readonly IEdge[] = [];
+    protected _masterEdges: IEdge[] = [];
+    mergeEdges() {
+        const columns = this.edgeColumns();
+        const idIdx = this.indexOf(columns, this.edgeIDColumn(), "id");
+        const sourceIdx = this.indexOf(columns, this.edgeSourceColumn(), "source");
+        const targetIdx = this.indexOf(columns, this.edgeTargetColumn(), "target");
+        const labelIdx = this.indexOf(columns, this.edgeLabelColumn(), "label");
+        const weightIdx = this.indexOf(columns, this.edgeWeightColumn(), "weight");
+        const edges: IEdge[] = this.edges().map(e => {
+            const source = this._masterVerticesMap["" + e[sourceIdx]];
+            if (!source) console.error(`Invalid edge source entity "${e[sourceIdx]}" does not exist.`);
+            const target = this._masterVerticesMap["" + e[targetIdx]];
+            if (!target) console.error(`Invalid edge target entity "${e[targetIdx]}" does not exist.`);
+            return {
+                type: "edge",
+                id: idIdx >= 0 ? "" + e[idIdx] : "" + e[sourceIdx] + "->" + e[targetIdx],
+                source,
+                target,
+                value: +e[weightIdx] || 0,
+                label: labelIdx >= 0 ? ("" + e[labelIdx]) : "",
+                origData: toJsonObj(e, columns)
+            };
+        }).filter(e => e.source && e.target);
+        const diff = compare2(this._masterEdges, edges, d => d.id);
+        diff.exit.forEach(item => {
+            this._masterEdges = this._masterEdges.filter(i => i.id !== item.id);
+        });
+        diff.enter.forEach(item => {
+            this._masterEdges.push(item);
+        });
+        this._prevEdges = edges;
+    }
+
+    sankeyData() {
+        this.mergeVertices();
+        this.mergeEdges();
+        return {
+            vertices: this._masterVertices,
+            edges: this._masterEdges
+        };
+    }
+
+    enter(domNode, element) {
+        super.enter(domNode, element);
+
+        this._d3Sankey = d3Sankey();
+        this._selection.widgetElement(element);
+    }
+
+    update(domNode, element) {
+        super.update(domNode, element);
+
+        this._palette = this._palette.switch(this.paletteID());
+
+        const strokeWidth = this.vertexStrokeWidth();
+
+        const sankeyData = this.sankeyData();
+        this._d3Sankey
+            .nodeId(d => d.id)
+            .extent([
+                [0, 0],
+                [this.width(), this.height()]
+            ])
+            // .nodeAlign(sankeyCenter)
+            // .nodeWidth(this.vertexWidth())
+            // .nodePadding(this.vertexPadding())
+            ;
+        if (sankeyData.vertices.length > 0) {
+            this._d3Sankey({
+                nodes: sankeyData.vertices,
+                links: sankeyData.edges
+            });
+        }
+        const context = this;
+
+        // Links --- 
+        const link = element.selectAll(".link").data(sankeyData.edges);
+        link.enter().append("path")
+            .attr("class", "link")
+            .each(function () {
+                d3Select(this)
+                    .append("title")
+                    ;
+            })
+            .merge(link)
+            .attr("d", d3SankeyLinkHorizontal())
+            .style("stroke-width", (d: any) => Math.max(1, d.width))
+            // .sort(function (a, b) { return b.width - a.width; })
+            .select("title")
+            .text(function (d) {
+                return d.source.text + " → " + d.target.text + "\n" + d.value;
+            })
+            ;
+        link.exit().remove();
+
+        // Nodes ---
+        const node = element.selectAll(".node").data(sankeyData.vertices);
+        node.enter().append("g")
+            .attr("class", "node")
+            .call(this._selection.enter.bind(this._selection))
+            .on("click", function (d) {
+                context.click(d.origData, "", context._selection.selected(this));
+            })
+            .on("dblclick", function (d) {
+                context.dblclick(d.origData, "", context._selection.selected(this));
+            })
+            .each(function () {
+                const gElement = d3Select(this);
+                gElement.append("rect");
+                gElement.append("text");
+            })
+            /*
+            .call(d3.behavior.drag()
+                .origin(function (d) { return d; })
+                .on("dragstart", function () {
+                    this.parentNode.appendChild(this);
+                })
+                .on("drag", dragmove)
+            )
+            */
+            .merge(node)
+            .attr("transform", function (d) {
+                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", (d: any) => {
+                        return d.y1 - d.y0;
+                    })
+                    .attr("width", (d: any) => d.x1 - d.x0)
+                    .style("fill", function (d: any) { return context._palette(d.categoryID); })
+                    .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.y1 - d.y0) / 2;
+                    })
+                    .attr("dy", ".35em")
+                    .attr("text-anchor", "end")
+                    .attr("transform", null)
+                    .text(function (d: any) {
+                        return d.text;
+                    })
+                    .filter(function (d: any) {
+                        return d.x0 < context.width() / 2;
+                    })
+                    .attr("x", 6 + context._d3Sankey.nodeWidth())
+                    .attr("text-anchor", "start")
+                    ;
+            });
+        node.exit().remove();
+
+        /*
+        function dragmove(d) {
+            var gElement = d3.select(this);
+            if (context.xAxisMovement()) {
+                d.x = Math.max(0, Math.min(context.width() - d.dx, d3.event.x));
+            }
+            if (context.yAxisMovement()) {
+                d.y = Math.max(0, Math.min(context.height() - d.dy, d3.event.y));
+            }
+            gElement.attr("transform", "translate(" + d.x + "," + d.y + ")");
+            context._d3Sankey.relayout();
+            link.attr("d", context._d3SankeyPath);
+     
+            gElement.select("text")
+                .attr("x", -6)
+                .attr("y", function (d) { return d.dy / 2; })
+                .attr("dy", ".35em")
+                .attr("text-anchor", "end")
+                .attr("transform", null)
+                .text(function (d) { return d.name; })
+                .filter(function (d) { return d.x < context.width() / 2; })
+                    .attr("x", 6 + context._d3Sankey.nodeWidth())
+                    .attr("text-anchor", "start")
+            ;
+        }
+        */
+    }
+
+    paletteID: { (): string; (_: string): SankeyGraph; };
+    vertexStrokeWidth: { (): number; (_: number): SankeyGraph; };
+    vertexStrokeColor: { (): string; (_: string): SankeyGraph; };
+    vertexWidth: { (): number; (_: number): SankeyGraph; };
+    vertexPadding: { (): number; (_: number): SankeyGraph; };
+    xAxisMovement: { (): boolean; (_: boolean): SankeyGraph; };
+    yAxisMovement: { (): boolean; (_: boolean): SankeyGraph; };
+
+    exit(domNode, element) {
+        super.exit(domNode, element);
+    }
+
+    //  Events  ---
+    click(row, column, selected) {
+        console.log("Click:  " + JSON.stringify(row) + ", " + column + "," + selected);
+    }
+
+    dblclick(row, column, selected) {
+        console.log("Double Click:  " + JSON.stringify(row) + ", " + column + "," + selected);
+    }
+}
+SankeyGraph.prototype._class += " graph_SankeyGraph";
+SankeyGraph.prototype.mixin(Utility.SimpleSelectionMixin);
+
+SankeyGraph.prototype._palette = Palette.ordinal("category10");
+
+SankeyGraph.prototype.publish("paletteID", "category10", "set", "Color palette for this widget", SankeyGraph.prototype._palette.switch());
+SankeyGraph.prototype.publish("vertexStrokeWidth", 1, "number", "Vertex Stroke Width");
+SankeyGraph.prototype.publish("vertexStrokeColor", "darkgray", "string", "Vertex Stroke Color");
+SankeyGraph.prototype.publish("vertexWidth", 36, "number", "Vertex Width");
+SankeyGraph.prototype.publish("vertexPadding", 20, "number", "Vertex Padding");
+SankeyGraph.prototype.publish("xAxisMovement", false, "boolean", "Enable x-axis movement");
+SankeyGraph.prototype.publish("yAxisMovement", false, "boolean", "Enable y-axis movement");

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.70.0";
-export declare const BUILD_VERSION = "2.88.0";
+export declare const PKG_VERSION = "2.74.0";
+export declare const BUILD_VERSION = "2.95.0";
 //# sourceMappingURL=__package__.d.ts.map

package/types/graph2/dataGraph.d.ts

@@ -1,6 +1,7 @@
 import { PropertyExt, publish, Widget } from "@hpcc-js/common";
 import { Graph2 } from "./graph";
 import { IEdge } from "./layouts/placeholders";
+export declare function toJsonObj(row: any, columns: any): {};
 export declare class AnnotationColumn extends PropertyExt {
     columnID: publish<this, string>;
     annotationID: publish<this, string>;
@@ -31,6 +32,7 @@ export declare class DataGraph extends Graph2 {
     edgeSourceColumn: publish<this, string>;
     edgeTargetColumn: publish<this, string>;
     edgeWeightColumn: publish<this, string>;
+    edgeColorColumn: publish<this, string>;
     hierarchyColumns: publish<this, string[]>;
     hierarchy: publish<this, Array<Array<string | number | boolean>>>;
     hierarchyParentIDColumn: publish<this, string>;
@@ -48,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/graph.d.ts

@@ -52,7 +52,7 @@ export declare class Graph2 extends SVGZoomWidget {
     selection(_: Array<IVertex | ISubgraph | IEdge>): this;
     selection(): Array<IVertex | ISubgraph | IEdge>;
     graphData(): GraphCollection<VertexPlaceholder, EdgePlaceholder>;
-    resetLayout(): void;
+    resetLayout(): this;
     layoutRunning(): boolean;
     protected _layoutAlgo: ILayout;
     layoutAlgo(layout: ILayout): Promise<void>;
@@ -228,6 +228,8 @@ export interface Graph2 {
     forceDirectedMinDistance(_: number): this;
     forceDirectedMaxDistance(): number;
     forceDirectedMaxDistance(_: number): this;
+    treeRankDirection(): "TB" | "LR";
+    treeRankDirection(_: "TB" | "LR"): this;
     edgeColor(): string;
     edgeColor(_: string): this;
     edgeStrokeWidth(): number;

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

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

package/types/graph2/index.d.ts

@@ -1,3 +1,4 @@
 export * from "./graph";
 export * from "./dataGraph";
+export * from "./sankeyGraph";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/graph2/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/graph2/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC"}

package/types/graph2/layouts/graphviz.d.ts

@@ -1,10 +1,15 @@
-import { Layout } from "./layout";
+import { Layout, Point } from "./layout";
+import { EdgePlaceholder } from "./placeholders";
 declare type Engine = "circo" | "dot" | "fdp" | "neato" | "osage" | "patchwork" | "twopi";
 export declare class Graphviz extends Layout {
     _engine: Engine;
     _wasmFolder: string;
     constructor(graph: any, engine: Engine, wasmFolder: string);
     start(): Promise<this>;
+    edgePath(ep: EdgePlaceholder, curveDepth: number): {
+        path: string;
+        labelPos: Point;
+    };
 }
 export {};
 //# sourceMappingURL=graphviz.d.ts.map

package/types/graph2/layouts/graphviz.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"graphviz.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/graphviz.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIlC,aAAK,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,OAAO,CAAC;AAElF,qBAAa,QAAS,SAAQ,MAAM;IAEhC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;gBAER,KAAK,KAAA,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAMrD,KAAK;CAoER"}
+{"version":3,"file":"graphviz.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/graphviz.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAIjD,aAAK,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,OAAO,CAAC;AAQlF,qBAAa,QAAS,SAAQ,MAAM;IAEhC,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;gBAER,KAAK,KAAA,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAMrD,KAAK;IAqEL,QAAQ,CAAC,EAAE,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,KAAK,CAAA;KAAE;CAsBvF"}

package/types/graph2/layouts/placeholders.d.ts

@@ -16,6 +16,7 @@ export interface IEdge extends Edge {
     source: IVertex;
     target: IVertex;
     label?: string;
+    color?: string;
     fontFamily?: string;
     origData?: any;
 }

package/types/graph2/layouts/placeholders.d.ts.map

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