@hpcc-js/graph 2.78.0 → 2.79.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/graph",
-    "version": "2.78.0",
+    "version": "2.79.3",
     "description": "hpcc-js - Viz Graph",
     "main": "dist/index.js",
     "module": "dist/index.es6",
@@ -45,30 +45,25 @@
         "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
         "build": "run-s build-workers copy-resources build-package",
         "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
-        "stamp": "node node_modules/@hpcc-js/bundle/src/stamp.js",
+        "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint src/**/*.ts",
         "docs": "typedoc --options tdoptions.json .",
         "ddd": "downlevel-dts . ts3.4",
         "update": "npx npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/api": "^2.8.60",
-        "@hpcc-js/common": "^2.65.0",
-        "@hpcc-js/html": "^2.40.0",
-        "@hpcc-js/react": "^2.48.0",
-        "@hpcc-js/util": "^2.45.0"
+        "@hpcc-js/api": "^2.9.1",
+        "@hpcc-js/common": "^2.66.1",
+        "@hpcc-js/html": "^2.41.2",
+        "@hpcc-js/react": "^2.49.2",
+        "@hpcc-js/util": "^2.46.1",
+        "dagre": "0.8.5"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.10.23",
-        "@hpcc-js/wasm": "1.7.1",
-        "@rollup/plugin-alias": "3.1.0",
-        "@rollup/plugin-commonjs": "12.0.0",
-        "@rollup/plugin-node-resolve": "8.0.0",
+        "@hpcc-js/bundle": "^2.11.1",
+        "@hpcc-js/wasm": "1.13.0",
         "@types/d3-transition": "1.3.2",
-        "@types/dagre": "0.7.41",
-        "@typescript-eslint/eslint-plugin": "4.31.0",
-        "@typescript-eslint/parser": "4.31.0",
-        "cpx": "1.5.0",
+        "@types/dagre": "0.7.47",
         "d3-array": "^1",
         "d3-drag": "^1",
         "d3-force": "^1",
@@ -79,20 +74,8 @@
         "d3-shape": "^1",
         "d3-tile": "^1",
         "d3-transition": "^1",
-        "dagre": "0.8.5",
-        "downlevel-dts": "0.6.0",
         "es6-promise": "4.2.8",
-        "eslint": "7.32.0",
-        "eslint-plugin-react-hooks": "^4.3.0",
-        "npm-run-all": "4.1.5",
-        "rimraf": "2.6.3",
-        "rollup": "2.10.7",
-        "rollup-plugin-postcss": "3.1.1",
-        "rollup-plugin-sourcemaps": "0.6.2",
-        "terser": "4.0.0",
-        "tslib": "2.3.0",
-        "typedoc": "0.14.2",
-        "typescript": "4.3.4"
+        "tslib": "2.3.1"
     },
     "repository": {
         "type": "git",
@@ -105,5 +88,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization",
-    "gitHead": "e89ca1a0aecd1422fde175a1916720134e18014e"
+    "gitHead": "a60063f97e3d02385d18fbcf6848c503c1c5c57b"
 }

package/src/Graph.ts

@@ -688,7 +688,7 @@ export class Graph extends SVGZoomWidget {
                 this.forceLayout = null;
                 context._dragging = true;
                 context._graphData.nodes().forEach(function (item) {
-                    const pos = layoutEngine.nodePos(item._id);
+                    const pos = layoutEngine.nodePos(item.id());
                     if (item instanceof Graph.Subgraph) {
                         item
                             .pos({ x: pos.x, y: pos.y })

package/src/GraphData.ts

@@ -1,11 +1,13 @@
-import { Edge as GLEdge, GraphEdge, graphlib, Node as GLNode } from "dagre";
+import { Edge as GLEdge, GraphEdge, graphlib, Node } from "dagre";
+import { Vertex } from "./Vertex";
 
-class GraphlibGraph extends graphlib.Graph {
+type GLNode = Node<Vertex>;
+
+class GraphlibGraph extends graphlib.Graph<Vertex> {
 }
 
 interface GraphlibGraph {
     nodeEdges(outNodeName: string, inNodeName?: string): GLEdge[] | undefined;
-    removeEdge(outNodeName: string, inNodeName: string, name?: string): graphlib.Graph;
 }
 
 export interface GraphLabel {
@@ -99,7 +101,7 @@ export class GraphData {
             });
             this
                 .filterEdges(item => edgeIDs.indexOf(item.name) < 0)
-                .forEach(item => this._g.removeEdge(item.v, item.w, item.name))
+                .forEach(item => this._g.removeEdge(item.v, item.w))
                 ;
 
             const vertexIDs = allVertices.map(function (item) {

package/src/Vertex.ts

@@ -147,7 +147,7 @@ export class Vertex extends SVGWidget {
                     for (const key in d) {
                         if (annotationWidget[key]) {
                             annotationWidget[key](d[key]);
-                        } else if ((window as any).__hpcc_debug) {
+                        } else if (globalThis.__hpcc_debug) {
                             console.log("Invalid annotation property:  " + key);
                         }
                     }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/graph";
-export const PKG_VERSION = "2.78.0";
-export const BUILD_VERSION = "2.101.0";
+export const PKG_VERSION = "2.79.3";
+export const BUILD_VERSION = "2.102.9";