@antv/layout 1.2.13 → 1.2.14-beta.1

package/lib/bundle-supervisor.js

@@ -1,9 +1,8 @@
-import { __awaiter, __extends, __generator, __read, __rest } from "tslib";
-// @ts-ignore
-import EventEmitter from "@antv/event-emitter";
+import { __awaiter, __rest } from "tslib";
+import EventEmitter from '@antv/event-emitter';
 // @ts-ignore
 // Inline the worker as a Blob. @see https://github.com/developit/workerize-loader#inline
-import worker from "workerize-loader?inline!./bundle-worker";
+import worker from 'workerize-loader?inline!./bundle-worker';
 /**
  * @example
  * const graph = new Graph();
@@ -14,17 +13,15 @@ import worker from "workerize-loader?inline!./bundle-worker";
  * 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() {
         if (this.worker) {
             this.worker.terminate();
         }
@@ -40,55 +37,59 @@ 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, 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"]);
-                        payload = {
-                            layout: {
-                                id: this.layout.id,
-                                options: rest,
-                                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.worker.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 payload = {
+                layout: {
+                    id: this.layout.id,
+                    options: rest,
+                    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.worker.calculateLayout(payload, [
+                arraybufferWithNodesEdges,
+            ]);
+            return positions;
         });
-    };
-    Supervisor.prototype.stop = function () {
+    }
+    stop() {
         this.running = false;
         // trigger `layout.stop()` if needed
         this.worker.stopLayout();
         return this;
-    };
-    Supervisor.prototype.kill = function () {
+    }
+    kill() {
         if (this.worker) {
             this.worker.terminate();
         }
         // TODO: unbind listeners on graph.
         // TODO: release attached memory
-    };
-    Supervisor.prototype.isRunning = function () {
+    }
+    isRunning() {
         return this.running;
-    };
-    return Supervisor;
-}(EventEmitter));
-export { Supervisor };
+    }
+}
 //# sourceMappingURL=bundle-supervisor.js.map

package/lib/bundle-supervisor.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-supervisor.js","sourceRoot":"","sources":["../src/bundle-supervisor.ts"],"names":[],"mappings":";AAAA,aAAa;AACb,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAG/C,aAAa;AACb,yFAAyF;AACzF,OAAO,MAAM,MAAM,yCAAyC,CAAC;AAuB7D;;;;;;;;;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,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;SACzB;QAED;;WAEG;QACH,yDAAyD;QACzD,qEAAqE;QAErE,4CAA4C;QAC5C,qDAAqD;QACrD,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;QAEvB,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,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE;gCAC7D,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,MAAM,CAAC,UAAU,EAAE,CAAC;QAEzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,yBAAI,GAAJ;QACE,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;SACzB;QAED,mCAAmC;QAEnC,gCAAgC;IAClC,CAAC;IAED,8BAAS,GAAT;QACE,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;IACH,iBAAC;AAAD,CAAC,AAxGD,CAAgC,YAAY,GAwG3C"}
+{"version":3,"file":"bundle-supervisor.js","sourceRoot":"","sources":["../src/bundle-supervisor.ts"],"names":[],"mappings":";AAAA,OAAO,YAAY,MAAM,qBAAqB,CAAC;AAG/C,aAAa;AACb,yFAAyF;AACzF,OAAO,MAAM,MAAM,yCAAyC,CAAC;AAG7D;;;;;;;;;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,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;SACzB;QAED;;WAEG;QACH,yDAAyD;QACzD,qEAAqE;QAErE,4CAA4C;QAC5C,qDAAqD;QACrD,IAAI,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;QAEvB,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,OAAO,GAAG;gBACd,MAAM,EAAE;oBACN,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,EAAE;oBAClB,OAAO,EAAE,IAAI;oBACb,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,MAAM,CAAC,eAAe,CAAC,OAAO,EAAE;gBAC7D,yBAAyB;aAC1B,CAAC,CAAC;YAEH,OAAO,SAAS,CAAC;;KAClB;IAED,IAAI;QACF,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC;QAErB,oCAAoC;QACpC,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,CAAC;QAEzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI;QACF,IAAI,IAAI,CAAC,MAAM,EAAE;YACf,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,CAAC;SACzB;QAED,mCAAmC;QAEnC,gCAAgC;IAClC,CAAC;IAED,SAAS;QACP,OAAO,IAAI,CAAC,OAAO,CAAC;IACtB,CAAC;CACF"}

package/lib/bundle-worker.d.ts

@@ -1,3 +1,3 @@
-import type { Payload } from "./supervisor";
+import type { Payload } from './supervisor';
 export declare function stopLayout(): void;
 export declare function calculateLayout(payload: Payload, transferables: Float32Array[]): Promise<(import("./types").LayoutMapping | Float32Array[])[]>;

package/lib/bundle-worker.js

@@ -1,8 +1,8 @@
-import { __awaiter, __generator } from "tslib";
-import { Graph } from "@antv/graphlib";
+import { __awaiter } from "tslib";
+import { Graph } from '@antv/graphlib';
 // import { setupTransferableMethodsOnWorker } from "@naoak/workerize-transferable";
-import { registry } from "./registry";
-import { isLayoutWithIterations } from "./types";
+import { registry } from './registry';
+import { isLayoutWithIterations } from './types';
 // @see https://www.npmjs.com/package/@naoak/workerize-transferable
 // setupTransferableMethodsOnWorker({
 //   // The name of function which use some transferables.
@@ -13,41 +13,39 @@ import { isLayoutWithIterations } from "./types";
 //     pickTransferablesFromResult: (result) => [result[1].buffer],
 //   },
 // });
-var currentLayout;
+let currentLayout;
 export function stopLayout() {
-    var _a;
-    if ((_a = currentLayout) === null || _a === void 0 ? void 0 : _a.stop) {
+    if (currentLayout === null || currentLayout === void 0 ? void 0 : currentLayout.stop) {
         currentLayout.stop();
     }
 }
 export function calculateLayout(payload, transferables) {
-    return __awaiter(this, void 0, void 0, function () {
-        var _a, id, options, iterations, nodes, edges, graph, layoutCtor, positions;
-        return __generator(this, function (_b) {
-            switch (_b.label) {
-                case 0:
-                    _a = payload.layout, id = _a.id, options = _a.options, iterations = _a.iterations, nodes = payload.nodes, edges = payload.edges;
-                    graph = new Graph({
-                        nodes: nodes,
-                        edges: edges,
-                    });
-                    layoutCtor = registry[id];
-                    if (layoutCtor) {
-                        currentLayout = new layoutCtor(options);
-                    }
-                    else {
-                        throw new Error("Unknown layout id: " + id);
-                    }
-                    return [4 /*yield*/, currentLayout.execute(graph)];
-                case 1:
-                    positions = _b.sent();
-                    if (isLayoutWithIterations(currentLayout)) {
-                        currentLayout.stop();
-                        positions = currentLayout.tick(iterations);
-                    }
-                    return [2 /*return*/, [positions, transferables]];
-            }
+    return __awaiter(this, void 0, void 0, function* () {
+        const { layout: { id, options, iterations }, nodes, edges, } = payload;
+        // Sync graph on the worker side.
+        // TODO: Use transferable objects like ArrayBuffer for nodes & edges,
+        // in which case we don't need the whole graph.
+        // @see https://github.com/graphology/graphology/blob/master/src/layout-noverlap/webworker.tpl.js#L32
+        const graph = new Graph({
+            nodes,
+            edges,
         });
+        /**
+         * Create layout instance on the worker side.
+         */
+        const layoutCtor = registry[id];
+        if (layoutCtor) {
+            currentLayout = new layoutCtor(options);
+        }
+        else {
+            throw new Error(`Unknown layout id: ${id}`);
+        }
+        let positions = yield currentLayout.execute(graph);
+        if (isLayoutWithIterations(currentLayout)) {
+            currentLayout.stop();
+            positions = currentLayout.tick(iterations);
+        }
+        return [positions, transferables];
     });
 }
 //# sourceMappingURL=bundle-worker.js.map

package/lib/bundle-worker.js.map

@@ -1 +1 @@
-{"version":3,"file":"bundle-worker.js","sourceRoot":"","sources":["../src/bundle-worker.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,oFAAoF;AACpF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAgC,sBAAsB,EAAE,MAAM,SAAS,CAAC;AAE/E,mEAAmE;AACnE,qCAAqC;AACrC,0DAA0D;AAC1D,uBAAuB;AACvB,6CAA6C;AAC7C,2BAA2B;AAC3B,yFAAyF;AACzF,mEAAmE;AACnE,OAAO;AACP,MAAM;AAEN,IAAI,aAA0B,CAAC;AAE/B,MAAM,UAAU,UAAU;;IACxB,IAAI,MAAC,aAA2C,0CAAE,IAAI,EAAE;QACrD,aAA2C,CAAC,IAAI,EAAE,CAAC;KACrD;AACH,CAAC;AAED,MAAM,UAAgB,eAAe,CACnC,OAAgB,EAChB,aAA6B;;;;;;oBAG3B,KAGE,OAAO,OAH0B,EAAzB,EAAE,QAAA,EAAE,OAAO,aAAA,EAAE,UAAU,gBAAA,EACjC,KAAK,GAEH,OAAO,MAFJ,EACL,KAAK,GACH,OAAO,MADJ,CACK;oBAMN,KAAK,GAAG,IAAI,KAAK,CAAC;wBACtB,KAAK,OAAA;wBACL,KAAK,OAAA;qBACN,CAAC,CAAC;oBAMG,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;oBAChC,IAAI,UAAU,EAAE;wBACd,aAAa,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;qBACzC;yBAAM;wBACL,MAAM,IAAI,KAAK,CAAC,wBAAsB,EAAI,CAAC,CAAC;qBAC7C;oBAEe,qBAAM,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,EAAA;;oBAA9C,SAAS,GAAG,SAAkC;oBAClD,IAAI,sBAAsB,CAAC,aAAa,CAAC,EAAE;wBACzC,aAAa,CAAC,IAAI,EAAE,CAAC;wBACrB,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;qBAC5C;oBACD,sBAAO,CAAC,SAAS,EAAE,aAAa,CAAC,EAAC;;;;CACnC"}
+{"version":3,"file":"bundle-worker.js","sourceRoot":"","sources":["../src/bundle-worker.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACvC,oFAAoF;AACpF,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEtC,OAAO,EAAE,sBAAsB,EAAgC,MAAM,SAAS,CAAC;AAE/E,mEAAmE;AACnE,qCAAqC;AACrC,0DAA0D;AAC1D,uBAAuB;AACvB,6CAA6C;AAC7C,2BAA2B;AAC3B,yFAAyF;AACzF,mEAAmE;AACnE,OAAO;AACP,MAAM;AAEN,IAAI,aAA0B,CAAC;AAE/B,MAAM,UAAU,UAAU;IACxB,IAAK,aAA2C,aAA3C,aAAa,uBAAb,aAAa,CAAgC,IAAI,EAAE;QACrD,aAA2C,CAAC,IAAI,EAAE,CAAC;KACrD;AACH,CAAC;AAED,MAAM,UAAgB,eAAe,CACnC,OAAgB,EAChB,aAA6B;;QAE7B,MAAM,EACJ,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE,EACnC,KAAK,EACL,KAAK,GACN,GAAG,OAAO,CAAC;QAEZ,iCAAiC;QACjC,qEAAqE;QACrE,+CAA+C;QAC/C,qGAAqG;QACrG,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC;YACtB,KAAK;YACL,KAAK;SACN,CAAC,CAAC;QAEH;;WAEG;QAEH,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;QAChC,IAAI,UAAU,EAAE;YACd,aAAa,GAAG,IAAI,UAAU,CAAC,OAAO,CAAC,CAAC;SACzC;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,sBAAsB,EAAE,EAAE,CAAC,CAAC;SAC7C;QAED,IAAI,SAAS,GAAG,MAAM,aAAa,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;QACnD,IAAI,sBAAsB,CAAC,aAAa,CAAC,EAAE;YACzC,aAAa,CAAC,IAAI,EAAE,CAAC;YACrB,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;SAC5C;QACD,OAAO,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACpC,CAAC;CAAA"}

package/lib/circular.d.ts

@@ -1,4 +1,4 @@
-import type { Graph, CircularLayoutOptions, Layout, LayoutMapping } from './types';
+import type { CircularLayoutOptions, Graph, Layout, LayoutMapping } from './types';
 /**
  * Layout arranging the nodes in a circle.
  *

package/lib/circular.js

@@ -1,7 +1,7 @@
-import { __assign, __awaiter, __generator, __read } from "tslib";
-import { formatSizeFn, formatNumberFn, cloneFormatData } from './util';
+import { __awaiter } from "tslib";
+import { cloneFormatData, formatNumberFn, formatSizeFn } from './util';
 import { handleSingleNodeGraph } from './util/common';
-var DEFAULTS_LAYOUT_OPTIONS = {
+const DEFAULTS_LAYOUT_OPTIONS = {
     radius: null,
     startRadius: null,
     endRadius: null,
@@ -27,138 +27,125 @@ var DEFAULTS_LAYOUT_OPTIONS = {
  * // If you want to assign the positions directly to the nodes, use assign method.
  * await layout.assign(graph, { radius: 20 });
  */
-var CircularLayout = /** @class */ (function () {
-    function CircularLayout(options) {
-        if (options === void 0) { options = {}; }
+export class CircularLayout {
+    constructor(options = {}) {
         this.options = options;
         this.id = 'circular';
-        this.options = __assign(__assign({}, DEFAULTS_LAYOUT_OPTIONS), options);
+        this.options = Object.assign(Object.assign({}, DEFAULTS_LAYOUT_OPTIONS), options);
     }
     /**
      * Return the positions of nodes and edges(if needed).
      */
-    CircularLayout.prototype.execute = function (graph, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                return [2 /*return*/, this.genericCircularLayout(false, graph, options)];
-            });
+    execute(graph, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.genericCircularLayout(false, graph, options);
         });
-    };
+    }
     /**
      * To directly assign the positions to the nodes.
      */
-    CircularLayout.prototype.assign = function (graph, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.genericCircularLayout(true, graph, options)];
-                    case 1:
-                        _a.sent();
-                        return [2 /*return*/];
-                }
-            });
+    assign(graph, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.genericCircularLayout(true, graph, options);
         });
-    };
-    CircularLayout.prototype.genericCircularLayout = function (assign, graph, options) {
-        return __awaiter(this, void 0, void 0, function () {
-            var mergedOptions, width, height, center, divisions, _a, startAngle, _b, endAngle, angleRatio, ordering, clockwise, paramNodeSpacing, paramNodeSize, nodes, edges, _c, calculatedWidth, calculatedHeight, calculatedCenter, n, angleStep, radius, startRadius, endRadius, nodeSpacing_1, nodeSize_1, maxNodeSize_1, perimeter_1, astep, layoutNodes, divN, i, r, angle, result;
-            return __generator(this, function (_d) {
-                mergedOptions = __assign(__assign({}, this.options), options);
-                width = mergedOptions.width, height = mergedOptions.height, center = mergedOptions.center, divisions = mergedOptions.divisions, _a = mergedOptions.startAngle, startAngle = _a === void 0 ? 0 : _a, _b = mergedOptions.endAngle, endAngle = _b === void 0 ? 2 * Math.PI : _b, angleRatio = mergedOptions.angleRatio, ordering = mergedOptions.ordering, clockwise = mergedOptions.clockwise, paramNodeSpacing = mergedOptions.nodeSpacing, paramNodeSize = mergedOptions.nodeSize;
-                nodes = graph.getAllNodes();
-                edges = graph.getAllEdges();
-                _c = __read(calculateCenter(width, height, center), 3), calculatedWidth = _c[0], calculatedHeight = _c[1], calculatedCenter = _c[2];
-                n = nodes === null || nodes === void 0 ? void 0 : nodes.length;
-                if (!n || n === 1) {
-                    return [2 /*return*/, handleSingleNodeGraph(graph, assign, calculatedCenter)];
-                }
-                angleStep = (endAngle - startAngle) / n;
-                radius = mergedOptions.radius, startRadius = mergedOptions.startRadius, endRadius = mergedOptions.endRadius;
-                if (paramNodeSpacing) {
-                    nodeSpacing_1 = formatNumberFn(10, paramNodeSpacing);
-                    nodeSize_1 = formatSizeFn(10, paramNodeSize);
-                    maxNodeSize_1 = -Infinity;
-                    nodes.forEach(function (node) {
-                        var nSize = nodeSize_1(node);
-                        if (maxNodeSize_1 < nSize)
-                            maxNodeSize_1 = nSize;
-                    });
-                    perimeter_1 = 0;
-                    nodes.forEach(function (node, i) {
-                        if (i === 0)
-                            perimeter_1 += maxNodeSize_1 || 10;
-                        else
-                            perimeter_1 += (nodeSpacing_1(node) || 0) + (maxNodeSize_1 || 10);
-                    });
-                    radius = perimeter_1 / (2 * Math.PI);
-                }
-                else if (!radius && !startRadius && !endRadius) {
-                    radius = Math.min(calculatedHeight, calculatedWidth) / 2;
-                }
-                else if (!startRadius && endRadius) {
-                    startRadius = endRadius;
-                }
-                else if (startRadius && !endRadius) {
-                    endRadius = startRadius;
-                }
-                astep = angleStep * angleRatio;
-                layoutNodes = [];
-                if (ordering === 'topology') {
-                    // layout according to the topology
-                    layoutNodes = topologyOrdering(graph, nodes);
-                }
-                else if (ordering === 'topology-directed') {
-                    // layout according to the topology
-                    layoutNodes = topologyOrdering(graph, nodes, true);
-                }
-                else if (ordering === 'degree') {
-                    // layout according to the descent order of degrees
-                    layoutNodes = degreeOrdering(graph, nodes);
+    }
+    genericCircularLayout(assign, graph, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const mergedOptions = Object.assign(Object.assign({}, this.options), options);
+            const { width, height, center, divisions, startAngle = 0, endAngle = 2 * Math.PI, angleRatio, ordering, clockwise, nodeSpacing: paramNodeSpacing, nodeSize: paramNodeSize, } = mergedOptions;
+            const nodes = graph.getAllNodes();
+            const edges = graph.getAllEdges();
+            // Calculate center according to `window` if not provided.
+            const [calculatedWidth, calculatedHeight, calculatedCenter] = calculateCenter(width, height, center);
+            const n = nodes === null || nodes === void 0 ? void 0 : nodes.length;
+            if (!n || n === 1) {
+                return handleSingleNodeGraph(graph, assign, calculatedCenter);
+            }
+            const angleStep = (endAngle - startAngle) / n;
+            let { radius, startRadius, endRadius } = mergedOptions;
+            if (paramNodeSpacing) {
+                const nodeSpacing = formatNumberFn(10, paramNodeSpacing);
+                const nodeSize = formatSizeFn(10, paramNodeSize);
+                let maxNodeSize = -Infinity;
+                nodes.forEach((node) => {
+                    const nSize = nodeSize(node);
+                    if (maxNodeSize < nSize)
+                        maxNodeSize = nSize;
+                });
+                let perimeter = 0;
+                nodes.forEach((node, i) => {
+                    if (i === 0)
+                        perimeter += maxNodeSize || 10;
+                    else
+                        perimeter += (nodeSpacing(node) || 0) + (maxNodeSize || 10);
+                });
+                radius = perimeter / (2 * Math.PI);
+            }
+            else if (!radius && !startRadius && !endRadius) {
+                radius = Math.min(calculatedHeight, calculatedWidth) / 2;
+            }
+            else if (!startRadius && endRadius) {
+                startRadius = endRadius;
+            }
+            else if (startRadius && !endRadius) {
+                endRadius = startRadius;
+            }
+            const astep = angleStep * angleRatio;
+            // calculated nodes as temporary result
+            let layoutNodes = [];
+            if (ordering === 'topology') {
+                // layout according to the topology
+                layoutNodes = topologyOrdering(graph, nodes);
+            }
+            else if (ordering === 'topology-directed') {
+                // layout according to the topology
+                layoutNodes = topologyOrdering(graph, nodes, true);
+            }
+            else if (ordering === 'degree') {
+                // layout according to the descent order of degrees
+                layoutNodes = degreeOrdering(graph, nodes);
+            }
+            else {
+                // layout according to the original order in the data.nodes
+                layoutNodes = nodes.map((node) => cloneFormatData(node));
+            }
+            const divN = Math.ceil(n / divisions); // node number in each division
+            for (let i = 0; i < n; ++i) {
+                let r = radius;
+                if (!r && startRadius !== null && endRadius !== null) {
+                    r = startRadius + (i * (endRadius - startRadius)) / (n - 1);
                 }
-                else {
-                    // layout according to the original order in the data.nodes
-                    layoutNodes = nodes.map(function (node) { return cloneFormatData(node); });
+                if (!r) {
+                    r = 10 + (i * 100) / (n - 1);
                 }
-                divN = Math.ceil(n / divisions);
-                for (i = 0; i < n; ++i) {
-                    r = radius;
-                    if (!r && startRadius !== null && endRadius !== null) {
-                        r = startRadius + (i * (endRadius - startRadius)) / (n - 1);
-                    }
-                    if (!r) {
-                        r = 10 + (i * 100) / (n - 1);
-                    }
-                    angle = startAngle +
-                        (i % divN) * astep +
-                        ((2 * Math.PI) / divisions) * Math.floor(i / divN);
-                    if (!clockwise) {
-                        angle =
-                            endAngle -
-                                (i % divN) * astep -
-                                ((2 * Math.PI) / divisions) * Math.floor(i / divN);
-                    }
-                    layoutNodes[i].data.x = calculatedCenter[0] + Math.cos(angle) * r;
-                    layoutNodes[i].data.y = calculatedCenter[1] + Math.sin(angle) * r;
+                let angle = startAngle +
+                    (i % divN) * astep +
+                    ((2 * Math.PI) / divisions) * Math.floor(i / divN);
+                if (!clockwise) {
+                    angle =
+                        endAngle -
+                            (i % divN) * astep -
+                            ((2 * Math.PI) / divisions) * Math.floor(i / divN);
                 }
-                if (assign) {
-                    layoutNodes.forEach(function (node) {
-                        graph.mergeNodeData(node.id, {
-                            x: node.data.x,
-                            y: node.data.y,
-                        });
+                layoutNodes[i].data.x = calculatedCenter[0] + Math.cos(angle) * r;
+                layoutNodes[i].data.y = calculatedCenter[1] + Math.sin(angle) * r;
+            }
+            if (assign) {
+                layoutNodes.forEach((node) => {
+                    graph.mergeNodeData(node.id, {
+                        x: node.data.x,
+                        y: node.data.y,
                     });
-                }
-                result = {
-                    nodes: layoutNodes,
-                    edges: edges,
-                };
-                return [2 /*return*/, result];
-            });
+                });
+            }
+            const result = {
+                nodes: layoutNodes,
+                edges,
+            };
+            return result;
         });
-    };
-    return CircularLayout;
-}());
-export { CircularLayout };
+    }
+}
 /**
  * order the nodes acoording to the graph topology
  * @param graph
@@ -166,15 +153,14 @@ export { CircularLayout };
  * @param directed
  * @returns
  */
-var topologyOrdering = function (graph, nodes, directed) {
-    if (directed === void 0) { directed = false; }
-    var orderedCNodes = [cloneFormatData(nodes[0])];
-    var pickFlags = {};
-    var n = nodes.length;
+const topologyOrdering = (graph, nodes, directed = false) => {
+    const orderedCNodes = [cloneFormatData(nodes[0])];
+    const pickFlags = {};
+    const n = nodes.length;
     pickFlags[nodes[0].id] = true;
     // write children into cnodes
-    var k = 0;
-    nodes.forEach(function (node, i) {
+    let k = 0;
+    nodes.forEach((node, i) => {
         if (i !== 0) {
             if ((i === n - 1 ||
                 graph.getDegree(node.id, 'both') !==
@@ -186,12 +172,12 @@ var topologyOrdering = function (graph, nodes, directed) {
                 k++;
             }
             else {
-                var children = directed
+                const children = directed
                     ? graph.getSuccessors(orderedCNodes[k].id)
                     : graph.getNeighbors(orderedCNodes[k].id);
-                var foundChild = false;
-                for (var j = 0; j < children.length; j++) {
-                    var child = children[j];
+                let foundChild = false;
+                for (let j = 0; j < children.length; j++) {
+                    const child = children[j];
                     if (graph.getDegree(child.id) === graph.getDegree(node.id) &&
                         !pickFlags[child.id]) {
                         orderedCNodes.push(cloneFormatData(child));
@@ -200,7 +186,7 @@ var topologyOrdering = function (graph, nodes, directed) {
                         break;
                     }
                 }
-                var ii = 0;
+                let ii = 0;
                 while (!foundChild) {
                     if (!pickFlags[nodes[ii].id]) {
                         orderedCNodes.push(cloneFormatData(nodes[ii]));
@@ -224,13 +210,11 @@ var topologyOrdering = function (graph, nodes, directed) {
  * @returns
  */
 function degreeOrdering(graph, nodes) {
-    var orderedNodes = [];
-    nodes.forEach(function (node, i) {
+    const orderedNodes = [];
+    nodes.forEach((node, i) => {
         orderedNodes.push(cloneFormatData(node));
     });
-    orderedNodes.sort(function (nodeA, nodeB) {
-        return graph.getDegree(nodeA.id, 'both') - graph.getDegree(nodeB.id, 'both');
-    });
+    orderedNodes.sort((nodeA, nodeB) => graph.getDegree(nodeA.id, 'both') - graph.getDegree(nodeB.id, 'both'));
     return orderedNodes;
 }
 /**
@@ -240,10 +224,10 @@ function degreeOrdering(graph, nodes) {
  * @param center
  * @returns
  */
-var calculateCenter = function (width, height, center) {
-    var calculatedWidth = width;
-    var calculatedHeight = height;
-    var calculatedCenter = center;
+const calculateCenter = (width, height, center) => {
+    let calculatedWidth = width;
+    let calculatedHeight = height;
+    let calculatedCenter = center;
     if (!calculatedWidth && typeof window !== 'undefined') {
         calculatedWidth = window.innerWidth;
     }