@hpcc-js/graph 2.84.4 → 2.85.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/graph",
-    "version": "2.84.4",
+    "version": "2.85.1",
     "description": "hpcc-js - Viz Graph",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -88,5 +88,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "cec45fe4a28dff27d43cf0bb9238d751534c8e88"
+    "gitHead": "c1baf3e4992b882bbe526b550a72b873f0f4ccc2"
 }

package/src/__package__.ts

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

package/src/graph2/graphT.ts

@@ -219,7 +219,7 @@ export class GraphT<SG extends SubgraphBaseProps, V extends VertexBaseProps, E e
     resolveEventOrigin(): { origin: string, data?: SG | V | E } {
         const d3evt = d3Event();
         const eventPath = d3evt?.sourceEvent?.path ?? d3evt?.path;
-        const element = eventPath.find(n => n?.hasAttribute && n?.hasAttribute("data-click"));
+        const element = eventPath?.find(n => n?.hasAttribute && n?.hasAttribute("data-click"));
         const origin = element ? element.getAttribute("data-click") : "";
         const dataStr = element ? element.getAttribute("data-click-data") : "";
         let data = undefined;

package/src/graph2/layouts/graphviz.ts

@@ -1,5 +1,5 @@
 import { curveBasis as d3CurveBasis, line as d3Line } from "d3-shape";
-import { Cluster, graphviz as gvWorker, Node } from "./graphvizWorker";
+import { Cluster, graphviz as gvWorker, Node, isLayoutSuccess, LayoutError } from "./graphvizWorker";
 import { Layout, Point } from "./layout";
 import { EdgePlaceholder } from "./placeholders";
 
@@ -60,31 +60,39 @@ export class Graphviz extends Layout {
             raw: ""
         }, {
             engine: this._engine
-        }).response.then((response: any) => {
+        }).response.then(response => {
             if (this.running()) {
-                response.clusters.forEach(n => {
-                    const sg = data.subgraph(n.id);
-                    sg.x = n.x + size.width / 2 - n.width;
-                    sg.y = n.y + size.height / 2 - n.height;
-                    sg.props.width = n.width;
-                    sg.props.height = n.height;
-                });
-                response.nodes.forEach(n => {
-                    const v = data.vertex(n.id);
-                    v.x = n.x + size.width / 2;
-                    v.y = n.y + size.height / 2;
-                });
-                response.links.forEach(l => {
-                    const e = data.edge(l.id);
-                    e.points = [[e.source.x, e.source.y], ...(l.points !== undefined ? l.points.map(p => [p[0] + size.width / 2, p[1] + size.height / 2]) : []), [e.target.x, e.target.y]];
-                    // e.points = l.points.map(p => [p[0] + size.width / 2, p[1] + size.height / 2]);
-                });
-                this._graph
-                    .moveSubgraphs(true)
-                    .moveVertices(true)
-                    .moveEdges(true)
-                    ;
-                this.stop();
+                if (isLayoutSuccess(response)) {
+                    response.clusters.forEach(n => {
+                        const sg = data.subgraph(n.id);
+                        sg.x = n.x + size.width / 2 - n.width;
+                        sg.y = n.y + size.height / 2 - n.height;
+                        sg.props.width = n.width;
+                        sg.props.height = n.height;
+                    });
+                    response.nodes.forEach(n => {
+                        const v = data.vertex(n.id);
+                        v.x = n.x + size.width / 2;
+                        v.y = n.y + size.height / 2;
+                    });
+                    response.links.forEach(l => {
+                        const e = data.edge(l.id);
+                        const start: [number, number] = [e.source.x, e.source.y];
+                        const mid: [number, number][] = l.points !== undefined ? l.points.map(p => [p[0] + size.width / 2, p[1] + size.height / 2]) : [];
+                        const end: [number, number] = [e.target.x, e.target.y];
+                        e.points = [start, ...mid, end];
+                        // e.points = l.points.map(p => [p[0] + size.width / 2, p[1] + size.height / 2]);
+                    });
+                    this._graph
+                        .moveSubgraphs(true)
+                        .moveVertices(true)
+                        .moveEdges(true)
+                        ;
+                    this.stop();
+                } else {
+                    const err = response as LayoutError;
+                    console.error(`Graphviz layout fail:  ${err.error}`, err.errorDot);
+                }
             }
             return this;
         });

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/graph";
-export declare const PKG_VERSION = "2.84.4";
-export declare const BUILD_VERSION = "2.104.14";
+export declare const PKG_VERSION = "2.85.1";
+export declare const BUILD_VERSION = "2.104.16";
 //# sourceMappingURL=__package__.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":"AAEA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACzC,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAEjD,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;IAoEL,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":"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;AAEjD,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;IA4EL,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/graphvizWorker.d.ts

@@ -32,6 +32,23 @@ export interface Data {
 export interface Options {
     engine: Engine;
 }
+export interface LayoutError {
+    error?: string;
+    errorDot?: string;
+}
+export interface LayoutSVG extends LayoutError {
+    svg?: string;
+}
+export interface LayoutJSON extends LayoutError {
+    json?: any;
+}
+export declare type LayoutSuccess = {
+    clusters: Cluster[];
+    nodes: Node[];
+    links: Link[];
+};
+export declare type Layout = LayoutSuccess | LayoutJSON | LayoutSVG;
+export declare function isLayoutSuccess(item: any): item is LayoutSuccess;
 export declare function graphviz(data: Data, options: Options): {
     terminate: () => void;
     response: Promise<string>;

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

@@ -1 +1 @@
-{"version":3,"file":"graphvizWorker.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/graphvizWorker.ts"],"names":[],"mappings":"AAAA,oBAAY,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,OAAO,CAAC;AAEzF,MAAM,WAAW,OAAO;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAGhC,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,IAAI;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IAGf,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,IAAI,OAAO,CAE/D;AAED,MAAM,WAAW,IAAI;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,IAAI,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IAGb,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,IAAI;IACjB,KAAK,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC7B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO;;;EAmBpD"}
+{"version":3,"file":"graphvizWorker.d.ts","sourceRoot":"","sources":["../../../src/graph2/layouts/graphvizWorker.ts"],"names":[],"mappings":"AAAA,oBAAY,MAAM,GAAG,OAAO,GAAG,KAAK,GAAG,KAAK,GAAG,OAAO,GAAG,OAAO,GAAG,WAAW,GAAG,OAAO,CAAC;AAEzF,MAAM,WAAW,OAAO;IACpB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAGhC,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,IAAI;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IAGf,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,CAAC,CAAC,EAAE,MAAM,CAAC;CACd;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,OAAO,GAAG,IAAI,GAAG,IAAI,IAAI,OAAO,CAE/D;AAED,MAAM,WAAW,IAAI;IACjB,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,IAAI,CAAC;IACb,MAAM,EAAE,IAAI,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IAGb,MAAM,CAAC,EAAE,KAAK,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,IAAI;IACjB,KAAK,EAAE,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC,CAAC;IAC7B,KAAK,EAAE,IAAI,EAAE,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,OAAO;IACpB,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,WAAW;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,SAAU,SAAQ,WAAW;IAC1C,GAAG,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,UAAW,SAAQ,WAAW;IAC3C,IAAI,CAAC,EAAE,GAAG,CAAC;CACd;AAED,oBAAY,aAAa,GAAG;IAAE,QAAQ,EAAE,OAAO,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAC;IAAC,KAAK,EAAE,IAAI,EAAE,CAAA;CAAE,CAAC;AAClF,oBAAY,MAAM,GAAG,aAAa,GAAG,UAAU,GAAG,SAAS,CAAC;AAE5D,wBAAgB,eAAe,CAAC,IAAI,EAAE,GAAG,GAAG,IAAI,IAAI,aAAa,CAIhE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO;;;EAmBpD"}

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.84.4";
-export declare const BUILD_VERSION = "2.104.14";
+export declare const PKG_VERSION = "2.85.1";
+export declare const BUILD_VERSION = "2.104.16";
 //# sourceMappingURL=__package__.d.ts.map

package/types-3.4/graph2/layouts/graphvizWorker.d.ts

@@ -35,6 +35,23 @@ export interface Data {
 export interface Options {
     engine: Engine;
 }
+export interface LayoutError {
+    error?: string;
+    errorDot?: string;
+}
+export interface LayoutSVG extends LayoutError {
+    svg?: string;
+}
+export interface LayoutJSON extends LayoutError {
+    json?: any;
+}
+export declare type LayoutSuccess = {
+    clusters: Cluster[];
+    nodes: Node[];
+    links: Link[];
+};
+export declare type Layout = LayoutSuccess | LayoutJSON | LayoutSVG;
+export declare function isLayoutSuccess(item: any): item is LayoutSuccess;
 export declare function graphviz(data: Data, options: Options): {
     terminate: () => void;
     response: Promise<string>;