@antv/layout 0.2.0-beta.2 → 0.2.0-beta.5

package/lib/layout/dagreCompound.js

@@ -0,0 +1,429 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DagreCompoundLayout = void 0;
+var base_1 = require("./base");
+var dagre_compound_1 = require("dagre-compound");
+var util_1 = require("../util");
+var DagreCompoundLayout = /** @class */ (function (_super) {
+    __extends(DagreCompoundLayout, _super);
+    function DagreCompoundLayout(options) {
+        var _this = _super.call(this) || this;
+        /** layout 方向, 可选 TB, BT, LR, RL */
+        _this.rankdir = 'TB';
+        /** 节点水平间距(px) */
+        _this.nodesep = 50;
+        /** 边水平间距(px) */
+        _this.edgesep = 5;
+        /** 每一层节点之间间距 */
+        _this.ranksep = 50;
+        /** 是否保留布局连线的控制点 */
+        _this.controlPoints = true;
+        /** 是否保留使用布局计算的锚点 */
+        _this.anchorPoint = true;
+        _this.nodes = [];
+        _this.edges = [];
+        _this.combos = [];
+        /** 迭代结束的回调函数 */
+        _this.onLayoutEnd = function () { };
+        _this.updateCfg(options);
+        return _this;
+    }
+    DagreCompoundLayout.prototype.getDefaultCfg = function () {
+        return {
+            rankdir: 'TB',
+            align: undefined,
+            begin: undefined,
+            nodeSize: undefined,
+            nodesep: 50,
+            ranksep: 50,
+            controlPoints: true,
+            anchorPoint: true // 是否使用布局计算的锚点
+        };
+    };
+    DagreCompoundLayout.prototype.init = function (data) {
+        var hiddenNodes = data.hiddenNodes || []; // 被隐藏的节点
+        var hiddenEdges = data.hiddenEdges || []; // 被隐藏的边
+        var hiddenCombos = data.hiddenCombos || []; // 赋值 hiddenCombos
+        // 确保此次排序按照用户输入顺序
+        this.nodes = this.getDataByOrder((data.nodes || []).concat(hiddenNodes));
+        this.edges = this.getDataByOrder((data.edges || []).concat(hiddenEdges));
+        this.combos = (data.combos || []).concat(hiddenCombos.map(function (hc) { return (__assign(__assign({}, hc), { collapsed: true })); }));
+    };
+    DagreCompoundLayout.prototype.execute = function () {
+        var self = this;
+        var nodes = self.nodes, edges = self.edges;
+        if (!nodes)
+            return;
+        var _a = self.getLayoutConfig(), graphDef = _a.graphDef, graphOption = _a.graphOption, graphSettings = _a.graphSettings;
+        var renderInfo = (0, dagre_compound_1.buildGraph)(graphDef, graphOption, graphSettings);
+        var flattenedRenderInfo = (0, dagre_compound_1.flatGraph)(renderInfo, true); // 打平数据进行遍历
+        this.updatePosition(flattenedRenderInfo);
+        if (self.onLayoutEnd)
+            self.onLayoutEnd();
+        return {
+            nodes: nodes,
+            edges: edges
+        };
+    };
+    /**
+     * combo 模式下查找节点完整路径
+     * @param nodeId
+     * @private
+     */
+    DagreCompoundLayout.prototype.getNodePath = function (nodeId) {
+        var self = this;
+        var nodes = self.nodes, combos = self.combos;
+        var targetNode = nodes.find(function (n) { return n.id === nodeId; });
+        var findPath = function (comboId, fullPath) {
+            if (fullPath === void 0) { fullPath = []; }
+            var combo = combos.find(function (c) { return c.id === comboId; });
+            if (combo) {
+                fullPath.unshift(comboId);
+                if (combo.parentId) {
+                    return findPath(combo.parentId, fullPath);
+                }
+                return fullPath;
+            }
+            return fullPath;
+        };
+        if (targetNode && targetNode.comboId) {
+            return findPath(targetNode.comboId, [nodeId]);
+        }
+        return [nodeId];
+    };
+    /** 准备 dagre-compound 布局参数 */
+    DagreCompoundLayout.prototype.getLayoutConfig = function () {
+        var _a, _b, _c;
+        var self = this;
+        var nodes = self.nodes, edges = self.edges, combos = self.combos, nodeSize = self.nodeSize, rankdir = self.rankdir, align = self.align, edgesep = self.edgesep, nodesep = self.nodesep, ranksep = self.ranksep, settings = self.settings;
+        var compound = (combos || []).reduce(function (pre, cur) {
+            var matchedNodes = nodes.filter(function (n) { return n.comboId === cur.id; }).map(function (n) { return n.id; });
+            var matchedCombos = (combos || []).filter(function (n) { return n.parentId === cur.id; }).map(function (n) { return n.id; });
+            if (matchedNodes.length || matchedCombos.length) {
+                pre[cur.id] = __spreadArray(__spreadArray([], matchedNodes, true), matchedCombos, true);
+            }
+            return pre;
+        }, {});
+        /** 计算 nodeSize */
+        var nodeSizeFunc;
+        if (!nodeSize) {
+            nodeSizeFunc = function (d) {
+                if (d && d.size) {
+                    if ((0, util_1.isArray)(d.size)) {
+                        return d.size;
+                    }
+                    if ((0, util_1.isObject)(d.size)) {
+                        return [d.size.width || 40, d.size.height || 40];
+                    }
+                    return [d.size, d.size];
+                }
+                return [40, 40];
+            };
+        }
+        else if ((0, util_1.isArray)(nodeSize)) {
+            nodeSizeFunc = function () { return nodeSize; };
+        }
+        else {
+            nodeSizeFunc = function () { return [nodeSize, nodeSize]; };
+        }
+        /** 计算 comboSize */
+        var comboSizeFunc = function (d) {
+            if (d && d.size) {
+                if ((0, util_1.isArray)(d.size)) {
+                    return d.size;
+                }
+                return [d.size, d.size];
+            }
+            return [80, 40];
+        };
+        // 接受 defaultCombo 设置的 size
+        var _d = comboSizeFunc(combos === null || combos === void 0 ? void 0 : combos[0]), metaWidth = _d[0], metaHeight = _d[1];
+        // 初始化 padding
+        var subSceneMeta = (_b = (_a = self.graphSettings) === null || _a === void 0 ? void 0 : _a.subScene) === null || _b === void 0 ? void 0 : _b.meta;
+        var _e = ((_c = combos.find(function (c) { return !c.collapsed; })) === null || _c === void 0 ? void 0 : _c.padding) || [20, 20, 20, 20], paddingTop = _e[0], paddingRight = _e[1], paddingBottom = _e[2], paddingLeft = _e[3];
+        var graphDef = {
+            compound: compound,
+            nodes: __spreadArray([], (nodes || []).map(function (n) {
+                var size = nodeSizeFunc(n);
+                var width = size[0];
+                var height = size[1];
+                return __assign(__assign({}, n), { width: width, height: height });
+            }), true),
+            edges: __spreadArray([], (edges || []).map(function (e) { return (__assign(__assign({}, e), { v: e.source, w: e.target })); }), true)
+        };
+        // 需要展开的节点
+        var graphOption = {
+            expanded: (combos || []).filter(function (c) { return !c.collapsed; }).map(function (c) { return c.id; })
+        };
+        // dagre-compound 布局参数
+        var graphMetaConfig = {
+            graph: {
+                meta: {
+                    align: align,
+                    rankDir: rankdir,
+                    nodeSep: nodesep,
+                    edgeSep: edgesep,
+                    rankSep: ranksep
+                }
+            },
+            subScene: {
+                meta: {
+                    paddingTop: paddingTop || (subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingTop) || 20,
+                    paddingRight: paddingRight || (subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingRight) || 20,
+                    paddingBottom: paddingBottom || (subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingBottom) || 20,
+                    paddingLeft: paddingLeft || (subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingLeft) || 20,
+                    labelHeight: 0
+                }
+            },
+            nodeSize: {
+                meta: {
+                    width: metaWidth,
+                    height: metaHeight
+                }
+            }
+        };
+        // 合并用户输入的内容
+        var graphSettings = (0, dagre_compound_1.mergeConfig)(settings, __assign({}, (0, dagre_compound_1.mergeConfig)(graphMetaConfig, dagre_compound_1.LAYOUT_CONFIG)));
+        self.graphSettings = graphSettings;
+        return {
+            graphDef: graphDef,
+            graphOption: graphOption,
+            graphSettings: graphSettings
+        };
+    };
+    /** 更新节点与边位置 */
+    DagreCompoundLayout.prototype.updatePosition = function (flattenedGraph) {
+        var nodes = flattenedGraph.nodes, edges = flattenedGraph.edges;
+        this.updateNodePosition(nodes, edges);
+        this.updateEdgePosition(nodes, edges);
+    };
+    DagreCompoundLayout.prototype.getBegin = function (flattenedNodes, flattenedEdges) {
+        var self = this;
+        var begin = self.begin;
+        var dBegin = [0, 0];
+        if (begin) {
+            var minX_1 = Infinity;
+            var minY_1 = Infinity;
+            flattenedNodes.forEach(function (node) {
+                if (minX_1 > node.x)
+                    minX_1 = node.x;
+                if (minY_1 > node.y)
+                    minY_1 = node.y;
+            });
+            flattenedEdges.forEach(function (edge) {
+                edge.points.forEach(function (point) {
+                    if (minX_1 > point.x)
+                        minX_1 = point.x;
+                    if (minY_1 > point.y)
+                        minY_1 = point.y;
+                });
+            });
+            dBegin[0] = begin[0] - minX_1;
+            dBegin[1] = begin[1] - minY_1;
+        }
+        return dBegin;
+    };
+    DagreCompoundLayout.prototype.updateNodePosition = function (flattenedNodes, flattenedEdges) {
+        var self = this;
+        var combos = self.combos, nodes = self.nodes, edges = self.edges, anchorPoint = self.anchorPoint, graphSettings = self.graphSettings;
+        var dBegin = this.getBegin(flattenedNodes, flattenedEdges);
+        flattenedNodes.forEach(function (node) {
+            var _a;
+            var x = node.x, y = node.y, id = node.id, type = node.type, coreBox = node.coreBox;
+            if (type === dagre_compound_1.HierarchyNodeType.META && id !== dagre_compound_1.ROOT_NAME) {
+                var i = combos.findIndex(function (item) { return item.id === id; });
+                var subSceneMeta = (_a = graphSettings === null || graphSettings === void 0 ? void 0 : graphSettings.subScene) === null || _a === void 0 ? void 0 : _a.meta;
+                // 将布局生成的 combo 位置暂存至 offsetX offsetY
+                combos[i].offsetX = x + dBegin[0];
+                combos[i].offsetY = y + dBegin[1];
+                combos[i].fixSize = [coreBox.width, coreBox.height];
+                combos[i].fixCollapseSize = [coreBox.width, coreBox.height];
+                // 如果设置了收起时隐藏 padding，则手动优化 combo padding 信息，展开的话则恢复
+                if (!node.expanded) {
+                    combos[i].padding = [0, 0, 0, 0];
+                }
+                else {
+                    combos[i].padding = [
+                        subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingTop,
+                        subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingRight,
+                        subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingBottom,
+                        subSceneMeta === null || subSceneMeta === void 0 ? void 0 : subSceneMeta.paddingLeft
+                    ];
+                }
+            }
+            else if (type === dagre_compound_1.HierarchyNodeType.OP) {
+                var i = nodes.findIndex(function (item) { return item.id === id; });
+                nodes[i].x = x + dBegin[0];
+                nodes[i].y = y + dBegin[1];
+                if (anchorPoint) {
+                    var anchorPoints_1 = [];
+                    var outEdges = flattenedEdges.filter(function (e) { return e.v === id; });
+                    var inEdges = flattenedEdges.filter(function (e) { return e.w === id; });
+                    // 指定出边锚点，锚点中心点为 [0.5, 0.5]
+                    if (outEdges.length > 0) {
+                        outEdges.forEach(function (outEdge) {
+                            var firstPoint = outEdge.points[0];
+                            var anchorPointX = (firstPoint.x - x) / node.width + 0.5;
+                            var anchorPointY = (firstPoint.y - y) / node.height + 0.5;
+                            anchorPoints_1.push([anchorPointX, anchorPointY]);
+                            // 出边对应 source 边锚点
+                            outEdge.baseEdgeList.forEach(function (baseEdge) {
+                                var edge = edges.find(function (e) { return e.source === baseEdge.v && e.target === baseEdge.w; });
+                                if (edge) {
+                                    edge.sourceAnchor = anchorPoints_1.length - 1;
+                                }
+                            });
+                        });
+                    }
+                    // 指定入边锚点
+                    if (inEdges.length > 0) {
+                        inEdges.forEach(function (inEdge) {
+                            var lastPoint = inEdge.points[inEdge.points.length - 1];
+                            var anchorPointX = (lastPoint.x - x) / node.width + 0.5;
+                            var anchorPointY = (lastPoint.y - y) / node.height + 0.5;
+                            anchorPoints_1.push([anchorPointX, anchorPointY]);
+                            // 出边对应 source 锚点
+                            inEdge.baseEdgeList.forEach(function (baseEdge) {
+                                var edge = edges.find(function (e) { return e.source === baseEdge.v && e.target === baseEdge.w; });
+                                if (edge) {
+                                    edge.targetAnchor = anchorPoints_1.length - 1;
+                                }
+                            });
+                        });
+                    }
+                    nodes[i].anchorPoints = anchorPoints_1.length > 0 ? anchorPoints_1 : nodes[i].anchorPoints || [];
+                }
+            }
+        });
+    };
+    DagreCompoundLayout.prototype.updateEdgePosition = function (flattenedNodes, flattenedEdges) {
+        var self = this;
+        var combos = self.combos, edges = self.edges, controlPoints = self.controlPoints;
+        var dBegin = this.getBegin(flattenedNodes, flattenedEdges);
+        if (controlPoints) {
+            combos.forEach(function (combo) {
+                combo.inEdges = [];
+                combo.outEdges = [];
+            });
+            edges.forEach(function (sourceEdge) {
+                var _a, _b, _c, _d;
+                var sourceNode = flattenedNodes.find(function (v) { return v.id === sourceEdge.source; });
+                var targetNode = flattenedNodes.find(function (v) { return v.id === sourceEdge.target; });
+                // Combo 收起状态，dagre-compound 不会渲染该节点，边需要使用到 group 的边作为补充
+                var points = [];
+                var sortedEdges = [];
+                if (sourceNode && targetNode) {
+                    sortedEdges = (0, dagre_compound_1.getEdges)(sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.id, targetNode === null || targetNode === void 0 ? void 0 : targetNode.id, flattenedNodes);
+                }
+                else if (!sourceNode || !targetNode) {
+                    /** 存在收起节点时，需要重新计算边的 controlPoints，确保线正常 */
+                    // 情况1：目标节点被收起了，向上寻找该节点最近一个存在的父节点
+                    var sourceNodePath = self.getNodePath(sourceEdge.source);
+                    var targetNodePath = self.getNodePath(sourceEdge.target);
+                    var lastExistingSource_1 = sourceNodePath
+                        .reverse()
+                        .slice(!sourceNode ? 1 : 0)
+                        .find(function (parentId) { return flattenedNodes.find(function (fNode) { return fNode.id === parentId; }); });
+                    var lastExistingTarget_1 = targetNodePath
+                        .reverse()
+                        .slice(!targetNode ? 1 : 0)
+                        .find(function (parentId) { return flattenedNodes.find(function (fNode) { return fNode.id === parentId; }); });
+                    sourceNode = flattenedNodes.find(function (v) { return v.id === lastExistingSource_1; });
+                    targetNode = flattenedNodes.find(function (v) { return v.id === lastExistingTarget_1; });
+                    sortedEdges = (0, dagre_compound_1.getEdges)(sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.id, targetNode === null || targetNode === void 0 ? void 0 : targetNode.id, flattenedNodes, { v: sourceEdge.source, w: sourceEdge.target });
+                }
+                points = sortedEdges.reduce(function (pre, cur) {
+                    return __spreadArray(__spreadArray([], pre, true), cur.points.map(function (p) {
+                        return __assign(__assign({}, p), { x: p.x + dBegin[0], y: p.y + dBegin[1] });
+                    }), true);
+                }, []);
+                // 取消首尾节点
+                points = points.slice(1, -1);
+                sourceEdge.controlPoints = points;
+                if ((targetNode === null || targetNode === void 0 ? void 0 : targetNode.type) === dagre_compound_1.NodeType.META) {
+                    // combo 节点控制点
+                    var i = combos.findIndex(function (item) { return item.id === (targetNode === null || targetNode === void 0 ? void 0 : targetNode.id); });
+                    if (!combos[i] || ((_a = combos[i].inEdges) === null || _a === void 0 ? void 0 : _a.some(function (inEdge) { return inEdge.source === sourceNode.id && inEdge.target === targetNode.id; }))) {
+                        return;
+                    }
+                    (_b = combos[i].inEdges) === null || _b === void 0 ? void 0 : _b.push({
+                        source: sourceNode.id,
+                        target: targetNode.id,
+                        controlPoints: points
+                    });
+                }
+                if ((sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.type) === dagre_compound_1.NodeType.META) {
+                    var i = combos.findIndex(function (item) { return item.id === (sourceNode === null || sourceNode === void 0 ? void 0 : sourceNode.id); });
+                    if (!combos[i] || ((_c = combos[i].outEdges) === null || _c === void 0 ? void 0 : _c.some(function (oedge) { return oedge.source === sourceNode.id && oedge.target === targetNode.id; }))) {
+                        return;
+                    }
+                    (_d = combos[i].outEdges) === null || _d === void 0 ? void 0 : _d.push({
+                        source: sourceNode.id,
+                        target: targetNode.id,
+                        controlPoints: points
+                    });
+                }
+            });
+        }
+    };
+    DagreCompoundLayout.prototype.getType = function () {
+        return 'dagreCompound';
+    };
+    /**
+     * 确保布局使用的数据与用户输入数据顺序一致
+     * 通过 layoutOrder 排序 节点 与 边
+     * @param list
+     * @private
+     */
+    DagreCompoundLayout.prototype.getDataByOrder = function (list) {
+        if (list.every(function (n) { return n.layoutOrder !== undefined; })) {
+            // 所有数据均设置过索引，表示仅布局，数据未变化，无需处理
+        }
+        else {
+            // 首次布局或动态添加删减节点时重新赋值
+            list.forEach(function (n, i) {
+                n.layoutOrder = i;
+            });
+        }
+        // 按照 layoutOrder 排序
+        return list.sort(function (pre, cur) { return pre.layoutOrder - cur.layoutOrder; });
+    };
+    return DagreCompoundLayout;
+}(base_1.Base));
+exports.DagreCompoundLayout = DagreCompoundLayout;
+//# sourceMappingURL=dagreCompound.js.map

package/lib/layout/dagreCompound.js.map

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

package/lib/layout/index.d.ts

@@ -4,6 +4,7 @@ import { GForceLayout } from "./gForce";
 import { ForceLayout } from "./force";
 import { CircularLayout } from "./circular";
 import { DagreLayout } from "./dagre";
+import { DagreCompoundLayout } from "./dagreCompound";
 import { RadialLayout } from "./radial";
 import { ConcentricLayout } from "./concentric";
 import { MDSLayout } from "./mds";
@@ -16,5 +17,5 @@ import { ForceAtlas2Layout } from "./forceAtlas2";
 import { ERLayout } from './er';
 import { Layout, Layouts } from "./layout";
 export { Layout, Layouts };
-export { GridLayout, RandomLayout, GForceLayout, ForceLayout, CircularLayout, DagreLayout, RadialLayout, ConcentricLayout, MDSLayout, FruchtermanLayout, FruchtermanGPULayout, GForceGPULayout, ComboForceLayout, ComboCombinedLayout, ForceAtlas2Layout, ERLayout };
+export { GridLayout, RandomLayout, GForceLayout, ForceLayout, CircularLayout, DagreLayout, DagreCompoundLayout, RadialLayout, ConcentricLayout, MDSLayout, FruchtermanLayout, FruchtermanGPULayout, GForceGPULayout, ComboForceLayout, ComboCombinedLayout, ForceAtlas2Layout, ERLayout };
 export * from "./types";

package/lib/layout/index.js

@@ -10,7 +10,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ERLayout = exports.ForceAtlas2Layout = exports.ComboCombinedLayout = exports.ComboForceLayout = exports.GForceGPULayout = exports.FruchtermanGPULayout = exports.FruchtermanLayout = exports.MDSLayout = exports.ConcentricLayout = exports.RadialLayout = exports.DagreLayout = exports.CircularLayout = exports.ForceLayout = exports.GForceLayout = exports.RandomLayout = exports.GridLayout = exports.Layouts = exports.Layout = void 0;
+exports.ERLayout = exports.ForceAtlas2Layout = exports.ComboCombinedLayout = exports.ComboForceLayout = exports.GForceGPULayout = exports.FruchtermanGPULayout = exports.FruchtermanLayout = exports.MDSLayout = exports.ConcentricLayout = exports.RadialLayout = exports.DagreCompoundLayout = exports.DagreLayout = exports.CircularLayout = exports.ForceLayout = exports.GForceLayout = exports.RandomLayout = exports.GridLayout = exports.Layouts = exports.Layout = void 0;
 var grid_1 = require("./grid");
 Object.defineProperty(exports, "GridLayout", { enumerable: true, get: function () { return grid_1.GridLayout; } });
 var random_1 = require("./random");
@@ -23,6 +23,8 @@ var circular_1 = require("./circular");
 Object.defineProperty(exports, "CircularLayout", { enumerable: true, get: function () { return circular_1.CircularLayout; } });
 var dagre_1 = require("./dagre");
 Object.defineProperty(exports, "DagreLayout", { enumerable: true, get: function () { return dagre_1.DagreLayout; } });
+var dagreCompound_1 = require("./dagreCompound");
+Object.defineProperty(exports, "DagreCompoundLayout", { enumerable: true, get: function () { return dagreCompound_1.DagreCompoundLayout; } });
 var radial_1 = require("./radial");
 Object.defineProperty(exports, "RadialLayout", { enumerable: true, get: function () { return radial_1.RadialLayout; } });
 var concentric_1 = require("./concentric");

package/lib/layout/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/layout/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+BAAoC;AAuBlC,2FAvBO,iBAAU,OAuBP;AAtBZ,mCAAwC;AAuBtC,6FAvBO,qBAAY,OAuBP;AAtBd,mCAAwC;AAuBtC,6FAvBO,qBAAY,OAuBP;AAtBd,iCAAsC;AAuBpC,4FAvBO,mBAAW,OAuBP;AAtBb,uCAA4C;AAuB1C,+FAvBO,yBAAc,OAuBP;AAtBhB,iCAAsC;AAuBpC,4FAvBO,mBAAW,OAuBP;AAtBb,mCAAwC;AAuBtC,6FAvBO,qBAAY,OAuBP;AAtBd,2CAAgD;AAuB9C,iGAvBO,6BAAgB,OAuBP;AAtBlB,6BAAkC;AAuBhC,0FAvBO,eAAS,OAuBP;AAtBX,6CAAkD;AAuBhD,kGAvBO,+BAAiB,OAuBP;AAtBnB,iDAAyD;AAuBvD,qGAvBO,kCAAoB,OAuBP;AAtBtB,uCAA+C;AAuB7C,gGAvBO,wBAAe,OAuBP;AAtBjB,2CAAgD;AAuB9C,iGAvBO,6BAAgB,OAuBP;AAtBlB,iDAAsD;AAuBpD,oGAvBO,mCAAmB,OAuBP;AAtBrB,6CAAkD;AAuBhD,kGAvBO,+BAAiB,OAuBP;AAtBnB,2BAAgC;AAuB9B,yFAvBO,aAAQ,OAuBP;AArBV,mCAA2C;AAElC,uFAFA,eAAM,OAEA;AAAE,wFAFA,gBAAO,OAEA;AAsBxB,aAAa;AACb,0CAAwB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/layout/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,+BAAoC;AAwBlC,2FAxBO,iBAAU,OAwBP;AAvBZ,mCAAwC;AAwBtC,6FAxBO,qBAAY,OAwBP;AAvBd,mCAAwC;AAwBtC,6FAxBO,qBAAY,OAwBP;AAvBd,iCAAsC;AAwBpC,4FAxBO,mBAAW,OAwBP;AAvBb,uCAA4C;AAwB1C,+FAxBO,yBAAc,OAwBP;AAvBhB,iCAAsC;AAwBpC,4FAxBO,mBAAW,OAwBP;AAvBb,iDAAsD;AAwBpD,oGAxBO,mCAAmB,OAwBP;AAvBrB,mCAAwC;AAwBtC,6FAxBO,qBAAY,OAwBP;AAvBd,2CAAgD;AAwB9C,iGAxBO,6BAAgB,OAwBP;AAvBlB,6BAAkC;AAwBhC,0FAxBO,eAAS,OAwBP;AAvBX,6CAAkD;AAwBhD,kGAxBO,+BAAiB,OAwBP;AAvBnB,iDAAyD;AAwBvD,qGAxBO,kCAAoB,OAwBP;AAvBtB,uCAA+C;AAwB7C,gGAxBO,wBAAe,OAwBP;AAvBjB,2CAAgD;AAwB9C,iGAxBO,6BAAgB,OAwBP;AAvBlB,iDAAsD;AAwBpD,oGAxBO,mCAAmB,OAwBP;AAvBrB,6CAAkD;AAwBhD,kGAxBO,+BAAiB,OAwBP;AAvBnB,2BAAgC;AAwB9B,yFAxBO,aAAQ,OAwBP;AAtBV,mCAA2C;AAElC,uFAFA,eAAM,OAEA;AAAE,wFAFA,gBAAO,OAEA;AAuBxB,aAAa;AACb,0CAAwB"}

package/lib/layout/layout.js

@@ -18,6 +18,7 @@ var comboForce_1 = require("./comboForce");
 var comboCombined_1 = require("./comboCombined");
 var forceAtlas2_1 = require("./forceAtlas2");
 var er_1 = require("./er");
+var dagreCompound_1 = require("./dagreCompound");
 var Layout = /** @class */ (function () {
     function Layout(options) {
         var layoutClass = (0, registy_1.getLayoutByName)(options.type);
@@ -53,6 +54,7 @@ exports.Layouts = {
     forceAtlas2: forceAtlas2_1.ForceAtlas2Layout,
     gForce: gForce_1.GForceLayout,
     dagre: dagre_1.DagreLayout,
+    dagreCompound: dagreCompound_1.DagreCompoundLayout,
     circular: circular_1.CircularLayout,
     radial: radial_1.RadialLayout,
     concentric: concentric_1.ConcentricLayout,

package/lib/layout/layout.js.map

@@ -1 +1 @@
-{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/layout/layout.ts"],"names":[],"mappings":";;;AAEA,sCAA6C;AAC7C,+BAAoC;AACpC,mCAAwC;AACxC,mCAAwC;AACxC,iCAAsC;AACtC,uCAA4C;AAC5C,iCAAsC;AACtC,mCAAwC;AACxC,2CAAgD;AAChD,6BAAkC;AAClC,6CAAkD;AAClD,iDAAyD;AACzD,uCAA+C;AAC/C,2CAAgD;AAChD,iDAAsD;AACtD,6CAAkD;AAClD,2BAAgC;AAChC;IAGE,gBAAY,OAA8B;QACxC,IAAM,WAAW,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,IAAc,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,uBAAM,GAAN,UAAO,IAAW;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,0BAAS,GAAT,UAAU,GAA0B;QAClC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,qBAAI,GAAJ,UAAK,IAAW;QACd,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,wBAAO,GAAP;QACE,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IAED,8BAAa,GAAb;QACE,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;IAC7C,CAAC;IAED,wBAAO,GAAP;QACE,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC;IACH,aAAC;AAAD,CAAC,AA/BD,IA+BC;AA/BY,wBAAM;AAiCnB,QAAQ;AACR,SAAS;AACT,2BAA2B;AACd,QAAA,OAAO,GAA2B;IAC7C,KAAK,EAAE,mBAAW;IAClB,WAAW,EAAE,+BAAiB;IAC9B,WAAW,EAAE,+BAAiB;IAC9B,MAAM,EAAE,qBAAY;IACpB,KAAK,EAAE,mBAAW;IAClB,QAAQ,EAAE,yBAAc;IACxB,MAAM,EAAE,qBAAY;IACpB,UAAU,EAAE,6BAAgB;IAC5B,IAAI,EAAE,iBAAU;IAChB,GAAG,EAAE,eAAS;IACd,UAAU,EAAE,6BAAgB;IAC5B,aAAa,EAAE,mCAAmB;IAClC,MAAM,EAAE,qBAAY;IACpB,YAAY,EAAE,wBAAe;IAC7B,iBAAiB,EAAE,kCAAoB;IACvC,EAAE,EAAE,aAAQ;CACb,CAAC"}
+{"version":3,"file":"layout.js","sourceRoot":"","sources":["../../src/layout/layout.ts"],"names":[],"mappings":";;;AAEA,sCAA6C;AAC7C,+BAAoC;AACpC,mCAAwC;AACxC,mCAAwC;AACxC,iCAAsC;AACtC,uCAA4C;AAC5C,iCAAsC;AACtC,mCAAwC;AACxC,2CAAgD;AAChD,6BAAkC;AAClC,6CAAkD;AAClD,iDAAyD;AACzD,uCAA+C;AAC/C,2CAAgD;AAChD,iDAAsD;AACtD,6CAAkD;AAClD,2BAAgC;AAChC,iDAAsD;AACtD;IAGE,gBAAY,OAA8B;QACxC,IAAM,WAAW,GAAG,IAAA,yBAAe,EAAC,OAAO,CAAC,IAAc,CAAC,CAAC;QAC5D,IAAI,CAAC,cAAc,GAAG,IAAI,WAAW,CAAC,OAAO,CAAC,CAAC;IACjD,CAAC;IAED,uBAAM,GAAN,UAAO,IAAW;QAChB,OAAO,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;IAC1C,CAAC;IAED,0BAAS,GAAT,UAAU,GAA0B;QAClC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;IACrC,CAAC;IAED,qBAAI,GAAJ,UAAK,IAAW;QACd,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACjC,CAAC;IAED,wBAAO,GAAP;QACE,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IAChC,CAAC;IAED,8BAAa,GAAb;QACE,OAAO,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,CAAC;IAC7C,CAAC;IAED,wBAAO,GAAP;QACE,OAAO,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE,CAAC;IACvC,CAAC;IACH,aAAC;AAAD,CAAC,AA/BD,IA+BC;AA/BY,wBAAM;AAiCnB,QAAQ;AACR,SAAS;AACT,2BAA2B;AACd,QAAA,OAAO,GAA2B;IAC7C,KAAK,EAAE,mBAAW;IAClB,WAAW,EAAE,+BAAiB;IAC9B,WAAW,EAAE,+BAAiB;IAC9B,MAAM,EAAE,qBAAY;IACpB,KAAK,EAAE,mBAAW;IAClB,aAAa,EAAE,mCAAmB;IAClC,QAAQ,EAAE,yBAAc;IACxB,MAAM,EAAE,qBAAY;IACpB,UAAU,EAAE,6BAAgB;IAC5B,IAAI,EAAE,iBAAU;IAChB,GAAG,EAAE,eAAS;IACd,UAAU,EAAE,6BAAgB;IAC5B,aAAa,EAAE,mCAAmB;IAClC,MAAM,EAAE,qBAAY;IACpB,YAAY,EAAE,wBAAe;IAC7B,iBAAiB,EAAE,kCAAoB;IACvC,EAAE,EAAE,aAAQ;CACb,CAAC"}

package/lib/layout/types.d.ts

@@ -165,6 +165,19 @@ export interface DagreLayoutOptions {
     edgeLabelSpace?: boolean;
     nodeOrder?: string[];
 }
+export interface DagreCompoundLayoutOptions {
+    type?: "dagreCompound";
+    rankdir?: "TB" | "BT" | "LR" | "RL";
+    align?: "UL" | "UR" | "DL" | "DR";
+    begin?: PointTuple;
+    nodeSize?: number | number[] | undefined;
+    nodesep?: number;
+    ranksep?: number;
+    controlPoints?: boolean;
+    anchorPoint?: boolean;
+    settings?: any;
+    onLayoutEnd?: () => void;
+}
 export interface FruchtermanLayoutOptions {
     type: "fruchterman";
     center?: PointTuple;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/layout",
-  "version": "0.2.0-beta.2",
+  "version": "0.2.0-beta.5",
   "description": "graph layout algorithm",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,7 +31,7 @@
     "release": "release-it",
     "test": "jest",
     "coverage": "jest --coverage",
-    "test-live": "DEBUG_MODE=1 jest --watch __tests__/g6/combo-concentric-test.ts"
+    "test-live": "DEBUG_MODE=1 jest --watch __tests__/g6/dagre-g6-test.ts"
   },
   "lint-staged": {
     "*.js": [
@@ -43,9 +43,10 @@
   },
   "dependencies": {
     "@antv/g-webgpu": "0.5.5",
+    "@dagrejs/graphlib": "2.1.4",
     "d3-force": "^2.0.1",
-    "ml-matrix": "^6.5.0",
-    "@dagrejs/graphlib": "2.1.4"
+    "dagre-compound": "^0.0.11",
+    "ml-matrix": "^6.5.0"
   },
   "devDependencies": {
     "@antv/g-webgpu-compiler": "0.5.5",