@hpcc-js/graph 2.83.1 → 2.83.2

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

@@ -1,156 +1,35 @@
-import { Palette, Selection, SVGGlowFilter, SVGZoomWidget, ToggleButton, Utility, Widget } from "@hpcc-js/common";
-import { IconEx, React, Vertex, IVertex3, IVertex4Annotation, Icon } 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 { IEdge, IGraphData2, IHierarchy, ISubgraph, IVertex } from "./layouts/placeholders";
-import { EdgePlaceholder, SubgraphPlaceholder, VertexPlaceholder } from "./layouts/placeholders";
-import { Engine } from "./layouts/graphvizWorker";
-import "../../src/graph2/graph.css";
-export { IGraphData2, ISubgraph, IVertex, IEdge, IHierarchy };
-declare type GraphLayoutType = "Hierarchy" | "DOT" | "Tree" | "Dendrogram" | "RadialTree" | "RadialDendrogram" | "ForceDirected" | "ForceDirected2" | "ForceDirectedHybrid" | "Neato" | "FDP" | "Circle" | "TwoPI" | "Circo" | "None";
-export declare class Graph2 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, EdgePlaceholder, SubgraphPlaceholder>;
-    protected _prevDoClickTime: number;
+import { SVGGlowFilter } from "@hpcc-js/common";
+import { React, SubgraphProps, VertexProps } from "@hpcc-js/react";
+import { BasicEdgeProps } from "./edge";
+import { GraphReactT } from "./graphReactT";
+export declare class Graph2 extends GraphReactT<SubgraphProps, VertexProps, BasicEdgeProps> {
     protected _centroidFilter: SVGGlowFilter;
-    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();
-    resolveEventOrigin(): {
-        origin: string;
-        data: undefined | IVertex4Annotation | Icon;
-    };
-    iconBarButtons(): Widget[];
-    protected _categories: IconEx[];
-    categories(): IconEx[];
-    categories(_: IconEx[]): this;
-    protected _annotations: IconEx[];
-    annotations(): IconEx[];
-    annotations(_: IconEx[]): this;
-    private _origData;
-    data(): IGraphData2;
-    data(_: IGraphData2, merge?: boolean): this;
-    selected(vertex: IVertex, _?: Array<IVertex>): boolean;
-    selection(_: Array<IVertex | ISubgraph | IEdge>): this;
-    selection(): Array<IVertex | ISubgraph | IEdge>;
-    graphData(): GraphCollection<VertexPlaceholder, EdgePlaceholder>;
-    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): {
-        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: any): this;
-    highlightVertex(_element: any, d: VertexPlaceholder): void;
-    highlightEdge(_element: any, d: EdgePlaceholder): void;
-    moveSubgraphPlaceholder(sp: SubgraphPlaceholder, transition: boolean): this;
-    moveEdgePlaceholder(ep: EdgePlaceholder, transition: boolean): this;
-    moveVertexPlaceholder(vp: VertexPlaceholder, 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): {
-        x: number;
-        y: number;
-    };
-    categoryID(id: string | number, prefix?: "cat" | "ann"): string;
-    updateCategories(): void;
-    updateAnnotations(): void;
-    updateEdges(): this;
-    private _centroidRenderer;
-    centroidRenderer(): React.FunctionComponent;
-    centroidRenderer(_: React.FunctionComponent): this;
-    private _vertexRenderer;
-    vertexRenderer(): React.FunctionComponent;
-    vertexRenderer(_: React.FunctionComponent): this;
-    vertexMapper(props: IVertex, origRow: any): Vertex | IVertex3;
-    updateVertices(): this;
-    calcProps(isCentroid: boolean, props: any): any;
-    hasSubgraphs(): boolean;
-    updateSubgraphs(): this;
+    calcProps(_props: VertexProps): VertexProps;
+    protected _reactVertexRenderer2: React.FunctionComponent<VertexProps>;
+    vertexRenderer(): React.FunctionComponent<VertexProps>;
+    vertexRenderer(_: React.FunctionComponent<VertexProps>): this;
+    protected _reactCentroidRenderer: React.FunctionComponent<VertexProps>;
+    centroidRenderer(): React.FunctionComponent<VertexProps>;
+    centroidRenderer(_: React.FunctionComponent<VertexProps>): 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[];
-    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 Graph2 {
-    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;
+    vertexTextHeight(): number;
+    vertexTextHeight(_: number): this;
+    vertexTextPadding(): number;
+    vertexTextPadding(_: number): this;
+    vertexIconHeight(): number;
+    vertexIconHeight(_: number): this;
+    vertexIconPadding(): number;
+    vertexIconPadding(_: number): this;
+    vertexIconStrokeWidth(): number;
+    vertexIconStrokeWidth(_: number): this;
+    vertexIconFontFamily(): string;
+    vertexIconFontFamily(_: string): this;
+    vertexLabelFontFamily(): string;
+    vertexLabelFontFamily(_: string): this;
     centroidColor(): string;
     centroidColor(_: string): this;
     centroidScale(): number;
@@ -169,91 +48,5 @@ export interface Graph2 {
     centroidIconFontFamily(_: string): this;
     centroidLabelFontFamily(): string;
     centroidLabelFontFamily(_: string): this;
-    vertexTextHeight(): number;
-    vertexTextHeight(_: number): this;
-    vertexTextPadding(): number;
-    vertexTextPadding(_: number): this;
-    vertexIconHeight(): number;
-    vertexIconHeight(_: number): this;
-    vertexIconPadding(): number;
-    vertexIconPadding(_: number): this;
-    vertexIconStrokeWidth(): number;
-    vertexIconStrokeWidth(_: number): this;
-    vertexIconFontFamily(): string;
-    vertexIconFontFamily(_: string): this;
-    vertexLabelFontFamily(): string;
-    vertexLabelFontFamily(_: string): 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, _wasmFolder?: string): {
-    terminate: () => void;
-    response: Promise<string>;
-};
 //# sourceMappingURL=graph.d.ts.map

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

@@ -0,0 +1,15 @@
+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> {
+    constructor(subgraphRenderer: React.FunctionComponent<SG>, vertexRenderer: React.FunctionComponent<V>, edgeRenderer: React.FunctionComponent<E>);
+    private _reactSubgraphRenderer;
+    subgraphRenderer(): React.FunctionComponent<SG>;
+    subgraphRenderer(_: React.FunctionComponent<SG>): this;
+    private _reactVertexRenderer;
+    vertexRenderer(): React.FunctionComponent<V>;
+    vertexRenderer(_: React.FunctionComponent<V>): this;
+    private _reactEdgeRenderer;
+    edgeRenderer(): React.FunctionComponent<E>;
+    edgeRenderer(_: React.FunctionComponent<E>): this;
+}
+//# sourceMappingURL=graphReactT.d.ts.map

package/types-3.4/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 { 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-3.4/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-3.4/graph2/layouts/placeholders.d.ts

@@ -1,48 +1,58 @@
 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 +65,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,

package/types-3.4/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-3.4/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