@antv/layout 1.2.13 → 1.2.14-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/85db61ddc757dae66e04.worker.js +2 -0
- package/dist/85db61ddc757dae66e04.worker.js.map +1 -0
- package/dist/index.min.js +1 -1
- package/dist/index.min.js.map +1 -1
- package/lib/{dagre → antv-dagre}/acyclic.d.ts +1 -1
- package/lib/antv-dagre/acyclic.js +65 -0
- package/lib/antv-dagre/acyclic.js.map +1 -0
- package/lib/antv-dagre/add-border-segments.js +41 -0
- package/lib/antv-dagre/add-border-segments.js.map +1 -0
- package/lib/{dagre → antv-dagre}/coordinate-system.d.ts +2 -1
- package/lib/antv-dagre/coordinate-system.js +69 -0
- package/lib/antv-dagre/coordinate-system.js.map +1 -0
- package/lib/{dagre → antv-dagre}/data/list.d.ts +1 -1
- package/lib/{dagre → antv-dagre}/data/list.js +23 -22
- package/lib/antv-dagre/data/list.js.map +1 -0
- package/lib/{dagre → antv-dagre}/greedy-fas.d.ts +2 -2
- package/lib/antv-dagre/greedy-fas.js +141 -0
- package/lib/antv-dagre/greedy-fas.js.map +1 -0
- package/lib/{dagre → antv-dagre}/layout.d.ts +2 -1
- package/lib/{dagre → antv-dagre}/layout.js +156 -154
- package/lib/antv-dagre/layout.js.map +1 -0
- package/lib/{dagre → antv-dagre}/nesting-graph.js +42 -39
- package/lib/antv-dagre/nesting-graph.js.map +1 -0
- package/lib/{dagre → antv-dagre}/normalize.d.ts +2 -2
- package/lib/{dagre → antv-dagre}/normalize.js +29 -25
- package/lib/antv-dagre/normalize.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/add-subgraph-constraints.js +13 -9
- package/lib/antv-dagre/order/add-subgraph-constraints.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/barycenter.d.ts +2 -2
- package/lib/antv-dagre/order/barycenter.js +27 -0
- package/lib/antv-dagre/order/barycenter.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/build-layer-graph.js +23 -23
- package/lib/antv-dagre/order/build-layer-graph.js.map +1 -0
- package/lib/antv-dagre/order/cross-count.d.ts +3 -0
- package/lib/{dagre → antv-dagre}/order/cross-count.js +21 -17
- package/lib/antv-dagre/order/cross-count.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/index.d.ts +1 -1
- package/lib/antv-dagre/order/index.js +95 -0
- package/lib/antv-dagre/order/index.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/init-data-order.js +12 -9
- package/lib/antv-dagre/order/init-data-order.js.map +1 -0
- package/lib/antv-dagre/order/init-order.js +51 -0
- package/lib/antv-dagre/order/init-order.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/resolve-conflicts.d.ts +3 -3
- package/lib/{dagre → antv-dagre}/order/resolve-conflicts.js +35 -36
- package/lib/antv-dagre/order/resolve-conflicts.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/sort-subgraph.js +28 -23
- package/lib/antv-dagre/order/sort-subgraph.js.map +1 -0
- package/lib/{dagre → antv-dagre}/order/sort.d.ts +2 -2
- package/lib/{dagre → antv-dagre}/order/sort.js +23 -19
- package/lib/antv-dagre/order/sort.js.map +1 -0
- package/lib/{dagre → antv-dagre}/parent-dummy-chains.js +32 -28
- package/lib/antv-dagre/parent-dummy-chains.js.map +1 -0
- package/lib/{dagre → antv-dagre}/position/bk.d.ts +5 -4
- package/lib/{dagre → antv-dagre}/position/bk.js +162 -148
- package/lib/antv-dagre/position/bk.js.map +1 -0
- package/lib/{dagre → antv-dagre}/position/index.d.ts +2 -1
- package/lib/antv-dagre/position/index.js +55 -0
- package/lib/antv-dagre/position/index.js.map +1 -0
- package/lib/{dagre → antv-dagre}/rank/feasible-tree.d.ts +2 -2
- package/lib/{dagre → antv-dagre}/rank/feasible-tree.js +42 -38
- package/lib/antv-dagre/rank/feasible-tree.js.map +1 -0
- package/lib/antv-dagre/rank/index.d.ts +2 -0
- package/lib/{dagre → antv-dagre}/rank/index.js +17 -13
- package/lib/antv-dagre/rank/index.js.map +1 -0
- package/lib/{dagre → antv-dagre}/rank/network-simplex.d.ts +2 -2
- package/lib/{dagre → antv-dagre}/rank/network-simplex.js +90 -81
- package/lib/antv-dagre/rank/network-simplex.js.map +1 -0
- package/lib/{dagre → antv-dagre}/rank/util.d.ts +2 -2
- package/lib/{dagre → antv-dagre}/rank/util.js +37 -32
- package/lib/antv-dagre/rank/util.js.map +1 -0
- package/lib/antv-dagre/types.d.ts +2 -0
- package/lib/antv-dagre/types.js +3 -0
- package/lib/antv-dagre/types.js.map +1 -0
- package/lib/{dagre → antv-dagre}/util.d.ts +1 -1
- package/lib/antv-dagre/util.js +299 -0
- package/lib/antv-dagre/util.js.map +1 -0
- package/lib/antv-dagre.d.ts +50 -0
- package/lib/antv-dagre.js +542 -0
- package/lib/antv-dagre.js.map +1 -0
- package/lib/bundle-entry.d.ts +2 -18
- package/lib/bundle-entry.js +5 -18
- package/lib/bundle-entry.js.map +1 -1
- package/lib/bundle-supervisor.d.ts +4 -22
- package/lib/bundle-supervisor.js +59 -54
- package/lib/bundle-supervisor.js.map +1 -1
- package/lib/bundle-worker.d.ts +1 -1
- package/lib/bundle-worker.js +38 -35
- package/lib/bundle-worker.js.map +1 -1
- package/lib/circular.d.ts +1 -1
- package/lib/circular.js +133 -145
- package/lib/circular.js.map +1 -1
- package/lib/comboCombined.d.ts +1 -1
- package/lib/comboCombined.js +273 -299
- package/lib/comboCombined.js.map +1 -1
- package/lib/concentric.d.ts +1 -1
- package/lib/concentric.js +173 -179
- package/lib/concentric.js.map +1 -1
- package/lib/d3Force/forceInBox.js +80 -78
- package/lib/d3Force/forceInBox.js.map +1 -1
- package/lib/d3Force/index.d.ts +2 -2
- package/lib/d3Force/index.js +207 -229
- package/lib/d3Force/index.js.map +1 -1
- package/lib/dagre.d.ts +13 -24
- package/lib/dagre.js +61 -542
- package/lib/dagre.js.map +1 -1
- package/lib/exports.d.ts +17 -0
- package/lib/exports.js +20 -0
- package/lib/exports.js.map +1 -0
- package/lib/force/forceNBody.js +48 -47
- package/lib/force/forceNBody.js.map +1 -1
- package/lib/force/index.d.ts +1 -1
- package/lib/force/index.js +301 -324
- package/lib/force/index.js.map +1 -1
- package/lib/force/types.d.ts +5 -5
- package/lib/force/types.js +2 -1
- package/lib/forceAtlas2/body.d.ts +1 -1
- package/lib/forceAtlas2/body.js +32 -31
- package/lib/forceAtlas2/body.js.map +1 -1
- package/lib/forceAtlas2/index.d.ts +1 -1
- package/lib/forceAtlas2/index.js +219 -227
- package/lib/forceAtlas2/index.js.map +1 -1
- package/lib/forceAtlas2/quad.d.ts +2 -2
- package/lib/forceAtlas2/quad.js +43 -42
- package/lib/forceAtlas2/quad.js.map +1 -1
- package/lib/forceAtlas2/quadTree.js +19 -17
- package/lib/forceAtlas2/quadTree.js.map +1 -1
- package/lib/fruchterman.d.ts +1 -1
- package/lib/fruchterman.js +203 -219
- package/lib/fruchterman.js.map +1 -1
- package/lib/grid.d.ts +1 -1
- package/lib/grid.js +201 -207
- package/lib/grid.js.map +1 -1
- package/lib/index.d.ts +1 -15
- package/lib/index.js +5 -16
- package/lib/index.js.map +1 -1
- package/lib/mds.d.ts +1 -1
- package/lib/mds.js +73 -79
- package/lib/mds.js.map +1 -1
- package/lib/radial/index.d.ts +1 -1
- package/lib/radial/index.js +183 -186
- package/lib/radial/index.js.map +1 -1
- package/lib/radial/mds.d.ts +1 -1
- package/lib/radial/mds.js +20 -14
- package/lib/radial/mds.js.map +1 -1
- package/lib/radial/radial-nonoverlap-force.d.ts +2 -2
- package/lib/radial/radial-nonoverlap-force.js +40 -37
- package/lib/radial/radial-nonoverlap-force.js.map +1 -1
- package/lib/random.d.ts +1 -1
- package/lib/random.js +57 -66
- package/lib/random.js.map +1 -1
- package/lib/registry.d.ts +2 -2
- package/lib/registry.js +30 -25
- package/lib/registry.js.map +1 -1
- package/lib/supervisor.d.ts +2 -3
- package/lib/supervisor.js +63 -58
- package/lib/supervisor.js.map +1 -1
- package/lib/types.d.ts +20 -75
- package/lib/types.js +5 -1
- package/lib/types.js.map +1 -1
- package/lib/util/array.js +4 -1
- package/lib/util/array.js.map +1 -1
- package/lib/util/common.d.ts +1 -1
- package/lib/util/common.js +11 -8
- package/lib/util/common.js.map +1 -1
- package/lib/util/function.js +41 -37
- package/lib/util/function.js.map +1 -1
- package/lib/util/index.d.ts +0 -2
- package/lib/util/index.js +7 -6
- package/lib/util/index.js.map +1 -1
- package/lib/util/math.d.ts +1 -26
- package/lib/util/math.js +55 -154
- package/lib/util/math.js.map +1 -1
- package/lib/util/object.d.ts +1 -1
- package/lib/util/object.js +20 -15
- package/lib/util/object.js.map +1 -1
- package/lib/util/size.d.ts +3 -0
- package/lib/util/size.js +16 -0
- package/lib/util/size.js.map +1 -0
- package/lib/worker.js +36 -35
- package/lib/worker.js.map +1 -1
- package/package.json +10 -6
- package/dist/aa1bb0ccc06b11cf79c1.worker.js +0 -2
- package/dist/aa1bb0ccc06b11cf79c1.worker.js.map +0 -1
- package/lib/dagre/acyclic.js +0 -62
- package/lib/dagre/acyclic.js.map +0 -1
- package/lib/dagre/add-border-segments.js +0 -37
- package/lib/dagre/add-border-segments.js.map +0 -1
- package/lib/dagre/coordinate-system.js +0 -65
- package/lib/dagre/coordinate-system.js.map +0 -1
- package/lib/dagre/data/list.js.map +0 -1
- package/lib/dagre/greedy-fas.js +0 -147
- package/lib/dagre/greedy-fas.js.map +0 -1
- package/lib/dagre/layout.js.map +0 -1
- package/lib/dagre/nesting-graph.js.map +0 -1
- package/lib/dagre/normalize.js.map +0 -1
- package/lib/dagre/order/add-subgraph-constraints.js.map +0 -1
- package/lib/dagre/order/barycenter.js +0 -23
- package/lib/dagre/order/barycenter.js.map +0 -1
- package/lib/dagre/order/build-layer-graph.js.map +0 -1
- package/lib/dagre/order/cross-count.d.ts +0 -3
- package/lib/dagre/order/cross-count.js.map +0 -1
- package/lib/dagre/order/index.js +0 -91
- package/lib/dagre/order/index.js.map +0 -1
- package/lib/dagre/order/init-data-order.js.map +0 -1
- package/lib/dagre/order/init-order.js +0 -50
- package/lib/dagre/order/init-order.js.map +0 -1
- package/lib/dagre/order/resolve-conflicts.js.map +0 -1
- package/lib/dagre/order/sort-subgraph.js.map +0 -1
- package/lib/dagre/order/sort.js.map +0 -1
- package/lib/dagre/parent-dummy-chains.js.map +0 -1
- package/lib/dagre/position/bk.js.map +0 -1
- package/lib/dagre/position/index.js +0 -54
- package/lib/dagre/position/index.js.map +0 -1
- package/lib/dagre/rank/feasible-tree.js.map +0 -1
- package/lib/dagre/rank/index.d.ts +0 -2
- package/lib/dagre/rank/index.js.map +0 -1
- package/lib/dagre/rank/network-simplex.js.map +0 -1
- package/lib/dagre/rank/util.js.map +0 -1
- package/lib/dagre/util.js +0 -289
- package/lib/dagre/util.js.map +0 -1
- package/lib/util/gpu.d.ts +0 -45
- package/lib/util/gpu.js +0 -214
- package/lib/util/gpu.js.map +0 -1
- package/lib/util/number.d.ts +0 -1
- package/lib/util/number.js +0 -5
- package/lib/util/number.js.map +0 -1
- package/lib/util/string.d.ts +0 -1
- package/lib/util/string.js +0 -15
- package/lib/util/string.js.map +0 -1
- /package/lib/{dagre → antv-dagre}/add-border-segments.d.ts +0 -0
- /package/lib/{dagre → antv-dagre}/nesting-graph.d.ts +0 -0
- /package/lib/{dagre → antv-dagre}/order/add-subgraph-constraints.d.ts +0 -0
- /package/lib/{dagre → antv-dagre}/order/build-layer-graph.d.ts +0 -0
- /package/lib/{dagre → antv-dagre}/order/init-data-order.d.ts +0 -0
- /package/lib/{dagre → antv-dagre}/order/init-order.d.ts +0 -0
- /package/lib/{dagre → antv-dagre}/order/sort-subgraph.d.ts +0 -0
- /package/lib/{dagre → antv-dagre}/parent-dummy-chains.d.ts +0 -0
|
@@ -0,0 +1,65 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.undo = exports.run = void 0;
|
|
4
|
+
const greedy_fas_1 = require("./greedy-fas");
|
|
5
|
+
const run = (g, acyclicer) => {
|
|
6
|
+
const weightFn = (g) => {
|
|
7
|
+
return (e) => e.data.weight || 1;
|
|
8
|
+
};
|
|
9
|
+
const fas = acyclicer === 'greedy' ? (0, greedy_fas_1.greedyFAS)(g, weightFn(g)) : dfsFAS(g);
|
|
10
|
+
fas === null || fas === void 0 ? void 0 : fas.forEach((e) => {
|
|
11
|
+
const label = e.data;
|
|
12
|
+
g.removeEdge(e.id);
|
|
13
|
+
label.forwardName = e.data.name;
|
|
14
|
+
label.reversed = true;
|
|
15
|
+
g.addEdge({
|
|
16
|
+
id: e.id,
|
|
17
|
+
source: e.target,
|
|
18
|
+
target: e.source,
|
|
19
|
+
data: Object.assign({}, label),
|
|
20
|
+
});
|
|
21
|
+
});
|
|
22
|
+
};
|
|
23
|
+
exports.run = run;
|
|
24
|
+
const dfsFAS = (g) => {
|
|
25
|
+
const fas = [];
|
|
26
|
+
const stack = {};
|
|
27
|
+
const visited = {};
|
|
28
|
+
const dfs = (v) => {
|
|
29
|
+
if (visited[v]) {
|
|
30
|
+
return;
|
|
31
|
+
}
|
|
32
|
+
visited[v] = true;
|
|
33
|
+
stack[v] = true;
|
|
34
|
+
g.getRelatedEdges(v, 'out').forEach((e) => {
|
|
35
|
+
if (stack[e.target]) {
|
|
36
|
+
fas.push(e);
|
|
37
|
+
}
|
|
38
|
+
else {
|
|
39
|
+
dfs(e.target);
|
|
40
|
+
}
|
|
41
|
+
});
|
|
42
|
+
delete stack[v];
|
|
43
|
+
};
|
|
44
|
+
g.getAllNodes().forEach((n) => dfs(n.id));
|
|
45
|
+
return fas;
|
|
46
|
+
};
|
|
47
|
+
const undo = (g) => {
|
|
48
|
+
g.getAllEdges().forEach((e) => {
|
|
49
|
+
const label = e.data;
|
|
50
|
+
if (label.reversed) {
|
|
51
|
+
g.removeEdge(e.id);
|
|
52
|
+
const forwardName = label.forwardName;
|
|
53
|
+
delete label.reversed;
|
|
54
|
+
delete label.forwardName;
|
|
55
|
+
g.addEdge({
|
|
56
|
+
id: e.id,
|
|
57
|
+
source: e.target,
|
|
58
|
+
target: e.source,
|
|
59
|
+
data: Object.assign(Object.assign({}, label), { forwardName }),
|
|
60
|
+
});
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
};
|
|
64
|
+
exports.undo = undo;
|
|
65
|
+
//# sourceMappingURL=acyclic.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"acyclic.js","sourceRoot":"","sources":["../../src/antv-dagre/acyclic.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.addBorderSegments = void 0;
|
|
4
|
+
const util_1 = require("./util");
|
|
5
|
+
const addBorderSegments = (g) => {
|
|
6
|
+
const dfs = (v) => {
|
|
7
|
+
const children = g.getChildren(v);
|
|
8
|
+
const node = g.getNode(v);
|
|
9
|
+
if (children === null || children === void 0 ? void 0 : children.length) {
|
|
10
|
+
children.forEach((child) => dfs(child.id));
|
|
11
|
+
}
|
|
12
|
+
if (node.data.hasOwnProperty('minRank')) {
|
|
13
|
+
node.data.borderLeft = [];
|
|
14
|
+
node.data.borderRight = [];
|
|
15
|
+
for (let rank = node.data.minRank, maxRank = node.data.maxRank + 1; rank < maxRank; rank += 1) {
|
|
16
|
+
addBorderNode(g, 'borderLeft', '_bl', v, node, rank);
|
|
17
|
+
addBorderNode(g, 'borderRight', '_br', v, node, rank);
|
|
18
|
+
}
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
g.getRoots().forEach((child) => dfs(child.id));
|
|
22
|
+
};
|
|
23
|
+
exports.addBorderSegments = addBorderSegments;
|
|
24
|
+
const addBorderNode = (g, prop, prefix, sg, sgNode, rank) => {
|
|
25
|
+
const label = { rank, borderType: prop, width: 0, height: 0 };
|
|
26
|
+
// @ts-ignore
|
|
27
|
+
const prev = sgNode.data[prop][rank - 1];
|
|
28
|
+
const curr = (0, util_1.addDummyNode)(g, 'border', label, prefix);
|
|
29
|
+
// @ts-ignore
|
|
30
|
+
sgNode.data[prop][rank] = curr;
|
|
31
|
+
g.setParent(curr, sg);
|
|
32
|
+
if (prev) {
|
|
33
|
+
g.addEdge({
|
|
34
|
+
id: `e${Math.random()}`,
|
|
35
|
+
source: prev,
|
|
36
|
+
target: curr,
|
|
37
|
+
data: { weight: 1 },
|
|
38
|
+
});
|
|
39
|
+
}
|
|
40
|
+
};
|
|
41
|
+
//# sourceMappingURL=add-border-segments.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"add-border-segments.js","sourceRoot":"","sources":["../../src/antv-dagre/add-border-segments.ts"],"names":[],"mappings":";;;AAEA,iCAAsC;AAE/B,MAAM,iBAAiB,GAAG,CAAC,CAAQ,EAAE,EAAE;IAC5C,MAAM,GAAG,GAAG,CAAC,CAAK,EAAE,EAAE;QACpB,MAAM,QAAQ,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC;QAClC,MAAM,IAAI,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,CAAE,CAAC;QAC3B,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE;YACpB,QAAQ,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;SAC5C;QAED,IAAI,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YACvC,IAAI,CAAC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YAC1B,IAAI,CAAC,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;YAC3B,KACE,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,OAAQ,EAAE,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAQ,GAAG,CAAC,EAC/D,IAAI,GAAG,OAAO,EACd,IAAI,IAAI,CAAC,EACT;gBACA,aAAa,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrD,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aACvD;SACF;IACH,CAAC,CAAC;IAEF,CAAC,CAAC,QAAQ,EAAE,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC;AACjD,CAAC,CAAC;AAvBW,QAAA,iBAAiB,qBAuB5B;AAEF,MAAM,aAAa,GAAG,CACpB,CAAQ,EACR,IAAY,EACZ,MAAc,EACd,EAAM,EACN,MAAsB,EACtB,IAAY,EACZ,EAAE;IACF,MAAM,KAAK,GAAa,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IACxE,aAAa;IACb,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACzC,MAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACtD,aAAa;IACb,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC/B,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACtB,IAAI,IAAI,EAAE;QACR,CAAC,CAAC,OAAO,CAAC;YACR,EAAE,EAAE,IAAI,IAAI,CAAC,MAAM,EAAE,EAAE;YACvB,MAAM,EAAE,IAAI;YACZ,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE;SACpB,CAAC,CAAC;KACJ;AACH,CAAC,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import type { Graph } from '../types';
|
|
2
|
+
import type { DagreRankdir } from './types';
|
|
2
3
|
declare const adjust: (g: Graph, rankdir: DagreRankdir) => void;
|
|
3
4
|
declare const undo: (g: Graph, rankdir: DagreRankdir) => void;
|
|
4
5
|
export { adjust, undo };
|
|
@@ -0,0 +1,69 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.undo = exports.adjust = void 0;
|
|
4
|
+
const adjust = (g, rankdir) => {
|
|
5
|
+
const rd = rankdir.toLowerCase();
|
|
6
|
+
if (rd === 'lr' || rd === 'rl') {
|
|
7
|
+
swapWidthHeight(g);
|
|
8
|
+
}
|
|
9
|
+
};
|
|
10
|
+
exports.adjust = adjust;
|
|
11
|
+
const undo = (g, rankdir) => {
|
|
12
|
+
const rd = rankdir.toLowerCase();
|
|
13
|
+
if (rd === 'bt' || rd === 'rl') {
|
|
14
|
+
reverseY(g);
|
|
15
|
+
}
|
|
16
|
+
if (rd === 'lr' || rd === 'rl') {
|
|
17
|
+
swapXY(g);
|
|
18
|
+
swapWidthHeight(g);
|
|
19
|
+
}
|
|
20
|
+
};
|
|
21
|
+
exports.undo = undo;
|
|
22
|
+
const swapWidthHeight = (g) => {
|
|
23
|
+
g.getAllNodes().forEach((v) => {
|
|
24
|
+
swapWidthHeightOne(v);
|
|
25
|
+
});
|
|
26
|
+
g.getAllEdges().forEach((e) => {
|
|
27
|
+
swapWidthHeightOne(e);
|
|
28
|
+
});
|
|
29
|
+
};
|
|
30
|
+
const swapWidthHeightOne = (node) => {
|
|
31
|
+
const w = node.data.width;
|
|
32
|
+
node.data.width = node.data.height;
|
|
33
|
+
node.data.height = w;
|
|
34
|
+
};
|
|
35
|
+
const reverseY = (g) => {
|
|
36
|
+
g.getAllNodes().forEach((v) => {
|
|
37
|
+
reverseYOne(v.data);
|
|
38
|
+
});
|
|
39
|
+
g.getAllEdges().forEach((edge) => {
|
|
40
|
+
var _a;
|
|
41
|
+
(_a = edge.data.points) === null || _a === void 0 ? void 0 : _a.forEach((point) => reverseYOne(point));
|
|
42
|
+
if (edge.data.hasOwnProperty('y')) {
|
|
43
|
+
reverseYOne(edge.data);
|
|
44
|
+
}
|
|
45
|
+
});
|
|
46
|
+
};
|
|
47
|
+
const reverseYOne = (node) => {
|
|
48
|
+
if (node === null || node === void 0 ? void 0 : node.y) {
|
|
49
|
+
node.y = -node.y;
|
|
50
|
+
}
|
|
51
|
+
};
|
|
52
|
+
const swapXY = (g) => {
|
|
53
|
+
g.getAllNodes().forEach((v) => {
|
|
54
|
+
swapXYOne(v.data);
|
|
55
|
+
});
|
|
56
|
+
g.getAllEdges().forEach((edge) => {
|
|
57
|
+
var _a;
|
|
58
|
+
(_a = edge.data.points) === null || _a === void 0 ? void 0 : _a.forEach((point) => swapXYOne(point));
|
|
59
|
+
if (edge.data.hasOwnProperty('x')) {
|
|
60
|
+
swapXYOne(edge.data);
|
|
61
|
+
}
|
|
62
|
+
});
|
|
63
|
+
};
|
|
64
|
+
const swapXYOne = (node) => {
|
|
65
|
+
const x = node.x;
|
|
66
|
+
node.x = node.y;
|
|
67
|
+
node.y = x;
|
|
68
|
+
};
|
|
69
|
+
//# sourceMappingURL=coordinate-system.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"coordinate-system.js","sourceRoot":"","sources":["../../src/antv-dagre/coordinate-system.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,31 +1,33 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const filterOutLinks = (k, v) => {
|
|
4
|
+
if (k !== 'next' && k !== 'prev') {
|
|
3
5
|
return v;
|
|
4
6
|
}
|
|
5
7
|
};
|
|
6
|
-
|
|
8
|
+
const unlink = (entry) => {
|
|
7
9
|
entry.prev.next = entry.next;
|
|
8
10
|
entry.next.prev = entry.prev;
|
|
9
11
|
delete entry.next;
|
|
10
12
|
delete entry.prev;
|
|
11
13
|
};
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
14
|
+
class List {
|
|
15
|
+
constructor() {
|
|
16
|
+
const shortcut = {};
|
|
15
17
|
shortcut.prev = shortcut;
|
|
16
18
|
shortcut.next = shortcut.prev;
|
|
17
19
|
this.shortcut = shortcut;
|
|
18
20
|
}
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
21
|
+
dequeue() {
|
|
22
|
+
const shortcut = this.shortcut;
|
|
23
|
+
const entry = shortcut.prev;
|
|
22
24
|
if (entry && entry !== shortcut) {
|
|
23
25
|
unlink(entry);
|
|
24
26
|
return entry;
|
|
25
27
|
}
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
|
|
28
|
+
}
|
|
29
|
+
enqueue(entry) {
|
|
30
|
+
const shortcut = this.shortcut;
|
|
29
31
|
if (entry.prev && entry.next) {
|
|
30
32
|
unlink(entry);
|
|
31
33
|
}
|
|
@@ -33,18 +35,17 @@ var List = /** @class */ (function () {
|
|
|
33
35
|
shortcut.next.prev = entry;
|
|
34
36
|
shortcut.next = entry;
|
|
35
37
|
entry.prev = shortcut;
|
|
36
|
-
}
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
38
|
+
}
|
|
39
|
+
toString() {
|
|
40
|
+
const strs = [];
|
|
41
|
+
const sentinel = this.shortcut;
|
|
42
|
+
let curr = sentinel.prev;
|
|
41
43
|
while (curr !== sentinel) {
|
|
42
44
|
strs.push(JSON.stringify(curr, filterOutLinks));
|
|
43
45
|
curr = curr === null || curr === void 0 ? void 0 : curr.prev;
|
|
44
46
|
}
|
|
45
|
-
return
|
|
46
|
-
}
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
export default List;
|
|
47
|
+
return `[${strs.join(', ')}]`;
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
exports.default = List;
|
|
50
51
|
//# sourceMappingURL=list.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../src/antv-dagre/data/list.ts"],"names":[],"mappings":";;AAAA,MAAM,cAAc,GAAG,CAAC,CAAS,EAAE,CAAS,EAAE,EAAE;IAC9C,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,MAAM,EAAE;QAChC,OAAO,CAAC,CAAC;KACV;AACH,CAAC,CAAC;AAOF,MAAM,MAAM,GAAG,CAAI,KAAoB,EAAE,EAAE;IACzC,KAAK,CAAC,IAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC9B,KAAK,CAAC,IAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC9B,OAAO,KAAK,CAAC,IAAI,CAAC;IAClB,OAAO,KAAK,CAAC,IAAI,CAAC;AACpB,CAAC,CAAC;AAEF,MAAqB,IAAI;IAIvB;QACE,MAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;QACzB,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,OAAO;QACZ,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC5B,IAAI,KAAK,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC/B,MAAM,CAAC,KAAK,CAAC,CAAC;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,OAAO,CAAC,KAAoB;QACjC,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;QACD,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC3B,QAAQ,CAAC,IAAK,CAAC,IAAI,GAAG,KAAK,CAAC;QAC5B,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;QACtB,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;IACxB,CAAC;IAEM,QAAQ;QACb,MAAM,IAAI,GAAG,EAAE,CAAC;QAChB,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QACzB,OAAO,IAAI,KAAK,QAAQ,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YAChD,IAAI,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC;SACnB;QACD,OAAO,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IAChC,CAAC;CACF;AAzCD,uBAyCC"}
|
|
@@ -1,3 +1,3 @@
|
|
|
1
|
-
import { Edge } from
|
|
2
|
-
import { EdgeData, Graph as IGraph } from
|
|
1
|
+
import { Edge } from '@antv/graphlib';
|
|
2
|
+
import { EdgeData, Graph as IGraph } from '../types';
|
|
3
3
|
export declare const greedyFAS: (g: IGraph, weightFn?: (e: Edge<EdgeData>) => number) => Edge<EdgeData>[];
|
|
@@ -0,0 +1,141 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
/*
|
|
3
|
+
* A greedy heuristic for finding a feedback arc set for a graph. A feedback
|
|
4
|
+
* arc set is a set of edges that can be removed to make a graph acyclic.
|
|
5
|
+
* The algorithm comes from: P. Eades, X. Lin, and W. F. Smyth, "A fast and
|
|
6
|
+
* effective heuristic for the feedback arc set problem." This implementation
|
|
7
|
+
* adjusts that from the paper to allow for weighted edges.
|
|
8
|
+
*
|
|
9
|
+
* @see https://github.com/dagrejs/dagre/blob/master/lib/greedy-fas.js
|
|
10
|
+
*/
|
|
11
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
12
|
+
exports.greedyFAS = void 0;
|
|
13
|
+
const tslib_1 = require("tslib");
|
|
14
|
+
const graphlib_1 = require("@antv/graphlib");
|
|
15
|
+
const list_1 = tslib_1.__importDefault(require("./data/list"));
|
|
16
|
+
class List extends list_1.default {
|
|
17
|
+
}
|
|
18
|
+
const DEFAULT_WEIGHT_FN = () => 1;
|
|
19
|
+
const greedyFAS = (g, weightFn) => {
|
|
20
|
+
var _a;
|
|
21
|
+
if (g.getAllNodes().length <= 1)
|
|
22
|
+
return [];
|
|
23
|
+
const state = buildState(g, weightFn || DEFAULT_WEIGHT_FN);
|
|
24
|
+
const results = doGreedyFAS(state.graph, state.buckets, state.zeroIdx);
|
|
25
|
+
return (_a = results
|
|
26
|
+
.map((e) => g.getRelatedEdges(e.v, 'out').filter(({ target }) => target === e.w))) === null || _a === void 0 ? void 0 : _a.flat();
|
|
27
|
+
};
|
|
28
|
+
exports.greedyFAS = greedyFAS;
|
|
29
|
+
const doGreedyFAS = (g, buckets, zeroIdx) => {
|
|
30
|
+
let results = [];
|
|
31
|
+
const sources = buckets[buckets.length - 1];
|
|
32
|
+
const sinks = buckets[0];
|
|
33
|
+
let entry;
|
|
34
|
+
while (g.getAllNodes().length) {
|
|
35
|
+
while ((entry = sinks.dequeue())) {
|
|
36
|
+
removeNode(g, buckets, zeroIdx, entry);
|
|
37
|
+
}
|
|
38
|
+
while ((entry = sources.dequeue())) {
|
|
39
|
+
removeNode(g, buckets, zeroIdx, entry);
|
|
40
|
+
}
|
|
41
|
+
if (g.getAllNodes().length) {
|
|
42
|
+
for (let i = buckets.length - 2; i > 0; --i) {
|
|
43
|
+
entry = buckets[i].dequeue();
|
|
44
|
+
if (entry) {
|
|
45
|
+
results = results.concat(removeNode(g, buckets, zeroIdx, entry, true));
|
|
46
|
+
break;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
return results;
|
|
52
|
+
};
|
|
53
|
+
const removeNode = (g, buckets, zeroIdx, entry, collectPredecessors) => {
|
|
54
|
+
var _a, _b;
|
|
55
|
+
const results = [];
|
|
56
|
+
if (g.hasNode(entry.v)) {
|
|
57
|
+
(_a = g.getRelatedEdges(entry.v, 'in')) === null || _a === void 0 ? void 0 : _a.forEach((edge) => {
|
|
58
|
+
const weight = edge.data.weight;
|
|
59
|
+
const uEntry = g.getNode(edge.source);
|
|
60
|
+
if (collectPredecessors) {
|
|
61
|
+
// this result not really care about in or out
|
|
62
|
+
results.push({ v: edge.source, w: edge.target, in: 0, out: 0 });
|
|
63
|
+
}
|
|
64
|
+
if (uEntry.data.out === undefined)
|
|
65
|
+
uEntry.data.out = 0;
|
|
66
|
+
// @ts-ignore
|
|
67
|
+
uEntry.data.out -= weight;
|
|
68
|
+
assignBucket(buckets, zeroIdx, Object.assign({ v: uEntry.id }, uEntry.data));
|
|
69
|
+
});
|
|
70
|
+
(_b = g.getRelatedEdges(entry.v, 'out')) === null || _b === void 0 ? void 0 : _b.forEach((edge) => {
|
|
71
|
+
const weight = edge.data.weight;
|
|
72
|
+
const w = edge.target;
|
|
73
|
+
const wEntry = g.getNode(w);
|
|
74
|
+
if (wEntry.data.in === undefined)
|
|
75
|
+
wEntry.data.in = 0;
|
|
76
|
+
// @ts-ignore
|
|
77
|
+
wEntry.data.in -= weight;
|
|
78
|
+
assignBucket(buckets, zeroIdx, Object.assign({ v: wEntry.id }, wEntry.data));
|
|
79
|
+
});
|
|
80
|
+
g.removeNode(entry.v);
|
|
81
|
+
}
|
|
82
|
+
return collectPredecessors ? results : undefined;
|
|
83
|
+
};
|
|
84
|
+
const buildState = (g, weightFn) => {
|
|
85
|
+
const fasGraph = new graphlib_1.Graph();
|
|
86
|
+
let maxIn = 0;
|
|
87
|
+
let maxOut = 0;
|
|
88
|
+
g.getAllNodes().forEach((v) => {
|
|
89
|
+
fasGraph.addNode({
|
|
90
|
+
id: v.id,
|
|
91
|
+
data: { v: v.id, in: 0, out: 0 },
|
|
92
|
+
});
|
|
93
|
+
});
|
|
94
|
+
// Aggregate weights on nodes, but also sum the weights across multi-edges
|
|
95
|
+
// into a single edge for the fasGraph.
|
|
96
|
+
g.getAllEdges().forEach((e) => {
|
|
97
|
+
const edge = fasGraph
|
|
98
|
+
.getRelatedEdges(e.source, 'out')
|
|
99
|
+
.find((edge) => edge.target === e.target);
|
|
100
|
+
const weight = (weightFn === null || weightFn === void 0 ? void 0 : weightFn(e)) || 1;
|
|
101
|
+
if (!edge) {
|
|
102
|
+
fasGraph.addEdge({
|
|
103
|
+
id: e.id,
|
|
104
|
+
source: e.source,
|
|
105
|
+
target: e.target,
|
|
106
|
+
data: {
|
|
107
|
+
weight,
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
}
|
|
111
|
+
else {
|
|
112
|
+
fasGraph.updateEdgeData(edge === null || edge === void 0 ? void 0 : edge.id, Object.assign(Object.assign({}, edge.data), { weight: edge.data.weight + weight }));
|
|
113
|
+
}
|
|
114
|
+
// @ts-ignore
|
|
115
|
+
maxOut = Math.max(maxOut, (fasGraph.getNode(e.source).data.out += weight));
|
|
116
|
+
// @ts-ignore
|
|
117
|
+
maxIn = Math.max(maxIn, (fasGraph.getNode(e.target).data.in += weight));
|
|
118
|
+
});
|
|
119
|
+
const buckets = [];
|
|
120
|
+
const rangeMax = maxOut + maxIn + 3;
|
|
121
|
+
for (let i = 0; i < rangeMax; i++) {
|
|
122
|
+
buckets.push(new List());
|
|
123
|
+
}
|
|
124
|
+
const zeroIdx = maxIn + 1;
|
|
125
|
+
fasGraph.getAllNodes().forEach((v) => {
|
|
126
|
+
assignBucket(buckets, zeroIdx, Object.assign({ v: v.id }, fasGraph.getNode(v.id).data));
|
|
127
|
+
});
|
|
128
|
+
return { buckets, zeroIdx, graph: fasGraph };
|
|
129
|
+
};
|
|
130
|
+
const assignBucket = (buckets, zeroIdx, entry) => {
|
|
131
|
+
if (!entry.out) {
|
|
132
|
+
buckets[0].enqueue(entry);
|
|
133
|
+
}
|
|
134
|
+
else if (!entry['in']) {
|
|
135
|
+
buckets[buckets.length - 1].enqueue(entry);
|
|
136
|
+
}
|
|
137
|
+
else {
|
|
138
|
+
buckets[entry.out - entry['in'] + zeroIdx].enqueue(entry);
|
|
139
|
+
}
|
|
140
|
+
};
|
|
141
|
+
//# sourceMappingURL=greedy-fas.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"greedy-fas.js","sourceRoot":"","sources":["../../src/antv-dagre/greedy-fas.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ID } from '@antv/graphlib';
|
|
2
|
-
import {
|
|
2
|
+
import { Graph as IGraph } from '../types';
|
|
3
|
+
import type { DagreAlign, DagreRankdir } from './types';
|
|
3
4
|
export declare const layout: (g: IGraph, options: {
|
|
4
5
|
keepNodeOrder: boolean;
|
|
5
6
|
prevGraph: IGraph | null;
|