@antv/layout 1.2.5 → 1.2.8

package/lib/supervisor.js

@@ -1,7 +1,8 @@
 import { __awaiter, __extends, __generator, __read, __rest } from "tslib";
 // @ts-ignore
-import EventEmitter from "@antv/event-emitter";
-import * as Comlink from "comlink";
+import EventEmitter from '@antv/event-emitter';
+import * as Comlink from 'comlink';
+import { isFunction } from '@antv/util';
 /**
  * @example
  * const graph = new Graph();
@@ -25,7 +26,7 @@ var Supervisor = /** @class */ (function (_super) {
     Supervisor.prototype.spawnWorker = function () {
         this.proxy = Comlink.wrap(
         // @ts-ignore
-        new Worker(new URL("./worker.js", import.meta.url), { type: 'module' }));
+        new Worker(new URL('./worker.js', import.meta.url), { type: 'module' }));
         if (this.running) {
             this.running = false;
             this.execute();
@@ -34,7 +35,7 @@ var Supervisor = /** @class */ (function (_super) {
     Supervisor.prototype.execute = function () {
         var _a;
         return __awaiter(this, void 0, void 0, function () {
-            var _b, onTick, rest, payload, arraybufferWithNodesEdges, _c, positions;
+            var _b, onTick, rest, noFunctionOptions, payload, arraybufferWithNodesEdges, _c, positions;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -42,10 +43,15 @@ var Supervisor = /** @class */ (function (_super) {
                             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: rest,
+                                options: noFunctionOptions,
                                 iterations: (_a = this.options) === null || _a === void 0 ? void 0 : _a.iterations,
                             },
                             nodes: this.graph.getAllNodes(),

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;AAuBnC;;;;;;;;;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,OAAO,GAAG;4BACd,MAAM,EAAE;gCACN,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;gCAClB,OAAO,EAAE,IAAI;gCACb,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,AA/FD,CAAgC,YAAY,GA+F3C"}
+{"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"}

package/lib/types.d.ts

@@ -122,14 +122,14 @@ export interface CircularLayoutOptions {
     startAngle?: number;
     endAngle?: number;
     nodeSpacing?: ((node?: Node) => number) | number;
-    nodeSize?: number | number[];
+    nodeSize?: number | number[] | ((nodeData: Node) => number);
 }
 export interface GridLayoutOptions {
     width?: number;
     height?: number;
     begin?: PointTuple;
     preventOverlap?: boolean;
-    nodeSize?: number | number[];
+    nodeSize?: number | number[] | ((nodeData: Node) => number);
     preventOverlapPadding?: number;
     condense?: boolean;
     rows?: number;
@@ -153,7 +153,7 @@ export interface MDSLayoutOptions {
 export interface ConcentricLayoutOptions {
     center?: PointTuple;
     preventOverlap?: boolean;
-    nodeSize?: number | PointTuple;
+    nodeSize?: number | PointTuple | ((nodeData: Node) => number);
     sweep?: number;
     equidistant?: boolean;
     startAngle?: number;
@@ -173,7 +173,7 @@ export interface RadialLayoutOptions {
     focusNode?: string | Node | null;
     unitRadius?: number | null;
     preventOverlap?: boolean;
-    nodeSize?: number | number[];
+    nodeSize?: number | number[] | ((nodeData: Node) => number);
     nodeSpacing?: number | Function;
     maxPreventOverlapIteration?: number;
     strictRadial?: boolean;
@@ -186,7 +186,7 @@ export interface DagreLayoutOptions {
     rankdir?: DagreRankdir;
     align?: DagreAlign;
     begin?: PointTuple;
-    nodeSize?: number | number[];
+    nodeSize?: number | number[] | ((nodeData: Node) => number);
     nodesep?: number;
     ranksep?: number;
     controlPoints?: boolean;

package/lib/util/function.d.ts

@@ -1,4 +1,4 @@
-import { Node } from "../types";
+import { Node } from '../types';
 /**
  * Format value with multiple types into a function returns number.
  * @param defaultValue default value when value is invalid
@@ -23,4 +23,4 @@ export declare function formatSizeFn<T extends Node>(defaultValue: number, value
  * @param nodeSpacing
  * @returns
  */
-export declare const formatNodeSize: (nodeSize: number | number[] | undefined, nodeSpacing: number | Function | undefined) => (nodeData: Node) => number;
+export declare const formatNodeSize: (nodeSize: number | number[] | ((nodeData: Node) => number), nodeSpacing: number | Function | undefined) => (nodeData: Node) => number;

package/lib/util/function.js

@@ -1,6 +1,6 @@
 import { __read, __spreadArray } from "tslib";
-import { isFunction, isNumber, isObject } from "@antv/util";
-import { isArray } from ".";
+import { isFunction, isNumber, isObject } from '@antv/util';
+import { isArray } from '.';
 /**
  * Format value with multiple types into a function returns number.
  * @param defaultValue default value when value is invalid
@@ -116,6 +116,9 @@ export var formatNodeSize = function (nodeSize, nodeSpacing) {
             return res + nodeSpacingFunc(d);
         };
     }
+    else if (isFunction(nodeSize)) {
+        nodeSizeFunc = nodeSize;
+    }
     else {
         nodeSizeFunc = function (d) { return nodeSize + nodeSpacingFunc(d); };
     }

package/lib/util/function.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antv/layout",
-  "version": "1.2.5",
+  "version": "1.2.8",
   "description": "graph layout algorithm",
   "license": "MIT",
   "repository": {