@antv/layout 1.2.13 → 1.2.14-beta.1

package/lib/radial/radial-nonoverlap-force.js

@@ -1,21 +1,20 @@
-import { __assign } from "tslib";
-var SPEED_DIVISOR = 800;
-var DEFAULTS_LAYOUT_OPTIONS = {
+const SPEED_DIVISOR = 800;
+const DEFAULTS_LAYOUT_OPTIONS = {
     iterations: 10,
     height: 10,
     width: 10,
     speed: 100,
     gravity: 10,
-    k: 5
+    k: 5,
 };
-export var radialNonoverlapForce = function (graph, options) {
-    var mergedOptions = __assign(__assign({}, DEFAULTS_LAYOUT_OPTIONS), options);
-    var positions = mergedOptions.positions, iterations = mergedOptions.iterations, width = mergedOptions.width, k = mergedOptions.k, _a = mergedOptions.speed, speed = _a === void 0 ? 100 : _a, strictRadial = mergedOptions.strictRadial, focusIdx = mergedOptions.focusIdx, _b = mergedOptions.radii, radii = _b === void 0 ? [] : _b, nodeSizeFunc = mergedOptions.nodeSizeFunc;
-    var nodes = graph.getAllNodes();
-    var disp = [];
-    var maxDisplace = width / 10;
-    for (var i = 0; i < iterations; i++) {
-        positions.forEach(function (_, k) {
+export const radialNonoverlapForce = (graph, options) => {
+    const mergedOptions = Object.assign(Object.assign({}, DEFAULTS_LAYOUT_OPTIONS), options);
+    const { positions, iterations, width, k, speed = 100, strictRadial, focusIdx, radii = [], nodeSizeFunc, } = mergedOptions;
+    const nodes = graph.getAllNodes();
+    const disp = [];
+    const maxDisplace = width / 10;
+    for (let i = 0; i < iterations; i++) {
+        positions.forEach((_, k) => {
             disp[k] = { x: 0, y: 0 };
         });
         // 给重叠的节点增加斥力
@@ -24,10 +23,10 @@ export var radialNonoverlapForce = function (graph, options) {
     }
     return positions;
 };
-var getRepulsion = function (nodes, positions, disp, k, radii, nodeSizeFunc) {
-    positions.forEach(function (v, i) {
+const getRepulsion = (nodes, positions, disp, k, radii, nodeSizeFunc) => {
+    positions.forEach((v, i) => {
         disp[i] = { x: 0, y: 0 };
-        positions.forEach(function (u, j) {
+        positions.forEach((u, j) => {
             if (i === j) {
                 return;
             }
@@ -35,59 +34,59 @@ var getRepulsion = function (nodes, positions, disp, k, radii, nodeSizeFunc) {
             if (radii[i] !== radii[j]) {
                 return;
             }
-            var vecx = v.x - u.x;
-            var vecy = v.y - u.y;
-            var vecLength = Math.sqrt(vecx * vecx + vecy * vecy);
+            let vecx = v.x - u.x;
+            let vecy = v.y - u.y;
+            let vecLength = Math.sqrt(vecx * vecx + vecy * vecy);
             if (vecLength === 0) {
                 vecLength = 1;
-                var sign = i > j ? 1 : -1;
+                const sign = i > j ? 1 : -1;
                 vecx = 0.01 * sign;
                 vecy = 0.01 * sign;
             }
             // these two nodes overlap
             if (vecLength < nodeSizeFunc(nodes[i]) / 2 + nodeSizeFunc(nodes[j]) / 2) {
-                var common = (k * k) / vecLength;
+                const common = (k * k) / vecLength;
                 disp[i].x += (vecx / vecLength) * common;
                 disp[i].y += (vecy / vecLength) * common;
             }
         });
     });
 };
-var updatePositions = function (positions, disp, speed, strictRadial, focusIdx, maxDisplace, width, radii) {
-    var maxDisp = maxDisplace || width / 10;
+const updatePositions = (positions, disp, speed, strictRadial, focusIdx, maxDisplace, width, radii) => {
+    const maxDisp = maxDisplace || width / 10;
     if (strictRadial) {
-        disp.forEach(function (di, i) {
-            var vx = positions[i].x - positions[focusIdx].x;
-            var vy = positions[i].y - positions[focusIdx].y;
-            var vLength = Math.sqrt(vx * vx + vy * vy);
-            var vpx = vy / vLength;
-            var vpy = -vx / vLength;
-            var diLength = Math.sqrt(di.x * di.x + di.y * di.y);
-            var alpha = Math.acos((vpx * di.x + vpy * di.y) / diLength);
+        disp.forEach((di, i) => {
+            const vx = positions[i].x - positions[focusIdx].x;
+            const vy = positions[i].y - positions[focusIdx].y;
+            const vLength = Math.sqrt(vx * vx + vy * vy);
+            let vpx = vy / vLength;
+            let vpy = -vx / vLength;
+            const diLength = Math.sqrt(di.x * di.x + di.y * di.y);
+            let alpha = Math.acos((vpx * di.x + vpy * di.y) / diLength);
             if (alpha > Math.PI / 2) {
                 alpha -= Math.PI / 2;
                 vpx *= -1;
                 vpy *= -1;
             }
-            var tdispLength = Math.cos(alpha) * diLength;
+            const tdispLength = Math.cos(alpha) * diLength;
             di.x = vpx * tdispLength;
             di.y = vpy * tdispLength;
         });
     }
     // move
-    positions.forEach(function (n, i) {
+    positions.forEach((n, i) => {
         if (i === focusIdx) {
             return;
         }
-        var distLength = Math.sqrt(disp[i].x * disp[i].x + disp[i].y * disp[i].y);
+        const distLength = Math.sqrt(disp[i].x * disp[i].x + disp[i].y * disp[i].y);
         if (distLength > 0 && i !== focusIdx) {
-            var limitedDist = Math.min(maxDisp * (speed / SPEED_DIVISOR), distLength);
+            const limitedDist = Math.min(maxDisp * (speed / SPEED_DIVISOR), distLength);
             n.x += (disp[i].x / distLength) * limitedDist;
             n.y += (disp[i].y / distLength) * limitedDist;
             if (strictRadial) {
-                var vx = n.x - positions[focusIdx].x;
-                var vy = n.y - positions[focusIdx].y;
-                var nfDis = Math.sqrt(vx * vx + vy * vy);
+                let vx = n.x - positions[focusIdx].x;
+                let vy = n.y - positions[focusIdx].y;
+                const nfDis = Math.sqrt(vx * vx + vy * vy);
                 vx = (vx / nfDis) * radii[i];
                 vy = (vy / nfDis) * radii[i];
                 n.x = positions[focusIdx].x + vx;

package/lib/radial/radial-nonoverlap-force.js.map

@@ -1 +1 @@
-{"version":3,"file":"radial-nonoverlap-force.js","sourceRoot":"","sources":["../../src/radial/radial-nonoverlap-force.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"radial-nonoverlap-force.js","sourceRoot":"","sources":["../../src/radial/radial-nonoverlap-force.ts"],"names":[],"mappings":"AAEA,MAAM,aAAa,GAAG,GAAG,CAAC;AAiB1B,MAAM,uBAAuB,GAA0C;IACrE,UAAU,EAAE,EAAE;IACd,MAAM,EAAE,EAAE;IACV,KAAK,EAAE,EAAE;IACT,KAAK,EAAE,GAAG;IACV,OAAO,EAAE,EAAE;IACX,CAAC,EAAE,CAAC;CACL,CAAC;AAEF,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAY,EACZ,OAAqC,EAC5B,EAAE;IACX,MAAM,aAAa,mCAAQ,uBAAuB,GAAK,OAAO,CAAE,CAAC;IACjE,MAAM,EACJ,SAAS,EACT,UAAU,EACV,KAAK,EACL,CAAC,EACD,KAAK,GAAG,GAAG,EACX,YAAY,EACZ,QAAQ,EACR,KAAK,GAAG,EAAE,EACV,YAAY,GACb,GAAG,aAAa,CAAC;IAElB,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAElC,MAAM,IAAI,GAAY,EAAE,CAAC;IACzB,MAAM,WAAW,GAAG,KAAK,GAAG,EAAE,CAAC;IAE/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,UAAU,EAAE,CAAC,EAAE,EAAE;QACnC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAQ,EAAE,CAAS,EAAE,EAAE;YACxC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QAC3B,CAAC,CAAC,CAAC;QACH,aAAa;QACb,YAAY,CAAC,KAAK,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,YAAY,CAAC,CAAC;QAC7D,eAAe,CACb,SAAS,EACT,IAAI,EACJ,KAAK,EACL,YAAY,EACZ,QAAQ,EACR,WAAW,EACX,KAAK,EACL,KAAK,CACN,CAAC;KACH;IACD,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC;AAEF,MAAM,YAAY,GAAG,CACnB,KAAa,EACb,SAAkB,EAClB,IAAa,EACb,CAAS,EACT,KAAe,EACf,YAAoC,EACpC,EAAE;IACF,SAAS,CAAC,OAAO,CAAC,CAAC,CAAQ,EAAE,CAAS,EAAE,EAAE;QACxC,IAAI,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC;QACzB,SAAS,CAAC,OAAO,CAAC,CAAC,CAAQ,EAAE,CAAS,EAAE,EAAE;YACxC,IAAI,CAAC,KAAK,CAAC,EAAE;gBACX,OAAO;aACR;YACD,6CAA6C;YAC7C,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,EAAE;gBACzB,OAAO;aACR;YACD,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;YACrB,IAAI,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,GAAG,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC,CAAC;YACrD,IAAI,SAAS,KAAK,CAAC,EAAE;gBACnB,SAAS,GAAG,CAAC,CAAC;gBACd,MAAM,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5B,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;gBACnB,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;aACpB;YACD,0BAA0B;YAC1B,IAAI,SAAS,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE;gBACvE,MAAM,MAAM,GAAG,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,SAAS,CAAC;gBACnC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC;gBACzC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,GAAG,SAAS,CAAC,GAAG,MAAM,CAAC;aAC1C;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CACtB,SAAkB,EAClB,IAAa,EACb,KAAa,EACb,YAAqB,EACrB,QAAgB,EAChB,WAAmB,EACnB,KAAa,EACb,KAAe,EACf,EAAE;IACF,MAAM,OAAO,GAAG,WAAW,IAAI,KAAK,GAAG,EAAE,CAAC;IAC1C,IAAI,YAAY,EAAE;QAChB,IAAI,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,CAAC,EAAE,EAAE;YACrB,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,EAAE,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;YAClD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;YAC7C,IAAI,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC;YACvB,IAAI,GAAG,GAAG,CAAC,EAAE,GAAG,OAAO,CAAC;YACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC;YACtD,IAAI,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,CAAC;YAC5D,IAAI,KAAK,GAAG,IAAI,CAAC,EAAE,GAAG,CAAC,EAAE;gBACvB,KAAK,IAAI,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;gBACrB,GAAG,IAAI,CAAC,CAAC,CAAC;gBACV,GAAG,IAAI,CAAC,CAAC,CAAC;aACX;YACD,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,QAAQ,CAAC;YAC/C,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,WAAW,CAAC;YACzB,EAAE,CAAC,CAAC,GAAG,GAAG,GAAG,WAAW,CAAC;QAC3B,CAAC,CAAC,CAAC;KACJ;IAED,OAAO;IACP,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACzB,IAAI,CAAC,KAAK,QAAQ,EAAE;YAClB,OAAO;SACR;QACD,MAAM,UAAU,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QAC5E,IAAI,UAAU,GAAG,CAAC,IAAI,CAAC,KAAK,QAAQ,EAAE;YACpC,MAAM,WAAW,GAAG,IAAI,CAAC,GAAG,CAC1B,OAAO,GAAG,CAAC,KAAK,GAAG,aAAa,CAAC,EACjC,UAAU,CACX,CAAC;YACF,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,WAAW,CAAC;YAC9C,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,WAAW,CAAC;YAC9C,IAAI,YAAY,EAAE;gBAChB,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACrC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBACrC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC,CAAC;gBAC3C,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,EAAE,GAAG,CAAC,EAAE,GAAG,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;gBACjC,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC;aAClC;SACF;IACH,CAAC,CAAC,CAAC;IACH,OAAO,SAAS,CAAC;AACnB,CAAC,CAAC"}

package/lib/random.d.ts

@@ -1,4 +1,4 @@
-import type { Graph, LayoutMapping, RandomLayoutOptions, Layout } from "./types";
+import type { Graph, Layout, LayoutMapping, RandomLayoutOptions } from './types';
 /**
  * Layout randomizing the nodes' position
  *

package/lib/random.js

@@ -1,5 +1,5 @@
-import { __assign, __awaiter, __generator } from "tslib";
-var DEFAULTS_LAYOUT_OPTIONS = {
+import { __awaiter } from "tslib";
+const DEFAULTS_LAYOUT_OPTIONS = {
     center: [0, 0],
     width: 300,
     height: 300,
@@ -19,80 +19,67 @@ var DEFAULTS_LAYOUT_OPTIONS = {
  * // If you want to assign the positions directly to the nodes, use assign method.
  * await layout.assign(graph, { center: [100, 100] });
  */
-var RandomLayout = /** @class */ (function () {
-    function RandomLayout(options) {
-        if (options === void 0) { options = {}; }
+export class RandomLayout {
+    constructor(options = {}) {
         this.options = options;
-        this.id = "random";
-        this.options = __assign(__assign({}, DEFAULTS_LAYOUT_OPTIONS), options);
+        this.id = 'random';
+        this.options = Object.assign(Object.assign({}, DEFAULTS_LAYOUT_OPTIONS), options);
     }
     /**
      * Return the positions of nodes and edges(if needed).
      */
-    RandomLayout.prototype.execute = function (graph, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.genericRandomLayout(false, graph, options)];
-            });
+    execute(graph, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.genericRandomLayout(false, graph, options);
         });
-    };
+    }
     /**
      * To directly assign the positions to the nodes.
      */
-    RandomLayout.prototype.assign = function (graph, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                this.genericRandomLayout(true, graph, options);
-                return [2 /*return*/];
-            });
+    assign(graph, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.genericRandomLayout(true, graph, options);
         });
-    };
-    RandomLayout.prototype.genericRandomLayout = function (assign, graph, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var mergedOptions, propsCenter, propsWidth, propsHeight, nodes, layoutScale, width, height, center, layoutNodes, result;
-            return __generator(this, function (_a) {
-                mergedOptions = __assign(__assign({}, this.options), options);
-                propsCenter = mergedOptions.center, propsWidth = mergedOptions.width, propsHeight = mergedOptions.height;
-                nodes = graph.getAllNodes();
-                layoutScale = 0.9;
-                width = !propsWidth && typeof window !== "undefined"
-                    ? window.innerWidth
-                    : propsWidth;
-                height = !propsHeight && typeof window !== "undefined"
-                    ? window.innerHeight
-                    : propsHeight;
-                center = !propsCenter
-                    ? [width / 2, height / 2]
-                    : propsCenter;
-                layoutNodes = [];
-                if (nodes) {
-                    nodes.forEach(function (node) {
-                        layoutNodes.push({
-                            id: node.id,
-                            data: {
-                                x: (Math.random() - 0.5) * layoutScale * width + center[0],
-                                y: (Math.random() - 0.5) * layoutScale * height + center[1],
-                            },
-                        });
-                    });
-                }
-                if (assign) {
-                    layoutNodes.forEach(function (node) {
-                        return graph.mergeNodeData(node.id, {
-                            x: node.data.x,
-                            y: node.data.y,
-                        });
+    }
+    genericRandomLayout(assign, graph, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const mergedOptions = Object.assign(Object.assign({}, this.options), options);
+            const { center: propsCenter, width: propsWidth, height: propsHeight, } = mergedOptions;
+            const nodes = graph.getAllNodes();
+            const layoutScale = 0.9;
+            const width = !propsWidth && typeof window !== 'undefined'
+                ? window.innerWidth
+                : propsWidth;
+            const height = !propsHeight && typeof window !== 'undefined'
+                ? window.innerHeight
+                : propsHeight;
+            const center = !propsCenter
+                ? [width / 2, height / 2]
+                : propsCenter;
+            const layoutNodes = [];
+            if (nodes) {
+                nodes.forEach((node) => {
+                    layoutNodes.push({
+                        id: node.id,
+                        data: {
+                            x: (Math.random() - 0.5) * layoutScale * width + center[0],
+                            y: (Math.random() - 0.5) * layoutScale * height + center[1],
+                        },
                     });
-                }
-                result = {
-                    nodes: layoutNodes,
-                    edges: graph.getAllEdges(),
-                };
-                return [2 /*return*/, result];
-            });
+                });
+            }
+            if (assign) {
+                layoutNodes.forEach((node) => graph.mergeNodeData(node.id, {
+                    x: node.data.x,
+                    y: node.data.y,
+                }));
+            }
+            const result = {
+                nodes: layoutNodes,
+                edges: graph.getAllEdges(),
+            };
+            return result;
         });
-    };
-    return RandomLayout;
-}());
-export { RandomLayout };
+    }
+}
 //# sourceMappingURL=random.js.map

package/lib/random.js.map

@@ -1 +1 @@
-{"version":3,"file":"random.js","sourceRoot":"","sources":["../src/random.ts"],"names":[],"mappings":";AASA,IAAM,uBAAuB,GAAiC;IAC5D,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACd,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;CACZ,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH;IAGE,sBAAmB,OAAwD;QAAxD,wBAAA,EAAA,UAA+B,EAAyB;QAAxD,YAAO,GAAP,OAAO,CAAiD;QAF3E,OAAE,GAAG,QAAQ,CAAC;QAGZ,IAAI,CAAC,OAAO,yBACP,uBAAuB,GACvB,OAAO,CACX,CAAC;IACJ,CAAC;IAED;;OAEG;IACG,8BAAO,GAAb,UAAc,KAAY,EAAE,OAA6B;;;gBACvD,sBAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,EAAC;;;KACxD;IACD;;OAEG;IACG,6BAAM,GAAZ,UAAa,KAAY,EAAE,OAA6B;;;gBACtD,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;;;;KAChD;IAYa,0CAAmB,GAAjC,UACE,MAAe,EACf,KAAY,EACZ,OAA6B;;;;gBAEvB,aAAa,yBAAQ,IAAI,CAAC,OAAO,GAAK,OAAO,CAAE,CAAC;gBAE5C,WAAW,GAGjB,aAAa,OAHI,EACZ,UAAU,GAEf,aAAa,MAFE,EACT,WAAW,GACjB,aAAa,OADI,CACH;gBAEZ,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBAC5B,WAAW,GAAG,GAAG,CAAC;gBAClB,KAAK,GACT,CAAC,UAAU,IAAI,OAAO,MAAM,KAAK,WAAW;oBAC1C,CAAC,CAAC,MAAM,CAAC,UAAU;oBACnB,CAAC,CAAE,UAAqB,CAAC;gBACvB,MAAM,GACV,CAAC,WAAW,IAAI,OAAO,MAAM,KAAK,WAAW;oBAC3C,CAAC,CAAC,MAAM,CAAC,WAAW;oBACpB,CAAC,CAAE,WAAsB,CAAC;gBACxB,MAAM,GAAG,CAAC,WAAW;oBACzB,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;oBACzB,CAAC,CAAE,WAA0B,CAAC;gBAE1B,WAAW,GAAc,EAAE,CAAC;gBAClC,IAAI,KAAK,EAAE;oBACT,KAAK,CAAC,OAAO,CAAC,UAAC,IAAI;wBACjB,WAAW,CAAC,IAAI,CAAC;4BACf,EAAE,EAAE,IAAI,CAAC,EAAE;4BACX,IAAI,EAAE;gCACJ,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC;gCAC1D,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;6BAC5D;yBACF,CAAC,CAAC;oBACL,CAAC,CAAC,CAAC;iBACJ;gBAED,IAAI,MAAM,EAAE;oBACV,WAAW,CAAC,OAAO,CAAC,UAAC,IAAI;wBACvB,OAAA,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE;4BAC3B,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;4BACd,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;yBACf,CAAC;oBAHF,CAGE,CACH,CAAC;iBACH;gBAEK,MAAM,GAAG;oBACb,KAAK,EAAE,WAAW;oBAClB,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;iBAC3B,CAAC;gBAEF,sBAAO,MAAM,EAAC;;;KACf;IACH,mBAAC;AAAD,CAAC,AAxFD,IAwFC"}
+{"version":3,"file":"random.js","sourceRoot":"","sources":["../src/random.ts"],"names":[],"mappings":";AASA,MAAM,uBAAuB,GAAiC;IAC5D,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;IACd,KAAK,EAAE,GAAG;IACV,MAAM,EAAE,GAAG;CACZ,CAAC;AAEF;;;;;;;;;;;;;;GAcG;AACH,MAAM,OAAO,YAAY;IAGvB,YAAmB,UAA+B,EAAyB;QAAxD,YAAO,GAAP,OAAO,CAAiD;QAF3E,OAAE,GAAG,QAAQ,CAAC;QAGZ,IAAI,CAAC,OAAO,mCACP,uBAAuB,GACvB,OAAO,CACX,CAAC;IACJ,CAAC;IAED;;OAEG;IACG,OAAO,CAAC,KAAY,EAAE,OAA6B;;YACvD,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACzD,CAAC;KAAA;IACD;;OAEG;IACG,MAAM,CAAC,KAAY,EAAE,OAA6B;;YACtD,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;QACjD,CAAC;KAAA;IAYa,mBAAmB,CAC/B,MAAe,EACf,KAAY,EACZ,OAA6B;;YAE7B,MAAM,aAAa,mCAAQ,IAAI,CAAC,OAAO,GAAK,OAAO,CAAE,CAAC;YACtD,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,KAAK,EAAE,UAAU,EACjB,MAAM,EAAE,WAAW,GACpB,GAAG,aAAa,CAAC;YAElB,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;YAClC,MAAM,WAAW,GAAG,GAAG,CAAC;YACxB,MAAM,KAAK,GACT,CAAC,UAAU,IAAI,OAAO,MAAM,KAAK,WAAW;gBAC1C,CAAC,CAAC,MAAM,CAAC,UAAU;gBACnB,CAAC,CAAE,UAAqB,CAAC;YAC7B,MAAM,MAAM,GACV,CAAC,WAAW,IAAI,OAAO,MAAM,KAAK,WAAW;gBAC3C,CAAC,CAAC,MAAM,CAAC,WAAW;gBACpB,CAAC,CAAE,WAAsB,CAAC;YAC9B,MAAM,MAAM,GAAG,CAAC,WAAW;gBACzB,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,EAAE,MAAM,GAAG,CAAC,CAAC;gBACzB,CAAC,CAAE,WAA0B,CAAC;YAEhC,MAAM,WAAW,GAAc,EAAE,CAAC;YAClC,IAAI,KAAK,EAAE;gBACT,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;oBACrB,WAAW,CAAC,IAAI,CAAC;wBACf,EAAE,EAAE,IAAI,CAAC,EAAE;wBACX,IAAI,EAAE;4BACJ,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,WAAW,GAAG,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC;4BAC1D,CAAC,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,GAAG,CAAC,GAAG,WAAW,GAAG,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC;yBAC5D;qBACF,CAAC,CAAC;gBACL,CAAC,CAAC,CAAC;aACJ;YAED,IAAI,MAAM,EAAE;gBACV,WAAW,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE,CAC3B,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,EAAE;oBAC3B,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBACd,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;iBACf,CAAC,CACH,CAAC;aACH;YAED,MAAM,MAAM,GAAG;gBACb,KAAK,EAAE,WAAW;gBAClB,KAAK,EAAE,KAAK,CAAC,WAAW,EAAE;aAC3B,CAAC;YAEF,OAAO,MAAM,CAAC;QAChB,CAAC;KAAA;CACF"}

package/lib/registry.d.ts

@@ -1,2 +1,2 @@
-import type { LayoutConstructor } from './types';
-export declare const registry: Record<string, LayoutConstructor<any>>;
+import type { Layout } from './types';
+export declare const registry: Record<string, new (...args: any) => Layout<any>>;

package/lib/registry.js

@@ -1,3 +1,4 @@
+import { AntVDagreLayout } from './antv-dagre';
 import { CircularLayout } from './circular';
 import { ComboCombinedLayout } from './comboCombined';
 import { ConcentricLayout } from './concentric';
@@ -10,7 +11,7 @@ import { GridLayout } from './grid';
 import { MDSLayout } from './mds';
 import { RadialLayout } from './radial';
 import { RandomLayout } from './random';
-export var registry = {
+export const registry = {
     circular: CircularLayout,
     concentric: ConcentricLayout,
     mds: MDSLayout,
@@ -22,6 +23,7 @@ export var registry = {
     fruchterman: FruchtermanLayout,
     forceAtlas2: ForceAtlas2Layout,
     dagre: DagreLayout,
+    antvDagre: AntVDagreLayout,
     comboCombined: ComboCombinedLayout,
 };
 //# sourceMappingURL=registry.js.map

package/lib/registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,MAAM,CAAC,IAAM,QAAQ,GAA2C;IAC9D,QAAQ,EAAE,cAAc;IACxB,UAAU,EAAE,gBAAgB;IAC5B,GAAG,EAAE,SAAS;IACd,MAAM,EAAE,YAAY;IACpB,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,WAAW;IAClB,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,iBAAiB;IAC9B,KAAK,EAAE,WAAW;IAClB,aAAa,EAAE,mBAAmB;CACnC,CAAC"}
+{"version":3,"file":"registry.js","sourceRoot":"","sources":["../src/registry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AAC5C,OAAO,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAC1C,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAGxC,MAAM,CAAC,MAAM,QAAQ,GAAsD;IACzE,QAAQ,EAAE,cAAc;IACxB,UAAU,EAAE,gBAAgB;IAC5B,GAAG,EAAE,SAAS;IACd,MAAM,EAAE,YAAY;IACpB,IAAI,EAAE,UAAU;IAChB,MAAM,EAAE,YAAY;IACpB,KAAK,EAAE,WAAW;IAClB,OAAO,EAAE,aAAa;IACtB,WAAW,EAAE,iBAAiB;IAC9B,WAAW,EAAE,iBAAiB;IAC9B,KAAK,EAAE,WAAW;IAClB,SAAS,EAAE,eAAe;IAC1B,aAAa,EAAE,mBAAmB;CACnC,CAAC"}

package/lib/supervisor.d.ts

@@ -1,5 +1,5 @@
 import EventEmitter from '@antv/event-emitter';
-import { Graph, Node, Edge } from '@antv/graphlib';
+import { Edge, Graph, Node } from '@antv/graphlib';
 import type { Layout, LayoutSupervisor } from './types';
 /**
  * The payload transferred from main thread to the worker.
@@ -13,7 +13,7 @@ export interface Payload {
     nodes: Node<any>[];
     edges: Edge<any>[];
 }
-interface SupervisorOptions {
+export interface SupervisorOptions {
     /**
      * Iterations run in algorithm such as d3force, will be passed in `tick()` later.
      */
@@ -48,4 +48,3 @@ export declare class Supervisor extends EventEmitter implements LayoutSupervisor
     kill(): void;
     isRunning(): boolean;
 }
-export {};

package/lib/supervisor.js

@@ -1,8 +1,7 @@
-import { __awaiter, __extends, __generator, __read, __rest } from "tslib";
-// @ts-ignore
+import { __awaiter, __rest } from "tslib";
 import EventEmitter from '@antv/event-emitter';
-import * as Comlink from 'comlink';
 import { isFunction } from '@antv/util';
+import * as Comlink from 'comlink';
 /**
  * @example
  * const graph = new Graph();
@@ -13,17 +12,15 @@ import { isFunction } from '@antv/util';
  * supervisor.stop();
  * supervisor.kill();
  */
-var Supervisor = /** @class */ (function (_super) {
-    __extends(Supervisor, _super);
-    function Supervisor(graph, layout, options) {
-        var _this = _super.call(this) || this;
-        _this.graph = graph;
-        _this.layout = layout;
-        _this.options = options;
-        _this.spawnWorker();
-        return _this;
+export class Supervisor extends EventEmitter {
+    constructor(graph, layout, options) {
+        super();
+        this.graph = graph;
+        this.layout = layout;
+        this.options = options;
+        this.spawnWorker();
     }
-    Supervisor.prototype.spawnWorker = function () {
+    spawnWorker() {
         this.proxy = Comlink.wrap(
         // @ts-ignore
         new Worker(new URL('./worker.js', import.meta.url), { type: 'module' }));
@@ -31,60 +28,64 @@ var Supervisor = /** @class */ (function (_super) {
             this.running = false;
             this.execute();
         }
-    };
-    Supervisor.prototype.execute = function () {
+    }
+    execute() {
         var _a;
-        return __awaiter(this, void 0, void 0, function () {
-            var _b, onTick, rest, noFunctionOptions, payload, arraybufferWithNodesEdges, _c, positions;
-            return __generator(this, function (_d) {
-                switch (_d.label) {
-                    case 0:
-                        if (this.running)
-                            return [2 /*return*/, this];
-                        this.running = true;
-                        _b = this.layout.options, onTick = _b.onTick, rest = __rest(_b, ["onTick"]);
-                        noFunctionOptions = {};
-                        Object.keys(rest).forEach(function (name) {
-                            if (!isFunction(rest[name]))
-                                noFunctionOptions[name] = rest[name];
-                        });
-                        payload = {
-                            layout: {
-                                id: this.layout.id,
-                                options: noFunctionOptions,
-                                iterations: (_a = this.options) === null || _a === void 0 ? void 0 : _a.iterations,
-                            },
-                            nodes: this.graph.getAllNodes(),
-                            edges: this.graph.getAllEdges(),
-                        };
-                        arraybufferWithNodesEdges = new Float32Array([0]);
-                        return [4 /*yield*/, this.proxy.calculateLayout(payload, [
-                                arraybufferWithNodesEdges,
-                            ])];
-                    case 1:
-                        _c = __read.apply(void 0, [_d.sent(), 1]), positions = _c[0];
-                        return [2 /*return*/, positions];
-                }
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.running)
+                return this;
+            this.running = true;
+            // Payload should include nodes & edges(if needed).
+            const _b = this.layout.options, { onTick } = _b, rest = __rest(_b, ["onTick"]);
+            const noFunctionOptions = {};
+            Object.keys(rest).forEach((name) => {
+                if (!isFunction(rest[name]))
+                    noFunctionOptions[name] = rest[name];
             });
+            const payload = {
+                layout: {
+                    id: this.layout.id,
+                    options: noFunctionOptions,
+                    iterations: (_a = this.options) === null || _a === void 0 ? void 0 : _a.iterations,
+                },
+                nodes: this.graph.getAllNodes(),
+                edges: this.graph.getAllEdges(),
+            };
+            /**
+             * TODO: Convert graph object to linear memory(e.g. csr, adjacency matrix), then transfer the ownership to worker.
+             * @example
+             * const arraybufferWithNodesEdges = graphToByteArrays(this.graph); // Float32Array
+             */
+            const arraybufferWithNodesEdges = new Float32Array([0]);
+            // TODO: Support transferables.
+            // @see https://www.npmjs.com/package/@naoak/workerize-transferable
+            // setupTransferableMethodsOnMain(this.worker, {
+            //   calculateLayout: {
+            //     // pick a transferable object from the method parameters
+            //     pickTransferablesFromParams: (params) => [params[1].buffer],
+            //   },
+            // });
+            const [positions] = yield this.proxy.calculateLayout(payload, [
+                arraybufferWithNodesEdges,
+            ]);
+            return positions;
         });
-    };
-    Supervisor.prototype.stop = function () {
+    }
+    stop() {
         this.running = false;
         // trigger `layout.stop()` if needed
         this.proxy.stopLayout();
         return this;
-    };
-    Supervisor.prototype.kill = function () {
+    }
+    kill() {
         // allow the GC to collect wrapper port
         // @see https://github.com/GoogleChromeLabs/comlink#comlinkreleaseproxy
         this.proxy[Comlink.releaseProxy]();
         // TODO: unbind listeners on graph.
         // TODO: release attached memory
-    };
-    Supervisor.prototype.isRunning = function () {
+    }
+    isRunning() {
         return this.running;
-    };
-    return Supervisor;
-}(EventEmitter));
-export { Supervisor };
+    }
+}
 //# sourceMappingURL=supervisor.js.map

package/lib/supervisor.js.map

@@ -1 +1 @@
-{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../src/supervisor.ts"],"names":[],"mappings":";AAAA,aAAa;AACb,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAE/C,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAEnC,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAsBxC;;;;;;;;;GASG;AACH;IAAgC,8BAAY;IAW1C,oBACU,KAAsB,EACtB,MAAmB,EACnB,OAAoC;QAH9C,YAKE,iBAAO,SAGR;QAPS,WAAK,GAAL,KAAK,CAAiB;QACtB,YAAM,GAAN,MAAM,CAAa;QACnB,aAAO,GAAP,OAAO,CAA6B;QAI5C,KAAI,CAAC,WAAW,EAAE,CAAC;;IACrB,CAAC;IAED,gCAAW,GAAX;QACE,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI;QACvB,aAAa;QACb,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CACxE,CAAC;QAEF,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;IACH,CAAC;IAEK,4BAAO,GAAb;;;;;;;wBACE,IAAI,IAAI,CAAC,OAAO;4BAAE,sBAAO,IAAI,EAAC;wBAE9B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;wBAGd,KAAsB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAvC,MAAM,YAAA,EAAK,IAAI,cAAjB,UAAmB,CAAF,CAAyB;wBAC1C,iBAAiB,GAAQ,EAAE,CAAC;wBAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAC,IAAI;4BAC7B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gCAAE,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;wBACpE,CAAC,CAAC,CAAC;wBACG,OAAO,GAAG;4BACd,MAAM,EAAE;gCACN,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;gCAClB,OAAO,EAAE,iBAAiB;gCAC1B,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU;6BACrC;4BACD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;4BAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;yBAChC,CAAC;wBAOI,yBAAyB,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;wBAWpC,qBAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE;gCAC5D,yBAAyB;6BAC1B,CAAC,EAAA;;wBAFI,KAAA,sBAAc,SAElB,KAAA,EAFK,SAAS,QAAA;wBAIhB,sBAAO,SAAS,EAAC;;;;KAClB;IAED,yBAAI,GAAJ;QACE,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAErB,oCAAoC;QACpC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yBAAI,GAAJ;QACE,uCAAuC;QACvC,uEAAuE;QACvE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAEnC,mCAAmC;QAEnC,gCAAgC;IAClC,CAAC;IAED,8BAAS,GAAT;QACE,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACH,iBAAC;AAAD,CAAC,AAnGD,CAAgC,YAAY,GAmG3C"}
+{"version":3,"file":"supervisor.js","sourceRoot":"","sources":["../src/supervisor.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAE/C,OAAO,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,OAAO,MAAM,SAAS,CAAC;AAuBnC;;;;;;;;;GASG;AACH,MAAM,OAAO,UAAW,SAAQ,YAAY;IAW1C,YACU,KAAsB,EACtB,MAAmB,EACnB,OAAoC;QAE5C,KAAK,EAAE,CAAC;QAJA,UAAK,GAAL,KAAK,CAAiB;QACtB,WAAM,GAAN,MAAM,CAAa;QACnB,YAAO,GAAP,OAAO,CAA6B;QAI5C,IAAI,CAAC,WAAW,EAAE,CAAC;IACrB,CAAC;IAED,WAAW;QACT,IAAI,CAAC,KAAK,GAAG,OAAO,CAAC,IAAI;QACvB,aAAa;QACb,IAAI,MAAM,CAAC,IAAI,GAAG,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CACxE,CAAC;QAEF,IAAI,IAAI,CAAC,OAAO,EAAE;YAChB,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;YACrB,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;IACH,CAAC;IAEK,OAAO;;;YACX,IAAI,IAAI,CAAC,OAAO;gBAAE,OAAO,IAAI,CAAC;YAE9B,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;YAEpB,mDAAmD;YACnD,MAAM,KAAsB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAzC,EAAE,MAAM,OAAiC,EAA5B,IAAI,cAAjB,UAAmB,CAAsB,CAAC;YAChD,MAAM,iBAAiB,GAAQ,EAAE,CAAC;YAClC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACjC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBAAE,iBAAiB,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;YACpE,CAAC,CAAC,CAAC;YACH,MAAM,OAAO,GAAG;gBACd,MAAM,EAAE;oBACN,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;oBAClB,OAAO,EAAE,iBAAiB;oBAC1B,UAAU,EAAE,MAAA,IAAI,CAAC,OAAO,0CAAE,UAAU;iBACrC;gBACD,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;gBAC/B,KAAK,EAAE,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE;aAChC,CAAC;YAEF;;;;eAIG;YACH,MAAM,yBAAyB,GAAG,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YAExD,+BAA+B;YAC/B,mEAAmE;YACnE,gDAAgD;YAChD,uBAAuB;YACvB,+DAA+D;YAC/D,mEAAmE;YACnE,OAAO;YACP,MAAM;YAEN,MAAM,CAAC,SAAS,CAAC,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,OAAO,EAAE;gBAC5D,yBAAyB;aAC1B,CAAC,CAAC;YAEH,OAAO,SAAS,CAAC;;KAClB;IAED,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAErB,oCAAoC;QACpC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;QAExB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,uCAAuC;QACvC,uEAAuE;QACvE,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,YAAY,CAAC,EAAE,CAAC;QAEnC,mCAAmC;QAEnC,gCAAgC;IAClC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF"}