@antv/layout 0.2.0 → 0.2.3

package/lib/layout/dagre/graph.d.ts

@@ -0,0 +1,91 @@
+import { Graph as RawGraph } from "@antv/graphlib";
+export declare class Graph extends RawGraph<string, Node<Record<string, any>> & NodeConfig, Partial<EdgeConfig & Edge & GraphEdge>, Partial<GraphLabel>> {
+}
+export interface GraphLabel {
+    width?: number | undefined;
+    height?: number | undefined;
+    compound?: boolean | undefined;
+    rankdir?: string | undefined;
+    align?: string | undefined;
+    nodesep?: number | undefined;
+    edgesep?: number | undefined;
+    ranksep?: number | undefined;
+    marginx?: number | undefined;
+    marginy?: number | undefined;
+    acyclicer?: string | undefined;
+    ranker?: string | undefined;
+    maxRank?: number;
+    nestingRoot?: string;
+    nodeRankFactor?: number;
+    dummyChains?: string[];
+    root?: string;
+}
+export interface NodeConfig {
+    width?: number | undefined;
+    height?: number | undefined;
+}
+export interface EdgeConfig {
+    minlen?: number | undefined;
+    weight?: number | undefined;
+    width?: number | undefined;
+    height?: number | undefined;
+    lablepos?: "l" | "c" | "r" | undefined;
+    labeloffest?: number | undefined;
+}
+export interface CustomConfig {
+    edgeLabelSpace?: boolean | undefined;
+    keepNodeOrder?: boolean | undefined;
+    nodeOrder?: string[] | undefined;
+    prevGraph?: Graph | undefined;
+}
+export declare type layout = (graph: Graph, layout?: GraphLabel & NodeConfig & EdgeConfig & CustomConfig) => void;
+export interface Edge {
+    v: string;
+    w: string;
+    name?: string | undefined;
+    label?: any;
+    e?: any;
+}
+export interface GraphEdge {
+    points: {
+        x: number;
+        y: number;
+    }[];
+    [key: string]: any;
+}
+export declare type Node<T = {}> = T & {
+    x?: number;
+    y?: number;
+    width?: number;
+    height?: number;
+    class?: string | undefined;
+    label?: any;
+    padding?: number | undefined;
+    paddingX?: number | undefined;
+    paddingY?: number | undefined;
+    rx?: number | undefined;
+    ry?: number | undefined;
+    shape?: string | undefined;
+    order?: number;
+    rank?: number;
+    in?: number;
+    out?: number;
+    fixorder?: number;
+    _order?: number;
+    _rank?: number;
+    dummy?: string;
+    selfEdges?: any;
+    borderTop?: any;
+    borderBottom?: any;
+    borderLeft?: any;
+    borderRight?: any;
+    minRank?: number;
+    maxRank?: number;
+    layer?: number;
+    edgeLabel?: any;
+    edgeObj?: Edge;
+    borderType?: string;
+    labelpos?: string;
+    parent?: string;
+    lim?: number;
+};

package/lib/layout/dagre/graph.js

@@ -0,0 +1,28 @@
+"use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Graph = void 0;
+var graphlib_1 = require("@antv/graphlib");
+var Graph = /** @class */ (function (_super) {
+    __extends(Graph, _super);
+    function Graph() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return Graph;
+}(graphlib_1.Graph));
+exports.Graph = Graph;
+//# sourceMappingURL=graph.js.map

package/lib/layout/dagre/graph.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"graph.js","sourceRoot":"","sources":["../../../src/layout/dagre/graph.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAAA,2CAAmD;AAEnD;IAA2B,yBAK1B;IALD;;IAKG,CAAC;IAAD,YAAC;AAAD,CAAC,AALJ,CAA2B,gBAAQ,GAK/B;AALS,sBAAK"}

package/lib/layout/dagre/index.d.ts

@@ -1,9 +1,8 @@
 declare const _default: {
-    graphlib: any;
-    layout: (g: import("./graphlib").graphlib.Graph<{}>, opts: any) => void;
+    layout: (g: import("./graph").Graph, opts?: any) => void;
     util: {
-        time: (name: string, fn: () => unknown) => unknown;
-        notime: (name: string, fn: () => unknown) => unknown;
+        time: (name: string, fn: () => void) => void;
+        notime: (name: string, fn: () => void) => void;
     };
 };
 export default _default;

package/lib/layout/dagre/index.js

@@ -24,11 +24,9 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-var graphlib_1 = __importDefault(require("./src/graphlib"));
 var layout_1 = __importDefault(require("./src/layout"));
 var util_1 = require("./src/util");
 exports.default = {
-    graphlib: graphlib_1.default,
     layout: layout_1.default,
     util: {
         time: util_1.time,

package/lib/layout/dagre/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/layout/dagre/index.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;;;;;;;;;;;;;;;EAoBE;AACF,4DAAsC;AACtC,wDAAkC;AAClC,mCAA0C;AAE1C,kBAAe;IACb,QAAQ,oBAAA;IACR,MAAM,kBAAA;IACN,IAAI,EAAE;QACJ,IAAI,aAAA;QACJ,MAAM,eAAA;KACP;CACF,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/layout/dagre/index.ts"],"names":[],"mappings":";;;;;AAAA;;;;;;;;;;;;;;;;;;;;EAoBE;AACF,wDAAkC;AAClC,mCAA0C;AAE1C,kBAAe;IACb,MAAM,kBAAA;IACN,IAAI,EAAE;QACJ,IAAI,aAAA;QACJ,MAAM,eAAA;KACP;CACF,CAAC"}

package/lib/layout/dagre/src/acyclic.d.ts

@@ -1,5 +1,4 @@
-import { graphlib } from '../graphlib';
-declare type Graph = graphlib.Graph;
+import { Graph } from "../graph";
 declare const _default: {
     run: (g: Graph) => void;
     undo: (g: Graph) => void;

package/lib/layout/dagre/src/acyclic.js

@@ -6,15 +6,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var greedy_fas_1 = __importDefault(require("./greedy-fas"));
 var run = function (g) {
     var weightFn = function (g) {
-        return function (e) { return g.edge(e).weight; };
+        return function (e) { var _a; return ((_a = g.edge(e)) === null || _a === void 0 ? void 0 : _a.weight) || 1; };
     };
-    var fas = (g.graph().acyclicer === "greedy" ? (0, greedy_fas_1.default)(g, weightFn(g)) : dfsFAS(g));
+    var fas = g.graph().acyclicer === "greedy" ? (0, greedy_fas_1.default)(g, weightFn(g)) : dfsFAS(g);
     fas === null || fas === void 0 ? void 0 : fas.forEach(function (e) {
         var label = g.edge(e);
-        g.removeEdge(e);
+        g.removeEdgeObj(e);
         label.forwardName = e.name;
         label.reversed = true;
-        g.setEdge(e.w, e.v, label, "rev-" + Math.random());
+        g.setEdge(e.w, e.v, label, "rev-".concat(Math.random()));
     });
 };
 var dfsFAS = function (g) {
@@ -23,13 +23,13 @@ var dfsFAS = function (g) {
     var visited = {};
     var dfs = function (v) {
         var _a;
-        if (visited.hasOwnProperty(v)) {
+        if (visited[v]) {
             return;
         }
         visited[v] = true;
         stack[v] = true;
         (_a = g.outEdges(v)) === null || _a === void 0 ? void 0 : _a.forEach(function (e) {
-            if (stack.hasOwnProperty(e.w)) {
+            if (stack[e.w]) {
                 fas.push(e);
             }
             else {
@@ -45,7 +45,7 @@ var undo = function (g) {
     g.edges().forEach(function (e) {
         var label = g.edge(e);
         if (label.reversed) {
-            g.removeEdge(e);
+            g.removeEdgeObj(e);
             var forwardName = label.forwardName;
             delete label.reversed;
             delete label.forwardName;

package/lib/layout/dagre/src/acyclic.js.map

@@ -1 +1 @@
-{"version":3,"file":"acyclic.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/acyclic.ts"],"names":[],"mappings":";;;;;AACA,4DAAqC;AAIrC,IAAM,GAAG,GAAG,UAAC,CAAQ;IACnB,IAAM,QAAQ,GAAG,UAAC,CAAQ;QACxB,OAAO,UAAC,CAAO,IAAK,OAAA,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,EAAhB,CAAgB,CAAC;IACvC,CAAC,CAAC;IACF,IAAM,GAAG,GAAG,CAAC,CAAC,CAAC,KAAK,EAAE,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,oBAAS,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;IACvF,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,UAAC,CAAO;QACnB,IAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;QAChB,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC;QAC3B,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,SAAO,IAAI,CAAC,MAAM,EAAI,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,IAAM,MAAM,GAAG,UAAC,CAAQ;IACtB,IAAM,GAAG,GAAW,EAAE,CAAC;IACvB,IAAM,KAAK,GAAQ,EAAE,CAAC;IACtB,IAAM,OAAO,GAAQ,EAAE,CAAC;IAExB,IAAM,GAAG,GAAG,UAAC,CAAM;;QACjB,IAAI,OAAO,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE;YAC7B,OAAO;SACR;QACD,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAClB,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAChB,MAAA,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,UAAC,CAAC;YACvB,IAAI,KAAK,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;gBAC7B,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACb;iBAAM;gBACL,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACV;QACH,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,IAAM,IAAI,GAAG,UAAC,CAAQ;IACpB,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,UAAC,CAAC;QAClB,IAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACxB,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;YAEhB,IAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACtC,OAAO,KAAK,CAAC,QAAQ,CAAC;YACtB,OAAO,KAAK,CAAC,WAAW,CAAC;YACzB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;SACzC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,kBAAe,EAAE,GAAG,KAAA,EAAE,IAAI,MAAA,EAAE,CAAC"}
+{"version":3,"file":"acyclic.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/acyclic.ts"],"names":[],"mappings":";;;;;AACA,4DAAqC;AAErC,IAAM,GAAG,GAAG,UAAC,CAAQ;IACnB,IAAM,QAAQ,GAAG,UAAC,CAAQ;QACxB,OAAO,UAAC,CAAO,YAAK,OAAA,CAAA,MAAA,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,0CAAE,MAAM,KAAI,CAAC,CAAA,EAAA,CAAC;IAC7C,CAAC,CAAC;IACF,IAAM,GAAG,GACP,CAAC,CAAC,KAAK,EAAE,CAAC,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAA,oBAAS,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;IAC3E,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,OAAO,CAAC,UAAC,CAAO;QACnB,IAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;QACzB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;QACnB,KAAK,CAAC,WAAW,GAAG,CAAC,CAAC,IAAI,CAAC;QAC3B,KAAK,CAAC,QAAQ,GAAG,IAAI,CAAC;QACtB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,cAAO,IAAI,CAAC,MAAM,EAAE,CAAE,CAAC,CAAC;IACrD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,IAAM,MAAM,GAAG,UAAC,CAAQ;IACtB,IAAM,GAAG,GAAW,EAAE,CAAC;IACvB,IAAM,KAAK,GAA4B,EAAE,CAAC;IAC1C,IAAM,OAAO,GAA4B,EAAE,CAAC;IAE5C,IAAM,GAAG,GAAG,UAAC,CAAS;;QACpB,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;YACd,OAAO;SACR;QACD,OAAO,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAClB,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAChB,MAAA,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,0CAAE,OAAO,CAAC,UAAC,CAAC;YACvB,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE;gBACd,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;aACb;iBAAM;gBACL,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;aACV;QACH,CAAC,CAAC,CAAC;QACH,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC;IAEF,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACvB,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAEF,IAAM,IAAI,GAAG,UAAC,CAAQ;IACpB,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,UAAC,CAAC;QAClB,IAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;QACzB,IAAI,KAAK,CAAC,QAAQ,EAAE;YAClB,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC;YAEnB,IAAM,WAAW,GAAG,KAAK,CAAC,WAAW,CAAC;YACtC,OAAO,KAAK,CAAC,QAAQ,CAAC;YACtB,OAAO,KAAK,CAAC,WAAW,CAAC;YACzB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,CAAC;SACzC;IACH,CAAC,CAAC,CAAC;AACL,CAAC,CAAC;AAEF,kBAAe,EAAE,GAAG,KAAA,EAAE,IAAI,MAAA,EAAE,CAAC"}

package/lib/layout/dagre/src/add-border-segments.d.ts

@@ -1,4 +1,3 @@
-import { graphlib } from '../graphlib';
-declare type Graph = graphlib.Graph;
+import { Graph } from "../graph";
 declare const addBorderSegments: (g: Graph) => void;
 export default addBorderSegments;

package/lib/layout/dagre/src/add-border-segments.js

@@ -1,9 +1,6 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var util_1 = __importDefault(require("./util"));
+var util_1 = require("./util");
 var addBorderSegments = function (g) {
     var _a;
     var dfs = function (v) {
@@ -12,10 +9,10 @@ var addBorderSegments = function (g) {
         if (children === null || children === void 0 ? void 0 : children.length) {
             children.forEach(function (child) { return dfs(child); });
         }
-        if (node.hasOwnProperty('minRank')) {
+        if (node.hasOwnProperty("minRank")) {
             node.borderLeft = [];
             node.borderRight = [];
-            for (var rank = node.minRank, maxRank = node.maxRank + 1; rank < maxRank; ++rank) {
+            for (var rank = node.minRank, maxRank = node.maxRank + 1; rank < maxRank; rank += 1) {
                 addBorderNode(g, "borderLeft", "_bl", v, node, rank);
                 addBorderNode(g, "borderRight", "_br", v, node, rank);
             }
@@ -24,9 +21,9 @@ var addBorderSegments = function (g) {
     (_a = g.children()) === null || _a === void 0 ? void 0 : _a.forEach(function (child) { return dfs(child); });
 };
 var addBorderNode = function (g, prop, prefix, sg, sgNode, rank) {
-    var label = { rank: rank, width: 0, height: 0, borderType: prop };
+    var label = { rank: rank, borderType: prop, width: 0, height: 0 };
     var prev = sgNode[prop][rank - 1];
-    var curr = util_1.default.addDummyNode(g, "border", label, prefix);
+    var curr = (0, util_1.addDummyNode)(g, "border", label, prefix);
     sgNode[prop][rank] = curr;
     g.setParent(curr, sg);
     if (prev) {

package/lib/layout/dagre/src/add-border-segments.js.map

@@ -1 +1 @@
-{"version":3,"file":"add-border-segments.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/add-border-segments.ts"],"names":[],"mappings":";;;;;AACA,gDAA0B;AAI1B,IAAM,iBAAiB,GAAG,UAAC,CAAQ;;IACjC,IAAM,GAAG,GAAG,UAAC,CAAS;QACpB,IAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAM,IAAI,GAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QAC5B,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE;YACpB,QAAQ,CAAC,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,EAAV,CAAU,CAAC,CAAC;SACzC;QAED,IAAI,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YAClC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;YACtB,KAAK,IAAI,IAAI,GAAG,IAAI,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI,CAAC,OAAO,GAAG,CAAC,EACtD,IAAI,GAAG,OAAO,EACd,EAAE,IAAI,EAAE;gBACR,aAAa,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrD,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aACvD;SACF;IACH,CAAC,CAAC;IAEF,MAAA,CAAC,CAAC,QAAQ,EAAE,0CAAE,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,EAAV,CAAU,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,IAAM,aAAa,GAAG,UAAC,CAAQ,EAAE,IAAY,EAAE,MAAc,EAAE,EAAU,EAAE,MAAW,EAAE,IAAY;IAClG,IAAM,KAAK,GAAG,EAAE,IAAI,MAAA,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IAC9D,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACpC,IAAM,IAAI,GAAG,cAAI,CAAC,YAAY,CAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IAC3D,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACtB,IAAI,IAAI,EAAE;QACR,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KACtC;AACH,CAAC,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}
+{"version":3,"file":"add-border-segments.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/add-border-segments.ts"],"names":[],"mappings":";;AACA,+BAAsC;AAEtC,IAAM,iBAAiB,GAAG,UAAC,CAAQ;;IACjC,IAAM,GAAG,GAAG,UAAC,CAAS;QACpB,IAAM,QAAQ,GAAG,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC/B,IAAM,IAAI,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC;QACxB,IAAI,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,MAAM,EAAE;YACpB,QAAQ,CAAC,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,EAAV,CAAU,CAAC,CAAC;SACzC;QAED,IAAI,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;YAClC,IAAI,CAAC,UAAU,GAAG,EAAE,CAAC;YACrB,IAAI,CAAC,WAAW,GAAG,EAAE,CAAC;YACtB,KACE,IAAI,IAAI,GAAG,IAAI,CAAC,OAAQ,EAAE,OAAO,GAAG,IAAI,CAAC,OAAQ,GAAG,CAAC,EACrD,IAAI,GAAG,OAAO,EACd,IAAI,IAAI,CAAC,EACT;gBACA,aAAa,CAAC,CAAC,EAAE,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;gBACrD,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;aACvD;SACF;IACH,CAAC,CAAC;IAEF,MAAA,CAAC,CAAC,QAAQ,EAAE,0CAAE,OAAO,CAAC,UAAC,KAAK,IAAK,OAAA,GAAG,CAAC,KAAK,CAAC,EAAV,CAAU,CAAC,CAAC;AAC/C,CAAC,CAAC;AAEF,IAAM,aAAa,GAAG,UACpB,CAAQ,EACR,IAAY,EACZ,MAAc,EACd,EAAU,EACV,MAAiC,EACjC,IAAY;IAEZ,IAAM,KAAK,GAAG,EAAE,IAAI,MAAA,EAAE,UAAU,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC;IAC9D,IAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,CAAC;IACpC,IAAM,IAAI,GAAG,IAAA,mBAAY,EAAC,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC;IACtD,MAAM,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC1B,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC;IACtB,IAAI,IAAI,EAAE;QACR,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;KACtC;AACH,CAAC,CAAC;AAEF,kBAAe,iBAAiB,CAAC"}

package/lib/layout/dagre/src/coordinate-system.d.ts

@@ -1,5 +1,4 @@
-import { graphlib } from "../graphlib";
-declare type Graph = graphlib.Graph;
+import { Graph } from "../graph";
 declare const _default: {
     adjust: (g: Graph) => void;
     undo: (g: Graph) => void;

package/lib/layout/dagre/src/coordinate-system.js

@@ -19,8 +19,12 @@ var undo = function (g) {
     }
 };
 var swapWidthHeight = function (g) {
-    g.nodes().forEach(function (v) { swapWidthHeightOne(g.node(v)); });
-    g.edges().forEach(function (e) { swapWidthHeightOne(g.edge(e)); });
+    g.nodes().forEach(function (v) {
+        swapWidthHeightOne(g.node(v));
+    });
+    g.edges().forEach(function (e) {
+        swapWidthHeightOne(g.edge(e));
+    });
 };
 var swapWidthHeightOne = function (attrs) {
     var w = attrs.width;
@@ -28,7 +32,9 @@ var swapWidthHeightOne = function (attrs) {
     attrs.height = w;
 };
 var reverseY = function (g) {
-    g.nodes().forEach(function (v) { reverseYOne(g.node(v)); });
+    g.nodes().forEach(function (v) {
+        reverseYOne(g.node(v));
+    });
     g.edges().forEach(function (e) {
         var _a;
         var edge = g.edge(e);
@@ -39,10 +45,14 @@ var reverseY = function (g) {
     });
 };
 var reverseYOne = function (attrs) {
-    attrs.y = -attrs.y;
+    if (attrs === null || attrs === void 0 ? void 0 : attrs.y) {
+        attrs.y = -attrs.y;
+    }
 };
 var swapXY = function (g) {
-    g.nodes().forEach(function (v) { swapXYOne(g.node(v)); });
+    g.nodes().forEach(function (v) {
+        swapXYOne(g.node(v));
+    });
     g.edges().forEach(function (e) {
         var _a;
         var edge = g.edge(e);

package/lib/layout/dagre/src/coordinate-system.js.map

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

package/lib/layout/dagre/src/data/list.d.ts

@@ -1,8 +1,12 @@
-declare class List {
-    isentinel: any;
+declare type LinkedNode<T> = {
+    prev?: LinkedNode<T>;
+    next?: LinkedNode<T>;
+} & T;
+export default class List<T> {
+    shortcut: LinkedNode<T>;
     constructor();
-    dequeue(): any;
-    enqueue(): any;
+    dequeue(): LinkedNode<T> | undefined;
+    enqueue(entry: LinkedNode<T>): void;
     toString(): string;
 }
-export default List;
+export {};

package/lib/layout/dagre/src/data/list.js

@@ -1,51 +1,50 @@
 "use strict";
-/*
- * Simple doubly linked list implementation derived from Cormen, et al.,
- * "Introduction to Algorithms".
- */
 Object.defineProperty(exports, "__esModule", { value: true });
-var unlink = function (entry) {
-    entry._prev._next = entry._next;
-    entry._next._prev = entry._prev;
-    delete entry._next;
-    delete entry._prev;
-};
 var filterOutLinks = function (k, v) {
-    if (k !== "_next" && k !== "_prev") {
+    if (k !== "next" && k !== "prev") {
         return v;
     }
 };
+var unlink = function (entry) {
+    entry.prev.next = entry.next;
+    entry.next.prev = entry.prev;
+    delete entry.next;
+    delete entry.prev;
+};
 var List = /** @class */ (function () {
     function List() {
-        var sentinel = {};
-        sentinel._next = sentinel._prev = sentinel;
-        this.isentinel = sentinel;
+        var shortcut = {};
+        shortcut.prev = shortcut;
+        shortcut.next = shortcut.prev;
+        this.shortcut = shortcut;
     }
     List.prototype.dequeue = function () {
-        var sentinel = this.isentinel;
-        var entry = sentinel._prev;
-        if (entry !== sentinel) {
+        var shortcut = this.shortcut;
+        var entry = shortcut.prev;
+        if (entry && entry !== shortcut) {
             unlink(entry);
             return entry;
         }
     };
-    List.prototype.enqueue = function () {
-        var sentinel = this.isentinel;
-        var entry = sentinel._prev;
-        if (entry !== sentinel) {
+    List.prototype.enqueue = function (entry) {
+        var shortcut = this.shortcut;
+        if (entry.prev && entry.next) {
             unlink(entry);
-            return entry;
         }
+        entry.next = shortcut.next;
+        shortcut.next.prev = entry;
+        shortcut.next = entry;
+        entry.prev = shortcut;
     };
     List.prototype.toString = function () {
         var strs = [];
-        var sentinel = this.isentinel;
-        var curr = sentinel._prev;
+        var sentinel = this.shortcut;
+        var curr = sentinel.prev;
         while (curr !== sentinel) {
             strs.push(JSON.stringify(curr, filterOutLinks));
-            curr = curr._prev;
+            curr = curr === null || curr === void 0 ? void 0 : curr.prev;
         }
-        return "[" + strs.join(", ") + "]";
+        return "[".concat(strs.join(", "), "]");
     };
     return List;
 }());

package/lib/layout/dagre/src/data/list.js.map

@@ -1 +1 @@
-{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/layout/dagre/src/data/list.ts"],"names":[],"mappings":";AAAA;;;GAGG;;AAEH,IAAM,MAAM,GAAG,UAAC,KAAU;IACxB,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAChC,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC;IAChC,OAAO,KAAK,CAAC,KAAK,CAAC;IACnB,OAAO,KAAK,CAAC,KAAK,CAAC;AACrB,CAAC,CAAC;AAEF,IAAM,cAAc,GAAG,UAAC,CAAS,EAAE,CAAS;IAC1C,IAAI,CAAC,KAAK,OAAO,IAAI,CAAC,KAAK,OAAO,EAAE;QAClC,OAAO,CAAC,CAAC;KACV;AACH,CAAC,CAAC;AAEF;IAGE;QACE,IAAM,QAAQ,GAAQ,EAAE,CAAC;QACzB,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC,KAAK,GAAG,QAAQ,CAAC;QAC3C,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAEM,sBAAO,GAAd;QACE,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC7B,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,MAAM,CAAC,KAAK,CAAC,CAAC;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,sBAAO,GAAd;QACE,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC7B,IAAI,KAAK,KAAK,QAAQ,EAAE;YACtB,MAAM,CAAC,KAAK,CAAC,CAAC;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,uBAAQ,GAAf;QACE,IAAM,IAAI,GAAG,EAAE,CAAC;QAChB,IAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,IAAI,IAAI,GAAG,QAAQ,CAAC,KAAK,CAAC;QAC1B,OAAO,IAAI,KAAK,QAAQ,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YAChD,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC;SACnB;QACD,OAAO,MAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC;IAChC,CAAC;IACH,WAAC;AAAD,CAAC,AArCD,IAqCC;AAED,kBAAe,IAAI,CAAC"}
+{"version":3,"file":"list.js","sourceRoot":"","sources":["../../../../../src/layout/dagre/src/data/list.ts"],"names":[],"mappings":";;AAAA,IAAM,cAAc,GAAG,UAAC,CAAS,EAAE,CAAS;IAC1C,IAAI,CAAC,KAAK,MAAM,IAAI,CAAC,KAAK,MAAM,EAAE;QAChC,OAAO,CAAC,CAAC;KACV;AACH,CAAC,CAAC;AAOF,IAAM,MAAM,GAAG,UAAI,KAAoB;IACrC,KAAK,CAAC,IAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC9B,KAAK,CAAC,IAAK,CAAC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC;IAC9B,OAAO,KAAK,CAAC,IAAI,CAAC;IAClB,OAAO,KAAK,CAAC,IAAI,CAAC;AACpB,CAAC,CAAC;AAEF;IAIE;QACE,IAAM,QAAQ,GAAoB,EAAE,CAAC;QACrC,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC;QACzB,QAAQ,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC9B,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;IAC3B,CAAC;IAEM,sBAAO,GAAd;QACE,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC5B,IAAI,KAAK,IAAI,KAAK,KAAK,QAAQ,EAAE;YAC/B,MAAM,CAAC,KAAK,CAAC,CAAC;YACd,OAAO,KAAK,CAAC;SACd;IACH,CAAC;IAEM,sBAAO,GAAd,UAAe,KAAoB;QACjC,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,KAAK,CAAC,IAAI,IAAI,KAAK,CAAC,IAAI,EAAE;YAC5B,MAAM,CAAC,KAAK,CAAC,CAAC;SACf;QACD,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QAC3B,QAAQ,CAAC,IAAK,CAAC,IAAI,GAAG,KAAK,CAAC;QAC5B,QAAQ,CAAC,IAAI,GAAG,KAAK,CAAC;QACtB,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC;IACxB,CAAC;IAEM,uBAAQ,GAAf;QACE,IAAM,IAAI,GAAG,EAAE,CAAC;QAChB,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;QAC/B,IAAI,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC;QACzB,OAAO,IAAI,KAAK,QAAQ,EAAE;YACxB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;YAChD,IAAI,GAAG,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,IAAI,CAAC;SACnB;QACD,OAAO,WAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,MAAG,CAAC;IAChC,CAAC;IACH,WAAC;AAAD,CAAC,AAzCD,IAyCC"}

package/lib/layout/dagre/src/debug.d.ts

@@ -1,4 +1,3 @@
-import { graphlib as IGraphType } from '../graphlib';
-declare type IGraph = IGraphType.Graph;
-declare const debugOrdering: (g: IGraph) => any;
+import { Graph } from "../graph";
+declare const debugOrdering: (g: Graph) => Graph;
 export default debugOrdering;

package/lib/layout/dagre/src/debug.js

@@ -1,24 +1,19 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-var util_1 = __importDefault(require("./util"));
-var graphlib_1 = __importDefault(require("./graphlib"));
-var Graph = graphlib_1.default.Graph;
-/* istanbul ignore next */
+var graph_1 = require("../graph");
+var util_1 = require("./util");
 var debugOrdering = function (g) {
-    var layerMatrix = util_1.default.buildLayerMatrix(g);
-    var h = new Graph({ compound: true, multigraph: true }).setGraph({});
+    var layerMatrix = (0, util_1.buildLayerMatrix)(g);
+    var h = new graph_1.Graph({ compound: true, multigraph: true }).setGraph({});
     g.nodes().forEach(function (v) {
         h.setNode(v, { label: v });
-        h.setParent(v, "layer" + g.node(v).rank);
+        h.setParent(v, "layer".concat(g.node(v).rank));
     });
     g.edges().forEach(function (e) {
         h.setEdge(e.v, e.w, {}, e.name);
     });
     layerMatrix === null || layerMatrix === void 0 ? void 0 : layerMatrix.forEach(function (layer, i) {
-        var layerV = "layer" + i;
+        var layerV = "layer".concat(i);
         h.setNode(layerV, { rank: "same" });
         layer === null || layer === void 0 ? void 0 : layer.reduce(function (u, v) {
             h.setEdge(u, v, { style: "invis" });

package/lib/layout/dagre/src/debug.js.map

@@ -1 +1 @@
-{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/debug.ts"],"names":[],"mappings":";;;;;AAAA,gDAA0B;AAC1B,wDAAkC;AAIlC,IAAM,KAAK,GAAI,kBAAgB,CAAC,KAAK,CAAC;AAEtC,0BAA0B;AAC1B,IAAM,aAAa,GAAG,UAAC,CAAS;IAC9B,IAAM,WAAW,GAAG,cAAI,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;IAE7C,IAAM,CAAC,GAAG,IAAI,KAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEvE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,UAAC,CAAS;QAC1B,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,UAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAM,CAAC,CAAC;IAC3C,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,UAAC,CAAC;QAClB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC,UAAC,KAAU,EAAE,CAAS;QACzC,IAAM,MAAM,GAAG,UAAQ,CAAG,CAAC;QAC3B,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,CAAC,CAAC;QACpC,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,UAAC,CAAS,EAAE,CAAS;YACjC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"debug.js","sourceRoot":"","sources":["../../../../src/layout/dagre/src/debug.ts"],"names":[],"mappings":";;AAAA,kCAAiC;AACjC,+BAA0C;AAE1C,IAAM,aAAa,GAAG,UAAC,CAAQ;IAC7B,IAAM,WAAW,GAAG,IAAA,uBAAgB,EAAC,CAAC,CAAC,CAAC;IAExC,IAAM,CAAC,GAAG,IAAI,aAAK,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;IAEvE,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,UAAC,CAAS;QAC1B,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;QAC3B,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,eAAQ,CAAC,CAAC,IAAI,CAAC,CAAC,CAAE,CAAC,IAAI,CAAE,CAAC,CAAC;IAC5C,CAAC,CAAC,CAAC;IAEH,CAAC,CAAC,KAAK,EAAE,CAAC,OAAO,CAAC,UAAC,CAAC;QAClB,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC,CAAC,CAAC;IAEH,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CAAC,UAAC,KAAK,EAAE,CAAS;QACpC,IAAM,MAAM,GAAG,eAAQ,CAAC,CAAE,CAAC;QAC3B,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,IAAI,EAAE,MAA2B,EAAE,CAAC,CAAC;QACzD,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,MAAM,CAAC,UAAC,CAAS,EAAE,CAAS;YACjC,CAAC,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC;YACpC,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,OAAO,CAAC,CAAC;AACX,CAAC,CAAC;AAEF,kBAAe,aAAa,CAAC"}

package/lib/layout/dagre/src/greedy-fas.d.ts

@@ -1,4 +1,3 @@
-import { graphlib as IGraphLib } from '../graphlib';
-declare type IGraph = IGraphLib.Graph;
-declare const greedyFAS: (g: IGraph, weightFn: () => unknown) => (import("../graphlib").Edge | undefined)[];
+import { Edge, Graph } from "../graph";
+declare const greedyFAS: (g: Graph, weightFn?: ((e: Edge) => number) | undefined) => (import("@antv/graphlib/lib/Graph").DefaultEdgeType<string, Partial<import("../graph").EdgeConfig & Edge & import("../graph").GraphEdge>> | undefined)[];
 export default greedyFAS;

package/lib/layout/dagre/src/greedy-fas.js

@@ -1,11 +1,39 @@
 "use strict";
+var __extends = (this && this.__extends) || (function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf ||
+            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
+            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
+        return extendStatics(d, b);
+    };
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null)
+            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() { this.constructor = d; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var graphlib_1 = __importDefault(require("./graphlib"));
 var list_1 = __importDefault(require("./data/list"));
-var Graph = graphlib_1.default.Graph;
+var graphlib_1 = require("@antv/graphlib");
+var List = /** @class */ (function (_super) {
+    __extends(List, _super);
+    function List() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return List;
+}(list_1.default));
+var StateGraph = /** @class */ (function (_super) {
+    __extends(StateGraph, _super);
+    function StateGraph() {
+        return _super !== null && _super.apply(this, arguments) || this;
+    }
+    return StateGraph;
+}(graphlib_1.Graph));
 /*
  * A greedy heuristic for finding a feedback arc set for a graph. A feedback
  * arc set is a set of edges that can be removed to make a graph acyclic.
@@ -13,7 +41,6 @@ var Graph = graphlib_1.default.Graph;
  * effective heuristic for the feedback arc set problem." This implementation
  * adjusts that from the paper to allow for weighted edges.
  */
-// module.exports = greedyFAS;
 var DEFAULT_WEIGHT_FN = function () { return 1; };
 var greedyFAS = function (g, weightFn) {
     var _a;
@@ -21,8 +48,6 @@ var greedyFAS = function (g, weightFn) {
         return [];
     var state = buildState(g, weightFn || DEFAULT_WEIGHT_FN);
     var results = doGreedyFAS(state.graph, state.buckets, state.zeroIdx);
-    // Expand multi-edges
-    // @ts-ignore
     return (_a = results.map(function (e) { return g.outEdges(e.v, e.w); })) === null || _a === void 0 ? void 0 : _a.flat();
 };
 var doGreedyFAS = function (g, buckets, zeroIdx) {
@@ -51,12 +76,13 @@ var doGreedyFAS = function (g, buckets, zeroIdx) {
 };
 var removeNode = function (g, buckets, zeroIdx, entry, collectPredecessors) {
     var _a, _b;
-    var results = collectPredecessors ? [] : undefined;
+    var results = [];
     (_a = g.inEdges(entry.v)) === null || _a === void 0 ? void 0 : _a.forEach(function (edge) {
         var weight = g.edge(edge);
         var uEntry = g.node(edge.v);
         if (collectPredecessors) {
-            results.push({ v: edge.v, w: edge.w });
+            // this result not really care about in or out
+            results.push({ v: edge.v, w: edge.w, in: 0, out: 0 });
         }
         if (uEntry.out === undefined)
             uEntry.out = 0;
@@ -73,29 +99,29 @@ var removeNode = function (g, buckets, zeroIdx, entry, collectPredecessors) {
         assignBucket(buckets, zeroIdx, wEntry);
     });
     g.removeNode(entry.v);
-    return results;
+    return collectPredecessors ? results : undefined;
 };
 var buildState = function (g, weightFn) {
-    var fasGraph = new Graph();
+    var fasGraph = new StateGraph();
     var maxIn = 0;
     var maxOut = 0;
     g.nodes().forEach(function (v) {
-        fasGraph.setNode(v, { v: v, "in": 0, out: 0 });
+        fasGraph.setNode(v, { v: v, in: 0, out: 0 });
     });
     // Aggregate weights on nodes, but also sum the weights across multi-edges
     // into a single edge for the fasGraph.
     g.edges().forEach(function (e) {
-        var prevWeight = fasGraph.edge(e.v, e.w) || 0;
-        var weight = weightFn === null || weightFn === void 0 ? void 0 : weightFn(e);
+        var prevWeight = fasGraph.edge(e) || 0;
+        var weight = (weightFn === null || weightFn === void 0 ? void 0 : weightFn(e)) || 1;
         var edgeWeight = prevWeight + weight;
         fasGraph.setEdge(e.v, e.w, edgeWeight);
-        maxOut = Math.max(maxOut, fasGraph.node(e.v).out += weight);
-        maxIn = Math.max(maxIn, fasGraph.node(e.w)["in"] += weight);
+        maxOut = Math.max(maxOut, (fasGraph.node(e.v).out += weight));
+        maxIn = Math.max(maxIn, (fasGraph.node(e.w).in += weight));
     });
     var buckets = [];
     var rangeMax = maxOut + maxIn + 3;
     for (var i = 0; i < rangeMax; i++) {
-        buckets.push(new list_1.default());
+        buckets.push(new List());
     }
     var zeroIdx = maxIn + 1;
     fasGraph.nodes().forEach(function (v) {