@antv/layout - npm Package Compare versions

Comparing version 0.0.2 to 0.0.3

es/layout/base.d.ts

@@ -8,5 +8,5 @@ import { Node, Edge, Combo, Model, PointTuple } from './types';
     destroyed: boolean;
-    layout(data: Model): void;
+    layout(data: Model): Model;
     init(data: Model): void;
-    execute(): void;
+    execute(): any;
     executeWithWorker(): void;
@@ -13,0 +13,0 @@ getDefaultCfg(): {};

es/layout/base.js

@@ -11,3 +11,3 @@ export class Base {
         this.init(data);
-        this.execute();
+        return this.execute();
     }
@@ -25,3 +25,5 @@ init(data) {
     updateCfg(cfg) {
-        Object.assign(this, cfg);
+        if (cfg) {
+            Object.assign(this, cfg);
+        }
     }
@@ -28,0 +30,0 @@ destroy() {

es/layout/circular.d.ts

@@ -7,2 +7,9 @@ /**
 import { Base } from './base';
+declare type INode = Node & {
+    degree: number;
+    size: number | PointTuple;
+    weight: number;
+    children: string[];
+    parent: string[];
+};
 /**
@@ -32,3 +39,3 @@ * 圆形布局
     angleRatio: number;
-    nodes: Node[];
+    nodes: INode[];
     edges: Edge[];
@@ -39,2 +46,3 @@ private nodeMap;
     height: number;
+    constructor(options?: CircularLayout.CircularLayoutOptions);
     getDefaultCfg(): {
@@ -55,3 +63,3 @@ center: number[];
      */
-    execute(): void;
+    execute(): INode[] | undefined;
     /**
@@ -61,3 +69,3 @@ * 根据节点的拓扑结构排序
      */
-    topologyOrdering(directed?: boolean): Node[];
+    topologyOrdering(directed?: boolean): INode[];
     /**
@@ -67,7 +75,7 @@ * 根据节点度数大小排序
      */
-    degreeOrdering(): Node[];
+    degreeOrdering(): INode[];
 }
 export declare namespace CircularLayout {
     interface CircularLayoutOptions {
-        name: 'circular';
+        type: 'circular';
         center?: PointTuple;
@@ -86,1 +94,2 @@ width?: number;
 }
+export {};

es/layout/circular.js

@@ -70,4 +70,4 @@ /**
 export class CircularLayout extends Base {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         /** 布局中心 */
@@ -99,2 +99,3 @@ this.center = [0, 0];
         this.height = 300;
+        this.updateCfg(options);
     }
@@ -205,2 +206,3 @@ getDefaultCfg() {
         }
+        return layoutNodes;
     }
@@ -207,0 +209,0 @@ /**

es/layout/dagre.d.ts

@@ -28,2 +28,3 @@ /**
     sortByCombo: boolean;
+    constructor(options?: DagreLayout.DagreLayoutOptions);
     getDefaultCfg(): {
@@ -42,3 +43,3 @@ rankdir: string;
      */
-    execute(): void;
+    execute(): import("./types").Node[] | undefined;
     sortLevel(propertyName: string): void;
@@ -48,3 +49,3 @@ }
     interface DagreLayoutOptions {
-        name: 'dagre';
+        type: 'dagre';
         rankdir?: 'TB' | 'BT' | 'LR' | 'RL';
@@ -51,0 +52,0 @@ align?: 'UL' | 'UR' | 'DL' | 'DR';

es/layout/dagre.js

@@ -12,4 +12,4 @@ /**
 export class DagreLayout extends Base {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         /** layout 方向, 可选 TB, BT, LR, RL */
@@ -25,2 +25,3 @@ this.rankdir = 'TB';
         this.sortByCombo = false;
+        this.updateCfg(options);
     }
@@ -107,2 +108,3 @@ getDefaultCfg() {
         }
+        return nodes;
     }
@@ -109,0 +111,0 @@ sortLevel(propertyName) {

es/layout/force/force-in-a-box.d.ts

@@ -1,2 +0,2 @@
-interface Node {
+interface INode {
     id: string;
@@ -9,4 +9,2 @@ x: number;
 }
-interface Link {
-}
 export default function forceInABox(): {
@@ -16,3 +14,3 @@ (alpha: number): any | undefined;
     template: (x: any) => string | any;
-    groupBy: (x: any) => ((d: Node) => any) | any;
+    groupBy: (x: any) => ((d: INode) => any) | any;
     enableGrouping: (x: any) => boolean | any;
@@ -22,4 +20,4 @@ strength: (x: any) => number | any;
     centerY: (_: any) => number | any;
-    nodes: (_: any) => Node[] | any;
-    links: (_: any) => Link[] | any;
+    nodes: (_: any) => INode[] | any;
+    links: (_: any) => any[] | any;
     forceNodeSize: (_: any) => ((d: any) => number) | any;
@@ -26,0 +24,0 @@ nodeSize: (_: any) => ((d: any) => number) | any;

es/layout/force/force.d.ts

@@ -10,3 +10,3 @@ /**
  */
-export declare class ForceLayout<Cfg = any> extends Base {
+export declare class ForceLayout extends Base {
     /** 向心力作用点 */
@@ -59,2 +59,3 @@ center: PointTuple;
     private clusterForce;
+    constructor(options?: ForceLayout.ForceLayoutOptions);
     getDefaultCfg(): {
@@ -102,3 +103,3 @@ center: number[];
      */
-    updateCfg(cfg: Partial<Cfg>): void;
+    updateCfg(cfg: ForceLayout.ForceLayoutOptions): void;
     destroy(): void;
@@ -108,3 +109,3 @@ }
     interface ForceLayoutOptions {
-        name: 'force';
+        type: 'force';
         center?: PointTuple;
@@ -131,4 +132,5 @@ width?: number;
         tick?: () => void;
+        onLayoutEnd?: () => void;
         workerEnabled?: boolean;
     }
 }

es/layout/force/force.js

@@ -14,4 +14,4 @@ /**
 export class ForceLayout extends Base {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         /** 向心力作用点 */
@@ -54,2 +54,5 @@ this.center = [0, 0];
         this.ticking = undefined;
+        if (options) {
+            this.updateCfg(options);
+        }
     }
@@ -56,0 +59,0 @@ getDefaultCfg() {

es/layout/g-force.d.ts

@@ -7,4 +7,7 @@ /**
 import { Base } from './base';
+declare type INode = Node & {
+    size: number | PointTuple;
+};
 declare type NodeMap = {
-    [key: string]: Node;
+    [key: string]: INode;
 };
@@ -53,3 +56,3 @@ /**
     enableTick: boolean;
-    nodes: Node[];
+    nodes: INode[];
     edges: Edge[];
@@ -66,2 +69,3 @@ width: number;
     private timeInterval;
+    constructor(options?: GForceLayout.GForceLayoutOptions);
     getDefaultCfg(): {
@@ -78,7 +82,7 @@ maxIteration: number;
     run(): void;
-    calRepulsive(accArray: number[], nodes: Node[]): void;
+    calRepulsive(accArray: number[], nodes: INode[]): void;
     calAttractive(accArray: number[], edges: Edge[]): void;
-    calGravity(accArray: number[], nodes: Node[]): void;
-    updateVelocity(accArray: number[], velArray: number[], stepInterval: number, nodes: Node[]): void;
-    updatePosition(velArray: number[], stepInterval: number, nodes: Node[]): void;
+    calGravity(accArray: number[], nodes: INode[]): void;
+    updateVelocity(accArray: number[], velArray: number[], stepInterval: number, nodes: INode[]): void;
+    updatePosition(velArray: number[], stepInterval: number, nodes: INode[]): void;
     stop(): void;
@@ -88,3 +92,3 @@ }
     interface GForceLayoutOptions {
-        name: 'gForce';
+        type: 'gForce';
         center?: PointTuple;
@@ -102,2 +106,3 @@ width?: number;
         damping?: number;
+        maxSpeed?: number;
         coulombDisScale?: number;
@@ -108,5 +113,7 @@ getMass?: ((d?: any) => number) | undefined;
         tick?: () => void;
+        onLayoutEnd?: () => void;
         workerEnabled?: boolean;
+        gpuEnabled?: boolean;
     }
 }
 export {};

es/layout/g-force.js

@@ -28,4 +28,4 @@ /**
 export class GForceLayout extends Base {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         /** 布局中心 */
@@ -65,2 +65,3 @@ this.center = [0, 0];
         this.nodeIdxMap = {};
+        this.updateCfg(options);
     }
@@ -67,0 +68,0 @@ getDefaultCfg() {

es/layout/grid.d.ts

@@ -8,2 +8,6 @@ /**
 import { Node, Edge, PointTuple } from './types';
+declare type INode = Node & {
+    degree: number;
+    size: number | PointTuple;
+};
 /**
@@ -26,3 +30,3 @@ * 网格布局
     /** returns { row, col } for element */
-    position: ((node: Node) => {
+    position: ((node: INode) => {
         row: number;
@@ -34,3 +38,3 @@ col: number;
     nodeSize: number | number[];
-    nodes: Node[];
+    nodes: INode[];
     edges: Edge[];
@@ -50,2 +54,3 @@ /** 布局中心 */
     private id2manPos;
+    constructor(options?: GridLayout.GridLayoutOptions);
     getDefaultCfg(): {
@@ -65,3 +70,3 @@ begin: number[];
      */
-    execute(): void;
+    execute(): INode[] | undefined;
     private small;
@@ -76,3 +81,3 @@ private large;
     interface GridLayoutOptions {
-        name: 'grid';
+        type: 'grid';
         center?: PointTuple;
@@ -92,1 +97,2 @@ width?: number;
 }
+export {};

es/layout/grid.js

@@ -12,4 +12,4 @@ /**
 export class GridLayout extends Base {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         /** 布局起始点 */
@@ -38,2 +38,3 @@ this.begin = [0, 0];
         this.id2manPos = {};
+        this.updateCfg(options);
     }
@@ -228,2 +229,3 @@ getDefaultCfg() {
         }
+        return layoutNodes;
     }
@@ -230,0 +232,0 @@ small(val) {

es/layout/radial/radial.d.ts

@@ -40,2 +40,3 @@ /**
     private radii;
+    constructor(options?: RadialLayout.RadialLayoutOptions);
     getDefaultCfg(): {
@@ -58,3 +59,3 @@ center: number[];
      */
-    execute(): void;
+    execute(): Node[] | undefined;
     run(): void;
@@ -68,3 +69,3 @@ private oneIteration;
     interface RadialLayoutOptions {
-        name: 'radial';
+        type: 'radial';
         center?: PointTuple;
@@ -78,6 +79,6 @@ width?: number;
         preventOverlap?: boolean;
-        nodeSize?: number;
+        nodeSize?: number | undefined;
         nodeSpacing?: number | Function | undefined;
         maxPreventOverlapIteration?: number;
-        strictRadial?: number;
+        strictRadial?: boolean;
         sortBy?: string | undefined;
@@ -84,0 +85,0 @@ sortStrength?: number;

es/layout/radial/radial.js

@@ -43,4 +43,4 @@ /**
 export class RadialLayout extends Base {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         /** 布局中心 */
@@ -63,2 +63,3 @@ this.center = [0, 0];
         this.sortStrength = 10;
+        this.updateCfg(options);
     }
@@ -249,2 +250,3 @@ getDefaultCfg() {
         });
+        return nodes;
     }
@@ -251,0 +253,0 @@ run() {

es/layout/random.d.ts

@@ -17,2 +17,3 @@ /**
     height: number;
+    constructor(options?: RandomLayout.RandomLayoutOptions);
     getDefaultCfg(): {
@@ -26,7 +27,7 @@ center: number[];
      */
-    execute(): void;
+    execute(): import("./types").Node[] | null;
 }
 export declare namespace RandomLayout {
     interface RandomLayoutOptions {
-        name: 'random';
+        type: 'random';
         center?: PointTuple;
@@ -33,0 +34,0 @@ width?: number;

es/layout/random.js

@@ -10,4 +10,4 @@ /**
 export class RandomLayout extends Base {
-    constructor() {
-        super(...arguments);
+    constructor(options) {
+        super();
         /** 布局中心 */
@@ -19,2 +19,3 @@ this.center = [0, 0];
         this.height = 300;
+        this.updateCfg(options);
     }
@@ -48,4 +49,5 @@ getDefaultCfg() {
         }
+        return nodes;
     }
 }
 //# sourceMappingURL=random.js.map

es/layout/types.d.ts

@@ -5,7 +5,2 @@ export interface Node {
     y: number;
-    degree?: number;
-    size?: number | PointTuple;
-    children?: string[];
-    parent?: string[];
-    weight?: number;
 }
@@ -12,0 +7,0 @@ export interface Edge {

es/util/math.d.ts

@@ -1,6 +0,4 @@
-import { Matrix, Model } from '../layout/types';
-export declare const getDegree: (n: number, nodeIdxMap: {
-    [key: string]: number;
-}, edges: any[]) => number[];
+import { Matrix, Model, IndexMap, Edge } from '../layout/types';
+export declare const getDegree: (n: number, nodeIdxMap: IndexMap, edges: Edge[]) => number[];
 export declare const floydWarshall: (adjMatrix: Matrix[]) => Matrix[];
 export declare const getAdjMatrix: (data: Model, directed: boolean) => Matrix[];

lib/layout/base.d.ts

@@ -8,5 +8,5 @@ import { Node, Edge, Combo, Model, PointTuple } from './types';
     destroyed: boolean;
-    layout(data: Model): void;
+    layout(data: Model): Model;
     init(data: Model): void;
-    execute(): void;
+    execute(): any;
     executeWithWorker(): void;
@@ -13,0 +13,0 @@ getDefaultCfg(): {};

lib/layout/base.js

@@ -14,3 +14,3 @@ "use strict";
         this.init(data);
-        this.execute();
+        return this.execute();
     };
@@ -28,3 +28,5 @@ Base.prototype.init = function (data) {
     Base.prototype.updateCfg = function (cfg) {
-        Object.assign(this, cfg);
+        if (cfg) {
+            Object.assign(this, cfg);
+        }
     };
@@ -31,0 +33,0 @@ Base.prototype.destroy = function () {

lib/layout/circular.d.ts

@@ -7,2 +7,9 @@ /**
 import { Base } from './base';
+declare type INode = Node & {
+    degree: number;
+    size: number | PointTuple;
+    weight: number;
+    children: string[];
+    parent: string[];
+};
 /**
@@ -32,3 +39,3 @@ * 圆形布局
     angleRatio: number;
-    nodes: Node[];
+    nodes: INode[];
     edges: Edge[];
@@ -39,2 +46,3 @@ private nodeMap;
     height: number;
+    constructor(options?: CircularLayout.CircularLayoutOptions);
     getDefaultCfg(): {
@@ -55,3 +63,3 @@ center: number[];
      */
-    execute(): void;
+    execute(): INode[] | undefined;
     /**
@@ -61,3 +69,3 @@ * 根据节点的拓扑结构排序
      */
-    topologyOrdering(directed?: boolean): Node[];
+    topologyOrdering(directed?: boolean): INode[];
     /**
@@ -67,7 +75,7 @@ * 根据节点度数大小排序
      */
-    degreeOrdering(): Node[];
+    degreeOrdering(): INode[];
 }
 export declare namespace CircularLayout {
     interface CircularLayoutOptions {
-        name: 'circular';
+        type: 'circular';
         center?: PointTuple;
@@ -86,1 +94,2 @@ width?: number;
 }
+export {};

lib/layout/circular.js

@@ -87,4 +87,4 @@ "use strict";
     __extends(CircularLayout, _super);
-    function CircularLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function CircularLayout(options) {
+        var _this = _super.call(this) || this;
         /** 布局中心 */
@@ -116,2 +116,3 @@ _this.center = [0, 0];
         _this.height = 300;
+        _this.updateCfg(options);
         return _this;
@@ -223,2 +224,3 @@ }
         }
+        return layoutNodes;
     };
@@ -225,0 +227,0 @@ /**

lib/layout/dagre.d.ts

@@ -28,2 +28,3 @@ /**
     sortByCombo: boolean;
+    constructor(options?: DagreLayout.DagreLayoutOptions);
     getDefaultCfg(): {
@@ -42,3 +43,3 @@ rankdir: string;
      */
-    execute(): void;
+    execute(): import("./types").Node[] | undefined;
     sortLevel(propertyName: string): void;
@@ -48,3 +49,3 @@ }
     interface DagreLayoutOptions {
-        name: 'dagre';
+        type: 'dagre';
         rankdir?: 'TB' | 'BT' | 'LR' | 'RL';
@@ -51,0 +52,0 @@ align?: 'UL' | 'UR' | 'DL' | 'DR';

lib/layout/dagre.js

@@ -32,4 +32,4 @@ "use strict";
     __extends(DagreLayout, _super);
-    function DagreLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function DagreLayout(options) {
+        var _this = _super.call(this) || this;
         /** layout 方向, 可选 TB, BT, LR, RL */
@@ -45,2 +45,3 @@ _this.rankdir = 'TB';
         _this.sortByCombo = false;
+        _this.updateCfg(options);
         return _this;
@@ -128,2 +129,3 @@ }
         }
+        return nodes;
     };
@@ -130,0 +132,0 @@ DagreLayout.prototype.sortLevel = function (propertyName) {

lib/layout/force/force-in-a-box.d.ts

@@ -1,2 +0,2 @@
-interface Node {
+interface INode {
     id: string;
@@ -9,4 +9,2 @@ x: number;
 }
-interface Link {
-}
 export default function forceInABox(): {
@@ -16,3 +14,3 @@ (alpha: number): any | undefined;
     template: (x: any) => string | any;
-    groupBy: (x: any) => ((d: Node) => any) | any;
+    groupBy: (x: any) => ((d: INode) => any) | any;
     enableGrouping: (x: any) => boolean | any;
@@ -22,4 +20,4 @@ strength: (x: any) => number | any;
     centerY: (_: any) => number | any;
-    nodes: (_: any) => Node[] | any;
-    links: (_: any) => Link[] | any;
+    nodes: (_: any) => INode[] | any;
+    links: (_: any) => any[] | any;
     forceNodeSize: (_: any) => ((d: any) => number) | any;
@@ -26,0 +24,0 @@ nodeSize: (_: any) => ((d: any) => number) | any;

lib/layout/force/force.d.ts

@@ -10,3 +10,3 @@ /**
  */
-export declare class ForceLayout<Cfg = any> extends Base {
+export declare class ForceLayout extends Base {
     /** 向心力作用点 */
@@ -59,2 +59,3 @@ center: PointTuple;
     private clusterForce;
+    constructor(options?: ForceLayout.ForceLayoutOptions);
     getDefaultCfg(): {
@@ -102,3 +103,3 @@ center: number[];
      */
-    updateCfg(cfg: Partial<Cfg>): void;
+    updateCfg(cfg: ForceLayout.ForceLayoutOptions): void;
     destroy(): void;
@@ -108,3 +109,3 @@ }
     interface ForceLayoutOptions {
-        name: 'force';
+        type: 'force';
         center?: PointTuple;
@@ -131,4 +132,5 @@ width?: number;
         tick?: () => void;
+        onLayoutEnd?: () => void;
         workerEnabled?: boolean;
     }
 }

lib/layout/force/force.js

@@ -53,4 +53,4 @@ "use strict";
     __extends(ForceLayout, _super);
-    function ForceLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function ForceLayout(options) {
+        var _this = _super.call(this) || this;
         /** 向心力作用点 */
@@ -93,2 +93,5 @@ _this.center = [0, 0];
         _this.ticking = undefined;
+        if (options) {
+            _this.updateCfg(options);
+        }
         return _this;
@@ -95,0 +98,0 @@ }

lib/layout/g-force.d.ts

@@ -7,4 +7,7 @@ /**
 import { Base } from './base';
+declare type INode = Node & {
+    size: number | PointTuple;
+};
 declare type NodeMap = {
-    [key: string]: Node;
+    [key: string]: INode;
 };
@@ -53,3 +56,3 @@ /**
     enableTick: boolean;
-    nodes: Node[];
+    nodes: INode[];
     edges: Edge[];
@@ -66,2 +69,3 @@ width: number;
     private timeInterval;
+    constructor(options?: GForceLayout.GForceLayoutOptions);
     getDefaultCfg(): {
@@ -78,7 +82,7 @@ maxIteration: number;
     run(): void;
-    calRepulsive(accArray: number[], nodes: Node[]): void;
+    calRepulsive(accArray: number[], nodes: INode[]): void;
     calAttractive(accArray: number[], edges: Edge[]): void;
-    calGravity(accArray: number[], nodes: Node[]): void;
-    updateVelocity(accArray: number[], velArray: number[], stepInterval: number, nodes: Node[]): void;
-    updatePosition(velArray: number[], stepInterval: number, nodes: Node[]): void;
+    calGravity(accArray: number[], nodes: INode[]): void;
+    updateVelocity(accArray: number[], velArray: number[], stepInterval: number, nodes: INode[]): void;
+    updatePosition(velArray: number[], stepInterval: number, nodes: INode[]): void;
     stop(): void;
@@ -88,3 +92,3 @@ }
     interface GForceLayoutOptions {
-        name: 'gForce';
+        type: 'gForce';
         center?: PointTuple;
@@ -102,2 +106,3 @@ width?: number;
         damping?: number;
+        maxSpeed?: number;
         coulombDisScale?: number;
@@ -108,5 +113,7 @@ getMass?: ((d?: any) => number) | undefined;
         tick?: () => void;
+        onLayoutEnd?: () => void;
         workerEnabled?: boolean;
+        gpuEnabled?: boolean;
     }
 }
 export {};

lib/layout/g-force.js

@@ -45,4 +45,4 @@ "use strict";
     __extends(GForceLayout, _super);
-    function GForceLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function GForceLayout(options) {
+        var _this = _super.call(this) || this;
         /** 布局中心 */
@@ -82,2 +82,3 @@ _this.center = [0, 0];
         _this.nodeIdxMap = {};
+        _this.updateCfg(options);
         return _this;
@@ -84,0 +85,0 @@ }

lib/layout/grid.d.ts

@@ -8,2 +8,6 @@ /**
 import { Node, Edge, PointTuple } from './types';
+declare type INode = Node & {
+    degree: number;
+    size: number | PointTuple;
+};
 /**
@@ -26,3 +30,3 @@ * 网格布局
     /** returns { row, col } for element */
-    position: ((node: Node) => {
+    position: ((node: INode) => {
         row: number;
@@ -34,3 +38,3 @@ col: number;
     nodeSize: number | number[];
-    nodes: Node[];
+    nodes: INode[];
     edges: Edge[];
@@ -50,2 +54,3 @@ /** 布局中心 */
     private id2manPos;
+    constructor(options?: GridLayout.GridLayoutOptions);
     getDefaultCfg(): {
@@ -65,3 +70,3 @@ begin: number[];
      */
-    execute(): void;
+    execute(): INode[] | undefined;
     private small;
@@ -76,3 +81,3 @@ private large;
     interface GridLayoutOptions {
-        name: 'grid';
+        type: 'grid';
         center?: PointTuple;
@@ -92,1 +97,2 @@ width?: number;
 }
+export {};

lib/layout/grid.js

@@ -29,4 +29,4 @@ "use strict";
     __extends(GridLayout, _super);
-    function GridLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function GridLayout(options) {
+        var _this = _super.call(this) || this;
         /** 布局起始点 */
@@ -55,2 +55,3 @@ _this.begin = [0, 0];
         _this.id2manPos = {};
+        _this.updateCfg(options);
         return _this;
@@ -246,2 +247,3 @@ }
         }
+        return layoutNodes;
     };
@@ -248,0 +250,0 @@ GridLayout.prototype.small = function (val) {

lib/layout/radial/radial.d.ts

@@ -40,2 +40,3 @@ /**
     private radii;
+    constructor(options?: RadialLayout.RadialLayoutOptions);
     getDefaultCfg(): {
@@ -58,3 +59,3 @@ center: number[];
      */
-    execute(): void;
+    execute(): Node[] | undefined;
     run(): void;
@@ -68,3 +69,3 @@ private oneIteration;
     interface RadialLayoutOptions {
-        name: 'radial';
+        type: 'radial';
         center?: PointTuple;
@@ -78,6 +79,6 @@ width?: number;
         preventOverlap?: boolean;
-        nodeSize?: number;
+        nodeSize?: number | undefined;
         nodeSpacing?: number | Function | undefined;
         maxPreventOverlapIteration?: number;
-        strictRadial?: number;
+        strictRadial?: boolean;
         sortBy?: string | undefined;
@@ -84,0 +85,0 @@ sortStrength?: number;

lib/layout/radial/radial.js

@@ -63,4 +63,4 @@ "use strict";
     __extends(RadialLayout, _super);
-    function RadialLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function RadialLayout(options) {
+        var _this = _super.call(this) || this;
         /** 布局中心 */
@@ -83,2 +83,3 @@ _this.center = [0, 0];
         _this.sortStrength = 10;
+        _this.updateCfg(options);
         return _this;
@@ -270,2 +271,3 @@ }
         });
+        return nodes;
     };
@@ -272,0 +274,0 @@ RadialLayout.prototype.run = function () {

lib/layout/random.d.ts

@@ -17,2 +17,3 @@ /**
     height: number;
+    constructor(options?: RandomLayout.RandomLayoutOptions);
     getDefaultCfg(): {
@@ -26,7 +27,7 @@ center: number[];
      */
-    execute(): void;
+    execute(): import("./types").Node[] | null;
 }
 export declare namespace RandomLayout {
     interface RandomLayoutOptions {
-        name: 'random';
+        type: 'random';
         center?: PointTuple;
@@ -33,0 +34,0 @@ width?: number;

lib/layout/random.js

@@ -27,4 +27,4 @@ "use strict";
     __extends(RandomLayout, _super);
-    function RandomLayout() {
-        var _this = _super !== null && _super.apply(this, arguments) || this;
+    function RandomLayout(options) {
+        var _this = _super.call(this) || this;
         /** 布局中心 */
@@ -36,2 +36,3 @@ _this.center = [0, 0];
         _this.height = 300;
+        _this.updateCfg(options);
         return _this;
@@ -66,2 +67,3 @@ }
         }
+        return nodes;
     };
@@ -68,0 +70,0 @@ return RandomLayout;

lib/layout/types.d.ts

@@ -5,7 +5,2 @@ export interface Node {
     y: number;
-    degree?: number;
-    size?: number | PointTuple;
-    children?: string[];
-    parent?: string[];
-    weight?: number;
 }
@@ -12,0 +7,0 @@ export interface Edge {

lib/util/math.d.ts

@@ -1,6 +0,4 @@
-import { Matrix, Model } from '../layout/types';
-export declare const getDegree: (n: number, nodeIdxMap: {
-    [key: string]: number;
-}, edges: any[]) => number[];
+import { Matrix, Model, IndexMap, Edge } from '../layout/types';
+export declare const getDegree: (n: number, nodeIdxMap: IndexMap, edges: Edge[]) => number[];
 export declare const floydWarshall: (adjMatrix: Matrix[]) => Matrix[];
 export declare const getAdjMatrix: (data: Model, directed: boolean) => Matrix[];

package.json

 {
   "name": "@antv/layout",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "description": "graph layout algorithm",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

421969

increased by0.87%

Lines of code

7035

increased by0.98%

No dependency changes