@antv/layout 0.2.0 → 0.2.3

package/lib/layout/dagre/src/rank/network-simplex.js

@@ -1,14 +1,11 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.exchangeEdges = exports.enterEdge = exports.leaveEdge = exports.initLowLimValues = exports.calcCutValue = exports.initCutValues = void 0;
 var feasible_tree_1 = require("./feasible-tree");
 var util_1 = require("./util");
 var util_2 = require("../util");
-var graphlib_1 = __importDefault(require("../graphlib"));
-var alg = graphlib_1.default.alg;
-var preorder = alg.preorder, postorder = alg.postorder;
+var graphlib_1 = require("@antv/graphlib");
+var preorder = graphlib_1.algorithm.preorder, postorder = graphlib_1.algorithm.postorder;
 /*
  * The network simplex algorithm assigns ranks to each node in the input graph
  * and iteratively improves the ranking to reduce the length of edges.
@@ -42,18 +39,17 @@ var preorder = alg.preorder, postorder = alg.postorder;
  * for Drawing Directed Graphs." The structure of the file roughly follows the
  * structure of the overall algorithm.
  */
-var networkSimplex = function (g) {
-    // tslint:disable-next-line
-    g = (0, util_2.simplify)(g);
+var networkSimplex = function (og) {
+    var g = (0, util_2.simplify)(og);
     (0, util_1.longestPath)(g);
     var t = (0, feasible_tree_1.feasibleTree)(g);
-    initLowLimValues(t);
-    initCutValues(t, g);
+    (0, exports.initLowLimValues)(t);
+    (0, exports.initCutValues)(t, g);
     var e;
     var f;
-    while ((e = leaveEdge(t))) {
-        f = enterEdge(t, g, e);
-        exchangeEdges(t, g, e, f);
+    while ((e = (0, exports.leaveEdge)(t))) {
+        f = (0, exports.enterEdge)(t, g, e);
+        (0, exports.exchangeEdges)(t, g, e, f);
     }
 };
 /*
@@ -66,10 +62,11 @@ var initCutValues = function (t, g) {
         assignCutValue(t, g, v);
     });
 };
+exports.initCutValues = initCutValues;
 var assignCutValue = function (t, g, child) {
     var childLab = t.node(child);
     var parent = childLab.parent;
-    t.edge(child, parent).cutvalue = calcCutValue(t, g, child);
+    t.edgeFromArgs(child, parent).cutvalue = (0, exports.calcCutValue)(t, g, child);
 };
 /*
  * Given the tight tree, its graph, and a child in the graph calculate and
@@ -82,12 +79,12 @@ var calcCutValue = function (t, g, child) {
     // True if the child is on the tail end of the edge in the directed graph
     var childIsTail = true;
     // The graph's view of the tree edge we're inspecting
-    var graphEdge = g.edge(child, parent);
+    var graphEdge = g.edgeFromArgs(child, parent);
     // The accumulated cut value for the edge between this node and its parent
     var cutValue = 0;
     if (!graphEdge) {
         childIsTail = false;
-        graphEdge = g.edge(parent, child);
+        graphEdge = g.edgeFromArgs(parent, child);
     }
     cutValue = graphEdge.weight;
     (_a = g.nodeEdges(child)) === null || _a === void 0 ? void 0 : _a.forEach(function (e) {
@@ -98,20 +95,19 @@ var calcCutValue = function (t, g, child) {
             var otherWeight = g.edge(e).weight;
             cutValue += pointsToHead ? otherWeight : -otherWeight;
             if (isTreeEdge(t, child, other)) {
-                var otherCutValue = t.edge(child, other).cutvalue;
+                var otherCutValue = t.edgeFromArgs(child, other).cutvalue;
                 cutValue += pointsToHead ? -otherCutValue : otherCutValue;
             }
         }
     });
     return cutValue;
 };
+exports.calcCutValue = calcCutValue;
 var initLowLimValues = function (tree, root) {
-    if (root !== undefined) {
-        // tslint:disable-next-line
-        root = tree.nodes()[0];
-    }
+    if (root === void 0) { root = tree.nodes()[0]; }
     dfsAssignLowLim(tree, {}, 1, root);
 };
+exports.initLowLimValues = initLowLimValues;
 var dfsAssignLowLim = function (tree, visited, nextLim, v, parent) {
     var _a;
     var low = nextLim;
@@ -119,7 +115,7 @@ var dfsAssignLowLim = function (tree, visited, nextLim, v, parent) {
     var label = tree.node(v);
     visited[v] = true;
     (_a = tree.neighbors(v)) === null || _a === void 0 ? void 0 : _a.forEach(function (w) {
-        if (!visited.hasOwnProperty(w)) {
+        if (!visited[w]) {
             useNextLim = dfsAssignLowLim(tree, visited, useNextLim, w, v);
         }
     });
@@ -139,6 +135,7 @@ var leaveEdge = function (tree) {
         return tree.edge(e).cutvalue < 0;
     });
 };
+exports.leaveEdge = leaveEdge;
 var enterEdge = function (t, g, edge) {
     var v = edge.v;
     var w = edge.w;
@@ -165,25 +162,27 @@ var enterEdge = function (t, g, edge) {
     });
     return (0, util_2.minBy)(candidates, function (edge) { return (0, util_1.slack)(g, edge); });
 };
+exports.enterEdge = enterEdge;
 var exchangeEdges = function (t, g, e, f) {
     var v = e.v;
     var w = e.w;
     t.removeEdge(v, w);
     t.setEdge(f.v, f.w, {});
-    initLowLimValues(t);
-    initCutValues(t, g);
+    (0, exports.initLowLimValues)(t);
+    (0, exports.initCutValues)(t, g);
     updateRanks(t, g);
 };
+exports.exchangeEdges = exchangeEdges;
 var updateRanks = function (t, g) {
-    var root = t.nodes().find(function (v) { return !g.node(v).parent; });
+    var root = t.nodes().find(function (v) { var _a; return !((_a = g.node(v)) === null || _a === void 0 ? void 0 : _a.parent); });
     var vs = preorder(t, root);
     vs = vs === null || vs === void 0 ? void 0 : vs.slice(1);
     vs === null || vs === void 0 ? void 0 : vs.forEach(function (v) {
         var parent = t.node(v).parent;
-        var edge = g.edge(v, parent);
+        var edge = g.edgeFromArgs(v, parent);
         var flipped = false;
         if (!edge) {
-            edge = g.edge(parent, v);
+            edge = g.edgeFromArgs(parent, v);
             flipped = true;
         }
         g.node(v).rank = g.node(parent).rank + (flipped ? edge.minlen : -edge.minlen);
@@ -202,12 +201,5 @@ var isTreeEdge = function (tree, u, v) {
 var isDescendant = function (tree, vLabel, rootLabel) {
     return rootLabel.low <= vLabel.lim && vLabel.lim <= rootLabel.lim;
 };
-// Expose some internals for testing purposes
-networkSimplex.initLowLimValues = initLowLimValues;
-networkSimplex.initCutValues = initCutValues;
-networkSimplex.calcCutValue = calcCutValue;
-networkSimplex.leaveEdge = leaveEdge;
-networkSimplex.enterEdge = enterEdge;
-networkSimplex.exchangeEdges = exchangeEdges;
 exports.default = networkSimplex;
 //# sourceMappingURL=network-simplex.js.map

package/lib/layout/dagre/src/rank/network-simplex.js.map

@@ -1 +1 @@
-{"version":3,"file":"network-simplex.js","sourceRoot":"","sources":["../../../../../src/layout/dagre/src/rank/network-simplex.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"network-simplex.js","sourceRoot":"","sources":["../../../../../src/layout/dagre/src/rank/network-simplex.ts"],"names":[],"mappings":";;;AAAA,iDAA+C;AAC/C,+BAAwD;AACxD,gCAA0C;AAC1C,2CAA2C;AAInC,IAAA,QAAQ,GAAgB,oBAAS,SAAzB,EAAE,SAAS,GAAK,oBAAS,UAAd,CAAe;AAG1C;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAgCG;AACH,IAAM,cAAc,GAAG,UAAC,EAAS;IAC/B,IAAM,CAAC,GAAG,IAAA,eAAQ,EAAC,EAAE,CAAC,CAAC;IACvB,IAAA,kBAAQ,EAAC,CAAC,CAAC,CAAC;IACZ,IAAM,CAAC,GAAG,IAAA,4BAAY,EAAC,CAAC,CAAC,CAAC;IAC1B,IAAA,wBAAgB,EAAC,CAAC,CAAC,CAAC;IACpB,IAAA,qBAAa,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAEpB,IAAI,CAAC,CAAC;IACN,IAAI,CAAC,CAAC;IACN,OAAO,CAAC,CAAC,GAAG,IAAA,iBAAS,EAAC,CAAC,CAAC,CAAC,EAAE;QACzB,CAAC,GAAG,IAAA,iBAAS,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;QACvB,IAAA,qBAAa,EAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;KAC3B;AACH,CAAC,CAAC;AAEF;;GAEG;AACI,IAAM,aAAa,GAAG,UAAC,CAAQ,EAAE,CAAQ;IAC9C,IAAI,EAAE,GAAG,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,EAAE,CAAC,CAAC;IACjC,EAAE,GAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,KAAK,CAAC,CAAC,EAAE,CAAA,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,MAAM,IAAG,CAAC,CAAC,CAAC;IAClC,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,CAAC,UAAC,CAAS;QACpB,cAAc,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1B,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AANW,QAAA,aAAa,iBAMxB;AAEF,IAAM,cAAc,GAAG,UAAC,CAAQ,EAAE,CAAQ,EAAE,KAAa;IACvD,IAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC;IAChC,IAAM,MAAM,GAAG,QAAQ,CAAC,MAAO,CAAC;IAChC,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAE,CAAC,QAAQ,GAAG,IAAA,oBAAY,EAAC,CAAC,EAAE,CAAC,EAAE,KAAK,CAAC,CAAC;AACtE,CAAC,CAAC;AAEF;;;GAGG;AACI,IAAM,YAAY,GAAG,UAAC,CAAQ,EAAE,CAAQ,EAAE,KAAa;;IAC5D,IAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAE,CAAC;IAChC,IAAM,MAAM,GAAG,QAAQ,CAAC,MAAgB,CAAC;IACzC,yEAAyE;IACzE,IAAI,WAAW,GAAG,IAAI,CAAC;IACvB,qDAAqD;IACrD,IAAI,SAAS,GAAG,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,MAAM,CAAE,CAAC;IAC/C,0EAA0E;IAC1E,IAAI,QAAQ,GAAG,CAAC,CAAC;IAEjB,IAAI,CAAC,SAAS,EAAE;QACd,WAAW,GAAG,KAAK,CAAC;QACpB,SAAS,GAAG,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,KAAK,CAAE,CAAC;KAC5C;IAED,QAAQ,GAAG,SAAS,CAAC,MAAO,CAAC;IAE7B,MAAA,CAAC,CAAC,SAAS,CAAC,KAAK,CAAC,0CAAE,OAAO,CAAC,UAAC,CAAC;QAC5B,IAAM,SAAS,GAAG,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC;QAChC,IAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAEpC,IAAI,KAAK,KAAK,MAAM,EAAE;YACpB,IAAM,YAAY,GAAG,SAAS,KAAK,WAAW,CAAC;YAC/C,IAAM,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,MAAO,CAAC;YAEvC,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,WAAW,CAAC;YACtD,IAAI,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE;gBAC/B,IAAM,aAAa,GAAG,CAAC,CAAC,YAAY,CAAC,KAAK,EAAE,KAAK,CAAE,CAAC,QAAQ,CAAC;gBAC7D,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,aAAa,CAAC;aAC3D;SACF;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAlCW,QAAA,YAAY,gBAkCvB;AAEK,IAAM,gBAAgB,GAAG,UAAC,IAAW,EAAE,IAA8B;IAA9B,qBAAA,EAAA,OAAe,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC;IAC1E,eAAe,CAAC,IAAI,EAAE,EAAE,EAAE,CAAC,EAAE,IAAI,CAAC,CAAC;AACrC,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B;AAEF,IAAM,eAAe,GAAG,UAAC,IAAW,EAAE,OAAgC,EAAE,OAAe,EAAE,CAAS,EAAE,MAAe;;IACjH,IAAM,GAAG,GAAG,OAAO,CAAC;IACpB,IAAI,UAAU,GAAG,OAAO,CAAC;IACzB,IAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;IAE5B,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;IAClB,MAAA,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,UAAC,CAAC;QAC3B,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACf,UAAU,GAAG,eAAe,CAAC,IAAI,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;SAC/D;IACH,CAAC,CAAC,CAAC;IAEH,KAAK,CAAC,GAAG,GAAG,GAAG,CAAC;IAChB,KAAK,CAAC,GAAG,GAAG,UAAU,EAAE,CAAC;IACzB,IAAI,MAAM,EAAE;QACV,KAAK,CAAC,MAAM,GAAG,MAAM,CAAC;KACvB;SAAM;QACL,0EAA0E;QAC1E,OAAO,KAAK,CAAC,MAAM,CAAC;KACrB;IAED,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC;AAEK,IAAM,SAAS,GAAG,UAAC,IAAW;IACnC,OAAO,IAAI,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,UAAC,CAAC;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,QAAQ,GAAG,CAAC,CAAC;IACpC,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAJW,QAAA,SAAS,aAIpB;AAEK,IAAM,SAAS,GAAG,UAAC,CAAQ,EAAE,CAAQ,EAAE,IAAS;IACrD,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IACf,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;IAEf,0EAA0E;IAC1E,wEAAwE;IACxE,iCAAiC;IACjC,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE;QACpB,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;QACX,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC;KACZ;IAED,IAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;IAC1B,IAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;IAC1B,IAAI,SAAS,GAAG,MAAM,CAAC;IACvB,IAAI,IAAI,GAAG,KAAK,CAAC;IAEjB,6EAA6E;IAC7E,uEAAuE;IACvE,IAAK,MAAM,CAAC,GAAc,GAAI,MAAM,CAAC,GAAc,EAAE;QACnD,SAAS,GAAG,MAAM,CAAC;QACnB,IAAI,GAAG,IAAI,CAAC;KACb;IAED,IAAM,UAAU,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,MAAM,CAAC,UAAC,IAAI;QACvC,OAAO,IAAI,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC;YACnD,IAAI,KAAK,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,CAAC;IAC7D,CAAC,CAAC,CAAC;IAEH,OAAO,IAAA,YAAK,EAAC,UAAU,EAAE,UAAC,IAAI,IAAO,OAAO,IAAA,YAAK,EAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACjE,CAAC,CAAC;AA9BW,QAAA,SAAS,aA8BpB;AAEK,IAAM,aAAa,GAAG,UAAC,CAAQ,EAAE,CAAQ,EAAE,CAAO,EAAE,CAAO;IAChE,IAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACd,IAAM,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IACd,CAAC,CAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACnB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IACxB,IAAA,wBAAgB,EAAC,CAAC,CAAC,CAAC;IACpB,IAAA,qBAAa,EAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACpB,WAAW,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AACpB,CAAC,CAAC;AARW,QAAA,aAAa,iBAQxB;AAEF,IAAM,WAAW,GAAG,UAAC,CAAQ,EAAE,CAAQ;IACrC,IAAM,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,IAAI,CAAC,UAAC,CAAC,YAAM,OAAO,CAAC,CAAA,MAAA,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,0CAAE,MAAM,CAAA,CAAC,CAAC,CAAC,CAAE,CAAC;IACnE,IAAI,EAAE,GAAG,QAAQ,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;IAC3B,EAAE,GAAG,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,OAAO,CAAC,UAAC,CAAS;QACpB,IAAM,MAAM,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,MAAgB,CAAC;QAC3C,IAAI,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QACrC,IAAI,OAAO,GAAG,KAAK,CAAC;QAEpB,IAAI,CAAC,IAAI,EAAE;YACT,IAAI,GAAG,CAAC,CAAC,YAAY,CAAC,MAAM,EAAE,CAAC,CAAE,CAAC;YAClC,OAAO,GAAG,IAAI,CAAC;SAChB;QAED,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,MAAM,CAAE,CAAC,IAAK,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,MAAO,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,MAAO,CAAC,CAAC;IACrF,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF;;GAEG;AACH,IAAM,UAAU,GAAG,UAAC,IAAW,EAAE,CAAS,EAAE,CAAS;IACnD,OAAO,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAC5B,CAAC,CAAC;AAEF;;;GAGG;AACH,IAAM,YAAY,GAAG,UAAC,IAAW,EAAE,MAAW,EAAE,SAAc;IAC5D,OAAO,SAAS,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,IAAI,SAAS,CAAC,GAAG,CAAC;AACpE,CAAC,CAAC;AAEF,kBAAe,cAAc,CAAC"}

package/lib/layout/dagre/src/rank/util.d.ts

@@ -1,12 +1,11 @@
-import { graphlib } from "../../graphlib";
-declare type Graph = graphlib.Graph;
+import { Edge, Graph } from "../../graph";
 declare const longestPath: (g: Graph) => void;
 declare const longestPathWithLayer: (g: Graph) => void;
-declare const slack: (g: Graph, e: any) => number;
-export { longestPath, longestPathWithLayer, slack, };
+declare const slack: (g: Graph, e: Edge) => number;
+export { longestPath, longestPathWithLayer, slack };
 declare const _default: {
     longestPath: (g: Graph) => void;
     longestPathWithLayer: (g: Graph) => void;
-    slack: (g: Graph, e: any) => number;
+    slack: (g: Graph, e: Edge) => number;
 };
 export default _default;

package/lib/layout/dagre/src/rank/util.js

@@ -28,17 +28,22 @@ var longestPath = function (g) {
     var dfs = function (v) {
         var _a;
         var label = g.node(v);
-        if (visited.hasOwnProperty(v)) {
+        if (visited[v]) {
             return label.rank;
         }
         visited[v] = true;
-        var lengths = (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.map(function (e) {
-            return (dfs(e.w) - g.edge(e).minlen) || Infinity;
+        var rank;
+        (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.forEach(function (edgeObj) {
+            var wRank = dfs(edgeObj.w);
+            var minLen = g.edge(edgeObj).minlen;
+            var r = wRank - minLen;
+            if (r) {
+                if (rank === undefined || r < rank) {
+                    rank = r;
+                }
+            }
         });
-        var rank = Math.min.apply(Math, lengths);
-        if (rank === Number.POSITIVE_INFINITY || // return value of _.map([]) for Lodash 3
-            rank === undefined || // return value of _.map([]) for Lodash 4
-            rank === null) { // return value of _.map([null])
+        if (!rank) {
             rank = 0;
         }
         label.rank = rank;
@@ -51,29 +56,39 @@ var longestPathWithLayer = function (g) {
     var _a;
     // 用longest path，找出最深的点
     var visited = {};
-    var minRank = 0;
+    var minRank;
     var dfs = function (v) {
         var _a;
         var label = g.node(v);
-        if (visited.hasOwnProperty(v)) {
+        if (visited[v]) {
             return label.rank;
         }
         visited[v] = true;
-        var lengths = (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.map(function (e) {
-            return (dfs(e.w) - g.edge(e).minlen) || Infinity;
+        var rank;
+        (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.forEach(function (edgeObj) {
+            var wRank = dfs(edgeObj.w);
+            var minLen = g.edge(edgeObj).minlen;
+            var r = wRank - minLen;
+            if (r) {
+                if (rank === undefined || r < rank) {
+                    rank = r;
+                }
+            }
         });
-        var rank = Math.min.apply(Math, lengths);
-        if (rank === Number.POSITIVE_INFINITY || // return value of _.map([]) for Lodash 3
-            rank === undefined || // return value of _.map([]) for Lodash 4
-            rank === null) { // return value of _.map([null])
+        if (!rank) {
             rank = 0;
         }
+        if (minRank === undefined || rank < minRank) {
+            minRank = rank;
+        }
         label.rank = rank;
-        minRank = Math.min(label.rank, minRank);
-        return label.rank;
+        return rank;
     };
     (_a = g.sources()) === null || _a === void 0 ? void 0 : _a.forEach(function (source) { return dfs(source); });
-    minRank += 1; // NOTE: 最小的层级是dummy root，+1
+    if (minRank === undefined) {
+        minRank = 0;
+    }
+    // minRank += 1; // NOTE: 最小的层级是dummy root，+1
     // forward一遍，赋值层级
     var dfsForward = function (v, nextRank) {
         var _a;
@@ -105,7 +120,9 @@ exports.longestPathWithLayer = longestPathWithLayer;
  * difference between the length of the edge and its minimum length.
  */
 var slack = function (g, e) {
-    return g.node(e.w).rank - g.node(e.v).rank - g.edge(e).minlen;
+    return (g.node(e.w).rank -
+        g.node(e.v).rank -
+        g.edge(e).minlen);
 };
 exports.slack = slack;
 exports.default = {

package/lib/layout/dagre/src/rank/util.js.map

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

package/lib/layout/dagre/src/util.d.ts

@@ -1,50 +1,31 @@
-import { graphlib as IGraphLib } from '../graphlib';
-declare type IGraph = IGraphLib.Graph;
-declare const addDummyNode: (g: IGraph, type: any, attrs: any, name: string) => string;
-declare const simplify: (g: IGraph) => any;
-declare const asNonCompoundGraph: (g: IGraph) => IGraph;
-declare const zipObject: (keys: string[], values: any) => any;
-declare const successorWeights: (g: IGraph) => any;
-declare const predecessorWeights: (g: IGraph) => any;
-declare const intersectRect: (rect: any, point: any) => {
-    x: any;
-    y: any;
+import { Graph, Node } from "../graph";
+export declare const addDummyNode: (g: Graph, type: string, attrs: Node<Record<string, any>>, name: string) => string;
+export declare const simplify: (g: Graph) => Graph;
+export declare const asNonCompoundGraph: (g: Graph) => Graph;
+export declare const zipObject: <T = any>(keys: string[], values: T[]) => Record<string, T>;
+export declare const successorWeights: (g: Graph) => Record<string, Record<string, number>>;
+export declare const predecessorWeights: (g: Graph) => Record<string, Record<string, number>>;
+export declare const intersectRect: (rect: {
+    x?: number | undefined;
+    y?: number | undefined;
+    width?: number | undefined;
+    height?: number | undefined;
+}, point: {
+    x?: number | undefined;
+    y?: number | undefined;
+}) => {
+    x: number;
+    y: number;
 };
-declare const buildLayerMatrix: (g: IGraph) => any;
-declare const normalizeRanks: (g: IGraph) => void;
-declare const removeEmptyRanks: (g: IGraph) => void;
-declare const addBorderNode: (g: IGraph, prefix: string, rank?: number | undefined, order?: number | undefined) => string;
-declare const maxRank: (g: IGraph) => number;
-declare const partition: (collection: any, fn: any) => {
-    lhs: any;
-    rhs: any;
+export declare const buildLayerMatrix: (g: Graph) => string[][];
+export declare const normalizeRanks: (g: Graph) => void;
+export declare const removeEmptyRanks: (g: Graph) => void;
+export declare const addBorderNode: (g: Graph, prefix: string, rank?: number | undefined, order?: number | undefined) => string;
+export declare const maxRank: (g: Graph) => number;
+export declare const partition: <T = any>(collection: T[], fn: (val: T) => boolean) => {
+    lhs: T[];
+    rhs: T[];
 };
-declare const time: (name: string, fn: () => unknown) => unknown;
-declare const notime: (name: string, fn: () => unknown) => unknown;
-declare const minBy: (array: any, func: (param: any) => number) => undefined;
-export { addDummyNode, simplify, asNonCompoundGraph, successorWeights, predecessorWeights, intersectRect, buildLayerMatrix, normalizeRanks, removeEmptyRanks, addBorderNode, maxRank, partition, time, notime, zipObject, minBy };
-declare const _default: {
-    addDummyNode: (g: IGraph, type: any, attrs: any, name: string) => string;
-    simplify: (g: IGraph) => any;
-    asNonCompoundGraph: (g: IGraph) => IGraph;
-    successorWeights: (g: IGraph) => any;
-    predecessorWeights: (g: IGraph) => any;
-    intersectRect: (rect: any, point: any) => {
-        x: any;
-        y: any;
-    };
-    buildLayerMatrix: (g: IGraph) => any;
-    normalizeRanks: (g: IGraph) => void;
-    removeEmptyRanks: (g: IGraph) => void;
-    addBorderNode: (g: IGraph, prefix: string, rank?: number | undefined, order?: number | undefined) => string;
-    maxRank: (g: IGraph) => number;
-    partition: (collection: any, fn: any) => {
-        lhs: any;
-        rhs: any;
-    };
-    time: (name: string, fn: () => unknown) => unknown;
-    notime: (name: string, fn: () => unknown) => unknown;
-    zipObject: (keys: string[], values: any) => any;
-    minBy: (array: any, func: (param: any) => number) => undefined;
-};
-export default _default;
+export declare const time: (name: string, fn: () => void) => void;
+export declare const notime: (name: string, fn: () => void) => void;
+export declare const minBy: <T = any>(array: T[], func: (param: T) => number) => T;