@antv/layout 0.2.0 → 0.2.3

package/es/layout/dagre/src/debug.js

@@ -1,9 +1,7 @@
-import util from './util';
-import graphlib from './graphlib';
-const Graph = graphlib.Graph;
-/* istanbul ignore next */
+import { Graph } from "../graph";
+import { buildLayerMatrix } from "./util";
 const debugOrdering = (g) => {
-    const layerMatrix = util.buildLayerMatrix(g);
+    const layerMatrix = buildLayerMatrix(g);
     const h = new Graph({ compound: true, multigraph: true }).setGraph({});
     g.nodes().forEach((v) => {
         h.setNode(v, { label: v });

package/es/layout/dagre/src/debug.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/debug.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,QAAQ,CAAC;AAC1B,OAAO,QAAQ,MAAM,YAAY,CAAC;AAIlC,MAAM,KAAK,GAAI,QAAgB,CAAC,KAAK,CAAC;AAEtC,0BAA0B;AAC1B,MAAM,aAAa,GAAG,CAAC,CAAS,EAAE,EAAE;IAClC,MAAM,WAAW,GAAG,IAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE7C,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEvE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;QAC9B,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC,CAAC,KAAU,EAAE,CAAS,EAAE,EAAE;QAC7C,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC;QAC3B,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;YACrC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}
+{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/debug.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,QAAQ,CAAC;AAE1C,MAAM,aAAa,GAAG,CAAC,CAAQ,EAAE,EAAE;IACjC,MAAM,WAAW,GAAG,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAExC,MAAM,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEvE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAS,EAAE,EAAE;QAC9B,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACtB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC,CAAC,KAAK,EAAE,CAAS,EAAE,EAAE;QACxC,MAAM,MAAM,GAAG,QAAQ,CAAC,EAAE,CAAC;QAC3B,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAA2B,EAAE,CAAC,CAAC;QACzD,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;YACrC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/es/layout/dagre/src/greedy-fas.d.ts

@@ -1,4 +1,3 @@
-import { graphlib as IGraphLib } from '../graphlib';
-declare type IGraph = IGraphLib.Graph;
-declare const greedyFAS: (g: IGraph, weightFn: () => unknown) => (import("../graphlib").Edge | undefined)[];
+import { Edge, Graph } from "../graph";
+declare const greedyFAS: (g: Graph, weightFn?: ((e: Edge) => number) | undefined) => (import("@antv/graphlib/lib/Graph").DefaultEdgeType<string, Partial<import("../graph").EdgeConfig & Edge & import("../graph").GraphEdge>> | undefined)[];
 export default greedyFAS;

package/es/layout/dagre/src/greedy-fas.js

@@ -1,6 +1,9 @@
-import graphlib from './graphlib';
-import List from './data/list';
-const Graph = graphlib.Graph;
+import RawList from "./data/list";
+import { Graph as RawGraph } from "@antv/graphlib";
+class List extends RawList {
+}
+class StateGraph extends RawGraph {
+}
 /*
  * A greedy heuristic for finding a feedback arc set for a graph. A feedback
  * arc set is a set of edges that can be removed to make a graph acyclic.
@@ -8,7 +11,6 @@ const Graph = graphlib.Graph;
  * effective heuristic for the feedback arc set problem." This implementation
  * adjusts that from the paper to allow for weighted edges.
  */
-// module.exports = greedyFAS;
 const DEFAULT_WEIGHT_FN = () => 1;
 const greedyFAS = (g, weightFn) => {
     var _a;
@@ -16,8 +18,6 @@ const greedyFAS = (g, weightFn) => {
         return [];
     const state = buildState(g, weightFn || DEFAULT_WEIGHT_FN);
     const results = doGreedyFAS(state.graph, state.buckets, state.zeroIdx);
-    // Expand multi-edges
-    // @ts-ignore
     return (_a = results.map((e) => g.outEdges(e.v, e.w))) === null || _a === void 0 ? void 0 : _a.flat();
 };
 const doGreedyFAS = (g, buckets, zeroIdx) => {
@@ -46,12 +46,13 @@ const doGreedyFAS = (g, buckets, zeroIdx) => {
 };
 const removeNode = (g, buckets, zeroIdx, entry, collectPredecessors) => {
     var _a, _b;
-    const results = collectPredecessors ? [] : undefined;
+    const results = [];
     (_a = g.inEdges(entry.v)) === null || _a === void 0 ? void 0 : _a.forEach((edge) => {
         const weight = g.edge(edge);
         const uEntry = g.node(edge.v);
         if (collectPredecessors) {
-            results.push({ v: edge.v, w: edge.w });
+            // this result not really care about in or out
+            results.push({ v: edge.v, w: edge.w, in: 0, out: 0 });
         }
         if (uEntry.out === undefined)
             uEntry.out = 0;
@@ -68,24 +69,24 @@ const removeNode = (g, buckets, zeroIdx, entry, collectPredecessors) => {
         assignBucket(buckets, zeroIdx, wEntry);
     });
     g.removeNode(entry.v);
-    return results;
+    return collectPredecessors ? results : undefined;
 };
 const buildState = (g, weightFn) => {
-    const fasGraph = new Graph();
+    const fasGraph = new StateGraph();
     let maxIn = 0;
     let maxOut = 0;
     g.nodes().forEach((v) => {
-        fasGraph.setNode(v, { v, "in": 0, out: 0 });
+        fasGraph.setNode(v, { v, in: 0, out: 0 });
     });
     // Aggregate weights on nodes, but also sum the weights across multi-edges
     // into a single edge for the fasGraph.
     g.edges().forEach((e) => {
-        const prevWeight = fasGraph.edge(e.v, e.w) || 0;
-        const weight = weightFn === null || weightFn === void 0 ? void 0 : weightFn(e);
+        const prevWeight = fasGraph.edge(e) || 0;
+        const weight = (weightFn === null || weightFn === void 0 ? void 0 : weightFn(e)) || 1;
         const edgeWeight = prevWeight + weight;
         fasGraph.setEdge(e.v, e.w, edgeWeight);
-        maxOut = Math.max(maxOut, fasGraph.node(e.v).out += weight);
-        maxIn = Math.max(maxIn, fasGraph.node(e.w)["in"] += weight);
+        maxOut = Math.max(maxOut, (fasGraph.node(e.v).out += weight));
+        maxIn = Math.max(maxIn, (fasGraph.node(e.w).in += weight));
     });
     const buckets = [];
     const rangeMax = maxOut + maxIn + 3;

package/es/layout/dagre/src/greedy-fas.js.map

@@ -1 +1 @@
-{"version":3,"file":"greedy-fas.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/greedy-fas.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"greedy-fas.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/greedy-fas.ts"],"names":[],"mappings":"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"}

package/es/layout/dagre/src/layout.d.ts

@@ -1,4 +1,3 @@
-import { graphlib as IGraphLib } from '../graphlib';
-declare type IGraph = IGraphLib.Graph;
-declare const layout: (g: IGraph, opts: any) => void;
+import { Graph } from "../graph";
+declare const layout: (g: Graph, opts?: any) => void;
 export default layout;

package/es/layout/dagre/src/layout.js

@@ -1,84 +1,148 @@
-import acyclic from './acyclic';
-import normalize from './normalize';
-import rank from './rank';
-import util, { normalizeRanks, removeEmptyRanks } from './util';
-import parentDummyChains from './parent-dummy-chains';
-import nestingGraph from './nesting-graph';
-import addBorderSegments from './add-border-segments';
-import coordinateSystem from './coordinate-system';
-import order from './order';
-import position from './position';
-import graphlib from './graphlib';
-import initDataOrder from './order/init-data-order';
-const Graph = graphlib.Graph;
+import acyclic from "./acyclic";
+import normalize from "./normalize";
+import rank from "./rank";
+import { normalizeRanks, removeEmptyRanks, time as usetime, notime, asNonCompoundGraph, addDummyNode, intersectRect, buildLayerMatrix, } from "./util";
+import parentDummyChains from "./parent-dummy-chains";
+import nestingGraph from "./nesting-graph";
+import addBorderSegments from "./add-border-segments";
+import coordinateSystem from "./coordinate-system";
+import order from "./order";
+import position from "./position";
+import initDataOrder from "./order/init-data-order";
+import { Graph } from "../graph";
 const layout = (g, opts) => {
-    const time = opts && opts.debugTiming ? util.time : util.notime;
+    const time = opts && opts.debugTiming ? usetime : notime;
     time("layout", () => {
         // 如果在原图基础上修改，继承原图的order结果
         if (opts && !opts.keepNodeOrder && opts.prevGraph) {
-            time("  inheritOrder", () => { inheritOrder(g, opts.prevGraph); });
+            time("  inheritOrder", () => {
+                inheritOrder(g, opts.prevGraph);
+            });
         }
-        const layoutGraph = time("  buildLayoutGraph", () => { return buildLayoutGraph(g); });
+        const layoutGraph = time("  buildLayoutGraph", () => {
+            return buildLayoutGraph(g);
+        });
         // 控制是否为边的label留位置（这会影响是否在边中间添加dummy node）
-        if (!(opts && (opts.edgeLabelSpace === false))) {
-            time("  makeSpaceForEdgeLabels", () => { makeSpaceForEdgeLabels(layoutGraph); });
+        if (!(opts && opts.edgeLabelSpace === false)) {
+            time("  makeSpaceForEdgeLabels", () => {
+                makeSpaceForEdgeLabels(layoutGraph);
+            });
         }
         // TODO: 暂时处理层级设置不正确时的异常报错，提示设置正确的层级
         try {
-            time("  runLayout", () => { runLayout(layoutGraph, time, opts); });
+            time("  runLayout", () => {
+                runLayout(layoutGraph, time, opts);
+            });
         }
         catch (e) {
-            if (e.message === "Not possible to find intersection inside of the rectangle") {
-                console.error('The following error may be caused by improper layer setting, please make sure your manual layer setting does not violate the graph\'s structure:\n', e);
+            if (e.message ===
+                "Not possible to find intersection inside of the rectangle") {
+                console.error("The following error may be caused by improper layer setting, please make sure your manual layer setting does not violate the graph's structure:\n", e);
                 return;
             }
-            throw (e);
+            throw e;
         }
-        time("  updateInputGraph", () => { updateInputGraph(g, layoutGraph); });
+        time("  updateInputGraph", () => {
+            updateInputGraph(g, layoutGraph);
+        });
     });
 };
 const runLayout = (g, time, opts) => {
-    time("    removeSelfEdges", () => { removeSelfEdges(g); });
-    time("    acyclic", () => { acyclic.run(g); });
-    time("    nestingGraph.run", () => { nestingGraph.run(g); });
-    time("    rank", () => { rank(util.asNonCompoundGraph(g)); });
-    time("    injectEdgeLabelProxies", () => { injectEdgeLabelProxies(g); });
-    time("    removeEmptyRanks", () => { removeEmptyRanks(g); });
-    time("    nestingGraph.cleanup", () => { nestingGraph.cleanup(g); });
-    time("    normalizeRanks", () => { normalizeRanks(g); });
-    time("    assignRankMinMax", () => { assignRankMinMax(g); });
-    time("    removeEdgeLabelProxies", () => { removeEdgeLabelProxies(g); });
-    time("    normalize.run", () => { normalize.run(g); });
-    time("    parentDummyChains", () => { parentDummyChains(g); });
-    time("    addBorderSegments", () => { addBorderSegments(g); });
+    time("    removeSelfEdges", () => {
+        removeSelfEdges(g);
+    });
+    time("    acyclic", () => {
+        acyclic.run(g);
+    });
+    time("    nestingGraph.run", () => {
+        nestingGraph.run(g);
+    });
+    time("    rank", () => {
+        rank(asNonCompoundGraph(g));
+    });
+    time("    injectEdgeLabelProxies", () => {
+        injectEdgeLabelProxies(g);
+    });
+    time("    removeEmptyRanks", () => {
+        removeEmptyRanks(g);
+    });
+    time("    nestingGraph.cleanup", () => {
+        nestingGraph.cleanup(g);
+    });
+    time("    normalizeRanks", () => {
+        normalizeRanks(g);
+    });
+    time("    assignRankMinMax", () => {
+        assignRankMinMax(g);
+    });
+    time("    removeEdgeLabelProxies", () => {
+        removeEdgeLabelProxies(g);
+    });
+    time("    normalize.run", () => {
+        normalize.run(g);
+    });
+    time("    parentDummyChains", () => {
+        parentDummyChains(g);
+    });
+    time("    addBorderSegments", () => {
+        addBorderSegments(g);
+    });
     if (opts && opts.keepNodeOrder) {
-        time("    initDataOrder", () => { initDataOrder(g, opts.nodeOrder); });
+        time("    initDataOrder", () => {
+            initDataOrder(g, opts.nodeOrder);
+        });
     }
-    time("    order", () => { order(g); });
-    time("    insertSelfEdges", () => { insertSelfEdges(g); });
-    time("    adjustCoordinateSystem", () => { coordinateSystem.adjust(g); });
-    time("    position", () => { position(g); });
-    time("    positionSelfEdges", () => { positionSelfEdges(g); });
-    time("    removeBorderNodes", () => { removeBorderNodes(g); });
-    time("    normalize.undo", () => { normalize.undo(g); });
-    time("    fixupEdgeLabelCoords", () => { fixupEdgeLabelCoords(g); });
-    time("    undoCoordinateSystem", () => { coordinateSystem.undo(g); });
-    time("    translateGraph", () => { translateGraph(g); });
-    time("    assignNodeIntersects", () => { assignNodeIntersects(g); });
-    time("    reversePoints", () => { reversePointsForReversedEdges(g); });
-    time("    acyclic.undo", () => { acyclic.undo(g); });
+    time("    order", () => {
+        order(g);
+    });
+    time("    insertSelfEdges", () => {
+        insertSelfEdges(g);
+    });
+    time("    adjustCoordinateSystem", () => {
+        coordinateSystem.adjust(g);
+    });
+    time("    position", () => {
+        position(g);
+    });
+    time("    positionSelfEdges", () => {
+        positionSelfEdges(g);
+    });
+    time("    removeBorderNodes", () => {
+        removeBorderNodes(g);
+    });
+    time("    normalize.undo", () => {
+        normalize.undo(g);
+    });
+    time("    fixupEdgeLabelCoords", () => {
+        fixupEdgeLabelCoords(g);
+    });
+    time("    undoCoordinateSystem", () => {
+        coordinateSystem.undo(g);
+    });
+    time("    translateGraph", () => {
+        translateGraph(g);
+    });
+    time("    assignNodeIntersects", () => {
+        assignNodeIntersects(g);
+    });
+    time("    reversePoints", () => {
+        reversePointsForReversedEdges(g);
+    });
+    time("    acyclic.undo", () => {
+        acyclic.undo(g);
+    });
 };
 /**
  * 继承上一个布局中的order，防止翻转
  * TODO: 暂时没有考虑涉及层级变动的布局，只保证原来布局层级和相对顺序不变
  */
 const inheritOrder = (currG, prevG) => {
-    const prevNodeMap = prevG._nodes || {};
     currG.nodes().forEach((n) => {
         const node = currG.node(n);
-        if (prevNodeMap[n] !== undefined) {
-            node.fixorder = prevNodeMap[n]._order;
-            delete prevNodeMap[n]._order;
+        const prevNode = prevG.node(n);
+        if (prevNode !== undefined) {
+            node.fixorder = prevNode._order;
+            delete prevNode._order;
         }
         else {
             delete node.fixorder;
@@ -95,8 +159,8 @@ const updateInputGraph = (inputGraph, layoutGraph) => {
     inputGraph.nodes().forEach((v) => {
         var _a;
         const inputLabel = inputGraph.node(v);
-        const layoutLabel = layoutGraph.node(v);
         if (inputLabel) {
+            const layoutLabel = layoutGraph.node(v);
             inputLabel.x = layoutLabel.x;
             inputLabel.y = layoutLabel.y;
             inputLabel._order = layoutLabel.order;
@@ -126,8 +190,12 @@ const nodeNumAttrs = ["width", "height", "layer", "fixorder"]; // 需要传入la
 const nodeDefaults = { width: 0, height: 0 };
 const edgeNumAttrs = ["minlen", "weight", "width", "height", "labeloffset"];
 const edgeDefaults = {
-    minlen: 1, weight: 1, width: 0, height: 0,
-    labeloffset: 10, labelpos: "r"
+    minlen: 1,
+    weight: 1,
+    width: 0,
+    height: 0,
+    labeloffset: 10,
+    labelpos: "r",
 };
 const edgeAttrs = ["labelpos"];
 /*
@@ -147,12 +215,8 @@ const buildLayoutGraph = (inputGraph) => {
     g.setGraph(Object.assign({}, graphDefaults, selectNumberAttrs(graph, graphNumAttrs), pickedProperties));
     inputGraph.nodes().forEach((v) => {
         const node = canonicalize(inputGraph.node(v));
-        const defaultAttrs = selectNumberAttrs(node, nodeNumAttrs);
-        Object.keys(nodeDefaults).forEach((key) => {
-            if (defaultAttrs[key] === undefined) {
-                defaultAttrs[key] = nodeDefaults[key];
-            }
-        });
+        const defaultNode = Object.assign(Object.assign({}, nodeDefaults), node);
+        const defaultAttrs = selectNumberAttrs(defaultNode, nodeNumAttrs);
         g.setNode(v, defaultAttrs);
         g.setParent(v, inputGraph.parent(v));
     });
@@ -163,7 +227,7 @@ const buildLayoutGraph = (inputGraph) => {
             if (edge[key] !== undefined)
                 pickedProperties[key] = edge[key];
         });
-        g.setEdge(e, Object.assign({}, edgeDefaults, selectNumberAttrs(edge, edgeNumAttrs), pickedProperties));
+        g.setEdgeObj(e, Object.assign({}, edgeDefaults, selectNumberAttrs(edge, edgeNumAttrs), pickedProperties));
     });
     return g;
 };
@@ -215,18 +279,22 @@ const injectEdgeLabelProxies = (g) => {
         if (edge.width && edge.height) {
             const v = g.node(e.v);
             const w = g.node(e.w);
-            const label = { e, rank: (w.rank - v.rank) / 2 + v.rank };
-            util.addDummyNode(g, "edge-proxy", label, "_ep");
+            const label = {
+                e,
+                rank: (w.rank - v.rank) / 2 + v.rank,
+            };
+            addDummyNode(g, "edge-proxy", label, "_ep");
         }
     });
 };
 const assignRankMinMax = (g) => {
     let maxRank = 0;
     g.nodes().forEach((v) => {
+        var _a, _b;
         const node = g.node(v);
         if (node.borderTop) {
-            node.minRank = g.node(node.borderTop).rank;
-            node.maxRank = g.node(node.borderBottom).rank;
+            node.minRank = (_a = g.node(node.borderTop)) === null || _a === void 0 ? void 0 : _a.rank;
+            node.maxRank = (_b = g.node(node.borderBottom)) === null || _b === void 0 ? void 0 : _b.rank;
             maxRank = Math.max(maxRank, node.maxRank || -Infinity);
         }
     });
@@ -242,9 +310,9 @@ const removeEdgeLabelProxies = (g) => {
     });
 };
 const translateGraph = (g) => {
-    let minX = Number.POSITIVE_INFINITY;
+    let minX;
     let maxX = 0;
-    let minY = Number.POSITIVE_INFINITY;
+    let minY;
     let maxY = 0;
     const graphLabel = g.graph();
     const marginX = graphLabel.marginx || 0;
@@ -257,18 +325,26 @@ const translateGraph = (g) => {
         const w = attrs.width;
         const h = attrs.height;
         if (!isNaN(x) && !isNaN(w)) {
+            if (minX === undefined) {
+                minX = x - w / 2;
+            }
             minX = Math.min(minX, x - w / 2);
             maxX = Math.max(maxX, x + w / 2);
         }
         if (!isNaN(y) && !isNaN(h)) {
+            if (minY === undefined) {
+                minY = y - h / 2;
+            }
             minY = Math.min(minY, y - h / 2);
             maxY = Math.max(maxY, y + h / 2);
         }
     };
-    g.nodes().forEach((v) => { getExtremes(g.node(v)); });
+    g.nodes().forEach((v) => {
+        getExtremes(g.node(v));
+    });
     g.edges().forEach((e) => {
         const edge = g.edge(e);
-        if (edge.hasOwnProperty("x")) {
+        if (edge === null || edge === void 0 ? void 0 : edge.hasOwnProperty("x")) {
             getExtremes(edge);
         }
     });
@@ -276,8 +352,10 @@ const translateGraph = (g) => {
     minY -= marginY;
     g.nodes().forEach((v) => {
         const node = g.node(v);
-        node.x -= minX;
-        node.y -= minY;
+        if (node) {
+            node.x -= minX;
+            node.y -= minY;
+        }
     });
     g.edges().forEach((e) => {
         var _a;
@@ -312,14 +390,14 @@ const assignNodeIntersects = (g) => {
             p1 = edge.points[0];
             p2 = edge.points[edge.points.length - 1];
         }
-        edge.points.unshift(util.intersectRect(nodeV, p1));
-        edge.points.push(util.intersectRect(nodeW, p2));
+        edge.points.unshift(intersectRect(nodeV, p1));
+        edge.points.push(intersectRect(nodeW, p2));
     });
 };
 const fixupEdgeLabelCoords = (g) => {
     g.edges().forEach((e) => {
         const edge = g.edge(e);
-        if (edge.hasOwnProperty("x")) {
+        if (edge === null || edge === void 0 ? void 0 : edge.hasOwnProperty("x")) {
             if (edge.labelpos === "l" || edge.labelpos === "r") {
                 edge.width -= edge.labeloffset;
             }
@@ -336,9 +414,10 @@ const fixupEdgeLabelCoords = (g) => {
 };
 const reversePointsForReversedEdges = (g) => {
     g.edges().forEach((e) => {
+        var _a;
         const edge = g.edge(e);
         if (edge.reversed) {
-            edge.points.reverse();
+            (_a = edge.points) === null || _a === void 0 ? void 0 : _a.reverse();
         }
     });
 };
@@ -358,7 +437,8 @@ const removeBorderNodes = (g) => {
         }
     });
     g.nodes().forEach((v) => {
-        if (g.node(v).dummy === "border") {
+        var _a;
+        if (((_a = g.node(v)) === null || _a === void 0 ? void 0 : _a.dummy) === "border") {
             g.removeNode(v);
         }
     });
@@ -371,12 +451,12 @@ const removeSelfEdges = (g) => {
                 node.selfEdges = [];
             }
             node.selfEdges.push({ e, label: g.edge(e) });
-            g.removeEdge(e);
+            g.removeEdgeObj(e);
         }
     });
 };
 const insertSelfEdges = (g) => {
-    const layers = util.buildLayerMatrix(g);
+    const layers = buildLayerMatrix(g);
     layers === null || layers === void 0 ? void 0 : layers.forEach((layer) => {
         let orderShift = 0;
         layer === null || layer === void 0 ? void 0 : layer.forEach((v, i) => {
@@ -384,13 +464,13 @@ const insertSelfEdges = (g) => {
             const node = g.node(v);
             node.order = i + orderShift;
             (_a = node.selfEdges) === null || _a === void 0 ? void 0 : _a.forEach((selfEdge) => {
-                util.addDummyNode(g, "selfedge", {
+                addDummyNode(g, "selfedge", {
                     width: selfEdge.label.width,
                     height: selfEdge.label.height,
                     rank: node.rank,
-                    order: i + (++orderShift),
+                    order: i + ++orderShift,
                     e: selfEdge.e,
-                    label: selfEdge.label
+                    label: selfEdge.label,
                 }, "_se");
             });
             delete node.selfEdges;
@@ -406,14 +486,14 @@ const positionSelfEdges = (g) => {
             const y = selfNode.y;
             const dx = node.x - x;
             const dy = selfNode.height / 2;
-            g.setEdge(node.e, node.label);
+            g.setEdgeObj(node.e, node.label);
             g.removeNode(v);
             node.label.points = [
-                { x: x + 2 * dx / 3, y: y - dy },
-                { x: x + 5 * dx / 6, y: y - dy },
+                { x: x + (2 * dx) / 3, y: y - dy },
+                { x: x + (5 * dx) / 6, y: y - dy },
                 { y, x: x + dx },
-                { x: x + 5 * dx / 6, y: y + dy },
-                { x: x + 2 * dx / 3, y: y + dy }
+                { x: x + (5 * dx) / 6, y: y + dy },
+                { x: x + (2 * dx) / 3, y: y + dy },
             ];
             node.label.x = node.x;
             node.label.y = node.y;
@@ -432,8 +512,7 @@ const selectNumberAttrs = (obj, attrs) => {
 const canonicalize = (attrs = {}) => {
     const newAttrs = {};
     Object.keys(attrs).forEach((k) => {
-        const v = attrs[k];
-        newAttrs[k.toLowerCase()] = v;
+        newAttrs[k.toLowerCase()] = attrs[k];
     });
     return newAttrs;
 };