@antv/layout 1.2.13 → 1.2.14-beta.1

package/lib/{dagre → antv-dagre}/order/index.js

@@ -1,11 +1,11 @@
-import { initOrder } from "./init-order";
-import { crossCount } from "./cross-count";
-import { buildLayerGraph } from "./build-layer-graph";
-import { addSubgraphConstraints } from "./add-subgraph-constraints";
-import { sortSubgraph } from "./sort-subgraph";
-import { buildLayerMatrix, maxRank } from "../util";
-import { Graph } from "@antv/graphlib";
-import { clone } from "@antv/util";
+import { Graph } from '@antv/graphlib';
+import { clone } from '@antv/util';
+import { buildLayerMatrix, maxRank } from '../util';
+import { addSubgraphConstraints } from './add-subgraph-constraints';
+import { buildLayerGraph } from './build-layer-graph';
+import { crossCount } from './cross-count';
+import { initOrder } from './init-order';
+import { sortSubgraph } from './sort-subgraph';
 /*
  * Applies heuristics to minimize edge crossings in the graph and sets the best
  * order solution as an order attribute on each node.
@@ -21,24 +21,24 @@ import { clone } from "@antv/util";
  *    1. Graph nodes will have an "order" attribute based on the results of the
  *       algorithm.
  */
-export var order = function (g, keepNodeOrder) {
-    var mxRank = maxRank(g);
-    var range1 = [];
-    var range2 = [];
-    for (var i = 1; i < mxRank + 1; i++)
+export const order = (g, keepNodeOrder) => {
+    const mxRank = maxRank(g);
+    const range1 = [];
+    const range2 = [];
+    for (let i = 1; i < mxRank + 1; i++)
         range1.push(i);
-    for (var i = mxRank - 1; i > -1; i--)
+    for (let i = mxRank - 1; i > -1; i--)
         range2.push(i);
-    var downLayerGraphs = buildLayerGraphs(g, range1, "in");
-    var upLayerGraphs = buildLayerGraphs(g, range2, "out");
-    var layering = initOrder(g);
+    const downLayerGraphs = buildLayerGraphs(g, range1, 'in');
+    const upLayerGraphs = buildLayerGraphs(g, range2, 'out');
+    let layering = initOrder(g);
     assignOrder(g, layering);
-    var bestCC = Number.POSITIVE_INFINITY;
-    var best;
-    for (var i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
+    let bestCC = Number.POSITIVE_INFINITY;
+    let best;
+    for (let i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
         sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2, false, keepNodeOrder);
         layering = buildLayerMatrix(g);
-        var cc = crossCount(g, layering);
+        const cc = crossCount(g, layering);
         if (cc < bestCC) {
             lastBest = 0;
             best = clone(layering);
@@ -48,10 +48,10 @@ export var order = function (g, keepNodeOrder) {
     // consider use previous result, maybe somewhat reduendant
     layering = initOrder(g);
     assignOrder(g, layering);
-    for (var i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
+    for (let i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
         sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2, true, keepNodeOrder);
         layering = buildLayerMatrix(g);
-        var cc = crossCount(g, layering);
+        const cc = crossCount(g, layering);
         if (cc < bestCC) {
             lastBest = 0;
             best = clone(layering);
@@ -60,20 +60,20 @@ export var order = function (g, keepNodeOrder) {
     }
     assignOrder(g, best);
 };
-var buildLayerGraphs = function (g, ranks, direction) {
-    return ranks.map(function (rank) {
+const buildLayerGraphs = (g, ranks, direction) => {
+    return ranks.map((rank) => {
         return buildLayerGraph(g, rank, direction);
     });
 };
-var sweepLayerGraphs = function (layerGraphs, biasRight, usePrev, keepNodeOrder) {
-    var cg = new Graph();
-    layerGraphs === null || layerGraphs === void 0 ? void 0 : layerGraphs.forEach(function (lg) {
+const sweepLayerGraphs = (layerGraphs, biasRight, usePrev, keepNodeOrder) => {
+    const cg = new Graph();
+    layerGraphs === null || layerGraphs === void 0 ? void 0 : layerGraphs.forEach((lg) => {
         var _a;
         // const root = lg.graph().root as string;
-        var root = lg.getRoots()[0].id;
-        var sorted = sortSubgraph(lg, root, cg, biasRight, usePrev, keepNodeOrder);
-        for (var i = 0; i < ((_a = sorted.vs) === null || _a === void 0 ? void 0 : _a.length) || 0; i++) {
-            var lnode = lg.getNode(sorted.vs[i]);
+        const root = lg.getRoots()[0].id;
+        const sorted = sortSubgraph(lg, root, cg, biasRight, usePrev, keepNodeOrder);
+        for (let i = 0; i < ((_a = sorted.vs) === null || _a === void 0 ? void 0 : _a.length) || 0; i++) {
+            const lnode = lg.getNode(sorted.vs[i]);
             if (lnode) {
                 lnode.data.order = i;
             }
@@ -81,9 +81,9 @@ var sweepLayerGraphs = function (layerGraphs, biasRight, usePrev, keepNodeOrder)
         addSubgraphConstraints(lg, cg, sorted.vs);
     });
 };
-var assignOrder = function (g, layering) {
-    layering === null || layering === void 0 ? void 0 : layering.forEach(function (layer) {
-        layer === null || layer === void 0 ? void 0 : layer.forEach(function (v, i) {
+const assignOrder = (g, layering) => {
+    layering === null || layering === void 0 ? void 0 : layering.forEach((layer) => {
+        layer === null || layer === void 0 ? void 0 : layer.forEach((v, i) => {
             g.getNode(v).data.order = i;
         });
     });

package/lib/antv-dagre/order/index.js.map

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

package/lib/{dagre → antv-dagre}/order/init-data-order.js

@@ -1,20 +1,19 @@
-import { __read, __spreadArray } from "tslib";
 /**
  * 按照数据中的结果设置fixorder
  */
-export var initDataOrder = function (g, nodeOrder) {
-    var simpleNodes = g.getAllNodes().filter(function (v) {
+export const initDataOrder = (g, nodeOrder) => {
+    const simpleNodes = g.getAllNodes().filter((v) => {
         var _a;
         return !((_a = g.getChildren(v.id)) === null || _a === void 0 ? void 0 : _a.length);
     });
-    var ranks = simpleNodes.map(function (v) { return v.data.rank; });
-    var maxRank = Math.max.apply(Math, __spreadArray([], __read(ranks)));
-    var layers = [];
-    for (var i = 0; i < maxRank + 1; i++) {
+    const ranks = simpleNodes.map((v) => v.data.rank);
+    const maxRank = Math.max(...ranks);
+    const layers = [];
+    for (let i = 0; i < maxRank + 1; i++) {
         layers[i] = [];
     }
-    nodeOrder === null || nodeOrder === void 0 ? void 0 : nodeOrder.forEach(function (n) {
-        var node = g.getNode(n);
+    nodeOrder === null || nodeOrder === void 0 ? void 0 : nodeOrder.forEach((n) => {
+        const node = g.getNode(n);
         // 只考虑原有节点，dummy节点需要按照后续算法排出
         if (!node || node.data.dummy) {
             return;

package/lib/antv-dagre/order/init-data-order.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init-data-order.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/init-data-order.ts"],"names":[],"mappings":"AAGA;;GAEG;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,CAAC,CAAQ,EAAE,SAAgB,EAAE,EAAE;IAC1D,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;;QAC/C,OAAO,CAAC,CAAA,MAAA,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,EAAE,CAAC,0CAAE,MAAM,CAAA,CAAC;IACtC,CAAC,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC;IACnC,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;KAChB;IAED,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QACvB,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;QAC1B,4BAA4B;QAC5B,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YAC5B,OAAO;SACR;QACD,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,EAAE;YAC3B,IAAI,CAAC,IAAI,CAAC,QAAQ,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,MAAM,CAAC,CAAC,mBAAmB;YACxE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;SACjC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC"}

package/lib/antv-dagre/order/init-order.js

@@ -0,0 +1,47 @@
+/*
+ * Assigns an initial order value for each node by performing a DFS search
+ * starting from nodes in the first rank. Nodes are assigned an order in their
+ * rank as they are first visited.
+ *
+ * This approach comes from Gansner, et al., "A Technique for Drawing Directed
+ * Graphs."
+ *
+ * Returns a layering matrix with an array per layer and each layer sorted by
+ * the order of its nodes.
+ */
+export const initOrder = (g) => {
+    const visited = {};
+    // const simpleNodes = g.getAllNodes().filter((v) => {
+    //   return !g.getChildren(v.id)?.length;
+    // });
+    const simpleNodes = g.getAllNodes();
+    const nodeRanks = simpleNodes.map((v) => { var _a; return (_a = v.data.rank) !== null && _a !== void 0 ? _a : -Infinity; });
+    const maxRank = Math.max(...nodeRanks);
+    const layers = [];
+    for (let i = 0; i < maxRank + 1; i++) {
+        layers.push([]);
+    }
+    const orderedVs = simpleNodes.sort((a, b) => g.getNode(a.id).data.rank - g.getNode(b.id).data.rank);
+    // const orderedVs = _.sortBy(simpleNodes, function(v) { return g.node(v)!.rank; });
+    // 有fixOrder的，直接排序好放进去
+    const beforeSort = orderedVs.filter((n) => {
+        return g.getNode(n.id).data.fixorder !== undefined;
+    });
+    const fixOrderNodes = beforeSort.sort((a, b) => g.getNode(a.id).data.fixorder - g.getNode(b.id).data.fixorder);
+    fixOrderNodes === null || fixOrderNodes === void 0 ? void 0 : fixOrderNodes.forEach((n) => {
+        if (!isNaN(g.getNode(n.id).data.rank)) {
+            layers[g.getNode(n.id).data.rank].push(n.id);
+        }
+        visited[n.id] = true;
+    });
+    orderedVs === null || orderedVs === void 0 ? void 0 : orderedVs.forEach((n) => g.dfsTree(n.id, (node) => {
+        if (visited.hasOwnProperty(node.id))
+            return true;
+        visited[node.id] = true;
+        if (!isNaN(node.data.rank)) {
+            layers[node.data.rank].push(node.id);
+        }
+    }));
+    return layers;
+};
+//# sourceMappingURL=init-order.js.map

package/lib/antv-dagre/order/init-order.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"init-order.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/init-order.ts"],"names":[],"mappings":"AAGA;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CAAC,CAAQ,EAAE,EAAE;IACpC,MAAM,OAAO,GAA4B,EAAE,CAAC;IAC5C,sDAAsD;IACtD,yCAAyC;IACzC,MAAM;IACN,MAAM,WAAW,GAAG,CAAC,CAAC,WAAW,EAAE,CAAC;IACpC,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,WAAC,OAAA,MAAA,CAAC,CAAC,IAAI,CAAC,IAAK,mCAAI,CAAC,QAAQ,CAAA,EAAA,CAAC,CAAC;IAEpE,MAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,CAAC;IACvC,MAAM,MAAM,GAAW,EAAE,CAAC;IAC1B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;KACjB;IAED,MAAM,SAAS,GAAG,WAAW,CAAC,IAAI,CAChC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,CAClE,CAAC;IACF,oFAAoF;IAEpF,sBAAsB;IACtB,MAAM,UAAU,GAAG,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE;QACxC,OAAO,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAC;IACrD,CAAC,CAAC,CAAC;IACH,MAAM,aAAa,GAAG,UAAU,CAAC,IAAI,CACnC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAS,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,QAAS,CAC1E,CAAC;IACF,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE;QAC3B,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,CAAC,EAAE;YACtC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAC/C;QACD,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IACvB,CAAC,CAAC,CAAC;IAEH,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CACvB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,EAAE,EAAE;QACvB,IAAI,OAAO,CAAC,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC;YAAE,OAAO,IAAI,CAAC;QACjD,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QACxB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;SACvC;IACH,CAAC,CAAC,CACH,CAAC;IAEF,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC"}

package/lib/{dagre → antv-dagre}/order/resolve-conflicts.d.ts

@@ -1,6 +1,6 @@
-import { ID } from "@antv/graphlib";
-import { Graph } from "../../types";
-export declare type ConflictEntry = {
+import { ID } from '@antv/graphlib';
+import { Graph } from '../../types';
+export type ConflictEntry = {
     i: number;
     indegree?: number;
     in?: ConflictEntry[];

package/lib/{dagre → antv-dagre}/order/resolve-conflicts.js

@@ -23,39 +23,39 @@
  *    graph. The property `i` is the lowest original index of any of the
  *    elements in `vs`.
  */
-var resolveConflicts = function (entries, cg) {
+const resolveConflicts = (entries, cg) => {
     var _a, _b, _c;
-    var mappedEntries = {};
-    entries === null || entries === void 0 ? void 0 : entries.forEach(function (entry, i) {
+    const mappedEntries = {};
+    entries === null || entries === void 0 ? void 0 : entries.forEach((entry, i) => {
         mappedEntries[entry.v] = {
-            i: i,
+            i,
             indegree: 0,
             in: [],
             out: [],
             vs: [entry.v],
         };
-        var tmp = mappedEntries[entry.v];
+        const tmp = mappedEntries[entry.v];
         if (entry.barycenter !== undefined) {
             tmp.barycenter = entry.barycenter;
             tmp.weight = entry.weight;
         }
     });
-    (_a = cg.getAllEdges()) === null || _a === void 0 ? void 0 : _a.forEach(function (e) {
-        var entryV = mappedEntries[e.source];
-        var entryW = mappedEntries[e.target];
+    (_a = cg.getAllEdges()) === null || _a === void 0 ? void 0 : _a.forEach((e) => {
+        const entryV = mappedEntries[e.source];
+        const entryW = mappedEntries[e.target];
         if (entryV !== undefined && entryW !== undefined) {
             entryW.indegree++;
             entryV.out.push(mappedEntries[e.target]);
         }
     });
-    var sourceSet = (_c = (_b = Object.values(mappedEntries)).filter) === null || _c === void 0 ? void 0 : _c.call(_b, function (entry) { return !entry.indegree; });
+    const sourceSet = (_c = (_b = Object.values(mappedEntries)).filter) === null || _c === void 0 ? void 0 : _c.call(_b, (entry) => !entry.indegree);
     return doResolveConflicts(sourceSet);
 };
-var doResolveConflicts = function (sourceSet) {
+const doResolveConflicts = (sourceSet) => {
     var _a, _b;
-    var entries = [];
-    var handleIn = function (vEntry) {
-        return function (uEntry) {
+    const entries = [];
+    const handleIn = (vEntry) => {
+        return (uEntry) => {
             if (uEntry.merged)
                 return;
             if (uEntry.barycenter === undefined ||
@@ -65,33 +65,30 @@ var doResolveConflicts = function (sourceSet) {
             }
         };
     };
-    var handleOut = function (vEntry) {
-        return function (wEntry) {
-            wEntry["in"].push(vEntry);
+    const handleOut = (vEntry) => {
+        return (wEntry) => {
+            wEntry['in'].push(vEntry);
             if (--wEntry.indegree === 0) {
                 sourceSet.push(wEntry);
             }
         };
     };
-    var _loop_1 = function () {
-        var entry = sourceSet.pop();
-        entries.push(entry);
-        (_a = entry["in"].reverse()) === null || _a === void 0 ? void 0 : _a.forEach(function (e) { return handleIn(entry)(e); });
-        (_b = entry.out) === null || _b === void 0 ? void 0 : _b.forEach(function (e) { return handleOut(entry)(e); });
-    };
     while (sourceSet === null || sourceSet === void 0 ? void 0 : sourceSet.length) {
-        _loop_1();
+        const entry = sourceSet.pop();
+        entries.push(entry);
+        (_a = entry['in'].reverse()) === null || _a === void 0 ? void 0 : _a.forEach((e) => handleIn(entry)(e));
+        (_b = entry.out) === null || _b === void 0 ? void 0 : _b.forEach((e) => handleOut(entry)(e));
     }
-    var filtered = entries.filter(function (entry) { return !entry.merged; });
-    var keys = [
-        "vs",
-        "i",
-        "barycenter",
-        "weight",
+    const filtered = entries.filter((entry) => !entry.merged);
+    const keys = [
+        'vs',
+        'i',
+        'barycenter',
+        'weight',
     ];
-    return filtered.map(function (entry) {
-        var picked = {};
-        keys === null || keys === void 0 ? void 0 : keys.forEach(function (key) {
+    return filtered.map((entry) => {
+        const picked = {};
+        keys === null || keys === void 0 ? void 0 : keys.forEach((key) => {
             if (entry[key] === undefined)
                 return;
             picked[key] = entry[key];
@@ -99,10 +96,10 @@ var doResolveConflicts = function (sourceSet) {
         return picked;
     });
 };
-var mergeEntries = function (target, source) {
+const mergeEntries = (target, source) => {
     var _a;
-    var sum = 0;
-    var weight = 0;
+    let sum = 0;
+    let weight = 0;
     if (target.weight) {
         sum += target.barycenter * target.weight;
         weight += target.weight;

package/lib/antv-dagre/order/resolve-conflicts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolve-conflicts.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/resolve-conflicts.ts"],"names":[],"mappings":"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"}

package/lib/{dagre → antv-dagre}/order/sort-subgraph.js

@@ -1,48 +1,48 @@
 import { barycenter } from './barycenter';
 import resolveConflicts from './resolve-conflicts';
 import { sort } from './sort';
-export var sortSubgraph = function (g, v, cg, biasRight, usePrev, keepNodeOrder) {
+export const sortSubgraph = (g, v, cg, biasRight, usePrev, keepNodeOrder) => {
     var _a, _b, _c, _d;
-    var movable = g.getChildren(v).map(function (n) { return n.id; });
+    let movable = g.getChildren(v).map((n) => n.id);
     // fixorder的点不参与排序（这个方案不合适，只排了新增节点，和原来的分离）
-    var node = g.getNode(v);
-    var bl = node ? node.data.borderLeft : undefined;
-    var br = node ? node.data.borderRight : undefined;
-    var subgraphs = {};
+    const node = g.getNode(v);
+    const bl = node ? node.data.borderLeft : undefined;
+    const br = node ? node.data.borderRight : undefined;
+    const subgraphs = {};
     if (bl) {
-        movable = movable === null || movable === void 0 ? void 0 : movable.filter(function (w) {
+        movable = movable === null || movable === void 0 ? void 0 : movable.filter((w) => {
             return w !== bl && w !== br;
         });
     }
-    var barycenters = barycenter(g, movable || []);
-    barycenters === null || barycenters === void 0 ? void 0 : barycenters.forEach(function (entry) {
+    const barycenters = barycenter(g, movable || []);
+    barycenters === null || barycenters === void 0 ? void 0 : barycenters.forEach((entry) => {
         var _a;
         if ((_a = g.getChildren(entry.v)) === null || _a === void 0 ? void 0 : _a.length) {
-            var subgraphResult = sortSubgraph(g, entry.v, cg, biasRight, keepNodeOrder);
+            const subgraphResult = sortSubgraph(g, entry.v, cg, biasRight, keepNodeOrder);
             subgraphs[entry.v] = subgraphResult;
             if (subgraphResult.hasOwnProperty('barycenter')) {
                 mergeBarycenters(entry, subgraphResult);
             }
         }
     });
-    var entries = resolveConflicts(barycenters, cg);
+    const entries = resolveConflicts(barycenters, cg);
     expandSubgraphs(entries, subgraphs);
     // 添加fixorder信息到entries里边
     // TODO: 不考虑复合情况，只用第一个点的fixorder信息，后续考虑更完备的实现
     (_a = entries
-        .filter(function (e) { return e.vs.length > 0; })) === null || _a === void 0 ? void 0 : _a.forEach(function (e) {
-        var node = g.getNode(e.vs[0]);
+        .filter((e) => e.vs.length > 0)) === null || _a === void 0 ? void 0 : _a.forEach((e) => {
+        const node = g.getNode(e.vs[0]);
         if (node) {
             e.fixorder = node.data.fixorder;
             e.order = node.data.order;
         }
     });
-    var result = sort(entries, biasRight, usePrev, keepNodeOrder);
+    const result = sort(entries, biasRight, usePrev, keepNodeOrder);
     if (bl) {
         result.vs = [bl, result.vs, br].flat();
         if ((_b = g.getPredecessors(bl)) === null || _b === void 0 ? void 0 : _b.length) {
-            var blPred = g.getNode(((_c = g.getPredecessors(bl)) === null || _c === void 0 ? void 0 : _c[0].id) || '');
-            var brPred = g.getNode(((_d = g.getPredecessors(br)) === null || _d === void 0 ? void 0 : _d[0].id) || '');
+            const blPred = g.getNode(((_c = g.getPredecessors(bl)) === null || _c === void 0 ? void 0 : _c[0].id) || '');
+            const brPred = g.getNode(((_d = g.getPredecessors(br)) === null || _d === void 0 ? void 0 : _d[0].id) || '');
             if (!result.hasOwnProperty('barycenter')) {
                 result.barycenter = 0;
                 result.weight = 0;
@@ -57,10 +57,10 @@ export var sortSubgraph = function (g, v, cg, biasRight, usePrev, keepNodeOrder)
     }
     return result;
 };
-var expandSubgraphs = function (entries, subgraphs) {
-    entries === null || entries === void 0 ? void 0 : entries.forEach(function (entry) {
+const expandSubgraphs = (entries, subgraphs) => {
+    entries === null || entries === void 0 ? void 0 : entries.forEach((entry) => {
         var _a;
-        var vss = (_a = entry.vs) === null || _a === void 0 ? void 0 : _a.map(function (v) {
+        const vss = (_a = entry.vs) === null || _a === void 0 ? void 0 : _a.map((v) => {
             if (subgraphs[v]) {
                 return subgraphs[v].vs;
             }
@@ -69,7 +69,7 @@ var expandSubgraphs = function (entries, subgraphs) {
         entry.vs = vss.flat();
     });
 };
-var mergeBarycenters = function (target, other) {
+const mergeBarycenters = (target, other) => {
     if (target.barycenter !== undefined) {
         target.barycenter =
             (target.barycenter * target.weight + other.barycenter * other.weight) /

package/lib/antv-dagre/order/sort-subgraph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"sort-subgraph.js","sourceRoot":"","sources":["../../../src/antv-dagre/order/sort-subgraph.ts"],"names":[],"mappings":"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"}

package/lib/{dagre → antv-dagre}/order/sort.d.ts

@@ -1,5 +1,5 @@
-import { ID } from "@antv/graphlib";
-import { ConflictEntry } from "./resolve-conflicts";
+import { ID } from '@antv/graphlib';
+import { ConflictEntry } from './resolve-conflicts';
 export declare const sort: (entries: ConflictEntry[], biasRight?: boolean, usePrev?: boolean, keepNodeOrder?: boolean) => {
     vs: ID[];
     barycenter?: number;

package/lib/{dagre → antv-dagre}/order/sort.js

@@ -1,22 +1,22 @@
-import { partition } from "../util";
-export var sort = function (entries, biasRight, usePrev, keepNodeOrder) {
-    var parts = partition(entries, function (entry) {
-        var hasFixOrder = entry.hasOwnProperty("fixorder") && !isNaN(entry.fixorder);
+import { partition } from '../util';
+export const sort = (entries, biasRight, usePrev, keepNodeOrder) => {
+    const parts = partition(entries, (entry) => {
+        const hasFixOrder = entry.hasOwnProperty('fixorder') && !isNaN(entry.fixorder);
         if (keepNodeOrder) {
-            return !hasFixOrder && entry.hasOwnProperty("barycenter");
+            return !hasFixOrder && entry.hasOwnProperty('barycenter');
         }
         // NOTE: 有fixorder的也可以排
-        return hasFixOrder || entry.hasOwnProperty("barycenter");
+        return hasFixOrder || entry.hasOwnProperty('barycenter');
     });
-    var sortable = parts.lhs;
-    var unsortable = parts.rhs.sort(function (a, b) { return -a.i - -b.i; });
-    var vs = [];
-    var sum = 0;
-    var weight = 0;
-    var vsIndex = 0;
+    const sortable = parts.lhs;
+    const unsortable = parts.rhs.sort((a, b) => -a.i - -b.i);
+    const vs = [];
+    let sum = 0;
+    let weight = 0;
+    let vsIndex = 0;
     sortable === null || sortable === void 0 ? void 0 : sortable.sort(compareWithBias(!!biasRight, !!usePrev));
     vsIndex = consumeUnsortable(vs, unsortable, vsIndex);
-    sortable === null || sortable === void 0 ? void 0 : sortable.forEach(function (entry) {
+    sortable === null || sortable === void 0 ? void 0 : sortable.forEach((entry) => {
         var _a;
         vsIndex += (_a = entry.vs) === null || _a === void 0 ? void 0 : _a.length;
         vs.push(entry.vs);
@@ -24,7 +24,7 @@ export var sort = function (entries, biasRight, usePrev, keepNodeOrder) {
         weight += entry.weight;
         vsIndex = consumeUnsortable(vs, unsortable, vsIndex);
     });
-    var result = {
+    const result = {
         vs: vs.flat(),
     };
     if (weight) {
@@ -33,9 +33,9 @@ export var sort = function (entries, biasRight, usePrev, keepNodeOrder) {
     }
     return result;
 };
-var consumeUnsortable = function (vs, unsortable, index) {
-    var iindex = index;
-    var last;
+const consumeUnsortable = (vs, unsortable, index) => {
+    let iindex = index;
+    let last;
     while (unsortable.length &&
         (last = unsortable[unsortable.length - 1]).i <= iindex) {
         unsortable.pop();
@@ -47,8 +47,8 @@ var consumeUnsortable = function (vs, unsortable, index) {
 /**
  * 配置是否考虑使用之前的布局结果
  */
-var compareWithBias = function (bias, usePrev) {
-    return function (entryV, entryW) {
+const compareWithBias = (bias, usePrev) => {
+    return (entryV, entryW) => {
         // 排序的时候先判断fixorder，不行再判断重心
         if (entryV.fixorder !== undefined && entryW.fixorder !== undefined) {
             return entryV.fixorder - entryW.fixorder;

package/lib/antv-dagre/order/sort.js.map

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

package/lib/{dagre → antv-dagre}/parent-dummy-chains.js

@@ -1,25 +1,25 @@
 // deep first search with both order low for pre, lim for post
-var dfsBothOrder = function (g) {
-    var result = {};
-    var lim = 0;
-    var dfs = function (v) {
-        var low = lim;
-        g.getChildren(v).forEach(function (n) { return dfs(n.id); });
-        result[v] = { low: low, lim: lim++ };
+const dfsBothOrder = (g) => {
+    const result = {};
+    let lim = 0;
+    const dfs = (v) => {
+        const low = lim;
+        g.getChildren(v).forEach((n) => dfs(n.id));
+        result[v] = { low, lim: lim++ };
     };
-    g.getRoots().forEach(function (n) { return dfs(n.id); });
+    g.getRoots().forEach((n) => dfs(n.id));
     return result;
 };
 // Find a path from v to w through the lowest common ancestor (LCA). Return the
 // full path and the LCA.
-var findPath = function (g, postorderNums, v, w) {
+const findPath = (g, postorderNums, v, w) => {
     var _a, _b;
-    var vPath = [];
-    var wPath = [];
-    var low = Math.min(postorderNums[v].low, postorderNums[w].low);
-    var lim = Math.max(postorderNums[v].lim, postorderNums[w].lim);
-    var parent;
-    var lca;
+    const vPath = [];
+    const wPath = [];
+    const low = Math.min(postorderNums[v].low, postorderNums[w].low);
+    const lim = Math.max(postorderNums[v].lim, postorderNums[w].lim);
+    let parent;
+    let lca;
     // Traverse up from v to find the LCA
     parent = v;
     do {
@@ -34,23 +34,23 @@ var findPath = function (g, postorderNums, v, w) {
         wPath.push(parent);
         parent = (_b = g.getParent(parent)) === null || _b === void 0 ? void 0 : _b.id;
     }
-    return { lca: lca, path: vPath.concat(wPath.reverse()) };
+    return { lca, path: vPath.concat(wPath.reverse()) };
 };
-export var parentDummyChains = function (g, dummyChains) {
-    var postorderNums = dfsBothOrder(g);
-    dummyChains.forEach(function (startV) {
+export const parentDummyChains = (g, dummyChains) => {
+    const postorderNums = dfsBothOrder(g);
+    dummyChains.forEach((startV) => {
         var _a, _b;
-        var v = startV;
-        var node = g.getNode(v);
-        var originalEdge = node.data.originalEdge;
+        let v = startV;
+        let node = g.getNode(v);
+        const originalEdge = node.data.originalEdge;
         if (!originalEdge)
             return;
-        var pathData = findPath(g, postorderNums, originalEdge.source, originalEdge.target);
-        var path = pathData.path;
-        var lca = pathData.lca;
-        var pathIdx = 0;
-        var pathV = path[pathIdx];
-        var ascending = true;
+        const pathData = findPath(g, postorderNums, originalEdge.source, originalEdge.target);
+        const path = pathData.path;
+        const lca = pathData.lca;
+        let pathIdx = 0;
+        let pathV = path[pathIdx];
+        let ascending = true;
         while (v !== originalEdge.target) {
             node = g.getNode(v);
             if (ascending) {

package/lib/antv-dagre/parent-dummy-chains.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"parent-dummy-chains.js","sourceRoot":"","sources":["../../src/antv-dagre/parent-dummy-chains.ts"],"names":[],"mappings":"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"}