@antv/layout 0.2.1 → 0.2.2

package/es/layout/dagre/src/rank/network-simplex.js

@@ -1,9 +1,8 @@
 import { feasibleTree } from './feasible-tree';
 import { slack, longestPath as initRank } from './util';
 import { minBy, simplify } from '../util';
-import graphlib from '../graphlib';
-const alg = graphlib.alg;
-const { preorder, postorder } = alg;
+import { algorithm } from '@antv/graphlib';
+const { preorder, postorder } = algorithm;
 /*
  * The network simplex algorithm assigns ranks to each node in the input graph
  * and iteratively improves the ranking to reduce the length of edges.
@@ -37,9 +36,8 @@ const { preorder, postorder } = alg;
  * for Drawing Directed Graphs." The structure of the file roughly follows the
  * structure of the overall algorithm.
  */
-const networkSimplex = (g) => {
-    // tslint:disable-next-line
-    g = simplify(g);
+const networkSimplex = (og) => {
+    const g = simplify(og);
     initRank(g);
     const t = feasibleTree(g);
     initLowLimValues(t);
@@ -54,7 +52,7 @@ const networkSimplex = (g) => {
 /*
  * Initializes cut values for all edges in the tree.
  */
-const initCutValues = (t, g) => {
+export const initCutValues = (t, g) => {
     let vs = postorder(t, t.nodes());
     vs = vs === null || vs === void 0 ? void 0 : vs.slice(0, (vs === null || vs === void 0 ? void 0 : vs.length) - 1);
     vs === null || vs === void 0 ? void 0 : vs.forEach((v) => {
@@ -64,25 +62,25 @@ const initCutValues = (t, g) => {
 const assignCutValue = (t, g, child) => {
     const childLab = t.node(child);
     const parent = childLab.parent;
-    t.edge(child, parent).cutvalue = calcCutValue(t, g, child);
+    t.edgeFromArgs(child, parent).cutvalue = calcCutValue(t, g, child);
 };
 /*
  * Given the tight tree, its graph, and a child in the graph calculate and
  * return the cut value for the edge between the child and its parent.
  */
-const calcCutValue = (t, g, child) => {
+export const calcCutValue = (t, g, child) => {
     var _a;
     const childLab = t.node(child);
     const parent = childLab.parent;
     // True if the child is on the tail end of the edge in the directed graph
     let childIsTail = true;
     // The graph's view of the tree edge we're inspecting
-    let graphEdge = g.edge(child, parent);
+    let graphEdge = g.edgeFromArgs(child, parent);
     // The accumulated cut value for the edge between this node and its parent
     let cutValue = 0;
     if (!graphEdge) {
         childIsTail = false;
-        graphEdge = g.edge(parent, child);
+        graphEdge = g.edgeFromArgs(parent, child);
     }
     cutValue = graphEdge.weight;
     (_a = g.nodeEdges(child)) === null || _a === void 0 ? void 0 : _a.forEach((e) => {
@@ -93,18 +91,14 @@ const calcCutValue = (t, g, child) => {
             const otherWeight = g.edge(e).weight;
             cutValue += pointsToHead ? otherWeight : -otherWeight;
             if (isTreeEdge(t, child, other)) {
-                const otherCutValue = t.edge(child, other).cutvalue;
+                const otherCutValue = t.edgeFromArgs(child, other).cutvalue;
                 cutValue += pointsToHead ? -otherCutValue : otherCutValue;
             }
         }
     });
     return cutValue;
 };
-const initLowLimValues = (tree, root) => {
-    if (root !== undefined) {
-        // tslint:disable-next-line
-        root = tree.nodes()[0];
-    }
+export const initLowLimValues = (tree, root = tree.nodes()[0]) => {
     dfsAssignLowLim(tree, {}, 1, root);
 };
 const dfsAssignLowLim = (tree, visited, nextLim, v, parent) => {
@@ -114,7 +108,7 @@ const dfsAssignLowLim = (tree, visited, nextLim, v, parent) => {
     const label = tree.node(v);
     visited[v] = true;
     (_a = tree.neighbors(v)) === null || _a === void 0 ? void 0 : _a.forEach((w) => {
-        if (!visited.hasOwnProperty(w)) {
+        if (!visited[w]) {
             useNextLim = dfsAssignLowLim(tree, visited, useNextLim, w, v);
         }
     });
@@ -129,12 +123,12 @@ const dfsAssignLowLim = (tree, visited, nextLim, v, parent) => {
     }
     return useNextLim;
 };
-const leaveEdge = (tree) => {
+export const leaveEdge = (tree) => {
     return tree.edges().find((e) => {
         return tree.edge(e).cutvalue < 0;
     });
 };
-const enterEdge = (t, g, edge) => {
+export const enterEdge = (t, g, edge) => {
     let v = edge.v;
     let w = edge.w;
     // For the rest of this function we assume that v is the tail and w is the
@@ -160,7 +154,7 @@ const enterEdge = (t, g, edge) => {
     });
     return minBy(candidates, (edge) => { return slack(g, edge); });
 };
-const exchangeEdges = (t, g, e, f) => {
+export const exchangeEdges = (t, g, e, f) => {
     const v = e.v;
     const w = e.w;
     t.removeEdge(v, w);
@@ -170,15 +164,15 @@ const exchangeEdges = (t, g, e, f) => {
     updateRanks(t, g);
 };
 const updateRanks = (t, g) => {
-    const root = t.nodes().find((v) => { return !g.node(v).parent; });
+    const root = t.nodes().find((v) => { var _a; return !((_a = g.node(v)) === null || _a === void 0 ? void 0 : _a.parent); });
     let vs = preorder(t, root);
     vs = vs === null || vs === void 0 ? void 0 : vs.slice(1);
     vs === null || vs === void 0 ? void 0 : vs.forEach((v) => {
         const parent = t.node(v).parent;
-        let edge = g.edge(v, parent);
+        let edge = g.edgeFromArgs(v, parent);
         let flipped = false;
         if (!edge) {
-            edge = g.edge(parent, v);
+            edge = g.edgeFromArgs(parent, v);
             flipped = true;
         }
         g.node(v).rank = g.node(parent).rank + (flipped ? edge.minlen : -edge.minlen);
@@ -197,12 +191,5 @@ const isTreeEdge = (tree, u, v) => {
 const isDescendant = (tree, vLabel, rootLabel) => {
     return rootLabel.low <= vLabel.lim && vLabel.lim <= rootLabel.lim;
 };
-// Expose some internals for testing purposes
-networkSimplex.initLowLimValues = initLowLimValues;
-networkSimplex.initCutValues = initCutValues;
-networkSimplex.calcCutValue = calcCutValue;
-networkSimplex.leaveEdge = leaveEdge;
-networkSimplex.enterEdge = enterEdge;
-networkSimplex.exchangeEdges = exchangeEdges;
 export default networkSimplex;
 //# sourceMappingURL=network-simplex.js.map

package/es/layout/dagre/src/rank/network-simplex.js.map

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

package/es/layout/dagre/src/rank/util.d.ts

@@ -1,12 +1,11 @@
-import { graphlib } from "../../graphlib";
-declare type Graph = graphlib.Graph;
+import { Edge, Graph } from "../../graph";
 declare const longestPath: (g: Graph) => void;
 declare const longestPathWithLayer: (g: Graph) => void;
-declare const slack: (g: Graph, e: any) => number;
-export { longestPath, longestPathWithLayer, slack, };
+declare const slack: (g: Graph, e: Edge) => number;
+export { longestPath, longestPathWithLayer, slack };
 declare const _default: {
     longestPath: (g: Graph) => void;
     longestPathWithLayer: (g: Graph) => void;
-    slack: (g: Graph, e: any) => number;
+    slack: (g: Graph, e: Edge) => number;
 };
 export default _default;

package/es/layout/dagre/src/rank/util.js

@@ -25,17 +25,22 @@ const longestPath = (g) => {
     const dfs = (v) => {
         var _a;
         const label = g.node(v);
-        if (visited.hasOwnProperty(v)) {
+        if (visited[v]) {
             return label.rank;
         }
         visited[v] = true;
-        const lengths = (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.map((e) => {
-            return (dfs(e.w) - g.edge(e).minlen) || Infinity;
+        let rank;
+        (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.forEach((edgeObj) => {
+            const wRank = dfs(edgeObj.w);
+            const minLen = g.edge(edgeObj).minlen;
+            const r = wRank - minLen;
+            if (r) {
+                if (rank === undefined || r < rank) {
+                    rank = r;
+                }
+            }
         });
-        let rank = Math.min(...lengths);
-        if (rank === Number.POSITIVE_INFINITY || // return value of _.map([]) for Lodash 3
-            rank === undefined || // return value of _.map([]) for Lodash 4
-            rank === null) { // return value of _.map([null])
+        if (!rank) {
             rank = 0;
         }
         label.rank = rank;
@@ -47,29 +52,39 @@ const longestPathWithLayer = (g) => {
     var _a;
     // 用longest path，找出最深的点
     const visited = {};
-    let minRank = 0;
+    let minRank;
     const dfs = (v) => {
         var _a;
         const label = g.node(v);
-        if (visited.hasOwnProperty(v)) {
+        if (visited[v]) {
             return label.rank;
         }
         visited[v] = true;
-        const lengths = (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.map((e) => {
-            return (dfs(e.w) - g.edge(e).minlen) || Infinity;
+        let rank;
+        (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.forEach((edgeObj) => {
+            const wRank = dfs(edgeObj.w);
+            const minLen = g.edge(edgeObj).minlen;
+            const r = wRank - minLen;
+            if (r) {
+                if (rank === undefined || r < rank) {
+                    rank = r;
+                }
+            }
         });
-        let rank = Math.min(...lengths);
-        if (rank === Number.POSITIVE_INFINITY || // return value of _.map([]) for Lodash 3
-            rank === undefined || // return value of _.map([]) for Lodash 4
-            rank === null) { // return value of _.map([null])
+        if (!rank) {
             rank = 0;
         }
+        if (minRank === undefined || rank < minRank) {
+            minRank = rank;
+        }
         label.rank = rank;
-        minRank = Math.min(label.rank, minRank);
-        return label.rank;
+        return rank;
     };
     (_a = g.sources()) === null || _a === void 0 ? void 0 : _a.forEach((source) => dfs(source));
-    minRank += 1; // NOTE: 最小的层级是dummy root，+1
+    if (minRank === undefined) {
+        minRank = 0;
+    }
+    // minRank += 1; // NOTE: 最小的层级是dummy root，+1
     // forward一遍，赋值层级
     const dfsForward = (v, nextRank) => {
         var _a;
@@ -100,9 +115,11 @@ const longestPathWithLayer = (g) => {
  * difference between the length of the edge and its minimum length.
  */
 const slack = (g, e) => {
-    return g.node(e.w).rank - g.node(e.v).rank - g.edge(e).minlen;
+    return (g.node(e.w).rank -
+        g.node(e.v).rank -
+        g.edge(e).minlen);
 };
-export { longestPath, longestPathWithLayer, slack, };
+export { longestPath, longestPathWithLayer, slack };
 export default {
     longestPath,
     longestPathWithLayer,

package/es/layout/dagre/src/rank/util.js.map

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

package/es/layout/dagre/src/util.d.ts

@@ -1,50 +1,31 @@
-import { graphlib as IGraphLib } from '../graphlib';
-declare type IGraph = IGraphLib.Graph;
-declare const addDummyNode: (g: IGraph, type: any, attrs: any, name: string) => string;
-declare const simplify: (g: IGraph) => any;
-declare const asNonCompoundGraph: (g: IGraph) => IGraph;
-declare const zipObject: (keys: string[], values: any) => any;
-declare const successorWeights: (g: IGraph) => any;
-declare const predecessorWeights: (g: IGraph) => any;
-declare const intersectRect: (rect: any, point: any) => {
-    x: any;
-    y: any;
+import { Graph, Node } from "../graph";
+export declare const addDummyNode: (g: Graph, type: string, attrs: Node<Record<string, any>>, name: string) => string;
+export declare const simplify: (g: Graph) => Graph;
+export declare const asNonCompoundGraph: (g: Graph) => Graph;
+export declare const zipObject: <T = any>(keys: string[], values: T[]) => Record<string, T>;
+export declare const successorWeights: (g: Graph) => Record<string, Record<string, number>>;
+export declare const predecessorWeights: (g: Graph) => Record<string, Record<string, number>>;
+export declare const intersectRect: (rect: {
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+}, point: {
+    x?: number;
+    y?: number;
+}) => {
+    x: number;
+    y: number;
 };
-declare const buildLayerMatrix: (g: IGraph) => any;
-declare const normalizeRanks: (g: IGraph) => void;
-declare const removeEmptyRanks: (g: IGraph) => void;
-declare const addBorderNode: (g: IGraph, prefix: string, rank?: number | undefined, order?: number | undefined) => string;
-declare const maxRank: (g: IGraph) => number;
-declare const partition: (collection: any, fn: any) => {
-    lhs: any;
-    rhs: any;
+export declare const buildLayerMatrix: (g: Graph) => string[][];
+export declare const normalizeRanks: (g: Graph) => void;
+export declare const removeEmptyRanks: (g: Graph) => void;
+export declare const addBorderNode: (g: Graph, prefix: string, rank?: number | undefined, order?: number | undefined) => string;
+export declare const maxRank: (g: Graph) => number;
+export declare const partition: <T = any>(collection: T[], fn: (val: T) => boolean) => {
+    lhs: T[];
+    rhs: T[];
 };
-declare const time: (name: string, fn: () => unknown) => unknown;
-declare const notime: (name: string, fn: () => unknown) => unknown;
-declare const minBy: (array: any, func: (param: any) => number) => undefined;
-export { addDummyNode, simplify, asNonCompoundGraph, successorWeights, predecessorWeights, intersectRect, buildLayerMatrix, normalizeRanks, removeEmptyRanks, addBorderNode, maxRank, partition, time, notime, zipObject, minBy };
-declare const _default: {
-    addDummyNode: (g: IGraph, type: any, attrs: any, name: string) => string;
-    simplify: (g: IGraph) => any;
-    asNonCompoundGraph: (g: IGraph) => IGraph;
-    successorWeights: (g: IGraph) => any;
-    predecessorWeights: (g: IGraph) => any;
-    intersectRect: (rect: any, point: any) => {
-        x: any;
-        y: any;
-    };
-    buildLayerMatrix: (g: IGraph) => any;
-    normalizeRanks: (g: IGraph) => void;
-    removeEmptyRanks: (g: IGraph) => void;
-    addBorderNode: (g: IGraph, prefix: string, rank?: number | undefined, order?: number | undefined) => string;
-    maxRank: (g: IGraph) => number;
-    partition: (collection: any, fn: any) => {
-        lhs: any;
-        rhs: any;
-    };
-    time: (name: string, fn: () => unknown) => unknown;
-    notime: (name: string, fn: () => unknown) => unknown;
-    zipObject: (keys: string[], values: any) => any;
-    minBy: (array: any, func: (param: any) => number) => undefined;
-};
-export default _default;
+export declare const time: (name: string, fn: () => void) => void;
+export declare const notime: (name: string, fn: () => void) => void;
+export declare const minBy: <T = any>(array: T[], func: (param: T) => number) => T;