@hpcc-js/graph 2.83.0 → 2.83.2

package/types/graph2/graphT.d.ts

@@ -0,0 +1,232 @@
+import { Palette, Selection, SVGZoomWidget, ToggleButton, Utility, Widget } from "@hpcc-js/common";
+import { IconEx } from "@hpcc-js/react";
+import { Graph2 as GraphCollection } from "@hpcc-js/util";
+import { HTMLTooltip } from "@hpcc-js/html";
+import "d3-transition";
+import { ILayout } from "./layouts/index";
+import { Options as FDOptions } from "./layouts/forceDirectedWorker";
+import type { VertexProps, EdgeProps, IGraphData2, HierarchyBase, SubgraphProps } from "./layouts/placeholders";
+import { EdgePlaceholder, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
+import { Engine } from "./layouts/graphvizWorker";
+import "../../src/graph2/graph.css";
+export { IGraphData2, SubgraphProps, VertexProps, EdgeProps, HierarchyBase };
+declare type GraphLayoutType = "Hierarchy" | "DOT" | "Tree" | "Dendrogram" | "RadialTree" | "RadialDendrogram" | "ForceDirected" | "ForceDirected2" | "ForceDirectedHybrid" | "Neato" | "FDP" | "Circle" | "TwoPI" | "Circo" | "None";
+export declare type RendererT<T> = (props: T, element: SVGGElement) => void;
+export declare class GraphT<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> extends SVGZoomWidget {
+    private _toggleHierarchy;
+    private _toggleForceDirected;
+    private _toggleForceDirected2;
+    private _toggleCircle;
+    private _toggleDot;
+    private _toggleNeato;
+    private _toggleFDP;
+    private _toggleTwoPI;
+    private _toggleCirco;
+    private _toggleT;
+    private _toggleRT;
+    private _toggleD;
+    private _toggleRD;
+    protected _graphData: GraphCollection<VertexPlaceholder<V>, EdgePlaceholder<E, V>, SubgraphPlaceholder<SG>>;
+    protected _prevDoClickTime: number;
+    protected _svgDefsAnn: any;
+    protected _svgDefsCat: any;
+    protected _subgraphG: Selection<SVGGElement, any, SVGGElement, any>;
+    protected _edgeG: Selection<SVGGElement, any, SVGGElement, any>;
+    protected _vertexG: Selection<SVGGElement, any, SVGGElement, any>;
+    protected _tooltip: HTMLTooltip;
+    protected _selection: Utility.SelectionBag;
+    private _dragHandler;
+    protected _catPalette: Palette.OrdinalPaletteFunc;
+    _svgDefs: any;
+    constructor(subgraphRenderer: RendererT<SG>, vertexRenderer: RendererT<V>, edgeRenderer: RendererT<E>);
+    resolveEventOrigin(): {
+        origin: string;
+        data?: SG | V | E;
+    };
+    iconBarButtons(): Widget[];
+    protected _categories: IconEx[];
+    categories(): IconEx[];
+    categories(_: IconEx[]): this;
+    protected _annotations: IconEx[];
+    annotations(): IconEx[];
+    annotations(_: IconEx[]): this;
+    private _origData;
+    data(): IGraphData2<SG, V, E>;
+    data(_: IGraphData2<SG, V, E>, merge?: boolean): this;
+    selected(vertex: V, _?: Array<V>): boolean;
+    selection(_: Array<V | SG | E>): this;
+    selection(): Array<V | SG | E>;
+    graphData(): GraphCollection<VertexPlaceholder<V>, EdgePlaceholder<E, V>>;
+    resetLayout(): this;
+    layoutRunning(): boolean;
+    protected _layoutAlgo: ILayout;
+    layoutAlgo(layout: ILayout): Promise<void>;
+    layoutClick(layout: GraphLayoutType): void;
+    updateIconBarItem(tb: ToggleButton, tbLayout: GraphLayoutType): void;
+    updateIconBar(): void;
+    getNeighborMap(vertex: VertexPlaceholder<V>): {
+        vertices: {};
+        edges: {};
+    };
+    centerOnItem(id: string): void;
+    hideVertex(id: string): this;
+    showVertex(id: string): this;
+    protected highlight: {
+        zoom: number;
+        opacity: number;
+        edge: string;
+    };
+    highlightVerticies(vertexMap?: {
+        [id: string]: boolean;
+    }): this;
+    highlightEdges(edgeMap?: {
+        [id: string]: boolean;
+    }): this;
+    highlightVertex(_element: any, d?: VertexPlaceholder<V>): void;
+    highlightEdge(_element: any, d?: EdgePlaceholder<E, V>): void;
+    moveSubgraphPlaceholder(sp: SubgraphPlaceholder<SG>, transition: boolean): this;
+    moveEdgePlaceholder(ep: EdgePlaceholder<E, V>, transition: boolean): this;
+    moveVertexPlaceholder(vp: VertexPlaceholder<V>, transition: boolean, moveNeighbours: boolean): this;
+    moveSubgraphs(transition: boolean): this;
+    moveEdges(transition: boolean): this;
+    moveVertices(transition: boolean): this;
+    project(pos: number, clip?: boolean): number;
+    rproject(pos: number): number;
+    projectPlacholder(vp: VertexPlaceholder<V>): {
+        x: number;
+        y: number;
+    };
+    categoryID(id: string | number, prefix?: "cat" | "ann"): string;
+    updateCategories(): void;
+    updateAnnotations(): void;
+    private _edgeRenderer;
+    edgeRenderer(): RendererT<E>;
+    edgeRenderer(_: RendererT<E>): this;
+    updateEdges(): this;
+    private _vertexRenderer;
+    vertexRenderer(): RendererT<V>;
+    vertexRenderer(_: RendererT<V>): this;
+    vertexMapper(props: V, origRow: V): V;
+    updateVertices(): this;
+    calcProps(props: V): V;
+    hasSubgraphs(): boolean;
+    private _subgraphRenderer;
+    subgraphRenderer(): RendererT<SG>;
+    subgraphRenderer(_: RendererT<SG>): this;
+    updateSubgraphs(): this;
+    enter(domNode: any, element: any): void;
+    protected forceDirectedOptions(): FDOptions;
+    private layoutOptions;
+    private _prevLayout;
+    updateLayout(): void;
+    update(domNode: any, element: any): void;
+    exit(domNode: any, element: any): void;
+    render(callback?: (w: Widget) => void): this;
+    private _prevWidth;
+    private _prevHeight;
+    private _prevTransformScale;
+    private _transformScale;
+    zoomed(transform: any): void;
+    centroids(): VertexPlaceholder<V>[];
+    selectionChanged(): void;
+    tooltipHTML(data: any): any;
+    subgraph_click(row: any, _col: any, sel: any): void;
+    vertex_click(row: any, _col: any, sel: any, data: any): void;
+    vertex_dblclick(row: any, _col: any, sel: any, data: any): void;
+    vertex_mousein(row: any, _col: any, sel: any, data: any): void;
+    vertex_mouseover(row: any, _col: any, sel: any, data: any): void;
+    vertex_mouseout(row: any, _col: any, sel: any, data: any): void;
+    edge_click(row: any, _col: any, sel: any): void;
+    edge_mouseover(element: any, d: any): void;
+    edge_mouseout(_element: any, _d: any): void;
+    progress(what: "start" | "stop" | "layout-start" | "layout-tick" | "layout-stop"): void;
+}
+export interface GraphT<SG extends SubgraphProps = any, V extends VertexProps = any, E extends EdgeProps = any> {
+    allowDragging(): boolean;
+    allowDragging(_: boolean): this;
+    dragSingleNeighbors(): boolean;
+    dragSingleNeighbors(_: boolean): this;
+    layout(): GraphLayoutType;
+    layout(_: GraphLayoutType): this;
+    applyScaleOnLayout(): boolean;
+    applyScaleOnLayout(_: boolean): this;
+    highlightOnMouseOverVertex(): boolean;
+    highlightOnMouseOverVertex(_: boolean): this;
+    highlightOnMouseOverEdge(): boolean;
+    highlightOnMouseOverEdge(_: boolean): this;
+    transitionDuration(): number;
+    transitionDuration(_: number): this;
+    highlightSelectedPathToCentroid(): boolean;
+    highlightSelectedPathToCentroid(_: boolean): this;
+    edgeArcDepth(): number;
+    edgeArcDepth(_: number): this;
+    minScale(): number;
+    minScale(_: number): this;
+    maxScale(): number;
+    maxScale(_: number): this;
+    showEdgeLabels(): boolean;
+    showEdgeLabels(_: boolean): this;
+    showEdgeLabelsOnHighlight(): boolean;
+    showEdgeLabelsOnHighlight(_: boolean): this;
+    showVertexLabels(): boolean;
+    showVertexLabels(_: boolean): this;
+    showVertexLabelsOnHighlight(): boolean;
+    showVertexLabelsOnHighlight(_: boolean): this;
+    hierarchyRankDirection(): "TB" | "BT" | "LR" | "RL";
+    hierarchyRankDirection(_: "TB" | "BT" | "LR" | "RL"): this;
+    hierarchyNodeSeparation(): number;
+    hierarchyNodeSeparation(_: number): this;
+    hierarchyEdgeSeparation(): number;
+    hierarchyEdgeSeparation(_: number): this;
+    hierarchyRankSeparation(): number;
+    hierarchyRankSeparation(_: number): this;
+    hierarchyDigraph(): boolean;
+    hierarchyDigraph(_: boolean): this;
+    forceDirectedAlpha(): number;
+    forceDirectedAlpha(_: number): this;
+    forceDirectedAlphaMin(): number;
+    forceDirectedAlphaMin(_: number): this;
+    forceDirectedAlphaDecay(): number;
+    forceDirectedAlphaDecay(_: number): this;
+    forceDirectedRepulsionStrength(): number;
+    forceDirectedRepulsionStrength(_: number): this;
+    forceDirectedVelocityDecay(): number;
+    forceDirectedVelocityDecay(_: number): this;
+    forceDirectedIterations(): number;
+    forceDirectedIterations(_: number): this;
+    forceDirectedLinkDistance(): number;
+    forceDirectedLinkDistance(_: number): this;
+    forceDirectedLinkStrength(): number;
+    forceDirectedLinkStrength(_: number): this;
+    forceDirectedPinCentroid(): boolean;
+    forceDirectedPinCentroid(_: boolean): this;
+    forceDirectedForceStrength(): number;
+    forceDirectedForceStrength(_: number): this;
+    forceDirectedMinDistance(): number;
+    forceDirectedMinDistance(_: number): this;
+    forceDirectedMaxDistance(): number;
+    forceDirectedMaxDistance(_: number): this;
+    treeRankDirection(): "TB" | "LR";
+    treeRankDirection(_: "TB" | "LR"): this;
+    edgeColor(): string;
+    edgeColor(_: string): this;
+    edgeStrokeWidth(): number;
+    edgeStrokeWidth(_: number): this;
+    tooltipWidth(): number;
+    tooltipWidth(_: number): this;
+    tooltipHeight(): number;
+    tooltipHeight(_: number): this;
+    enableTooltipPointerEvents(): boolean;
+    enableTooltipPointerEvents(_: boolean): this;
+    tooltipCloseDelay(): number;
+    tooltipCloseDelay(_: number): this;
+    doubleClickMaxDelay(): number;
+    doubleClickMaxDelay(_: number): this;
+    wasmFolder(): string;
+    wasmFolder(_: string): this;
+}
+export declare function graphviz(dot: string, engine?: Engine, _scriptDir?: string): {
+    terminate: () => void;
+    response: Promise<string>;
+};
+//# sourceMappingURL=graphT.d.ts.map

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

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

package/types/graph2/index.d.ts

@@ -1,4 +1,8 @@
+export * from "./graphT";
 export * from "./graph";
 export * from "./dataGraph";
 export * from "./sankeyGraph";
+export * from "./subgraph";
+export * from "./vertex";
+export * from "./edge";
 //# 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;AAC5B,cAAc,eAAe,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/graph2/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,UAAU,CAAC;AACzB,cAAc,QAAQ,CAAC"}

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

@@ -1 +1 @@
-{"version":3,"file":"dagre.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/dagre.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAiBjD,qBAAa,KAAM,SAAQ,MAAM;IAEV,QAAQ,CAAC,QAAQ,EAAE,OAAO;gBAAjC,KAAK,KAAA,EAAW,QAAQ,EAAE,OAAO;IAI7C,KAAK;IAsEL,QAAQ,CAAC,EAAE,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,GAAG;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,KAAK,CAAA;KAAE;CAsBvF"}
+{"version":3,"file":"dagre.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/dagre.ts"],"names":[],"mappings":"AACA,OAAO,EAAS,OAAO,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAiBjD,qBAAa,KAAM,SAAQ,MAAM;IAEV,QAAQ,CAAC,QAAQ,EAAE,OAAO;gBAAjC,KAAK,KAAA,EAAW,QAAQ,EAAE,OAAO;IAI7C,KAAK;IAkFL,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

@@ -1,48 +1,55 @@
 import { Selection } from "@hpcc-js/common";
-import { Edge, Subgraph, Vertex } from "@hpcc-js/react";
-export interface ISubgraph extends Subgraph {
+export interface BaseProps {
     id: string;
     origData?: any;
 }
-export interface IVertex extends Vertex {
-    id: string;
-    origData?: any;
+export interface VertexProps extends BaseProps {
+    text: string;
+    categoryID?: string;
     centroid?: boolean;
     hidden?: boolean;
     tooltip?: string;
+    annotationIDs?: string[];
 }
-export interface IEdge extends Edge {
-    id: string;
-    source: IVertex;
-    target: IVertex;
+export interface SubgraphProps extends BaseProps {
+    text: string;
+    width?: number;
+    height?: number;
+}
+export declare type Point = [number, number];
+export interface EdgeProps extends BaseProps {
+    source: VertexProps;
+    target: VertexProps;
     label?: string;
+    labelPos?: Point;
+    weight?: number;
+    strokeDasharray?: string;
+    strokeWidth?: number;
     color?: string;
     fontFamily?: string;
-    origData?: any;
 }
-export interface IHierarchy {
+export interface HierarchyBase<SG extends SubgraphProps, V extends VertexProps> {
     id: string;
-    parent: ISubgraph;
-    child: ISubgraph | IVertex;
+    parent: SG;
+    child: SG | V;
 }
-export interface IGraphData2 {
-    subgraphs?: ISubgraph[];
-    vertices: IVertex[];
-    edges: IEdge[];
-    hierarchy?: IHierarchy[];
+export interface IGraphData2<SG extends SubgraphProps, V extends VertexProps, E extends EdgeProps> {
+    subgraphs?: SG[];
+    vertices: V[];
+    edges: E[];
+    hierarchy?: HierarchyBase<SG, V>[];
 }
-export interface SubgraphPlaceholder {
+export interface SubgraphPlaceholder<SG extends SubgraphProps = SubgraphProps> {
     id: string;
-    element?: Selection<SVGGElement, SubgraphPlaceholder, SVGGElement, any>;
-    props: ISubgraph;
+    element?: Selection<SVGGElement, SubgraphPlaceholder<SG>, SVGGElement, any>;
+    props: SG;
     x?: number;
     y?: number;
 }
-export interface VertexPlaceholder {
+export interface VertexPlaceholder<V extends VertexProps = VertexProps> {
     id: string;
-    element?: Selection<SVGGElement, VertexPlaceholder, SVGGElement, any>;
-    props: IVertex;
-    centroid?: boolean;
+    element?: Selection<SVGGElement, VertexPlaceholder<V>, SVGGElement, any>;
+    props: V;
     index?: number;
     x?: number;
     y?: number;
@@ -55,14 +62,14 @@ export interface VertexPlaceholder {
     lat?: number;
     lng?: number;
 }
-export interface EdgePlaceholder {
+export interface EdgePlaceholder<E extends EdgeProps = EdgeProps, V extends VertexProps = VertexProps> {
     id: string;
-    element?: Selection<SVGGElement, EdgePlaceholder, SVGGElement, any>;
-    elementPath?: Selection<SVGPathElement, EdgePlaceholder, SVGGElement, any>;
-    elementText?: Selection<SVGTextElement, EdgePlaceholder, SVGGElement, any>;
-    props: IEdge;
-    source: VertexPlaceholder;
-    target: VertexPlaceholder;
+    element?: Selection<SVGGElement, EdgePlaceholder<E, V>, SVGGElement, any>;
+    elementPath?: Selection<SVGPathElement, EdgePlaceholder<E, V>, SVGGElement, any>;
+    elementText?: Selection<SVGTextElement, EdgePlaceholder<E, V>, SVGGElement, any>;
+    props: E;
+    source: VertexPlaceholder<V>;
+    target: VertexPlaceholder<V>;
     index?: number;
     points?: Array<[number, number]>;
 }

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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"}

package/types/graph2/sankeyGraph.d.ts

@@ -1,7 +1,7 @@
 import { publish, SVGWidget } from "@hpcc-js/common";
 import { AnnotationColumn } from "./dataGraph";
-import { IEdge, IVertex } from "./graph";
 import "../../src/graph2/sankeyGraph.css";
+import { EdgeProps, VertexProps } from "./graphT";
 export declare class SankeyGraph extends SVGWidget {
     vertexColumns: publish<this, string[]>;
     vertices: publish<this, Array<Array<string | number | boolean>>>;
@@ -29,12 +29,12 @@ export declare class SankeyGraph extends SVGWidget {
     private _masterVerticesMap;
     mergeVertices(): void;
     indexOf(columns: readonly string[], column: string, defColumn?: string): number;
-    protected _prevEdges: readonly IEdge[];
-    protected _masterEdges: IEdge[];
+    protected _prevEdges: readonly EdgeProps[];
+    protected _masterEdges: EdgeProps[];
     mergeEdges(): void;
     sankeyData(): {
-        vertices: IVertex[];
-        edges: IEdge[];
+        vertices: VertexProps[];
+        edges: EdgeProps[];
     };
     enter(domNode: any, element: any): void;
     update(domNode: any, element: any): void;

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/graph2/subgraph.d.ts

@@ -0,0 +1,12 @@
+import { React } from "@hpcc-js/react";
+import { SubgraphProps } from "./layouts/placeholders";
+export interface BasicSubgraphProps extends SubgraphProps {
+    label?: string;
+    labelFill?: string;
+    labelHeight?: number;
+    rectFill?: string;
+    rectStroke?: string;
+    rectStrokeWidth?: number;
+}
+export declare const BasicSubgraph: React.FunctionComponent<BasicSubgraphProps>;
+//# sourceMappingURL=subgraph.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"subgraph.d.ts","sourceRoot":"","sources":["../../src/graph2/subgraph.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAQ,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAEvD,MAAM,WAAW,kBAAmB,SAAQ,aAAa;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;AAED,eAAO,MAAM,aAAa,EAAE,KAAK,CAAC,iBAAiB,CAAC,kBAAkB,CAgBrE,CAAC"}

package/types/graph2/vertex.d.ts

@@ -0,0 +1,13 @@
+import { React } from "@hpcc-js/react";
+import { VertexProps } from "./layouts/placeholders";
+export interface BasicVertexProps extends VertexProps {
+    textFill?: string;
+    textHeight?: number;
+    scale?: number;
+    circleRadius?: number;
+    circleFill?: string;
+    circleStroke?: string;
+    circleStrokeWidth?: number;
+}
+export declare const BasicVertex: React.FunctionComponent<BasicVertexProps>;
+//# sourceMappingURL=vertex.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"vertex.d.ts","sourceRoot":"","sources":["../../src/graph2/vertex.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAQ,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,WAAW,gBAAiB,SAAQ,WAAW;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,iBAAiB,CAAC,EAAE,MAAM,CAAA;CAC7B;AAED,eAAO,MAAM,WAAW,EAAE,KAAK,CAAC,iBAAiB,CAAC,gBAAgB,CAgBjE,CAAC"}

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.83.0";
-export declare const BUILD_VERSION = "2.104.3";
+export declare const PKG_VERSION = "2.83.2";
+export declare const BUILD_VERSION = "2.104.7";
 //# sourceMappingURL=__package__.d.ts.map

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

@@ -1,7 +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): {};
+import { BasicEdgeProps } from "./edge";
+export declare function toJsonObj<T>(row: any, columns: any): T;
 export declare class AnnotationColumn extends PropertyExt {
     columnID: publish<this, string>;
     annotationID: publish<this, string>;
@@ -49,8 +49,8 @@ export declare class DataGraph extends Graph2 {
     private _masterVertices;
     private _masterVerticesMap;
     mergeVertices(): void;
-    protected _prevEdges: readonly IEdge[];
-    protected _masterEdges: IEdge[];
+    protected _prevEdges: readonly BasicEdgeProps[];
+    protected _masterEdges: BasicEdgeProps[];
     private _masterEdgesMap;
     mergeEdges(): void;
     private _prevHierarchy;

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

@@ -0,0 +1,9 @@
+import { React } from "@hpcc-js/react";
+import { EdgeProps as EdgeProps } from "./layouts/placeholders";
+export interface BasicEdgeProps extends EdgeProps {
+    labelFill?: string;
+    labelHeight?: number;
+    path?: string;
+}
+export declare const BasicEdge: React.FunctionComponent<BasicEdgeProps>;
+//# sourceMappingURL=edge.d.ts.map