@hpcc-js/graph 2.84.3 → 2.84.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/graph",
-    "version": "2.84.3",
+    "version": "2.84.4",
     "description": "hpcc-js - Viz Graph",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -51,15 +51,15 @@
         "update": "npx --yes npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/api": "^2.12.6",
-        "@hpcc-js/common": "^2.71.6",
-        "@hpcc-js/html": "^2.42.7",
-        "@hpcc-js/react": "^2.53.2",
-        "@hpcc-js/util": "^2.50.1"
+        "@hpcc-js/api": "^2.12.7",
+        "@hpcc-js/common": "^2.71.7",
+        "@hpcc-js/html": "^2.42.8",
+        "@hpcc-js/react": "^2.53.3",
+        "@hpcc-js/util": "^2.50.2"
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.11.3",
-        "@hpcc-js/wasm": "2.0.1",
+        "@hpcc-js/wasm": "2.1.0",
         "@types/d3-transition": "1.3.2",
         "@types/dagre": "0.7.48",
         "d3-array": "^1",
@@ -75,7 +75,7 @@
         "d3-transition": "^1",
         "dagre": "0.8.5",
         "es6-promise": "4.2.8",
-        "tslib": "2.4.0"
+        "tslib": "2.4.1"
     },
     "repository": {
         "type": "git",
@@ -88,5 +88,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "b5b4cf9ee4257885b41a3f90c11cbe6609704d0d"
+    "gitHead": "cec45fe4a28dff27d43cf0bb9238d751534c8e88"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/graph";
-export const PKG_VERSION = "2.84.3";
-export const BUILD_VERSION = "2.104.13";
+export const PKG_VERSION = "2.84.4";
+export const BUILD_VERSION = "2.104.14";

package/src/__tests__/index.ts

@@ -1 +1 @@
-export { Test5 as Test } from "./test5";
+export { Test4 as Test } from "./test4";

package/src/graph2/dataGraph.ts

@@ -1,9 +1,11 @@
 import { PropertyExt, publish, Widget } from "@hpcc-js/common";
-import { CentroidVertex3, IVertex3, SubgraphProps, Vertex3 } from "@hpcc-js/react";
+import { Vertex3, CentroidVertex3, Vertex3Props, EdgeProps, SubgraphProps } from "@hpcc-js/react";
 import { compare2 } from "@hpcc-js/util";
 import { Graph2 } from "./graph";
 import { HierarchyBase } from "./layouts/placeholders";
-import { BasicEdgeProps } from "./edge";
+
+//  Backward compatibility layer  ---
+export type IVertex3 = Vertex3Props;
 
 export function toJsonObj<T>(row, columns): T {
     const retVal: T = {} as T;
@@ -206,9 +208,9 @@ export class DataGraph extends Graph2 {
         this._prevVertices = vertices;
     }
 
-    protected _prevEdges: readonly BasicEdgeProps[] = [];
-    protected _masterEdges: BasicEdgeProps[] = [];
-    private _masterEdgesMap: { [key: string]: BasicEdgeProps } = {};
+    protected _prevEdges: readonly EdgeProps<IVertex3>[] = [];
+    protected _masterEdges: EdgeProps<IVertex3>[] = [];
+    private _masterEdgesMap: { [key: string]: EdgeProps<IVertex3> } = {};
     mergeEdges() {
         const columns = this.edgeColumns();
         const idIdx = this.indexOf(columns, this.edgeIDColumn(), "id");
@@ -217,7 +219,7 @@ export class DataGraph extends Graph2 {
         const labelIdx = this.indexOf(columns, this.edgeLabelColumn(), "label");
         const weightIdx = this.indexOf(columns, this.edgeWeightColumn(), "weight");
         const colorIdx = this.indexOf(columns, this.edgeColorColumn(), "color");
-        const edges: BasicEdgeProps[] = this.edges().map((e): BasicEdgeProps => {
+        const edges: EdgeProps<IVertex3>[] = this.edges().map((e): EdgeProps<IVertex3> => {
             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]];
@@ -227,7 +229,7 @@ export class DataGraph extends Graph2 {
                 source,
                 target,
                 weight: +e[weightIdx] || 1,
-                color: e[colorIdx] as string,
+                stroke: e[colorIdx] as string,
                 label: labelIdx >= 0 ? ("" + e[labelIdx]) : "",
                 origData: toJsonObj(e, columns),
                 labelPos: [0, 0],

package/src/graph2/graph.ts

@@ -1,11 +1,19 @@
-import { React, Subgraph, SubgraphProps, Vertex, VertexProps } from "@hpcc-js/react";
-import { BasicEdge, BasicEdgeProps } from "./edge";
+import { React, Subgraph, SubgraphProps, Vertex, VertexProps, Edge, EdgeProps } from "@hpcc-js/react";
+// import { IVertexEdgeProps, VertexEdge } from "./edge";
 import { GraphReactT } from "./graphReactT";
+import { GraphDataProps, HierarchyBase } from "./graphT";
 
-export class Graph2 extends GraphReactT<SubgraphProps, VertexProps, BasicEdgeProps> {
+//  Backward compatibility layer  ---
+export type ISubgraph = SubgraphProps;
+export type IVertex = VertexProps;
+export type IEdge = EdgeProps;
+export type IHierarchy = HierarchyBase<ISubgraph, IVertex>;
+export type IGraphData2 = GraphDataProps<ISubgraph, IVertex, IEdge>;
+
+export class Graph2 extends GraphReactT<ISubgraph, IVertex, IEdge> {
 
     constructor() {
-        super(Subgraph, Vertex, BasicEdge);
+        super(Subgraph, Vertex, Edge);
         this._reactCentroidRenderer = Vertex;
         this._reactVertexRenderer2 = Vertex;
         super.vertexRenderer((props) => {

package/src/graph2/graphReactT.ts

@@ -1,11 +1,11 @@
-import { render, React, SubgraphProps, VertexProps } from "@hpcc-js/react";
-import { EdgeProps, GraphT, RendererT } from "./graphT";
+import { render, React, SubgraphProps, VertexProps, EdgeProps } from "@hpcc-js/react";
+import { GraphT, RendererT } from "./graphT";
 
 function adapter<T>(reactRenderer: React.FunctionComponent<T>): RendererT<T> {
     return (props: T, element: SVGGElement) => render(reactRenderer, props, element);
 }
 
-export class GraphReactT<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> extends GraphT<SG, V, E>  {
+export class GraphReactT<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps<V>> extends GraphT<SG, V, E>  {
 
     constructor(subgraphRenderer: React.FunctionComponent<SG>, vertexRenderer: React.FunctionComponent<V>, edgeRenderer: React.FunctionComponent<E>) {
         super(adapter(subgraphRenderer), adapter(vertexRenderer), adapter(edgeRenderer));

package/src/graph2/graphT.ts

@@ -7,7 +7,7 @@ import "d3-transition";
 import { interpolatePath as d3InterpolatePath } from "d3-interpolate-path";
 import { Circle, Dagre, ForceDirected, ForceDirectedAnimated, Graphviz, ILayout, Null } from "./layouts/index";
 import { Options as FDOptions } from "./layouts/forceDirectedWorker";
-import type { VertexProps, EdgeProps, IGraphData2, HierarchyBase, SubgraphProps } from "./layouts/placeholders";
+import type { VertexBaseProps, EdgeBaseProps, GraphDataProps, HierarchyBase, SubgraphBaseProps } from "./layouts/placeholders";
 import { EdgePlaceholder, SubgraphPlaceholder, VertexPlaceholder, isEdgePlaceholder } from "./layouts/placeholders";
 import { Engine, graphviz as gvWorker } from "./layouts/graphvizWorker";
 import { Tree, RadialTree, Dendrogram, RadialDendrogram } from "./layouts/tree";
@@ -18,25 +18,25 @@ let scriptDir = (globalThis?.document?.currentScript as HTMLScriptElement)?.src
 scriptDir = scriptDir.substring(0, scriptDir.replace(/[?#].*/, "").lastIndexOf("/") + 1);
 
 export {
-    IGraphData2,
-    SubgraphProps,
-    VertexProps,
-    EdgeProps,
+    GraphDataProps,
+    SubgraphBaseProps,
+    VertexBaseProps,
+    EdgeBaseProps,
     HierarchyBase
 };
 
 type GraphLayoutType = "Hierarchy" | "DOT" | "Tree" | "Dendrogram" | "RadialTree" | "RadialDendrogram" | "ForceDirected" | "ForceDirected2" | "ForceDirectedHybrid" | "Neato" | "FDP" | "Circle" | "TwoPI" | "Circo" | "None";
 const GraphLayoutTypeSet = ["Hierarchy", "DOT", "Tree", "Dendrogram", "RadialTree", "RadialDendrogram", "ForceDirected", "ForceDirected2", "ForceDirectedHybrid", "Neato", "FDP", "Circle", "TwoPI", "Circo", "None"];
 
-function dragStart<V extends VertexProps>(n: VertexPlaceholder<V>) {
+function dragStart<V extends VertexBaseProps>(n: VertexPlaceholder<V>) {
     n.fx = n.sx = n.x;
     n.fy = n.sy = n.y;
 }
-function dragTick(n: VertexPlaceholder<VertexProps>, d: VertexPlaceholder<VertexProps>) {
+function dragTick(n: VertexPlaceholder<VertexBaseProps>, d: VertexPlaceholder<VertexBaseProps>) {
     n.fx = n.sx + d.fx - d.sx;
     n.fy = n.sy + d.fy - d.sy;
 }
-function dragEnd<V extends VertexProps>(n: VertexPlaceholder<V>) {
+function dragEnd<V extends VertexBaseProps>(n: VertexPlaceholder<V>) {
     n.x = n.fx;
     n.y = n.fy;
     n.fx = n.sx = undefined;
@@ -45,7 +45,7 @@ function dragEnd<V extends VertexProps>(n: VertexPlaceholder<V>) {
 
 export type RendererT<T> = (props: T, element: SVGGElement) => void;
 
-export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> extends SVGZoomWidget {
+export class GraphT<SG extends SubgraphBaseProps, V extends VertexBaseProps, E extends EdgeBaseProps<V>> extends SVGZoomWidget {
 
     protected _centroidFilter: SVGGlowFilter;
 
@@ -63,11 +63,11 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
     private _toggleD = new ToggleButton().faChar("fa-sitemap fa-rotate-270").tooltip("Dendrogram").on("click", () => this.layoutClick("Dendrogram"));
     private _toggleRD = new ToggleButton().faChar("fa-asterisk").tooltip("Radial Dendrogram").on("click", () => this.layoutClick("RadialDendrogram"));
 
-    protected _graphData = new GraphCollection<VertexPlaceholder<V>, EdgePlaceholder<E, V>, SubgraphPlaceholder<SG>>()
+    protected _graphData = new GraphCollection<VertexPlaceholder<V>, EdgePlaceholder<V, E>, SubgraphPlaceholder<SG>>()
         .idFunc(d => d.id)
         .sourceFunc(e => e.source.id)
         .targetFunc(e => e.target.id)
-        .updateFunc((b: VertexPlaceholder<V> | EdgePlaceholder<E, V> | SubgraphPlaceholder<SG>, a: VertexPlaceholder<V> | EdgePlaceholder<E, V> | SubgraphPlaceholder<SG>) => {
+        .updateFunc((b: VertexPlaceholder<V> | EdgePlaceholder<V, E> | SubgraphPlaceholder<SG>, a: VertexPlaceholder<V> | EdgePlaceholder<V, E> | SubgraphPlaceholder<SG>) => {
             b.props = a.props;
             if (isEdgePlaceholder(a) && isEdgePlaceholder(b)) {
                 b.source = a.source;
@@ -259,15 +259,15 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
         return this;
     }
 
-    private _origData: IGraphData2<SG, V, E> = {
+    private _origData: GraphDataProps<SG, V, E> = {
         subgraphs: [],
         vertices: [],
         edges: [],
         hierarchy: []
     };
-    data(): IGraphData2<SG, V, E>;
-    data(_: IGraphData2<SG, V, E>, merge?: boolean): this;
-    data(_?: IGraphData2<SG, V, E>, merge?: boolean): IGraphData2<SG, V, E> | this {
+    data(): GraphDataProps<SG, V, E>;
+    data(_: GraphDataProps<SG, V, E>, merge?: boolean): this;
+    data(_?: GraphDataProps<SG, V, E>, merge?: boolean): GraphDataProps<SG, V, E> | this {
         if (_ === void 0) return this._origData;
         this._origData = _;
 
@@ -325,7 +325,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
         return this;
     }
 
-    graphData(): GraphCollection<VertexPlaceholder<V>, EdgePlaceholder<E, V>> {
+    graphData(): GraphCollection<VertexPlaceholder<V>, EdgePlaceholder<V, E>> {
         return this._graphData;
     }
 
@@ -509,7 +509,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
 
     highlightEdges(edgeMap?: { [id: string]: boolean }) {
         const context = this;
-        const edgeElements = this._edgeG.selectAll<SVGGElement, EdgePlaceholder<E, V>>(".graphEdge");
+        const edgeElements = this._edgeG.selectAll<SVGGElement, EdgePlaceholder<V, E>>(".graphEdge");
         edgeElements
             .classed("graphEdge-highlighted", d => !edgeMap || edgeMap[d.id])
             .style("stroke-width", function (o) {
@@ -543,7 +543,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
         }
     }
 
-    highlightEdge(_element, d?: EdgePlaceholder<E, V>) {
+    highlightEdge(_element, d?: EdgePlaceholder<V, E>) {
         if (this.highlightOnMouseOverEdge()) {
             if (d) {
                 const vertices = {};
@@ -577,7 +577,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
         return this;
     }
 
-    moveEdgePlaceholder(ep: EdgePlaceholder<E, V>, transition: boolean): this {
+    moveEdgePlaceholder(ep: EdgePlaceholder<V, E>, transition: boolean): this {
         const edgeLayout = {
             ...this._layoutAlgo.edgePath(ep, this.edgeArcDepth())
         };
@@ -594,7 +594,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
                             path: pathInterpolator(t),
                             labelPos: labelPosInterpolator(t),
                             strokeWidth: ep.props.strokeWidth ?? context.edgeStrokeWidth(),
-                            color: ep.props.color ?? context.edgeColor()
+                            color: ep.props.stroke ?? context.edgeColor()
                         };
                         context._edgeRenderer({ ...edgeLayout, ...ep.props, ...updated }, ep.element.node());
                     };
@@ -605,7 +605,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
 
     moveVertexPlaceholder(vp: VertexPlaceholder<V>, transition: boolean, moveNeighbours: boolean): this {
         const { x, y } = this.projectPlacholder(vp);
-        vp.element && (transition ? vp.element.transition().duration(this.transitionDuration()) as unknown as Selection<SVGPathElement, EdgePlaceholder<E, V>, SVGGElement, any> : vp.element)
+        vp.element && (transition ? vp.element.transition().duration(this.transitionDuration()) as unknown as Selection<SVGPathElement, EdgePlaceholder<V, E>, SVGGElement, any> : vp.element)
             .attr("transform", `translate(${x} ${y})`)
             ;
         if (moveNeighbours) {
@@ -695,7 +695,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
     updateEdges(): this {
         const context = this;
         this._edgeG.selectAll(".graphEdge")
-            .data(this._graphData.allEdges(), (d: EdgePlaceholder<E, V>) => d.id)
+            .data(this._graphData.allEdges(), (d: EdgePlaceholder<V, E>) => d.id)
             .join(
                 enter => enter.append("g")
                     .attr("class", "graphEdge")
@@ -1168,7 +1168,7 @@ export class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends E
 }
 GraphT.prototype._class += " graph_GraphT";
 
-export interface GraphT<SG extends SubgraphProps = any, V extends VertexProps = any, E extends EdgeProps = any> {
+export interface GraphT<SG extends SubgraphBaseProps = any, V extends VertexBaseProps = any, E extends EdgeBaseProps<V> = any> {
     allowDragging(): boolean;
     allowDragging(_: boolean): this;
     dragSingleNeighbors(): boolean;

package/src/graph2/index.ts

@@ -5,4 +5,3 @@ export * from "./dataGraph";
 export * from "./sankeyGraph";
 export * from "./subgraph";
 export * from "./vertex";
-export * from "./edge";

package/src/graph2/layouts/placeholders.ts

@@ -5,7 +5,7 @@ export interface BaseProps {
     origData?: any;
 }
 
-export interface VertexProps extends BaseProps {
+export interface VertexBaseProps extends BaseProps {
     text: string;
     categoryID?: string;
     centroid?: boolean;
@@ -14,7 +14,7 @@ export interface VertexProps extends BaseProps {
     annotationIDs?: string[];
 }
 
-export interface SubgraphProps extends BaseProps {
+export interface SubgraphBaseProps extends BaseProps {
     text: string;
     width?: number;
     height?: number;
@@ -22,32 +22,32 @@ export interface SubgraphProps extends BaseProps {
 
 export type Point = [number, number];
 
-export interface EdgeProps extends BaseProps {
-    source: VertexProps;
-    target: VertexProps;
+export interface EdgeBaseProps<V extends VertexBaseProps = VertexBaseProps> extends BaseProps {
+    source: V;
+    target: V;
     label?: string;
     labelPos?: Point;
     weight?: number;
     strokeDasharray?: string;
     strokeWidth?: number;
-    color?: string;
+    stroke?: string;
     fontFamily?: string;
 }
 
-export interface HierarchyBase<SG extends SubgraphProps, V extends VertexProps> {
+export interface HierarchyBase<SG extends SubgraphBaseProps, V extends VertexBaseProps> {
     id: string | number;
     parent: SG;
     child: SG | V;
 }
 
-export interface IGraphData2<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> {
+export interface GraphDataProps<SG extends SubgraphBaseProps, V extends VertexBaseProps, E extends EdgeBaseProps<V>> {
     subgraphs?: SG[];
     vertices: V[];
     edges: E[];
     hierarchy?: HierarchyBase<SG, V>[];
 }
 
-export interface SubgraphPlaceholder<SG extends SubgraphProps = SubgraphProps> {
+export interface SubgraphPlaceholder<SG extends SubgraphBaseProps = SubgraphBaseProps> {
     id: string | number;
     element?: Selection<SVGGElement, SubgraphPlaceholder<SG>, SVGGElement, any>;
     props: SG;
@@ -57,7 +57,7 @@ export interface SubgraphPlaceholder<SG extends SubgraphProps = SubgraphProps> {
     y?: number; // The node’s current y-position
 }
 
-export interface VertexPlaceholder<V extends VertexProps = VertexProps> {
+export interface VertexPlaceholder<V extends VertexBaseProps = VertexBaseProps> {
     id: string | number;
     element?: Selection<SVGGElement, VertexPlaceholder<V>, SVGGElement, any>;
     props: V;
@@ -82,11 +82,11 @@ export interface VertexPlaceholder<V extends VertexProps = VertexProps> {
     lng?: number;
 }
 
-export interface EdgePlaceholder<E extends EdgeProps = EdgeProps, V extends VertexProps = VertexProps> {
+export interface EdgePlaceholder<V extends VertexBaseProps = VertexBaseProps, E extends EdgeBaseProps<V> = EdgeBaseProps<V>> {
     id: string | number;
-    element?: Selection<SVGGElement, EdgePlaceholder<E, V>, SVGGElement, any>;
-    elementPath?: Selection<SVGPathElement, EdgePlaceholder<E, V>, SVGGElement, any>;
-    elementText?: Selection<SVGTextElement, EdgePlaceholder<E, V>, SVGGElement, any>;
+    element?: Selection<SVGGElement, EdgePlaceholder<V, E>, SVGGElement, any>;
+    elementPath?: Selection<SVGPathElement, EdgePlaceholder<V, E>, SVGGElement, any>;
+    elementText?: Selection<SVGTextElement, EdgePlaceholder<V, E>, SVGGElement, any>;
     props: E;
     source: VertexPlaceholder<V>; // The link’s source node
     target: VertexPlaceholder<V>; // The link’s target node
@@ -98,6 +98,6 @@ export interface EdgePlaceholder<E extends EdgeProps = EdgeProps, V extends Vert
     points?: Array<[number, number]>;
 }
 
-export function isEdgePlaceholder<E extends EdgeProps = EdgeProps, V extends VertexProps = VertexProps>(item): item is EdgePlaceholder<E, V> {
+export function isEdgePlaceholder<V extends VertexBaseProps = VertexBaseProps, E extends EdgeBaseProps<V> = EdgeBaseProps<V>>(item): item is EdgePlaceholder<V, E> {
     return item.id !== undefined && item.props !== undefined && item.source !== undefined && item.target !== undefined;
 }

package/src/graph2/sankeyGraph.ts

@@ -5,7 +5,7 @@ import { select as d3Select } from "d3-selection";
 import { AnnotationColumn, toJsonObj } from "./dataGraph";
 
 import "../../src/graph2/sankeyGraph.css";
-import { EdgeProps, VertexProps } from "./graphT";
+import { EdgeBaseProps, VertexBaseProps } from "./graphT";
 
 export class SankeyGraph extends SVGWidget {
     @publish([], "any", "Vertex Columns", null, { internal: true })
@@ -55,9 +55,9 @@ export class SankeyGraph extends SVGWidget {
         this._drawStartPos = "origin";
     }
 
-    private _prevVertices: readonly VertexProps[] = [];
-    private _masterVertices: VertexProps[] = [];
-    private _masterVerticesMap: { [key: string]: VertexProps } = {};
+    private _prevVertices: readonly VertexBaseProps[] = [];
+    private _masterVertices: VertexBaseProps[] = [];
+    private _masterVerticesMap: { [key: string]: VertexBaseProps } = {};
     mergeVertices() {
         const columns = this.vertexColumns();
         const annotationColumns = this.vertexAnnotationColumns();
@@ -67,7 +67,7 @@ export class SankeyGraph extends SVGWidget {
         const centroidIdx = this.indexOf(columns, this.vertexCentroidColumn(), "centroid");
         const vertexTooltipIdx = this.indexOf(columns, this.vertexTooltipColumn(), "tooltip");
         const annotationIdxs = annotationColumns.map(ac => this.indexOf(columns, ac.columnID(), ""));
-        const vertices: VertexProps[] = this.vertices().map((v): VertexProps => {
+        const vertices: VertexBaseProps[] = this.vertices().map((v): VertexBaseProps => {
             return {
                 categoryID: "" + v[catIdx],
                 id: "" + v[idIdx],
@@ -94,8 +94,8 @@ export class SankeyGraph extends SVGWidget {
         return retVal >= 0 ? retVal : columns.indexOf(defColumn);
     }
 
-    protected _prevEdges: readonly EdgeProps[] = [];
-    protected _masterEdges: EdgeProps[] = [];
+    protected _prevEdges: readonly EdgeBaseProps[] = [];
+    protected _masterEdges: EdgeBaseProps[] = [];
     mergeEdges() {
         const columns = this.edgeColumns();
         const idIdx = this.indexOf(columns, this.edgeIDColumn(), "id");
@@ -103,7 +103,7 @@ export class SankeyGraph extends SVGWidget {
         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: EdgeProps[] = this.edges().map(e => {
+        const edges: EdgeBaseProps[] = 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]];

package/src/graph2/subgraph.tsx

@@ -1,8 +1,8 @@
 // , Shape, Text,
 import { React, Text } from "@hpcc-js/react";
-import { SubgraphProps } from "./layouts/placeholders";
+import { SubgraphBaseProps } from "./layouts/placeholders";
 
-export interface BasicSubgraphProps extends SubgraphProps {
+export interface BasicSubgraphProps extends SubgraphBaseProps {
     label?: string;
     labelFill?: string;
     labelHeight?: number,

package/src/graph2/vertex.tsx

@@ -1,8 +1,8 @@
 // , Shape, Text,
 import { React, Text } from "@hpcc-js/react";
-import { VertexProps } from "./layouts/placeholders";
+import { VertexBaseProps } from "./layouts/placeholders";
 
-export interface BasicVertexProps extends VertexProps {
+export interface BasicVertexProps extends VertexBaseProps {
     textFill?: string;
     textHeight?: number,
     scale?: number,

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/graph";
-export declare const PKG_VERSION = "2.84.3";
-export declare const BUILD_VERSION = "2.104.13";
+export declare const PKG_VERSION = "2.84.4";
+export declare const BUILD_VERSION = "2.104.14";
 //# sourceMappingURL=__package__.d.ts.map

package/types/__tests__/index.d.ts

@@ -1,2 +1,2 @@
-export { Test5 as Test } from "./test5";
+export { Test4 as Test } from "./test4";
 //# sourceMappingURL=index.d.ts.map

package/types/graph2/dataGraph.d.ts

@@ -1,6 +1,7 @@
 import { PropertyExt, publish, Widget } from "@hpcc-js/common";
+import { Vertex3Props, EdgeProps } from "@hpcc-js/react";
 import { Graph2 } from "./graph";
-import { BasicEdgeProps } from "./edge";
+export declare type IVertex3 = Vertex3Props;
 export declare function toJsonObj<T>(row: any, columns: any): T;
 export declare class AnnotationColumn extends PropertyExt {
     columnID: publish<this, string>;
@@ -49,8 +50,8 @@ export declare class DataGraph extends Graph2 {
     private _masterVertices;
     private _masterVerticesMap;
     mergeVertices(): void;
-    protected _prevEdges: readonly BasicEdgeProps[];
-    protected _masterEdges: BasicEdgeProps[];
+    protected _prevEdges: readonly EdgeProps<IVertex3>[];
+    protected _masterEdges: EdgeProps<IVertex3>[];
     private _masterEdgesMap;
     mergeEdges(): void;
     private _prevHierarchy;

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

@@ -1 +1 @@
-{"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAG/D,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AAEjC,OAAO,EAAE,cAAc,EAAE,MAAM,QAAQ,CAAC;AAExC,wBAAgB,SAAS,CAAC,CAAC,EAAE,GAAG,KAAA,EAAE,OAAO,KAAA,GAAG,CAAC,CAI5C;AAED,qBAAa,gBAAiB,SAAQ,WAAW;IAG7C,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEhC,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEpC,SAAS,CAAC,MAAM,EAAE,SAAS,CAAC;IAC5B,KAAK,IAAI,SAAS;IAClB,KAAK,CAAC,CAAC,EAAE,SAAS,GAAG,IAAI;IAOzB,KAAK,IAAI,OAAO;CAGnB;AAGD,qBAAa,SAAU,SAAQ,MAAM;IAGjC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAEzC,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAElE,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAG3C,aAAa,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAEvC,QAAQ,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAEjE,oBAAoB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE5C,cAAc,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEtC,iBAAiB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEzC,oBAAoB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE5C,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEpC,kBAAkB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE1C,mBAAmB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE3C,uBAAuB,EAAE,OAAO,CAAC,IAAI,EAAE,gBAAgB,EAAE,CAAC,CAAC;IAE3D,2BAA2B,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAGnD,WAAW,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAErC,KAAK,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAE9D,YAAY,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEpC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAEvC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAExC,eAAe,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAGvC,gBAAgB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;IAE1C,SAAS,EAAE,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;IAElE,uBAAuB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAE/C,sBAAsB,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;;IAa9C,KAAK;IAoBL,OAAO,CAAC,OAAO,EAAE,SAAS,MAAM,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,SAAS,GAAE,MAAW,GAAG,MAAM;IAKnF,OAAO,CAAC,cAAc,CAAgC;IACtD,OAAO,CAAC,gBAAgB,CAAuB;IAC/C,OAAO,CAAC,mBAAmB,CAAwC;IACnE,cAAc;IA0Bd,OAAO,CAAC,aAAa,CAA2B;IAChD,OAAO,CAAC,eAAe,CAAkB;IACzC,OAAO,CAAC,kBAAkB,CAAmC;IAC7D,aAAa;IA6Cb,SAAS,CAAC,UAAU,EAAE,SAAS,cAAc,EAAE,CAAM;IACrD,SAAS,CAAC,YAAY,EAAE,cAAc,EAAE,CAAM;IAC9C,OAAO,CAAC,eAAe,CAAyC;IAChE,UAAU;IAyCV,OAAO,CAAC,cAAc,CAAyD;IAC/E,OAAO,CAAC,gBAAgB,CAAgD;IACxE,OAAO,CAAC,mBAAmB,CAAiE;IAC5F,cAAc;IAuBd,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IASvB,MAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,GAAG,IAAI;CAQ/C"}
+{"version":3,"file":"dataGraph.d.ts","sourceRoot":"","sources":["../../src/graph2/dataGraph.ts"],"names":[],"mappings":"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"}

package/types/graph2/graph.d.ts

@@ -1,7 +1,12 @@
-import { React, SubgraphProps, VertexProps } from "@hpcc-js/react";
-import { BasicEdgeProps } from "./edge";
+import { React, SubgraphProps, VertexProps, EdgeProps } from "@hpcc-js/react";
 import { GraphReactT } from "./graphReactT";
-export declare class Graph2 extends GraphReactT<SubgraphProps, VertexProps, BasicEdgeProps> {
+import { GraphDataProps, HierarchyBase } from "./graphT";
+export declare type ISubgraph = SubgraphProps;
+export declare type IVertex = VertexProps;
+export declare type IEdge = EdgeProps;
+export declare type IHierarchy = HierarchyBase<ISubgraph, IVertex>;
+export declare type IGraphData2 = GraphDataProps<ISubgraph, IVertex, IEdge>;
+export declare class Graph2 extends GraphReactT<ISubgraph, IVertex, IEdge> {
     constructor();
     calcProps(_props: VertexProps): VertexProps;
     protected _reactVertexRenderer2: React.FunctionComponent<VertexProps>;

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

@@ -1 +1 @@
-{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/graph2/graph.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAY,aAAa,EAAU,WAAW,EAAE,MAAM,gBAAgB,CAAC;AACrF,OAAO,EAAa,cAAc,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAE5C,qBAAa,MAAO,SAAQ,WAAW,CAAC,aAAa,EAAE,WAAW,EAAE,cAAc,CAAC;;IAW/E,SAAS,CAAC,MAAM,EAAE,WAAW,GAAG,WAAW;IA6B3C,SAAS,CAAC,qBAAqB,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACtE,cAAc,IAAI,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC;IACtD,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,IAAI;IAO7D,SAAS,CAAC,sBAAsB,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;IACvE,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC;IACxD,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,WAAW,CAAC,GAAG,IAAI;IAO/D,KAAK,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;IAItB,MAAM,CAAC,OAAO,KAAA,EAAE,OAAO,KAAA;CAI1B;AAGD,MAAM,WAAW,MAAM;IACnB,gBAAgB,IAAI,MAAM,CAAC;IAC3B,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,gBAAgB,IAAI,MAAM,CAAC;IAC3B,gBAAgB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAClC,iBAAiB,IAAI,MAAM,CAAC;IAC5B,iBAAiB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACnC,qBAAqB,IAAI,MAAM,CAAC;IAChC,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACvC,oBAAoB,IAAI,MAAM,CAAC;IAC/B,oBAAoB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACtC,qBAAqB,IAAI,MAAM,CAAC;IAChC,qBAAqB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAEvC,aAAa,IAAI,MAAM,CAAC;IACxB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,aAAa,IAAI,MAAM,CAAC;IACxB,aAAa,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC/B,kBAAkB,IAAI,MAAM,CAAC;IAC7B,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,IAAI,MAAM,CAAC;IAC9B,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,kBAAkB,IAAI,MAAM,CAAC;IAC7B,kBAAkB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACpC,mBAAmB,IAAI,MAAM,CAAC;IAC9B,mBAAmB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACrC,uBAAuB,IAAI,MAAM,CAAC;IAClC,uBAAuB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACzC,sBAAsB,IAAI,MAAM,CAAC;IACjC,sBAAsB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IACxC,uBAAuB,IAAI,MAAM,CAAC;IAClC,uBAAuB,CAAC,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5C"}
+{"version":3,"file":"graph.d.ts","sourceRoot":"","sources":["../../src/graph2/graph.ts"],"names":[],"mappings":"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"}

package/types/graph2/graphReactT.d.ts

@@ -1,6 +1,6 @@
-import { React, SubgraphProps, VertexProps } from "@hpcc-js/react";
-import { EdgeProps, GraphT } from "./graphT";
-export declare class GraphReactT<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> extends GraphT<SG, V, E> {
+import { React, SubgraphProps, VertexProps, EdgeProps } from "@hpcc-js/react";
+import { GraphT } from "./graphT";
+export declare class GraphReactT<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps<V>> extends GraphT<SG, V, E> {
     constructor(subgraphRenderer: React.FunctionComponent<SG>, vertexRenderer: React.FunctionComponent<V>, edgeRenderer: React.FunctionComponent<E>);
     private _reactSubgraphRenderer;
     subgraphRenderer(): React.FunctionComponent<SG>;

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

@@ -1 +1 @@
-{"version":3,"file":"graphReactT.d.ts","sourceRoot":"","sources":["../../src/graph2/graphReactT.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC3E,OAAO,EAAE,SAAS,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAMxD,qBAAa,WAAW,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,SAAS,CAAE,SAAQ,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAEvG,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAI/I,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAC/C,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,IAAI;IAQtD,OAAO,CAAC,oBAAoB,CAA6B;IACzD,cAAc,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC5C,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;IAQnD,OAAO,CAAC,kBAAkB,CAA6B;IACvD,YAAY,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC1C,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;CAOpD"}
+{"version":3,"file":"graphReactT.d.ts","sourceRoot":"","sources":["../../src/graph2/graphReactT.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,aAAa,EAAE,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AACtF,OAAO,EAAE,MAAM,EAAa,MAAM,UAAU,CAAC;AAM7C,qBAAa,WAAW,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC,SAAS,WAAW,EAAE,CAAC,SAAS,SAAS,CAAC,CAAC,CAAC,CAAE,SAAQ,MAAM,CAAC,EAAE,EAAE,CAAC,EAAE,CAAC,CAAC;gBAE1G,gBAAgB,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,cAAc,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAI/I,OAAO,CAAC,sBAAsB,CAA8B;IAC5D,gBAAgB,IAAI,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC;IAC/C,gBAAgB,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,EAAE,CAAC,GAAG,IAAI;IAQtD,OAAO,CAAC,oBAAoB,CAA6B;IACzD,cAAc,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC5C,cAAc,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;IAQnD,OAAO,CAAC,kBAAkB,CAA6B;IACvD,YAAY,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC1C,YAAY,CAAC,CAAC,EAAE,KAAK,CAAC,iBAAiB,CAAC,CAAC,CAAC,GAAG,IAAI;CAOpD"}