@dagrejs/dagre 1.0.4 → 1.1.0

package/index.d.ts

@@ -105,11 +105,18 @@ declare module '@dagrejs/dagre' {
     weight?: number | undefined;
     width?: number | undefined;
     height?: number | undefined;
-    lablepos?: 'l' | 'c' | 'r' | undefined;
+    labelpos?: 'l' | 'c' | 'r' | undefined;
     labeloffest?: number | undefined;
   }
 
-  export function layout(graph: graphlib.Graph, layout?: GraphLabel & NodeConfig & EdgeConfig): void;
+  export interface LayoutConfig {
+    customOrder?: (graph: graphlib.Graph, order: (graph: graphlib.Graph, opts: configUnion) => void) => void;
+    disableOptimalOrderHeuristic?: boolean;
+  }
+
+  type configUnion = GraphLabel & NodeConfig & EdgeConfig & LayoutConfig;
+
+  export function layout(graph: graphlib.Graph, layout?: configUnion): void;
 
   export interface Edge {
     v: string;
@@ -132,6 +139,7 @@ declare module '@dagrejs/dagre' {
     padding?: number | undefined;
     paddingX?: number | undefined;
     paddingY?: number | undefined;
+    rank?: number | undefined;
     rx?: number | undefined;
     ry?: number | undefined;
     shape?: string | undefined;

package/lib/acyclic.js

@@ -1,37 +1,32 @@
 "use strict";
 
-let greedyFAS = require("./greedy-fas");
-let uniqueId = require("./util").uniqueId;
-
-module.exports = {
-  run: run,
-  undo: undo
-};
-
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = run;
+exports.undo = undo;
+var _greedyFas = _interopRequireDefault(require("./greedy-fas.js"));
+var _util = require("./util.js");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function run(g) {
-  let fas = (g.graph().acyclicer === "greedy"
-    ? greedyFAS(g, weightFn(g))
-    : dfsFAS(g));
+  let fas = g.graph().acyclicer === "greedy" ? (0, _greedyFas.default)(g, weightFn(g)) : dfsFAS(g);
   fas.forEach(e => {
     let label = g.edge(e);
     g.removeEdge(e);
     label.forwardName = e.name;
     label.reversed = true;
-    g.setEdge(e.w, e.v, label, uniqueId("rev"));
+    g.setEdge(e.w, e.v, label, (0, _util.uniqueId)("rev"));
   });
-
   function weightFn(g) {
     return e => {
       return g.edge(e).weight;
     };
   }
 }
-
 function dfsFAS(g) {
   let fas = [];
   let stack = {};
   let visited = {};
-
   function dfs(v) {
     if (visited.hasOwnProperty(v)) {
       return;
@@ -47,17 +42,14 @@ function dfsFAS(g) {
     });
     delete stack[v];
   }
-
   g.nodes().forEach(dfs);
   return fas;
 }
-
 function undo(g) {
   g.edges().forEach(e => {
     let label = g.edge(e);
     if (label.reversed) {
       g.removeEdge(e);
-
       let forwardName = label.forwardName;
       delete label.reversed;
       delete label.forwardName;

package/lib/add-border-segments.js

@@ -1,7 +1,12 @@
-let util = require("./util");
-
-module.exports = addBorderSegments;
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = addBorderSegments;
+var util = _interopRequireWildcard(require("./util.js"));
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 function addBorderSegments(g) {
   function dfs(v) {
     let children = g.children(v);
@@ -9,29 +14,32 @@ function addBorderSegments(g) {
     if (children.length) {
       children.forEach(dfs);
     }
-
     if (node.hasOwnProperty("minRank")) {
       node.borderLeft = [];
       node.borderRight = [];
-      for (let rank = node.minRank, maxRank = node.maxRank + 1;
-        rank < maxRank;
-        ++rank) {
+      for (let rank = node.minRank, maxRank = node.maxRank + 1; rank < maxRank; ++rank) {
         addBorderNode(g, "borderLeft", "_bl", v, node, rank);
         addBorderNode(g, "borderRight", "_br", v, node, rank);
       }
     }
   }
-
   g.children().forEach(dfs);
 }
-
 function addBorderNode(g, prop, prefix, sg, sgNode, rank) {
-  let label = { width: 0, height: 0, rank: rank, borderType: prop };
+  let label = {
+    width: 0,
+    height: 0,
+    rank: rank,
+    borderType: prop
+  };
   let prev = sgNode[prop][rank - 1];
   let curr = util.addDummyNode(g, "border", label, prefix);
   sgNode[prop][rank] = curr;
   g.setParent(curr, sg);
   if (prev) {
-    g.setEdge(prev, curr, { weight: 1 });
+    g.setEdge(prev, curr, {
+      weight: 1
+    });
   }
 }
+module.exports = exports.default;

package/lib/coordinate-system.js

@@ -1,43 +1,37 @@
 "use strict";
 
-module.exports = {
-  adjust: adjust,
-  undo: undo
-};
-
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.adjust = adjust;
+exports.undo = undo;
 function adjust(g) {
   let rankDir = g.graph().rankdir.toLowerCase();
   if (rankDir === "lr" || rankDir === "rl") {
     swapWidthHeight(g);
   }
 }
-
 function undo(g) {
   let rankDir = g.graph().rankdir.toLowerCase();
   if (rankDir === "bt" || rankDir === "rl") {
     reverseY(g);
   }
-
   if (rankDir === "lr" || rankDir === "rl") {
     swapXY(g);
     swapWidthHeight(g);
   }
 }
-
 function swapWidthHeight(g) {
   g.nodes().forEach(v => swapWidthHeightOne(g.node(v)));
   g.edges().forEach(e => swapWidthHeightOne(g.edge(e)));
 }
-
 function swapWidthHeightOne(attrs) {
   let w = attrs.width;
   attrs.width = attrs.height;
   attrs.height = w;
 }
-
 function reverseY(g) {
   g.nodes().forEach(v => reverseYOne(g.node(v)));
-
   g.edges().forEach(e => {
     let edge = g.edge(e);
     edge.points.forEach(reverseYOne);
@@ -46,14 +40,11 @@ function reverseY(g) {
     }
   });
 }
-
 function reverseYOne(attrs) {
   attrs.y = -attrs.y;
 }
-
 function swapXY(g) {
   g.nodes().forEach(v => swapXYOne(g.node(v)));
-
   g.edges().forEach(e => {
     let edge = g.edge(e);
     edge.points.forEach(swapXYOne);
@@ -62,7 +53,6 @@ function swapXY(g) {
     }
   });
 }
-
 function swapXYOne(attrs) {
   let x = attrs.x;
   attrs.x = attrs.y;

package/lib/data/list.js

@@ -1,3 +1,9 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
 /*
  * Simple doubly linked list implementation derived from Cormen, et al.,
  * "Introduction to Algorithms".
@@ -9,7 +15,6 @@ class List {
     sentinel._next = sentinel._prev = sentinel;
     this._sentinel = sentinel;
   }
-
   dequeue() {
     let sentinel = this._sentinel;
     let entry = sentinel._prev;
@@ -18,7 +23,6 @@ class List {
       return entry;
     }
   }
-
   enqueue(entry) {
     let sentinel = this._sentinel;
     if (entry._prev && entry._next) {
@@ -29,7 +33,6 @@ class List {
     sentinel._next = entry;
     entry._prev = sentinel;
   }
-
   toString() {
     let strs = [];
     let sentinel = this._sentinel;
@@ -41,18 +44,16 @@ class List {
     return "[" + strs.join(", ") + "]";
   }
 }
-
+exports.default = List;
 function unlink(entry) {
   entry._prev._next = entry._next;
   entry._next._prev = entry._prev;
   delete entry._next;
   delete entry._prev;
 }
-
 function filterOutLinks(k, v) {
   if (k !== "_next" && k !== "_prev") {
     return v;
   }
 }
-
-module.exports = List;
+module.exports = exports.default;

package/lib/debug.js

@@ -1,31 +1,42 @@
-let util = require("./util");
-let Graph = require("@dagrejs/graphlib").Graph;
+"use strict";
 
-module.exports = {
-  debugOrdering: debugOrdering
-};
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = debugOrdering;
+var util = _interopRequireWildcard(require("./util.js"));
+var _graphlib = require("@dagrejs/graphlib");
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+// web-devs write a <script type="importmap"> to map
+// nodejs paths to actual http://paths
 
 /* istanbul ignore next */
 function debugOrdering(g) {
   let layerMatrix = util.buildLayerMatrix(g);
-
-  let h = new Graph({ compound: true, multigraph: true }).setGraph({});
-
+  let h = new _graphlib.Graph({
+    compound: true,
+    multigraph: true
+  }).setGraph({});
   g.nodes().forEach(v => {
-    h.setNode(v, { label: v });
+    h.setNode(v, {
+      label: v
+    });
     h.setParent(v, "layer" + g.node(v).rank);
   });
-
   g.edges().forEach(e => h.setEdge(e.v, e.w, {}, e.name));
-
   layerMatrix.forEach((layer, i) => {
     let layerV = "layer" + i;
-    h.setNode(layerV, { rank: "same" });
+    h.setNode(layerV, {
+      rank: "same"
+    });
     layer.reduce((u, v) => {
-      h.setEdge(u, v, { style: "invis" });
+      h.setEdge(u, v, {
+        style: "invis"
+      });
       return v;
     });
   });
-
   return h;
 }
+module.exports = exports.default;

package/lib/greedy-fas.js

@@ -1,5 +1,14 @@
-let Graph = require("@dagrejs/graphlib").Graph;
-let List = require("./data/list");
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = greedyFAS;
+var _graphlib = require("@dagrejs/graphlib");
+var _list = _interopRequireDefault(require("./data/list.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+// web-devs write a <script type="importmap"> to map
+// nodejs paths to actual http://paths
 
 /*
  * A greedy heuristic for finding a feedback arc set for a graph. A feedback
@@ -8,10 +17,8 @@ let List = require("./data/list");
  * effective heuristic for the feedback arc set problem." This implementation
  * adjusts that from the paper to allow for weighted edges.
  */
-module.exports = greedyFAS;
 
 let DEFAULT_WEIGHT_FN = () => 1;
-
 function greedyFAS(g, weightFn) {
   if (g.nodeCount() <= 1) {
     return [];
@@ -22,16 +29,18 @@ function greedyFAS(g, weightFn) {
   // Expand multi-edges
   return results.flatMap(e => g.outEdges(e.v, e.w));
 }
-
 function doGreedyFAS(g, buckets, zeroIdx) {
   let results = [];
   let sources = buckets[buckets.length - 1];
   let sinks = buckets[0];
-
   let entry;
   while (g.nodeCount()) {
-    while ((entry = sinks.dequeue()))   { removeNode(g, buckets, zeroIdx, entry); }
-    while ((entry = sources.dequeue())) { removeNode(g, buckets, zeroIdx, entry); }
+    while (entry = sinks.dequeue()) {
+      removeNode(g, buckets, zeroIdx, entry);
+    }
+    while (entry = sources.dequeue()) {
+      removeNode(g, buckets, zeroIdx, entry);
+    }
     if (g.nodeCount()) {
       for (let i = buckets.length - 2; i > 0; --i) {
         entry = buckets[i].dequeue();
@@ -42,25 +51,22 @@ function doGreedyFAS(g, buckets, zeroIdx) {
       }
     }
   }
-
   return results;
 }
-
 function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) {
   let results = collectPredecessors ? [] : undefined;
-
   g.inEdges(entry.v).forEach(edge => {
     let weight = g.edge(edge);
     let uEntry = g.node(edge.v);
-
     if (collectPredecessors) {
-      results.push({ v: edge.v, w: edge.w });
+      results.push({
+        v: edge.v,
+        w: edge.w
+      });
     }
-
     uEntry.out -= weight;
     assignBucket(buckets, zeroIdx, uEntry);
   });
-
   g.outEdges(entry.v).forEach(edge => {
     let weight = g.edge(edge);
     let w = edge.w;
@@ -68,19 +74,19 @@ function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) {
     wEntry["in"] -= weight;
     assignBucket(buckets, zeroIdx, wEntry);
   });
-
   g.removeNode(entry.v);
-
   return results;
 }
-
 function buildState(g, weightFn) {
-  let fasGraph = new Graph();
+  let fasGraph = new _graphlib.Graph();
   let maxIn = 0;
   let maxOut = 0;
-
   g.nodes().forEach(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
@@ -91,19 +97,19 @@ function buildState(g, weightFn) {
     let 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);
+    maxIn = Math.max(maxIn, fasGraph.node(e.w)["in"] += weight);
   });
-
-  let buckets = range(maxOut + maxIn + 3).map(() => new List());
+  let buckets = range(maxOut + maxIn + 3).map(() => new _list.default());
   let zeroIdx = maxIn + 1;
-
   fasGraph.nodes().forEach(v => {
     assignBucket(buckets, zeroIdx, fasGraph.node(v));
   });
-
-  return { graph: fasGraph, buckets: buckets, zeroIdx: zeroIdx };
+  return {
+    graph: fasGraph,
+    buckets: buckets,
+    zeroIdx: zeroIdx
+  };
 }
-
 function assignBucket(buckets, zeroIdx, entry) {
   if (!entry.out) {
     buckets[0].enqueue(entry);
@@ -113,12 +119,11 @@ function assignBucket(buckets, zeroIdx, entry) {
     buckets[entry.out - entry["in"] + zeroIdx].enqueue(entry);
   }
 }
-
 function range(limit) {
   const range = [];
   for (let i = 0; i < limit; i++) {
     range.push(i);
   }
-
   return range;
 }
+module.exports = exports.default;

package/lib/index.js

@@ -0,0 +1,38 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "debug", {
+  enumerable: true,
+  get: function () {
+    return _debug.default;
+  }
+});
+exports.graphlib = void 0;
+Object.defineProperty(exports, "layout", {
+  enumerable: true,
+  get: function () {
+    return _layout.default;
+  }
+});
+exports.util = void 0;
+Object.defineProperty(exports, "version", {
+  enumerable: true,
+  get: function () {
+    return _version.default;
+  }
+});
+var _graphlib = _interopRequireWildcard(require("@dagrejs/graphlib"));
+exports.graphlib = _graphlib;
+var _layout = _interopRequireDefault(require("./layout.js"));
+var _debug = _interopRequireDefault(require("./debug.js"));
+var _util = require("./util.js");
+var _version = _interopRequireDefault(require("./version.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
+const util = exports.util = {
+  time: _util.time,
+  notime: _util.notime
+};