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

package/lib/supervisor.js

@@ -1,91 +1,71 @@
-import { __awaiter, __rest } from "tslib";
-import EventEmitter from '@antv/event-emitter';
-import { isFunction } from '@antv/util';
-import * as Comlink from 'comlink';
-/**
- * @example
- * const graph = new Graph();
- * const layout = new CircularLayout();
- *
- * const supervisor = new Supervisor(graph, layout, { iterations: 1000 });
- * const positions = await supervisor.execute();
- * supervisor.stop();
- * supervisor.kill();
- */
-export class Supervisor extends EventEmitter {
-    constructor(graph, layout, options) {
-        super();
-        this.graph = graph;
-        this.layout = layout;
-        this.options = options;
-        this.spawnWorker();
+import { __awaiter } from './node_modules/.pnpm/@rollup_plugin-typescript@12.3.0_rollup@4.54.0_tslib@2.8.1_typescript@4.9.5/node_modules/tslib/tslib.es6.js';
+import { wrap } from './node_modules/.pnpm/comlink@4.4.2/node_modules/comlink/dist/esm/comlink.js';
+
+class Supervisor {
+    constructor() {
+        this.worker = null;
+        this.workerApi = null;
     }
-    spawnWorker() {
-        this.proxy = Comlink.wrap(
-        // @ts-ignore
-        new Worker(new URL('./worker.js', import.meta.url), { type: 'module' }));
-        if (this.running) {
-            this.running = false;
-            this.execute();
-        }
-    }
-    execute() {
-        var _a;
+    /**
+     * Execute layout in worker
+     */
+    execute(layoutId, data, options) {
         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;
+            if (!this.worker) {
+                yield this.initWorker();
+            }
+            if (!this.workerApi) {
+                throw new Error('Worker API not initialized');
+            }
+            const result = yield this.workerApi.execute(layoutId, data, options);
+            return result;
         });
     }
-    stop() {
-        this.running = false;
-        // trigger `layout.stop()` if needed
-        this.proxy.stopLayout();
-        return this;
+    /**
+     * Destroy worker
+     */
+    destroy() {
+        if (this.workerApi) {
+            this.workerApi.destroy();
+        }
+        if (this.worker) {
+            this.worker.terminate();
+            this.worker = null;
+            this.workerApi = null;
+        }
     }
-    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
+    /**
+     * Initialize worker
+     */
+    initWorker() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const workerPath = this.resolveWorkerPath();
+            const isESM = workerPath.includes('/lib/') || workerPath.endsWith('.mjs');
+            const type = isESM ? 'module' : 'classic';
+            this.worker = new Worker(workerPath, { type });
+            this.workerApi = wrap(this.worker);
+        });
     }
-    isRunning() {
-        return this.running;
+    /**
+     * Resolve worker script path which works in both ESM and UMD environments
+     */
+    resolveWorkerPath() {
+        if (typeof import.meta !== 'undefined' && import.meta.url) {
+            const currentUrl = new URL(import.meta.url);
+            return currentUrl.href.replace(/\/[^/]+\.js$/, '/worker.js');
+        }
+        if (typeof document !== 'undefined') {
+            const scripts = document.getElementsByTagName('script');
+            for (let i = scripts.length - 1; i >= 0; i--) {
+                const src = scripts[i].src;
+                if (src && (src.includes('index.js') || src.includes('index.min.js'))) {
+                    return src.replace(/index(\.min)?\.js/, 'worker.js');
+                }
+            }
+        }
+        return './worker.js';
     }
 }
-//# sourceMappingURL=supervisor.js.map
+
+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,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"}
+{"version":3,"file":"supervisor.js","sources":["../src/src/supervisor.ts"],"sourcesContent":[null],"names":[],"mappings":";;;MAIa,UAAU,CAAA;AAAvB,IAAA,WAAA,GAAA;QACU,IAAA,CAAA,MAAM,GAAkB,IAAI;QAC5B,IAAA,CAAA,SAAS,GAAgC,IAAI;IAsEvD;AApEE;;AAEG;AACG,IAAA,OAAO,CACX,QAAgB,EAChB,IAAe,EACf,OAAoB,EAAA;;AAEpB,YAAA,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;AAChB,gBAAA,MAAM,IAAI,CAAC,UAAU,EAAE;AACxB,YAAA;AAED,YAAA,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE;AACnB,gBAAA,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC;AAC9C,YAAA;AAED,YAAA,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,EAAE,IAAI,EAAE,OAAO,CAAC;AACpE,YAAA,OAAO,MAAM;QACf,CAAC,CAAA;AAAA,IAAA;AAED;;AAEG;IACH,OAAO,GAAA;QACL,IAAI,IAAI,CAAC,SAAS,EAAE;AAClB,YAAA,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;AACzB,QAAA;QACD,IAAI,IAAI,CAAC,MAAM,EAAE;AACf,YAAA,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;AACvB,YAAA,IAAI,CAAC,MAAM,GAAG,IAAI;AAClB,YAAA,IAAI,CAAC,SAAS,GAAG,IAAI;AACtB,QAAA;IACH;AAEA;;AAEG;IACW,UAAU,GAAA;;AACtB,YAAA,MAAM,UAAU,GAAG,IAAI,CAAC,iBAAiB,EAAE;AAE3C,YAAA,MAAM,KAAK,GAAG,UAAU,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;YACzE,MAAM,IAAI,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS;AAEzC,YAAA,IAAI,CAAC,MAAM,GAAG,IAAI,MAAM,CAAC,UAAU,EAAE,EAAE,IAAI,EAAE,CAAC;YAC9C,IAAI,CAAC,SAAS,GAAG,IAAI,CAAe,IAAI,CAAC,MAAM,CAAC;QAClD,CAAC,CAAA;AAAA,IAAA;AAED;;AAEG;IACK,iBAAiB,GAAA;AACvB,QAAA,IAAI,OAAO,MAAM,CAAC,IAAI,KAAK,WAAW,IAAI,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;YACzD,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;YAC3C,OAAO,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,cAAc,EAAE,YAAY,CAAC;AAC7D,QAAA;AAED,QAAA,IAAI,OAAO,QAAQ,KAAK,WAAW,EAAE;YACnC,MAAM,OAAO,GAAG,QAAQ,CAAC,oBAAoB,CAAC,QAAQ,CAAC;AACvD,YAAA,KAAK,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;gBAC5C,MAAM,GAAG,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG;AAC1B,gBAAA,IAAI,GAAG,KAAK,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC,EAAE;oBACrE,OAAO,GAAG,CAAC,OAAO,CAAC,mBAAmB,EAAE,WAAW,CAAC;AACrD,gBAAA;AACF,YAAA;AACF,QAAA;AAED,QAAA,OAAO,aAAa;IACtB;AACD;;;;"}

package/lib/types/common.d.ts

@@ -0,0 +1,4 @@
+type PlainObject = Record<string, any>;
+type Matrix = number[][];
+
+export type { Matrix, PlainObject };

package/lib/types/data.d.ts

@@ -0,0 +1,56 @@
+import { EdgeLabelPos } from '../dagre/types.js';
+import { PlainObject } from './common.js';
+import { ID } from './id.js';
+import { Point } from './point.js';
+import { Size } from './size.js';
+
+interface GraphData<N extends NodeData = NodeData, E extends EdgeData = EdgeData> {
+    nodes: N[];
+    edges?: E[];
+}
+interface NodeData extends PlainObject {
+}
+interface EdgeData extends PlainObject {
+}
+interface LayoutData<N extends NodeData = NodeData, E extends EdgeData = EdgeData> {
+    nodes: Map<ID, LayoutNode<N>>;
+    edges: Map<ID, LayoutEdge<E>>;
+}
+interface LayoutNode<N extends NodeData = NodeData> {
+    id: ID;
+    x: number;
+    y: number;
+    z?: number;
+    /** Applied for compound layout（dagre、antv-dagre、combo-combined） */
+    parentId?: ID | null;
+    isCombo?: boolean;
+    /** Applied for force-directed layout */
+    fx?: number | null;
+    fy?: number | null;
+    fz?: number | null;
+    vx?: number;
+    vy?: number;
+    vz?: number;
+    /** Output additional info */
+    size?: Size;
+    _original: N;
+    [key: string]: any;
+}
+interface LayoutEdge<E extends EdgeData = EdgeData> {
+    id: ID;
+    source: ID;
+    target: ID;
+    sourceNode?: LayoutNode;
+    targetNode?: LayoutNode;
+    _original: E;
+    /** Only for dagre layout */
+    points?: Point[];
+    labelSize?: Size;
+    labelPos?: EdgeLabelPos;
+    labelOffset?: number;
+    weight?: number;
+    minLen?: number;
+    [key: string]: any;
+}
+
+export type { EdgeData, GraphData, LayoutData, LayoutEdge, LayoutNode, NodeData };

package/lib/types/force.d.ts

@@ -0,0 +1,47 @@
+import { SimulationOptions } from '../core/base-simulation.js';
+import { BaseLayoutOptions, Layout } from '../core/types.js';
+import { ID } from './id.js';
+import { PointObject } from './point.js';
+
+type DisplacementMap = Map<ID, PointObject>;
+type DistanceThresholdMode = 'mean' | 'max' | 'min';
+/**
+ * <zh/> 公共力导向布局配置项
+ *
+ * <en/> Common force layout configuration items
+ */
+interface CommonForceLayoutOptions extends BaseLayoutOptions, SimulationOptions {
+    /**
+     * <zh/> 布局的维度，2D 渲染时指定为 2；若为 3D 渲染可指定为 3，则将多计算 z 轴的布局
+     *
+     * <en/> The dimensions of the layout, specify 2 for 2D rendering; if it is 3D rendering, specify 3 to calculate the layout of the z axis
+     * @defaultValue 2
+     */
+    dimensions?: 2 | 3;
+    /**
+     * <zh/> minMovement 的使用条件
+     * - 'mean': 平均移动距离小于 minMovement 时停止迭代
+     * - 'max': 最大移动距离小于时 minMovement 时停止迭代
+     * - 'min': 最小移动距离小于时 minMovement 时停止迭代
+     * <en/> The condition for using minMovement
+     * - 'mean': The average movement distance is less than minMovement when stopped iterating
+     * - 'max': The maximum movement distance is less than minMovement when stopped iterating
+     * - 'min': The minimum movement distance is less than minMovement when stopped iterating
+     * @defaultValue 'mean'
+     */
+    distanceThresholdMode?: 'mean' | 'max' | 'min';
+    /**
+     * <zh/> 最大距离
+     *
+     * <en/> Maximum distance
+     */
+    maxDistance?: number;
+    /**
+     * <zh/> 每次迭代后的回调函数
+     *
+     * <en/> Callback function after each iteration
+     */
+    onTick?: (layout: Layout<any>) => void;
+}
+
+export type { CommonForceLayoutOptions, DisplacementMap, DistanceThresholdMode };

package/lib/types/id.d.ts

@@ -0,0 +1,3 @@
+type ID = string | number;
+
+export type { ID };

package/lib/types/point.d.ts

@@ -0,0 +1,9 @@
+type Point = [number, number] | [number, number, number];
+type STDPoint = [number, number, number];
+type PointObject = {
+    x: number;
+    y: number;
+    z?: number;
+};
+
+export type { Point, PointObject, STDPoint };

package/lib/types/position.d.ts

@@ -0,0 +1,10 @@
+type Position = [number, number] | [number, number, number];
+type NullablePosition = Position | [null, null] | [null, null, null];
+type STDPosition = [number, number, number];
+type PositionObject = {
+    x: number;
+    y: number;
+    z?: number;
+};
+
+export type { NullablePosition, Position, PositionObject, STDPosition };

package/lib/types/size.d.ts

@@ -0,0 +1,4 @@
+type Size = number | number[];
+type STDSize = [number, number, number];
+
+export type { STDSize, Size };

package/lib/util/array.d.ts

@@ -1 +1,3 @@
-export declare const isArray: (arg: any) => arg is any[];
+declare const isArray: (arg: any) => arg is any[];
+
+export { isArray };

package/lib/util/array.js

@@ -1,2 +1,4 @@
-export const isArray = Array.isArray;
-//# sourceMappingURL=array.js.map
+const isArray = Array.isArray;
+
+export { isArray };
+//# sourceMappingURL=array.js.map

package/lib/util/array.js.map

@@ -1 +1 @@
-{"version":3,"file":"array.js","sourceRoot":"","sources":["../../src/util/array.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC"}
+{"version":3,"file":"array.js","sources":["../../src/util/src/util/array.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAO,MAAM,OAAO,GAAG,KAAK,CAAC;;;;"}

package/lib/util/common.d.ts

@@ -1,12 +1,12 @@
-import { Graph, PointTuple } from '../types';
+import { Point } from '../types/point.js';
+import { LayoutModel } from './model.js';
+
 /**
- * Assign or only return the result for the graph who has no nodes or only one node.
+ * Return the layout result for a graph with zero or one node.
  * @param graph original graph
- * @param assign whether assign result to original graph
  * @param center the layout center
- * @returns
+ * @returns layout result
  */
-export declare const handleSingleNodeGraph: (graph: Graph, assign: boolean, center: PointTuple) => {
-    nodes: any[];
-    edges: import("@antv/graphlib").Edge<import("../types").EdgeData>[];
-};
+declare function applySingleNodeLayout(model: LayoutModel, center: Point, dimensions?: 2 | 3): void;
+
+export { applySingleNodeLayout };

package/lib/util/common.js

@@ -1,31 +1,20 @@
 /**
- * Assign or only return the result for the graph who has no nodes or only one node.
+ * Return the layout result for a graph with zero or one node.
  * @param graph original graph
- * @param assign whether assign result to original graph
  * @param center the layout center
- * @returns
+ * @returns layout result
  */
-export const handleSingleNodeGraph = (graph, assign, center) => {
-    const nodes = graph.getAllNodes();
-    const edges = graph.getAllEdges();
-    if (!(nodes === null || nodes === void 0 ? void 0 : nodes.length)) {
-        const result = { nodes: [], edges };
-        return result;
-    }
-    if (nodes.length === 1) {
-        if (assign) {
-            graph.mergeNodeData(nodes[0].id, {
-                x: center[0],
-                y: center[1],
-            });
+function applySingleNodeLayout(model, center, dimensions = 2) {
+    const n = model.nodeCount();
+    if (n === 1) {
+        const first = model.firstNode();
+        first.x = center[0];
+        first.y = center[1];
+        if (dimensions === 3) {
+            first.z = center[2] || 0;
         }
-        const result = {
-            nodes: [
-                Object.assign(Object.assign({}, nodes[0]), { data: Object.assign(Object.assign({}, nodes[0].data), { x: center[0], y: center[1] }) }),
-            ],
-            edges,
-        };
-        return result;
     }
-};
-//# sourceMappingURL=common.js.map
+}
+
+export { applySingleNodeLayout };
+//# sourceMappingURL=common.js.map

package/lib/util/common.js.map

@@ -1 +1 @@
-{"version":3,"file":"common.js","sourceRoot":"","sources":["../../src/util/common.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,qBAAqB,GAAG,CACnC,KAAY,EACZ,MAAe,EACf,MAAkB,EAClB,EAAE;IACF,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,MAAM,KAAK,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;IAClC,IAAI,CAAC,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAA,EAAE;QAClB,MAAM,MAAM,GAAG,EAAE,KAAK,EAAE,EAAW,EAAE,KAAK,EAAE,CAAC;QAC7C,OAAO,MAAM,CAAC;KACf;IACD,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE;QACtB,IAAI,MAAM,EAAE;YACV,KAAK,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE;gBAC/B,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;gBACZ,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;aACb,CAAC,CAAC;SACJ;QACD,MAAM,MAAM,GAAG;YACb,KAAK,EAAE;gDAEA,KAAK,CAAC,CAAC,CAAC,KACX,IAAI,kCACC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAChB,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC,EACZ,CAAC,EAAE,MAAM,CAAC,CAAC,CAAC;aAGjB;YACD,KAAK;SACN,CAAC;QACF,OAAO,MAAM,CAAC;KACf;AACH,CAAC,CAAC"}
+{"version":3,"file":"common.js","sources":["../../src/util/src/util/common.ts"],"sourcesContent":[null],"names":[],"mappings":"AAGA;;;;;AAKG;AACG,SAAU,qBAAqB,CACnC,KAAkB,EAClB,MAAa,EACb,aAAoB,CAAC,EAAA;AAErB,IAAA,MAAM,CAAC,GAAG,KAAK,CAAC,SAAS,EAAE;IAE3B,IAAI,CAAC,KAAK,CAAC,EAAE;AACX,QAAA,MAAM,KAAK,GAAG,KAAK,CAAC,SAAS,EAAG;AAChC,QAAA,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;AACnB,QAAA,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;QACnB,IAAI,UAAU,KAAK,CAAC,EAAE;YACpB,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC;AACzB,QAAA;AACF,IAAA;AACH;;;;"}

package/lib/util/format.js

@@ -0,0 +1,72 @@
+import { parseSize } from './size.js';
+import isFunction from '../node_modules/.pnpm/@antv_util@3.3.11/node_modules/@antv/util/esm/lodash/is-function.js';
+import isNumber from '../node_modules/.pnpm/@antv_util@3.3.11/node_modules/@antv/util/esm/lodash/is-number.js';
+import isObject from '../node_modules/.pnpm/@antv_util@3.3.11/node_modules/@antv/util/esm/lodash/is-object.js';
+
+/**
+ * Format value with multiple types into a function that returns a number
+ * @param value The value to be formatted
+ * @param defaultValue The default value when value is invalid
+ * @returns A function that returns a number
+ */
+function formatNumberFn(value, defaultValue) {
+    // If value is a function, return it directly
+    if (isFunction(value)) {
+        return value;
+    }
+    // If value is a number, return a function that returns this number
+    if (isNumber(value)) {
+        return () => value;
+    }
+    // For other cases (undefined or invalid values), return default value function
+    return () => defaultValue;
+}
+/**
+ * Format size config with multiple types into a function that returns a size
+ * @param value The value to be formatted
+ * @param defaultValue The default value when value is invalid
+ * @param resultIsNumber Whether to return a number (max of width/height) or size array
+ * @returns A function that returns a size
+ */
+function formatSizeFn(value, defaultValue = 10) {
+    // If value is undefined, return default value function
+    if (!value) {
+        return () => defaultValue;
+    }
+    // If value is a function, return it directly
+    if (isFunction(value)) {
+        return value;
+    }
+    // If value is a number, return a function that returns this number
+    if (isNumber(value)) {
+        return () => value;
+    }
+    // If value is an array, return max or the array itself
+    if (Array.isArray(value)) {
+        return () => value;
+    }
+    // If value is an object with width and height
+    if (isObject(value) && value.width && value.height) {
+        return () => [value.width, value.height];
+    }
+    return () => defaultValue;
+}
+/**
+ * Format nodeSize and nodeSpacing into a function that returns the total size
+ * @param nodeSize The size of the node
+ * @param nodeSpacing The spacing around the node
+ * @param defaultNodeSize The default node size when value is invalid
+ * @returns A function that returns the total size (node size + spacing)
+ */
+const formatNodeSizeFn = (nodeSize, nodeSpacing, defaultNodeSize = 10) => {
+    const nodeSpacingFunc = formatNumberFn(nodeSpacing, 0);
+    const nodeSizeFunc = formatSizeFn(nodeSize, defaultNodeSize);
+    return (node) => {
+        const size = nodeSizeFunc(node);
+        const spacing = nodeSpacingFunc(node);
+        return Math.max(...parseSize(size)) + spacing;
+    };
+};
+
+export { formatNodeSizeFn, formatNumberFn, formatSizeFn };
+//# sourceMappingURL=format.js.map

package/lib/util/format.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"format.js","sources":["../../src/util/src/util/format.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;AAIA;;;;;AAKG;AACG,SAAU,cAAc,CAC5B,KAA+C,EAC/C,YAAoB,EAAA;;AAGpB,IAAA,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;AACrB,QAAA,OAAO,KAAK;AACb,IAAA;;AAGD,IAAA,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;AACnB,QAAA,OAAO,MAAM,KAAK;AACnB,IAAA;;AAGD,IAAA,OAAO,MAAM,YAAY;AAC3B;AAEA;;;;;;AAMG;SACa,YAAY,CAC1B,KAAoE,EACpE,eAAuB,EAAE,EAAA;;IAGzB,IAAI,CAAC,KAAK,EAAE;AACV,QAAA,OAAO,MAAM,YAAY;AAC1B,IAAA;;AAGD,IAAA,IAAI,UAAU,CAAC,KAAK,CAAC,EAAE;AACrB,QAAA,OAAO,KAAK;AACb,IAAA;;AAGD,IAAA,IAAI,QAAQ,CAAC,KAAK,CAAC,EAAE;AACnB,QAAA,OAAO,MAAM,KAAK;AACnB,IAAA;;AAGD,IAAA,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;AACxB,QAAA,OAAO,MAAM,KAAK;AACnB,IAAA;;AAGD,IAAA,IAAI,QAAQ,CAAC,KAAK,CAAC,IAAI,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;AAClD,QAAA,OAAO,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC;AACzC,IAAA;AAED,IAAA,OAAO,MAAM,YAAY;AAC3B;AAEA;;;;;;AAMG;AACI,MAAM,gBAAgB,GAAG,CAC9B,QAIa,EACb,WAA+D,EAC/D,eAAA,GAA0B,EAAE,KACK;IACjC,MAAM,eAAe,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,YAAY,CAAC,QAAQ,EAAE,eAAe,CAAC;IAE5D,OAAO,CAAC,IAAe,KAAI;AACzB,QAAA,MAAM,IAAI,GAAG,YAAY,CAAC,IAAI,CAAC;AAC/B,QAAA,MAAM,OAAO,GAAG,eAAe,CAAC,IAAI,CAAC;AACrC,QAAA,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC,GAAG,OAAO;AAC/C,IAAA,CAAC;AACH;;;;"}

package/lib/util/math.d.ts

@@ -1,22 +1,33 @@
 import { Graph } from '@antv/graphlib';
-import type { Matrix, Edge, Node, OutNode, Point } from '../types';
-export declare const floydWarshall: (adjMatrix: Matrix[]) => Matrix[];
-export declare const getAdjMatrix: (data: {
-    nodes: Node[];
-    edges: Edge[];
-}, directed: boolean) => Matrix[];
+import { Matrix } from '../types/common.js';
+import { NodeData } from '../types/data.js';
+import { PointObject } from '../types/point.js';
+import { LayoutModel } from './model.js';
+
+/**
+ * Floyd-Warshall algorithm to find shortest paths (but with no negative cycles).
+ */
+declare const floydWarshall: (adjMatrix: Matrix) => Matrix;
+/**
+ * Get the adjacency matrix of the graph model.
+ */
+declare const getAdjMatrix: (model: LayoutModel, directed: boolean) => Matrix;
+/**
+ * Get the adjacency list of the graph model.
+ */
+declare const getAdjList: (model: LayoutModel, directed: boolean) => Matrix;
 /**
  * scale matrix
  * @param matrix [ [], [], [] ]
  * @param ratio
  */
-export declare const scaleMatrix: (matrix: Matrix[], ratio: number) => Matrix[];
+declare const scaleMatrix: (matrix: Matrix, ratio: number) => any[];
 /**
  * calculate the bounding box for the nodes according to their x, y, and size
  * @param nodes nodes in the layout
  * @returns
  */
-export declare const getLayoutBBox: (nodes: OutNode[]) => {
+declare const getLayoutBBox: (nodes: NodeData[]) => {
     minX: number;
     minY: number;
     maxX: number;
@@ -28,7 +39,7 @@ export declare const getLayoutBBox: (nodes: OutNode[]) => {
  * @param p2
  * @returns
  */
-export declare const getEuclideanDistance: (p1: Point, p2: Point) => number;
+declare const getEuclideanDistance: (p1: PointObject, p2: PointObject) => number;
 /**
  * Depth first search begin from nodes in graphCore data.
  * @param graphCore graphlib data structure
@@ -37,7 +48,14 @@ export declare const getEuclideanDistance: (p1: Point, p2: Point) => number;
  * @param mode 'TB' - visit from top to bottom; 'BT' - visit from bottom to top;
  * @returns
  */
-export declare const graphTreeDfs: (graph: Graph<any, any>, nodes: Node[], fn: (n: Node) => void, mode: 'TB' | 'BT', treeKey: string, stopFns?: {
-    stopBranchFn?: (node: Node) => boolean;
-    stopAllFn?: (node: Node) => boolean;
+declare const graphTreeDfs: (graph: Graph<any, any>, nodes: NodeData[], fn: (n: NodeData) => void, mode: "TB" | "BT" | undefined, treeKey: string, stopFns?: {
+    stopBranchFn?: ((node: NodeData) => boolean) | undefined;
+    stopAllFn?: ((node: NodeData) => boolean) | undefined;
 }) => void;
+/**
+ * Use Johnson + Dijkstra to compute APSP for sparse graph.
+ * Fully compatible with floydWarshall(adjMatrix).
+ */
+declare function johnson(adjList: Matrix): Matrix;
+
+export { floydWarshall, getAdjList, getAdjMatrix, getEuclideanDistance, getLayoutBBox, graphTreeDfs, johnson, scaleMatrix };