npm - @antv/layout - Versions diffs - 2.0.0-beta.0 → 2.0.0-beta.2 - Mend

@antv/layout 2.0.0-beta.0 → 2.0.0-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (114) hide show

package/dist/index.js +322 -222
package/dist/index.js.map +1 -1
package/dist/index.min.js +2 -2
package/dist/index.min.js.map +1 -1
package/dist/worker.js +2 -2
package/dist/worker.js.map +1 -1
package/lib/algorithm/antv-dagre/index.js +8 -7
package/lib/algorithm/antv-dagre/index.js.map +1 -1
package/lib/algorithm/antv-dagre/rank/index.js +1 -1
package/lib/algorithm/antv-dagre/types.d.ts +3 -14
package/lib/algorithm/circular/index.js +8 -7
package/lib/algorithm/circular/index.js.map +1 -1
package/lib/algorithm/circular/types.d.ts +0 -16
package/lib/algorithm/combo-combined/index.js +9 -7
package/lib/algorithm/combo-combined/index.js.map +1 -1
package/lib/algorithm/combo-combined/types.d.ts +6 -18
package/lib/algorithm/concentric/index.js +10 -16
package/lib/algorithm/concentric/index.js.map +1 -1
package/lib/algorithm/concentric/types.d.ts +3 -17
package/lib/algorithm/d3-force/index.js +16 -12
package/lib/algorithm/d3-force/index.js.map +1 -1
package/lib/algorithm/d3-force/types.d.ts +10 -24
package/lib/algorithm/d3-force-3d/index.js +1 -1
package/lib/algorithm/d3-force-3d/index.js.map +1 -1
package/lib/algorithm/d3-force-3d/types.d.ts +5 -4
package/lib/algorithm/dagre/index.js +10 -7
package/lib/algorithm/dagre/index.js.map +1 -1
package/lib/algorithm/dagre/types.d.ts +8 -14
package/lib/algorithm/force/index.d.ts +1 -1
package/lib/algorithm/force/index.js +56 -44
package/lib/algorithm/force/index.js.map +1 -1
package/lib/algorithm/force/types.d.ts +39 -36
package/lib/algorithm/force-atlas2/index.d.ts +1 -1
package/lib/algorithm/force-atlas2/index.js +8 -7
package/lib/algorithm/force-atlas2/index.js.map +1 -1
package/lib/algorithm/force-atlas2/types.d.ts +0 -14
package/lib/algorithm/fruchterman/index.d.ts +1 -1
package/lib/algorithm/fruchterman/index.js +8 -10
package/lib/algorithm/fruchterman/index.js.map +1 -1
package/lib/algorithm/fruchterman/simulation.js +2 -1
package/lib/algorithm/fruchterman/simulation.js.map +1 -1
package/lib/algorithm/fruchterman/types.d.ts +2 -1
package/lib/algorithm/grid/index.d.ts +1 -1
package/lib/algorithm/grid/index.js +29 -34
package/lib/algorithm/grid/index.js.map +1 -1
package/lib/algorithm/grid/types.d.ts +5 -24
package/lib/algorithm/mds/index.js +1 -0
package/lib/algorithm/mds/index.js.map +1 -1
package/lib/algorithm/radial/index.js +8 -5
package/lib/algorithm/radial/index.js.map +1 -1
package/lib/algorithm/radial/radial-nonoverlap-force.js +2 -4
package/lib/algorithm/radial/radial-nonoverlap-force.js.map +1 -1
package/lib/algorithm/radial/types.d.ts +3 -16
package/lib/algorithm/random/index.js +1 -0
package/lib/algorithm/random/index.js.map +1 -1
package/lib/algorithm/types.d.ts +16 -0
package/lib/index.d.ts +7 -5
package/lib/index.js +3 -1
package/lib/index.js.map +1 -1
package/lib/node_modules/@antv/expr/dist/index.esm.js +4 -0
package/lib/node_modules/@antv/expr/dist/index.esm.js.map +1 -0
package/lib/runtime/supervisor.js +26 -12
package/lib/runtime/supervisor.js.map +1 -1
package/lib/types/common.d.ts +17 -1
package/lib/types/data.d.ts +1 -1
package/lib/util/expr.d.ts +12 -0
package/lib/util/expr.js +26 -0
package/lib/util/expr.js.map +1 -0
package/lib/util/format.d.ts +37 -0
package/lib/util/format.js +61 -17
package/lib/util/format.js.map +1 -1
package/lib/util/order.d.ts +3 -4
package/lib/util/order.js.map +1 -1
package/lib/util/size.d.ts +2 -1
package/lib/util/size.js +9 -1
package/lib/util/size.js.map +1 -1
package/lib/worker.js +309 -239
package/lib/worker.js.map +1 -1
package/package.json +2 -1
package/src/algorithm/antv-dagre/index.ts +15 -12
package/src/algorithm/antv-dagre/types.ts +3 -14
package/src/algorithm/circular/index.ts +5 -4
package/src/algorithm/circular/types.ts +0 -15
package/src/algorithm/combo-combined/index.ts +21 -17
package/src/algorithm/combo-combined/types.ts +6 -21
package/src/algorithm/concentric/index.ts +18 -16
package/src/algorithm/concentric/types.ts +2 -16
package/src/algorithm/d3-force/index.ts +25 -18
package/src/algorithm/d3-force/types.ts +9 -22
package/src/algorithm/d3-force-3d/index.ts +1 -1
package/src/algorithm/d3-force-3d/types.ts +5 -0
package/src/algorithm/dagre/index.ts +9 -7
package/src/algorithm/dagre/types.ts +7 -15
package/src/algorithm/force/index.ts +64 -40
package/src/algorithm/force/types.ts +76 -45
package/src/algorithm/force-atlas2/index.ts +13 -15
package/src/algorithm/force-atlas2/types.ts +0 -12
package/src/algorithm/fruchterman/index.ts +7 -15
package/src/algorithm/fruchterman/simulation.ts +2 -2
package/src/algorithm/fruchterman/types.ts +5 -2
package/src/algorithm/grid/index.ts +45 -46
package/src/algorithm/grid/types.ts +6 -35
package/src/algorithm/radial/index.ts +14 -6
package/src/algorithm/radial/radial-nonoverlap-force.ts +11 -6
package/src/algorithm/radial/types.ts +2 -15
package/src/algorithm/types.ts +18 -0
package/src/runtime/supervisor.ts +26 -11
package/src/types/common.ts +22 -0
package/src/types/data.ts +1 -1
package/src/util/expr.ts +26 -0
package/src/util/format.ts +71 -27
package/src/util/index.ts +2 -0
package/src/util/order.ts +3 -9
package/src/util/size.ts +8 -0

package/lib/algorithm/antv-dagre/index.js CHANGED Viewed

@@ -1,7 +1,7 @@
 import { __awaiter } from '../../node_modules/tslib/tslib.es6.js';
+import '../../node_modules/@antv/expr/dist/index.esm.js';
+import { formatNodeSizeFn, formatNumberFn } from '../../util/format.js';
 import { parsePoint } from '../../util/point.js';
-import { parseSize } from '../../util/size.js';
-import { formatSizeFn, formatNumberFn } from '../../util/format.js';
 import { BaseLayout } from '../base-layout.js';
 import { DagreGraph } from './graph.js';
 import { layout } from './layout.js';
@@ -9,6 +9,7 @@ import isNumber from '../../node_modules/@antv/util/esm/lodash/is-number.js';
 const DEFAULTS_LAYOUT_OPTIONS$8 = {
     nodeSize: 10,
+    nodeSpacing: 0,
     rankdir: 'TB',
     nodesep: 50,
     ranksep: 50,
@@ -33,27 +34,27 @@ class AntVDagreLayout extends BaseLayout {
     }
     layout(options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { nodeSize, align, rankdir = 'TB', ranksep, nodesep, edgeLabelSpace, ranker = 'tight-tree', nodeOrder, begin, controlPoints, radial, sortByCombo,
+            const { nodeSize, nodeSpacing, align, rankdir = 'TB', ranksep, nodesep, edgeLabelSpace, ranker = 'tight-tree', nodeOrder, begin, controlPoints, radial, sortByCombo,
             // focusNode,
             preset, ranksepFunc, nodesepFunc, } = options;
-            const ranksepfunc = formatNumberFn(ranksepFunc, ranksep !== null && ranksep !== void 0 ? ranksep : 50);
-            const nodesepfunc = formatNumberFn(nodesepFunc, nodesep !== null && nodesep !== void 0 ? nodesep : 50);
+            const ranksepfunc = formatNumberFn(ranksepFunc, ranksep !== null && ranksep !== void 0 ? ranksep : 50, 'node');
+            const nodesepfunc = formatNumberFn(nodesepFunc, nodesep !== null && nodesep !== void 0 ? nodesep : 50, 'node');
             let horisep = nodesepfunc;
             let vertisep = ranksepfunc;
             if (rankdir === 'LR' || rankdir === 'RL') {
                 horisep = ranksepfunc;
                 vertisep = nodesepfunc;
             }
-            const nodeSizeFunc = formatSizeFn(nodeSize, DEFAULTS_LAYOUT_OPTIONS$8.nodeSize);
             // Create internal graph
             const g = new DagreGraph({ tree: [] });
             // copy graph to g
             const nodes = this.model.nodes();
             const edges = this.model.edges();
+            const sizeFn = formatNodeSizeFn(nodeSize, nodeSpacing, DEFAULTS_LAYOUT_OPTIONS$8.nodeSize, DEFAULTS_LAYOUT_OPTIONS$8.nodeSpacing);
             nodes.forEach((node) => {
                 var _a;
                 const raw = node._original;
-                const size = parseSize(nodeSizeFunc(raw));
+                const size = sizeFn(raw);
                 const verti = vertisep(raw);
                 const hori = horisep(raw);
                 const width = size[0] + 2 * hori;

package/lib/algorithm/antv-dagre/index.js.map CHANGED Viewed

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

package/lib/algorithm/antv-dagre/rank/index.js CHANGED Viewed

@@ -1,6 +1,6 @@
 import { feasibleTreeWithLayer } from './feasible-tree.js';
 import { networkSimplex } from './network-simplex.js';
-import { longestPath, longestPathWithLayer } from './util.js';
+import { longestPathWithLayer, longestPath } from './util.js';
 /*
  * Assigns a rank to each node in the input graph that respects the "minlen"

package/lib/algorithm/antv-dagre/types.d.ts CHANGED Viewed

@@ -1,8 +1,8 @@
+import { Expr } from '../../types/common.js';
 import { NodeData } from '../../types/data.js';
 import { BaseLayoutOptions } from '../types.js';
 import { ID } from '../../types/id.js';
 import { Point } from '../../types/point.js';
-import { Size } from '../../types/size.js';
 type DagreRankdir = 'TB' | 'BT' | 'LR' | 'RL' | 'tb' | 'lr' | 'rl' | 'bt';
 type DagreAlign = 'UL' | 'UR' | 'DL' | 'DR';
@@ -55,17 +55,6 @@ interface AntVDagreLayoutOptions extends BaseLayoutOptions {
      * @defaultValue undefined
      */
     begin?: Point;
-    /**
-     * <zh/> 节点大小（直径）。
-     *
-     * <en/> The diameter of the node
-     * @remarks
-     * <zh/> 用于防止节点重叠时的碰撞检测
-     *
-     * <en/> Used for collision detection when nodes overlap
-     * @defaultValue undefined
-     */
-    nodeSize?: Size | ((d?: NodeData) => Size);
     /**
      * <zh/> 节点间距（px）
      *
@@ -98,7 +87,7 @@ interface AntVDagreLayoutOptions extends BaseLayoutOptions {
      * <en/> The horizontal spacing of the node in the case of rankdir is 'TB' or 'BT', and the vertical spacing of the node in the case of rankdir is 'LR' or 'RL'. The priority is higher than nodesep, that is, if nodesepFunc is set, nodesep does not take effect
      * @param d - <zh/> 节点实例 | <en/> Node instance
      */
-    nodesepFunc?: (d?: NodeData) => number;
+    nodesepFunc?: Expr | ((node: NodeData) => number);
     /**
      * <zh/> 层间距（px）的回调函数
      *
@@ -109,7 +98,7 @@ interface AntVDagreLayoutOptions extends BaseLayoutOptions {
      * <en/> The vertical spacing of adjacent layers in the case of rankdir is 'TB' or 'BT', and the horizontal spacing of adjacent layers in the case of rankdir is 'LR' or 'RL'. The priority is higher than nodesep, that is, if nodesepFunc is set, nodesep does not take effect
      * @param d - <zh/> 节点实例 | <en/> Node instance
      */
-    ranksepFunc?: (d?: NodeData) => number;
+    ranksepFunc?: Expr | ((node: NodeData) => number);
     /**
      * <zh/> 是否同时计算边上的的控制点位置
      *

package/lib/algorithm/circular/index.js CHANGED Viewed

@@ -1,12 +1,12 @@
 import { __awaiter } from '../../node_modules/tslib/tslib.es6.js';
 import { applySingleNodeLayout } from '../../util/common.js';
+import '../../node_modules/@antv/expr/dist/index.esm.js';
+import { formatNodeSizeFn } from '../../util/format.js';
 import { orderByTopology, orderByDegree } from '../../util/order.js';
 import { normalizeViewport } from '../../util/viewport.js';
-import { formatNodeSizeFn } from '../../util/format.js';
 import { BaseLayout } from '../base-layout.js';
-import isNil from '../../node_modules/@antv/util/esm/lodash/is-nil.js';
-const DEFAULT_LAYOUT_OPTIONS = {
+const DEFAULT_LAYOUT_OPTIONS$1 = {
     radius: null,
     startRadius: null,
     endRadius: null,
@@ -17,6 +17,7 @@ const DEFAULT_LAYOUT_OPTIONS = {
     ordering: null,
     angleRatio: 1,
     nodeSize: 10,
+    nodeSpacing: 0,
 };
 /**
  * <zh/> 环形布局
@@ -29,7 +30,7 @@ class CircularLayout extends BaseLayout {
         this.id = 'circular';
     }
     getDefaultOptions() {
-        return DEFAULT_LAYOUT_OPTIONS;
+        return DEFAULT_LAYOUT_OPTIONS$1;
     }
     layout() {
         return __awaiter(this, void 0, void 0, function* () {
@@ -55,11 +56,11 @@ class CircularLayout extends BaseLayout {
             }
             let { radius, startRadius, endRadius } = this.options;
             const nodes = this.model.nodes();
-            const format = formatNodeSizeFn(nodeSize, nodeSpacing, DEFAULT_LAYOUT_OPTIONS.nodeSize);
-            if (!isNil(nodeSpacing)) {
+            const sizeFn = formatNodeSizeFn(nodeSize, nodeSpacing, DEFAULT_LAYOUT_OPTIONS$1.nodeSize, DEFAULT_LAYOUT_OPTIONS$1.nodeSpacing);
+            if (nodeSpacing) {
                 let perimeter = 0;
                 for (const node of nodes) {
-                    perimeter += format(node._original);
+                    perimeter += Math.max(...sizeFn(node._original));
                 }
                 radius = perimeter / (2 * Math.PI);
             }

package/lib/algorithm/circular/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sources":["../../../src/algorithm/circular/src/algorithm/circular/index.ts"],"sourcesContent":[null],"names":[],"mappings":";;;;;;;;~~AASA~~,~~MAAM~~,~~sBAAsB~~,GAA0B;AACpD,IAAA,MAAM,EAAE,IAAI;AACZ,IAAA,WAAW,EAAE,IAAI;AACjB,IAAA,SAAS,EAAE,IAAI;AACf,IAAA,UAAU,EAAE,CAAC;AACb,IAAA,QAAQ,EAAE,CAAC,GAAG,IAAI,CAAC,EAAE;AACrB,IAAA,SAAS,EAAE,IAAI;AACf,IAAA,SAAS,EAAE,CAAC;AACZ,IAAA,QAAQ,EAAE,IAAI;AACd,IAAA,UAAU,EAAE,CAAC;AACb,IAAA,QAAQ,EAAE,EAAE;~~CACb~~;AAED;;;;AAIG;AACG,MAAO,cAAe,SAAQ,UAAiC,CAAA;AAArE,IAAA,WAAA,GAAA;;QACE,IAAA,CAAA,EAAE,GAAG,UAAU;~~IA8FjB~~;~~IA5FY~~,iBAAiB,GAAA;AACzB,QAAA,~~OAAO~~,~~sBAAsB~~;IAC/B;IAEgB,MAAM,GAAA;;AACpB,YAAA,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;YAEjE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;AAChC,YAAA,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;AACjB,gBAAA,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;gBACzC;AACD,YAAA;AAED,YAAA,MAAM,EACJ,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,GAAG,CAAC,GAAG,IAAI,CAAC,EAAE,EACtB,UAAU,GAAG,CAAC,EACd,SAAS,EACT,UAAU,EACV,SAAS,GACV,GAAG,IAAI,CAAC,OAAO;;YAGhB,IAAI,QAAQ,KAAK,UAAU,EAAE;;AAE3B,gBAAA,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;AACnC,YAAA;iBAAM,IAAI,QAAQ,KAAK,mBAAmB,EAAE;;AAE3C,gBAAA,eAAe,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC;AAClC,YAAA;iBAAM,IAAI,QAAQ,KAAK,QAAQ,EAAE;;AAEhC,gBAAA,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC;AACjC,YAAA;YAED,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO;YAErD,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;AAChC,YAAA,MAAM,MAAM,GAAG,gBAAgB,CAC7B,QAAQ,EACR,WAAW,~~EACX~~,~~sBAAsB~~,CAAC,QAAkB,~~CAC1C~~;AAED,YAAA,IAAI,~~CAAC,KAAK,CAAC,~~WAAW,~~CAAC,~~EAAE;~~gBACvB~~,IAAI,SAAS,GAAG,CAAC;AACjB,gBAAA,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;AACxB,oBAAA,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC;~~AACpC~~,gBAAA;gBACD,MAAM,GAAG,SAAS,IAAI,CAAC,GAAG,IAAI,CAAC,EAAE,CAAC;AACnC,YAAA;iBAAM,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,IAAI,CAAC,SAAS,EAAE;gBAChD,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC;AACrC,YAAA;AAAM,iBAAA,IAAI,CAAC,WAAW,IAAI,SAAS,EAAE;gBACpC,WAAW,GAAG,SAAS;AACxB,YAAA;AAAM,iBAAA,IAAI,WAAW,IAAI,CAAC,SAAS,EAAE;gBACpC,SAAS,GAAG,WAAW;AACxB,YAAA;;YAGD,MAAM,SAAS,GAAG,CAAC,QAAQ,GAAG,UAAU,IAAI,CAAC;AAC7C,YAAA,MAAM,YAAY,GAAG,SAAS,GAAG,UAAW;YAC5C,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,SAAU,CAAC;YAClD,MAAM,QAAQ,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,EAAE,IAAI,SAAU;YAE3C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,GAAI;AACvB,gBAAA,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC;;gBAErB,IAAI,CAAC,GAAG,MAAM;gBACd,IAAI,CAAC,CAAC,IAAI,WAAW,KAAK,IAAI,IAAI,SAAS,KAAK,IAAI,EAAE;AACpD,oBAAA,CAAC,GAAG,WAAY,GAAG,CAAC,CAAC,IAAI,SAAU,GAAG,WAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAC/D,gBAAA;gBACD,IAAI,CAAC,CAAC,EAAE;AACN,oBAAA,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;AAC7B,gBAAA;;gBAGD,MAAM,aAAa,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,gBAAgB,CAAC;AACtD,gBAAA,MAAM,eAAe,GAAG,CAAC,GAAG,gBAAgB;gBAC5C,MAAM,KAAK,GAAG,eAAe,GAAG,YAAY,GAAG,QAAQ,GAAG,aAAa;AACvE,gBAAA,IAAI,KAAK,GAAG,UAAU,GAAG,KAAK;gBAC9B,IAAI,CAAC,SAAS,EAAE;AACd,oBAAA,KAAK,GAAG,QAAQ,GAAG,KAAK;AACzB,gBAAA;;AAGD,gBAAA,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;AACxC,gBAAA,IAAI,CAAC,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC;AAExC,gBAAA,CAAC,EAAE;AACJ,YAAA;QACH,CAAC,CAAA;AAAA,IAAA;AACF;;;;"}
1	+ {"version":3,"file":"index.js","sources":["../../../src/algorithm/circular/src/algorithm/circular/index.ts"],"sourcesContent":[null],"names":["DEFAULT_LAYOUT_OPTIONS"],"mappings":"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"}

package/lib/algorithm/circular/types.d.ts CHANGED Viewed

@@ -1,6 +1,4 @@
 import { BaseLayoutOptions } from '../types.js';
-import { NodeData } from '../../types/data.js';
-import { Size } from '../../types/size.js';
 /**
  * <zh/> 环形 Circular 布局配置
@@ -86,20 +84,6 @@ interface CircularLayoutOptions extends BaseLayoutOptions {
      * @defaultValue 2 * Math.PI
      */
     endAngle?: number;
-    /**
-     * <zh/> 环与环之间最小间距，用于调整半径
-     *
-     * <en/> Minimum spacing between rings, used to adjust the radius
-     * @defaultValue 0
-     */
-    nodeSpacing?: number | ((d?: NodeData) => number);
-    /**
-     * <zh/> 节点大小（直径）。用于防止节点重叠时的碰撞检测
-     *
-     * <en/> Node size (diameter). Used for collision detection when nodes overlap
-     * @defaultValue 10
-     */
-    nodeSize?: Size | ((d?: NodeData) => Size);
 }
 export type { CircularLayoutOptions };

package/lib/algorithm/combo-combined/index.js CHANGED Viewed

@@ -1,8 +1,8 @@
 import { __awaiter, __rest } from '../../node_modules/tslib/tslib.es6.js';
 import { registry } from '../../registry.js';
-import { parseSize } from '../../util/size.js';
+import '../../node_modules/@antv/expr/dist/index.esm.js';
+import { formatFn, formatNumberFn, formatNodeSizeFn } from '../../util/format.js';
 import { normalizeViewport } from '../../util/viewport.js';
-import { formatNumberFn, formatNodeSizeFn } from '../../util/format.js';
 import { BaseLayout, isLayoutWithIterations } from '../base-layout.js';
 const DEFAULT_OPTIONS = {
@@ -143,7 +143,9 @@ class ComboCombinedLayout extends BaseLayout {
         });
     }
     getLayoutConfig(combo) {
-        const { layout } = this.options;
+        const layout = typeof this.options.layout === 'object'
+            ? this.options.layout
+            : formatFn(this.options.layout, ['comboId']);
         if (typeof layout === 'function') {
             const comboId = combo.id === ROOT_ID ? null : combo.id;
             return this.normalizeLayoutConfig(layout(comboId));
@@ -151,7 +153,7 @@ class ComboCombinedLayout extends BaseLayout {
         return this.normalizeLayoutConfig(layout);
     }
     normalizeLayoutConfig(config) {
-        const base = Object.assign(Object.assign({ type: 'concentric' }, normalizeViewport(this.options)), { nodeSize: (d) => d.size, nodeSpacing: 0 });
+        const base = Object.assign(Object.assign({ type: 'concentric' }, normalizeViewport(this.options)), { nodeSize: 'node.size', nodeSpacing: 0 });
         if (!config)
             return base;
         if (typeof config === 'string')
@@ -238,7 +240,7 @@ class ComboCombinedLayout extends BaseLayout {
         if (!Number.isFinite(minX) || !Number.isFinite(minY)) {
             return { center: [0, 0], width: 0, height: 0 };
         }
-        const comboPaddingFn = formatNumberFn(this.options.comboPadding, 20);
+        const comboPaddingFn = formatNumberFn(this.options.comboPadding, 20, 'combo');
         const padding = comboPaddingFn(combo._original);
         return {
             center: [(minX + maxX) / 2, (minY + maxY) / 2],
@@ -254,10 +256,10 @@ class ComboCombinedLayout extends BaseLayout {
     getNodeSize(node, includeSpacing = true) {
         const { nodeSize, nodeSpacing } = this.options;
         const sizeFn = formatNodeSizeFn(nodeSize, includeSpacing ? nodeSpacing : 0);
-        return parseSize(sizeFn(node._original));
+        return sizeFn(node._original);
     }
     getComboSize(combo, includeSpacing = true) {
-        const comboSpacingFn = formatNumberFn(this.options.comboSpacing, 0);
+        const comboSpacingFn = formatNumberFn(this.options.comboSpacing, 0, 'combo');
         const spacing = includeSpacing ? comboSpacingFn(combo._original) : 0;
         const [width, height] = combo.size;
         return [width + spacing / 2, height + spacing / 2, 0];

package/lib/algorithm/combo-combined/index.js.map CHANGED Viewed

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

package/lib/algorithm/combo-combined/types.d.ts CHANGED Viewed

@@ -1,9 +1,9 @@
-import { BaseLayoutOptions } from '../types.js';
+import { Expr } from '../../types/common.js';
 import { NodeData } from '../../types/data.js';
+import { BaseLayoutOptions } from '../types.js';
 import { ID } from '../../types/id.js';
-import { Size } from '../../types/size.js';
-type ComboCombinedLayoutConfig = string | {
+type ComboCombinedLayoutConfig = {
     type: string;
     [key: string]: any;
 };
@@ -11,27 +11,15 @@ interface ComboCombinedLayoutOptions extends BaseLayoutOptions {
     /**
      * 布局配置：支持固定配置或回调选择器（可基于层级信息选择不同布局）
      */
-    layout?: ComboCombinedLayoutConfig | ((comboId: ID | null) => ComboCombinedLayoutConfig);
-    /**
-     * <zh/> 节点尺寸
-     *
-     * <en/> Node size
-     */
-    nodeSize?: Size | ((node?: NodeData) => Size);
-    /**
-     * <zh/> 节点间距
-     *
-     * <en/> Node spacing
-     */
-    nodeSpacing?: number | ((node?: NodeData) => number);
+    layout?: ComboCombinedLayoutConfig | ((comboId: ID | null) => ComboCombinedLayoutConfig) | Expr;
     /**
      * Combo 之间的间距
      */
-    comboSpacing?: number | ((combo?: NodeData) => number);
+    comboSpacing?: number | ((combo: NodeData) => number) | Expr;
     /**
      * Combo 内部的边距
      */
-    comboPadding?: number | ((combo?: NodeData) => number);
+    comboPadding?: number | ((combo: NodeData) => number) | Expr;
 }
 export type { ComboCombinedLayoutConfig, ComboCombinedLayoutOptions };

package/lib/algorithm/concentric/index.js CHANGED Viewed

@@ -1,9 +1,10 @@
 import { __awaiter } from '../../node_modules/tslib/tslib.es6.js';
-import { BaseLayout } from '../base-layout.js';
 import { applySingleNodeLayout } from '../../util/common.js';
+import '../../node_modules/@antv/expr/dist/index.esm.js';
+import { formatNodeSizeFn, formatFn } from '../../util/format.js';
 import { orderByDegree, orderBySorter } from '../../util/order.js';
 import { normalizeViewport } from '../../util/viewport.js';
-import { formatNodeSizeFn } from '../../util/format.js';
+import { BaseLayout } from '../base-layout.js';
 const DEFAULTS_LAYOUT_OPTIONS$7 = {
     nodeSize: 30,
@@ -37,17 +38,10 @@ class ConcentricLayout extends BaseLayout {
                 applySingleNodeLayout(this.model, center);
                 return;
             }
-            const { sortBy: propsSortBy, maxLevelDiff: propsMaxLevelDiff, sweep: propsSweep, clockwise, equidistant, preventOverlap, startAngle = DEFAULTS_LAYOUT_OPTIONS$7.startAngle, nodeSize = DEFAULTS_LAYOUT_OPTIONS$7.nodeSize, nodeSpacing, } = this.options;
-            let sortBy = propsSortBy;
-            if (propsSortBy && typeof propsSortBy === 'function') {
-                const testNode = this.model.firstNode();
-                const testValue = propsSortBy(testNode._original);
-                if (typeof testValue !== 'number')
-                    sortBy = 'degree';
-            }
-            else {
-                sortBy = 'degree';
-            }
+            const { sortBy: propsSortBy, maxLevelDiff: propsMaxLevelDiff, sweep: propsSweep, clockwise, equidistant, preventOverlap, startAngle = DEFAULTS_LAYOUT_OPTIONS$7.startAngle, nodeSize, nodeSpacing, } = this.options;
+            const sortBy = !propsSortBy || propsSortBy === 'degree'
+                ? 'degree'
+                : formatFn(propsSortBy, ['node']);
             if (sortBy === 'degree') {
                 orderByDegree(this.model);
             }
@@ -64,15 +58,15 @@ class ConcentricLayout extends BaseLayout {
             for (const node of nodes) {
                 const v = sortBy === 'degree'
                     ? this.model.degree(node.id)
-                    : sortBy === null || sortBy === void 0 ? void 0 : sortBy(node._original);
+                    : sortBy(node._original);
                 sortKeys.set(node.id, v);
             }
             const maxValueNode = this.model.firstNode();
             const maxLevelDiff = propsMaxLevelDiff || sortKeys.get(maxValueNode.id) / 4;
-            const nodeSizeFn = formatNodeSizeFn(nodeSize, nodeSpacing);
+            const sizeFn = formatNodeSizeFn(nodeSize, nodeSpacing, DEFAULTS_LAYOUT_OPTIONS$7.nodeSize, DEFAULTS_LAYOUT_OPTIONS$7.nodeSpacing);
             const nodeDistances = new Map();
             for (const node of nodes) {
-                nodeDistances.set(node.id, nodeSizeFn(node._original));
+                nodeDistances.set(node.id, Math.max(...sizeFn(node._original)));
             }
             // put the values into levels
             const levels = [{ nodes: [] }];

package/lib/algorithm/concentric/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"index.js","sources":["../../../src/algorithm/concentric/src/algorithm/concentric/index.ts"],"sourcesContent":[null],"names":["DEFAULTS_LAYOUT_OPTIONS"],"mappings":"~~;;;;;;;~~AAaA,MAAMA,yBAAuB,GAAqC;AAChE,IAAA,QAAQ,EAAE,EAAE;AACZ,IAAA,WAAW,EAAE,EAAE;AACf,IAAA,cAAc,EAAE,KAAK;AACrB,IAAA,KAAK,EAAE,SAAS;AAChB,IAAA,WAAW,EAAE,KAAK;IAClB,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,EAAE;AAC7B,IAAA,SAAS,EAAE,IAAI;AACf,IAAA,YAAY,EAAE,SAAS;AACvB,IAAA,MAAM,EAAE,QAAQ;CACjB;AAED;;;;AAIG;AACG,MAAO,gBAAiB,SAAQ,UAAmC,CAAA;AAAzE,IAAA,WAAA,GAAA;;QACE,IAAA,CAAA,EAAE,GAAG,YAAY;~~IA0MnB~~;~~IAxMY~~,iBAAiB,GAAA;AACzB,QAAA,OAAOA,yBAAuB;IAChC;IAEgB,MAAM,GAAA;;AACpB,YAAA,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,iBAAiB,CAAC,IAAI,CAAC,OAAO,CAAC;YAEjE,MAAM,CAAC,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAE;AAChC,YAAA,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;AACjB,gBAAA,qBAAqB,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;gBACzC;AACD,YAAA;AAED,YAAA,MAAM,EACJ,MAAM,EAAE,WAAW,EACnB,YAAY,EAAE,iBAAiB,EAC/B,KAAK,EAAE,UAAU,EACjB,SAAS,EACT,WAAW,EACX,cAAc,EACd,UAAU,GAAGA,yBAAuB,CAAC,UAAU,EAC/C,QAAQ,~~GAAGA~~,~~yBAAuB,CAAC,QAAQ,EAC3C,~~WAAW,GACZ,GAAG,IAAI,CAAC,OAAO;~~YAEhB~~,~~IAAI~~,MAAM,~~GAAsC~~,~~WAAW;AAC3D~~,~~YAAA~~,~~IAAI,~~WAAW,IAAI,~~OAAO,~~WAAW,KAAK,~~UAAU,EAAE~~;~~gBACpD~~,~~MAAM,~~QAAQ,~~GAAG,IAAI,~~CAAC,~~KAAK,CAAC,SAAS,EAAG;gBACxC,MAAM,SAAS,GAAG,~~WAAW,~~CAAC~~,~~QAAQ,~~CAAC,~~SAAS~~,CAAC~~;gBACjD~~,~~IAAI,OAAO,SAAS,KAAK,QAAQ~~;~~oBAAE~~,~~MAAM,GAAG,QAAQ;AACrD,YAAA;AAAM,iBAAA;gBACL,MAAM,GAAG,QAAQ;AAClB,YAAA;YAED,~~IAAI,MAAM,KAAK,QAAQ,EAAE;AACvB,gBAAA,aAAa,CAAC,IAAI,CAAC,KAAK,CAAC;AAC1B,YAAA;AAAM,iBAAA;AACL,gBAAA,MAAM,MAAM,GAAG,CAAC,KAAe,EAAE,KAAe,KAAI;AAClD,oBAAA,MAAM,CAAC,~~GAAI~~,~~MAAqC~~,CAAC,KAAK,CAAC;~~AACvD~~,oBAAA,MAAM,CAAC,~~GAAI~~,~~MAAqC~~,CAAC,KAAK,CAAC;~~oBACvD~~,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC;AACrC,gBAAA,CAAC;AACD,gBAAA,aAAa,CAAC,IAAI,CAAC,KAAK,EAAE,MAAM,CAAC;AAClC,YAAA;YAED,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;AAEhC,YAAA,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAE;AAC1B,YAAA,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;AACxB,gBAAA,MAAM,CAAC,GACL,MAAM,KAAK;sBACP,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;~~sBACzB~~,~~MAAM~~,~~KAAA,IAAA,IAAN,~~MAAM,~~KAAA~~,~~MAAA,GAAA,MAAA,GAAN,MAAM,CAAG,~~IAAI,CAAC,SAAS,CAAC;~~gBAC9B~~,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;AACzB,YAAA;YAED,MAAM,YAAY,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,EAAG;AAC5C,YAAA,MAAM,YAAY,GAAG,iBAAiB,IAAI,QAAQ,CAAC,GAAG,CAAC,YAAY,CAAC,EAAE,CAAC,GAAG,CAAC;~~YAE3E~~,MAAM,~~UAAU~~,GAAG,gBAAgB,~~CAAC~~,QAAQ,~~EAAE~~,WAAW,CAAC;~~AAC1D~~,YAAA,MAAM,aAAa,GAAG,IAAI,GAAG,EAA4B;AACzD,YAAA,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;~~AACxB~~,~~gBAAA,~~aAAa,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,EAAE,~~UAAU~~,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;~~AACvD~~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"}
1	+ {"version":3,"file":"index.js","sources":["../../../src/algorithm/concentric/src/algorithm/concentric/index.ts"],"sourcesContent":[null],"names":["DEFAULTS_LAYOUT_OPTIONS"],"mappings":"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"}

package/lib/algorithm/concentric/types.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { BaseLayoutOptions } from '../types.js';
+import { Expr } from '../../types/common.js';
 import { NodeData } from '../../types/data.js';
-import { Size } from '../../types/size.js';
+import { BaseLayoutOptions } from '../types.js';
 /**
  * <zh/> Concentric 同心圆布局配置
@@ -19,20 +19,6 @@ interface ConcentricLayoutOptions extends BaseLayoutOptions {
      * @defaultValue false
      */
     preventOverlap?: boolean;
-    /**
-     * <zh/> 节点大小（直径）。用于防止节点重叠时的碰撞检测
-     *
-     * <en/> Node size (diameter). Used for collision detection when preventing node overlap
-     * @defaultValue 30
-     */
-    nodeSize?: Size | ((d?: NodeData) => Size);
-    /**
-     * <zh/> 环与环之间最小间距，用于调整半径
-     *
-     * <en/> Minimum spacing between rings, used to adjust the radius
-     * @defaultValue 10
-     */
-    nodeSpacing?: number | ((d?: NodeData) => number);
     /**
      * <zh/> 第一个节点与最后一个节点之间的弧度差
      *
@@ -86,7 +72,7 @@ interface ConcentricLayoutOptions extends BaseLayoutOptions {
      * - ((node) => ...): Custom sorting function, returns a number, the higher the value, the more the node will be placed in the center
      * @defaultValue degree
      */
-    sortBy?: 'degree' | ((d?: NodeData) => number);
+    sortBy?: 'degree' | Expr | ((node: NodeData) => number);
 }
 export type { ConcentricLayoutOptions };

package/lib/algorithm/d3-force/index.js CHANGED Viewed

@@ -1,7 +1,8 @@
 import { __awaiter } from '../../node_modules/tslib/tslib.es6.js';
+import '../../node_modules/@antv/expr/dist/index.esm.js';
+import { formatFn, formatNodeSizeFn } from '../../util/format.js';
 import { assignDefined } from '../../util/object.js';
 import { normalizeViewport } from '../../util/viewport.js';
-import { formatNodeSizeFn } from '../../util/format.js';
 import { BaseLayoutWithIterations } from '../base-layout.js';
 import forceInABox from './force-in-a-box.js';
 import deepMix from '../../node_modules/@antv/util/esm/lodash/deep-mix.js';
@@ -15,9 +16,7 @@ import forceY from '../../node_modules/d3-force/src/y.js';
 import forceRadial from '../../node_modules/d3-force/src/radial.js';
 const DEFAULTS_LAYOUT_OPTIONS$6 = {
-    link: {
-        id: (d) => String(d.id),
-    },
+    edgeId: 'edge.id',
     manyBody: {
         strength: -30,
     },
@@ -272,7 +271,9 @@ class D3ForceLayout extends BaseLayoutWithIterations {
         if (options.manyBody === false)
             return undefined;
         return assignDefined({}, options.manyBody || {}, {
-            strength: options.nodeStrength,
+            strength: options.nodeStrength
+                ? formatFn(options.nodeStrength, ['node'])
+                : undefined,
             distanceMin: options.distanceMin,
             distanceMax: options.distanceMax,
             theta: options.theta,
@@ -305,9 +306,13 @@ class D3ForceLayout extends BaseLayoutWithIterations {
         if (options.link === false)
             return undefined;
         return assignDefined({}, options.link || {}, {
-            id: options.edgeId,
-            distance: options.linkDistance,
-            strength: options.edgeStrength,
+            id: options.edgeId ? formatFn(options.edgeId, ['edge']) : undefined,
+            distance: options.linkDistance
+                ? formatFn(options.linkDistance, ['edge'])
+                : undefined,
+            strength: options.edgeStrength
+                ? formatFn(options.edgeStrength, ['edge'])
+                : undefined,
             iterations: options.edgeIterations,
         });
     }
@@ -339,9 +344,8 @@ class D3ForceLayout extends BaseLayoutWithIterations {
         if (options.preventOverlap === false &&
             (options.collide === false || options.collide === undefined))
             return undefined;
-        const radius = options.nodeSize || options.nodeSpacing
-            ? (d) => formatNodeSizeFn(options.nodeSize, options.nodeSpacing)(d._original) / 2
-            : undefined;
+        const sizeFn = formatNodeSizeFn(options.nodeSize, options.nodeSpacing, DEFAULTS_LAYOUT_OPTIONS$6.nodeSize, DEFAULTS_LAYOUT_OPTIONS$6.nodeSpacing);
+        const radius = (d) => Math.max(...sizeFn(d._original)) / 2;
         return assignDefined({}, options.collide || {}, {
             radius: (options.collide && options.collide.radius) || radius,
             strength: options.collideStrength,
@@ -482,7 +486,7 @@ class D3ForceLayout extends BaseLayoutWithIterations {
                 ['centerY', center && center.y],
                 ['template', 'force'],
                 ['strength', clusterFociStrength],
-                ['groupBy', clusterBy],
+                ['groupBy', clusterBy ? formatFn(clusterBy, ['node']) : undefined],
                 ['nodes', this.model.nodes()],
                 ['links', this.model.edges()],
                 ['forceLinkDistance', clusterEdgeDistance],