feat: expr (#285)

* feat: expr

* test: update tests

* fix: d3force id

* docs: update docs

* fix: 修复边标签位置函数的类型判断

* docs: add webworker docs

* fix: 更新边标签位置的 SVG 路径和坐标

* fix: 更新版本号至 2.0.0-beta.1

Author: yvonneyx

__tests__/demos/combo-combined.ts

@@ -44,7 +44,6 @@ export function render(gui?: GUI) {
     });
 
     layout.forEachNode((node) => {
-      console.log('node:', node);
       renderer.updateNodeAttributes(node.id, {
         cx: node.x,
         cy: node.y,

__tests__/demos/combo-combined2.ts

@@ -189,7 +189,6 @@ export function render(gui?: GUI) {
     });
 
     layout.forEachNode((node: any) => {
-      console.log('node:', node);
       renderer.updateNodeAttributes(node.id, {
         // cx: node.x,
         // cy: node.y,

__tests__/demos/fruchterman.ts

@@ -55,11 +55,12 @@ export async function render(gui?: GUI) {
   const clusterOptions = {
     ...options,
     clustering: true,
-    nodeClusterBy: (node: any) => node.cluster,
+    // nodeClusterBy: (node: any) => node.cluster,
+    nodeClusterBy: 'node.cluster',
   };
 
   console.time('fruchterman layout');
-  await layout.execute(processedData, options);
+  await layout.execute(processedData, clusterOptions);
   console.timeEnd('fruchterman layout');
 
   if (gui) {

__tests__/unit/circular.test.ts

@@ -2,8 +2,7 @@ import { CircularLayout } from '@/src';
 import { createCanvas } from '@@/utils/create';
 import type { Canvas } from '@antv/g';
 import { countries as data } from '../dataset';
-import { GraphRenderer } from '../utils';
-import { calculatePositions } from '../utils';
+import { calculatePositions, GraphRenderer } from '../utils';
 
 describe('layout circular', () => {
   let canvas: Canvas;
@@ -43,6 +42,7 @@ describe('layout circular', () => {
       ordering: null,
       angleRatio: 1,
       nodeSize: 10,
+      nodeSpacing: 0,
     });
   });
 

__tests__/unit/force.test.ts

@@ -244,6 +244,49 @@ describe('layout force', () => {
     expect(tickCount).toBeGreaterThanOrEqual(1);
   });
 
+  it('should support Expr for accessor callbacks', async () => {
+    const graph = {
+      nodes: [
+        { id: 'a', data: { cluster: 'c1', mass: 2, ns: 123, cs: 50 } },
+        { id: 'b', data: { cluster: 'c2', mass: 3, ns: 456, cs: 60 } },
+      ],
+      edges: [
+        {
+          id: 'e1',
+          source: 'a',
+          target: 'b',
+          data: { len: 77, es: 0.5 },
+        },
+      ],
+    };
+
+    const layout = new ForceLayout({
+      width,
+      height,
+      maxIteration: 1,
+      minMovement: 0,
+      clustering: true,
+      nodeClusterBy: 'node.data.cluster',
+      getMass: 'node.data.mass',
+      nodeStrength: 'node.data.ns',
+      edgeStrength: 'edge.data.es',
+      linkDistance: 'edge.data.len',
+      clusterNodeStrength: 'node.data.cs',
+      getCenter: '[0, 0, 10]',
+    });
+
+    await layout.execute(graph);
+
+    layout.forEachNode((node: any) => {
+      expect(node.mass).toBe(node._original.data.mass);
+      expect(node.nodeStrength).toBe(node._original.data.ns);
+    });
+    layout.forEachEdge((edge: any) => {
+      expect(edge.edgeStrength).toBe(edge._original.data.es);
+      expect(edge.linkDistance).toBe(edge._original.data.len);
+    });
+  });
+
   it('should handle overlapped nodes', async () => {
     const overlapGraph = {
       nodes: [

__tests__/unit/fruchterman.test.ts

@@ -39,7 +39,7 @@ describe('FruchtermanLayout', () => {
       clusterGravity: 10,
       width: 300,
       height: 300,
-      nodeClusterBy: 'data.cluster',
+      nodeClusterBy: 'node.cluster',
       dimensions: 2,
     });
   });

__tests__/unit/util/expr.test.ts

@@ -0,0 +1,22 @@
+import { evaluateExpression } from '@/src/util/expr';
+
+describe('expr', () => {
+  describe('evaluateExpression', () => {
+    test('evaluateExpression returns result for valid expression', () => {
+      expect(evaluateExpression('x + y', { x: 10, y: 20 })).toBe(30);
+    });
+
+    test('evaluateExpression supports dot notation and array access', () => {
+      const data = { values: [1, 2, 3], status: 'active' };
+      expect(
+        evaluateExpression('data.values[0] + data.values[1]', { data }),
+      ).toBe(3);
+    });
+
+    test('evaluateExpression returns undefined for non-string/empty/invalid expression', () => {
+      expect(evaluateExpression(123, { x: 1 })).toBeUndefined();
+      expect(evaluateExpression('   ', { x: 1 })).toBeUndefined();
+      expect(evaluateExpression('x +', { x: 1 })).toBeUndefined();
+    });
+  });
+});

__tests__/unit/util/format.test.ts

@@ -85,16 +85,6 @@ describe('format', () => {
       expect(result()).toEqual([20, 30]);
     });
 
-    test('should handle object value with width and height', () => {
-      const result = formatSizeFn<NodeData>({ width: 40, height: 50 }, 10);
-      expect(result()).toEqual([40, 50]);
-    });
-
-    test('should handle object value when resultIsNumber is false', () => {
-      const result = formatSizeFn<NodeData>({ width: 40, height: 50 }, 10);
-      expect(result()).toEqual([40, 50]);
-    });
-
     test('should return default value when value is undefined and no node provided', () => {
       const result = formatSizeFn<NodeData>(undefined, 10);
       expect(result()).toBe(10);
@@ -111,7 +101,7 @@ describe('format', () => {
 
     test('should handle number zero as valid size', () => {
       const result = formatSizeFn<NodeData>(0, 10);
-      expect(result()).toBe(10); // 0 is falsy, falls back to default
+      expect(result()).toBe(0);
     });
 
     test('should return default value when data has no size', () => {
@@ -157,41 +147,45 @@ describe('format', () => {
   describe('formatNodeSizeFn', () => {
     test('should return node size plus spacing', () => {
       const result = formatNodeSizeFn(20, 5, 10);
-      expect(result()).toBe(25);
+      expect(result()).toEqual([25, 25, 25]);
     });
 
     test('should use default node size when nodeSize is undefined', () => {
       const result = formatNodeSizeFn(undefined, 5, 15);
-      expect(result()).toBe(20); // 15 + 5
+      expect(result()).toEqual([20, 20, 20]); // 15 + 5
     });
 
     test('should handle zero spacing', () => {
       const result = formatNodeSizeFn(20, 0, 10);
-      expect(result()).toBe(20);
+      expect(result()).toEqual([20, 20, 20]);
     });
 
     test('should handle undefined spacing', () => {
       const result = formatNodeSizeFn(20, undefined, 10);
-      expect(result()).toBe(20);
+      expect(result()).toEqual([20, 20, 20]);
     });
 
     test('should handle nodeSize as array', () => {
       const result = formatNodeSizeFn([30, 40], 5, 10);
-      expect(result()).toBe(45); // max(30, 40) + 5
+      expect(result()).toEqual([35, 45, 35]);
     });
 
     test('should handle nodeSize as function', () => {
       const sizeFn = (node?: NodeData) =>
         ((node?.data as any)?.customSize as number) || 25;
       const result = formatNodeSizeFn(sizeFn, 10, 10);
-      expect(result({ id: 'test', data: { customSize: 30 } })).toBe(40); // 30 + 10
+      expect(result({ id: 'test', data: { customSize: 30 } })).toEqual([
+        40, 40, 40,
+      ]);
     });
 
     test('should handle nodeSpacing as function', () => {
       const spacingFn = (node?: NodeData) =>
         ((node?.data as any)?.spacing as number) || 0;
       const result = formatNodeSizeFn(20, spacingFn, 10);
-      expect(result({ id: 'test', data: { spacing: 5 } })).toBe(25); // 20 + 5
+      expect(result({ id: 'test', data: { spacing: 5 } })).toEqual([
+        25, 25, 25,
+      ]);
     });
 
     test('should handle both nodeSize and nodeSpacing as functions', () => {
@@ -200,7 +194,9 @@ describe('format', () => {
       const spacingFn = (node?: NodeData) =>
         ((node?.data as any)?.spacing as number) || 0;
       const result = formatNodeSizeFn(sizeFn, spacingFn, 10);
-      expect(result({ id: 'test', data: { size: 30, spacing: 5 } })).toBe(35);
+      expect(result({ id: 'test', data: { size: 30, spacing: 5 } })).toEqual([
+        35, 35, 35,
+      ]);
     });
 
     test('should return default when nodeSize undefined and node has no size in data', () => {
@@ -209,32 +205,34 @@ describe('format', () => {
         id: 'node1',
         data: {},
       };
-      expect(result(nodeData)).toBe(15); // default 10 + 5 spacing
+      expect(result(nodeData)).toEqual([15, 15, 15]); // default 10 + 5 spacing
     });
 
     test('should handle negative spacing', () => {
       const result = formatNodeSizeFn(20, -5, 10);
-      expect(result()).toBe(15); // 20 + (-5)
+      expect(result()).toEqual([15, 15, 15]); // 20 + (-5)
     });
 
     test('should handle fractional sizes and spacing', () => {
       const result = formatNodeSizeFn(20.5, 3.2, 10);
-      expect(result()).toBeCloseTo(23.7);
+      expect(result()[0]).toBeCloseTo(23.7);
+      expect(result()[1]).toBeCloseTo(23.7);
+      expect(result()[2]).toBeCloseTo(23.7);
     });
 
     test('should handle number zero node size', () => {
       const result = formatNodeSizeFn(0, 5, 10);
-      expect(result()).toBe(15); // 0 is falsy, falls back to default 10 + 5
+      expect(result()).toEqual([5, 5, 5]);
     });
 
     test('should handle large sizes', () => {
       const result = formatNodeSizeFn(1000, 100, 10);
-      expect(result()).toBe(1100);
+      expect(result()).toEqual([1100, 1100, 1100]);
     });
 
     test('should use default when all values are undefined', () => {
       const result = formatNodeSizeFn(undefined, undefined, 12);
-      expect(result()).toBe(12);
+      expect(result()).toEqual([12, 12, 12]);
     });
 
     test('should handle node data without spacing function', () => {
@@ -243,12 +241,12 @@ describe('format', () => {
         id: 'node1',
         data: {},
       };
-      expect(result(nodeData)).toBe(25);
+      expect(result(nodeData)).toEqual([25, 25, 25]);
     });
 
     test('should handle single element array size', () => {
       const result = formatNodeSizeFn([35], 5, 10);
-      expect(result()).toBe(40); // max(35) + 5
+      expect(result()).toEqual([40, 40, 40]); // max(35) + 5
     });
   });
 });

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/layout",
-  "version": "2.0.0-beta.0",
+  "version": "2.0.0-beta.1",
   "description": "graph layout algorithm",
   "main": "dist/index.min.js",
   "module": "lib/index.js",
@@ -35,6 +35,7 @@
   ],
   "dependencies": {
     "@antv/event-emitter": "^0.1.3",
+    "@antv/expr": "^1.0.2",
     "@antv/graphlib": "^2.0.0",
     "@antv/util": "^3.3.2",
     "comlink": "^4.4.1",

site/docs/en/guide/start/_meta.json

@@ -1 +1 @@
-["getting-started", "installation", "data-mapping", "layout-configuration"]
+["getting-started", "installation", "webworker", "data-mapping", "layout-configuration"]