@antv/layout 1.2.14-beta.9 → 2.0.0-alpha.2

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

@@ -0,0 +1,119 @@
+/*
+ * Given a list of entries of the form {v, barycenter, weight} and a
+ * constraint graph this function will resolve any conflicts between the
+ * constraint graph and the barycenters for the entries. If the barycenters for
+ * an entry would violate a constraint in the constraint graph then we coalesce
+ * the nodes in the conflict into a new node that respects the contraint and
+ * aggregates barycenter and weight information.
+ *
+ * This implementation is based on the description in Forster, "A Fast and
+ * Simple Hueristic for Constrained Two-Level Crossing Reduction," thought it
+ * differs in some specific details.
+ *
+ * Pre-conditions:
+ *
+ *    1. Each entry has the form {v, barycenter, weight}, or if the node has
+ *       no barycenter, then {v}.
+ *
+ * Returns:
+ *
+ *    A new list of entries of the form {vs, i, barycenter, weight}. The list
+ *    `vs` may either be a singleton or it may be an aggregation of nodes
+ *    ordered such that they do not violate constraints from the constraint
+ *    graph. The property `i` is the lowest original index of any of the
+ *    elements in `vs`.
+ */
+const resolveConflicts = (entries, cg) => {
+    var _a, _b, _c;
+    const mappedEntries = {};
+    entries === null || entries === void 0 ? void 0 : entries.forEach((entry, i) => {
+        mappedEntries[entry.v] = {
+            i,
+            indegree: 0,
+            in: [],
+            out: [],
+            vs: [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((e) => {
+        const entryV = mappedEntries[e.source];
+        const entryW = mappedEntries[e.target];
+        if (entryV !== undefined && entryW !== undefined) {
+            entryW.indegree++;
+            entryV.out.push(mappedEntries[e.target]);
+        }
+    });
+    const sourceSet = (_c = (_b = Object.values(mappedEntries)).filter) === null || _c === void 0 ? void 0 : _c.call(_b, (entry) => !entry.indegree);
+    return doResolveConflicts(sourceSet);
+};
+const doResolveConflicts = (sourceSet) => {
+    var _a, _b;
+    const entries = [];
+    const handleIn = (vEntry) => {
+        return (uEntry) => {
+            if (uEntry.merged)
+                return;
+            if (uEntry.barycenter === undefined ||
+                vEntry.barycenter === undefined ||
+                uEntry.barycenter >= vEntry.barycenter) {
+                mergeEntries(vEntry, uEntry);
+            }
+        };
+    };
+    const handleOut = (vEntry) => {
+        return (wEntry) => {
+            wEntry['in'].push(vEntry);
+            if (--wEntry.indegree === 0) {
+                sourceSet.push(wEntry);
+            }
+        };
+    };
+    while (sourceSet === null || sourceSet === void 0 ? void 0 : sourceSet.length) {
+        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));
+    }
+    const filtered = entries.filter((entry) => !entry.merged);
+    const keys = [
+        'vs',
+        'i',
+        'barycenter',
+        'weight',
+    ];
+    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];
+        });
+        return picked;
+    });
+};
+const mergeEntries = (target, source) => {
+    var _a;
+    let sum = 0;
+    let weight = 0;
+    if (target.weight) {
+        sum += target.barycenter * target.weight;
+        weight += target.weight;
+    }
+    if (source.weight) {
+        sum += source.barycenter * source.weight;
+        weight += source.weight;
+    }
+    target.vs = (_a = source.vs) === null || _a === void 0 ? void 0 : _a.concat(target.vs);
+    target.barycenter = sum / weight;
+    target.weight = weight;
+    target.i = Math.min(source.i, target.i);
+    source.merged = true;
+};
+
+export { resolveConflicts as default };
+//# sourceMappingURL=resolve-conflicts.js.map

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

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

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

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

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

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

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

@@ -0,0 +1,77 @@
+import { partition } from '../util.js';
+
+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');
+        }
+        // NOTE: 有fixorder的也可以排
+        return hasFixOrder || entry.hasOwnProperty('barycenter');
+    });
+    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((entry) => {
+        var _a;
+        vsIndex += (_a = entry.vs) === null || _a === void 0 ? void 0 : _a.length;
+        vs.push(entry.vs);
+        sum += entry.barycenter * entry.weight;
+        weight += entry.weight;
+        vsIndex = consumeUnsortable(vs, unsortable, vsIndex);
+    });
+    const result = {
+        vs: vs.flat(),
+    };
+    if (weight) {
+        result.barycenter = sum / weight;
+        result.weight = weight;
+    }
+    return result;
+};
+const consumeUnsortable = (vs, unsortable, index) => {
+    let iindex = index;
+    let last;
+    while (unsortable.length &&
+        (last = unsortable[unsortable.length - 1]).i <= iindex) {
+        unsortable.pop();
+        vs === null || vs === void 0 ? void 0 : vs.push(last.vs);
+        iindex++;
+    }
+    return iindex;
+};
+/**
+ * 配置是否考虑使用之前的布局结果
+ */
+const compareWithBias = (bias, usePrev) => {
+    return (entryV, entryW) => {
+        // 排序的时候先判断fixorder，不行再判断重心
+        if (entryV.fixorder !== undefined && entryW.fixorder !== undefined) {
+            return entryV.fixorder - entryW.fixorder;
+        }
+        if (entryV.barycenter < entryW.barycenter) {
+            return -1;
+        }
+        if (entryV.barycenter > entryW.barycenter) {
+            return 1;
+        }
+        // 重心相同，考虑之前排好的顺序
+        if (usePrev && entryV.order !== undefined && entryW.order !== undefined) {
+            if (entryV.order < entryW.order) {
+                return -1;
+            }
+            if (entryV.order > entryW.order) {
+                return 1;
+            }
+        }
+        return !bias ? entryV.i - entryW.i : entryW.i - entryV.i;
+    };
+};
+
+export { sort };
+//# sourceMappingURL=sort.js.map

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

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

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

@@ -0,0 +1,82 @@
+// deep first search with both order low for pre, lim for post
+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((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.
+const findPath = (g, postorderNums, v, w) => {
+    var _a, _b;
+    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 {
+        parent = (_a = g.getParent(parent)) === null || _a === void 0 ? void 0 : _a.id;
+        vPath.push(parent);
+    } while (parent &&
+        (postorderNums[parent].low > low || lim > postorderNums[parent].lim));
+    lca = parent;
+    // Traverse from w to LCA
+    parent = w;
+    while (parent && parent !== lca) {
+        wPath.push(parent);
+        parent = (_b = g.getParent(parent)) === null || _b === void 0 ? void 0 : _b.id;
+    }
+    return { lca, path: vPath.concat(wPath.reverse()) };
+};
+const parentDummyChains = (g, dummyChains) => {
+    const postorderNums = dfsBothOrder(g);
+    dummyChains.forEach((startV) => {
+        var _a, _b;
+        let v = startV;
+        let node = g.getNode(v);
+        const originalEdge = node.data.originalEdge;
+        if (!originalEdge)
+            return;
+        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) {
+                while (pathV !== lca &&
+                    ((_a = g.getNode(pathV)) === null || _a === void 0 ? void 0 : _a.data.maxRank) < node.data.rank) {
+                    pathIdx++;
+                    pathV = path[pathIdx];
+                }
+                if (pathV === lca) {
+                    ascending = false;
+                }
+            }
+            if (!ascending) {
+                while (pathIdx < path.length - 1 &&
+                    ((_b = g.getNode(path[pathIdx + 1])) === null || _b === void 0 ? void 0 : _b.data.minRank) <= node.data.rank) {
+                    pathIdx++;
+                }
+                pathV = path[pathIdx];
+            }
+            if (g.hasNode(pathV)) {
+                g.setParent(v, pathV);
+            }
+            v = g.getSuccessors(v)[0].id;
+        }
+    });
+};
+
+export { parentDummyChains };
+//# sourceMappingURL=parent-dummy-chains.js.map

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

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