@dagrejs/dagre 1.1.0 → 1.1.1

package/lib/position/bk.js

@@ -1,27 +1,26 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.addConflict = addConflict;
-exports.alignCoordinates = alignCoordinates;
-exports.balance = balance;
-exports.findSmallestWidthAlignment = findSmallestWidthAlignment;
-exports.findType1Conflicts = findType1Conflicts;
-exports.findType2Conflicts = findType2Conflicts;
-exports.hasConflict = hasConflict;
-exports.horizontalCompaction = horizontalCompaction;
-exports.positionX = positionX;
-exports.verticalAlignment = verticalAlignment;
-var _graphlib = require("@dagrejs/graphlib");
-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; }
+let Graph = require("@dagrejs/graphlib").Graph;
+let util = require("../util");
+
 /*
  * This module provides coordinate assignment based on Brandes and Köpf, "Fast
  * and Simple Horizontal Coordinate Assignment."
  */
 
+module.exports = {
+  positionX: positionX,
+  findType1Conflicts: findType1Conflicts,
+  findType2Conflicts: findType2Conflicts,
+  addConflict: addConflict,
+  hasConflict: hasConflict,
+  verticalAlignment: verticalAlignment,
+  horizontalCompaction: horizontalCompaction,
+  alignCoordinates: alignCoordinates,
+  findSmallestWidthAlignment: findSmallestWidthAlignment,
+  balance: balance
+};
+
 /*
  * Marks all edges in the graph with a type-1 conflict with the "type1Conflict"
  * property. A type-1 conflict is one where a non-inner segment crosses an
@@ -41,6 +40,7 @@ function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e;
  */
 function findType1Conflicts(g, layering) {
   let conflicts = {};
+
   function visitLayer(prevLayer, layer) {
     let
       // last visited node in the previous layer that is incident on an inner
@@ -51,15 +51,18 @@ function findType1Conflicts(g, layering) {
       scanPos = 0,
       prevLayerLength = prevLayer.length,
       lastNode = layer[layer.length - 1];
+
     layer.forEach((v, i) => {
       let w = findOtherInnerSegmentNode(g, v),
         k1 = w ? g.node(w).order : prevLayerLength;
+
       if (w || v === lastNode) {
-        layer.slice(scanPos, i + 1).forEach(scanNode => {
+        layer.slice(scanPos, i+1).forEach(scanNode => {
           g.predecessors(scanNode).forEach(u => {
             let uLabel = g.node(u),
               uPos = uLabel.order;
-            if ((uPos < k0 || k1 < uPos) && !(uLabel.dummy && g.node(scanNode).dummy)) {
+            if ((uPos < k0 || k1 < uPos) &&
+                !(uLabel.dummy && g.node(scanNode).dummy)) {
               addConflict(conflicts, u, scanNode);
             }
           });
@@ -68,13 +71,18 @@ function findType1Conflicts(g, layering) {
         k0 = k1;
       }
     });
+
     return layer;
   }
+
   layering.length && layering.reduce(visitLayer);
+
   return conflicts;
 }
+
 function findType2Conflicts(g, layering) {
   let conflicts = {};
+
   function scan(south, southPos, southEnd, prevNorthBorder, nextNorthBorder) {
     let v;
     util.range(southPos, southEnd).forEach(i => {
@@ -82,17 +90,21 @@ function findType2Conflicts(g, layering) {
       if (g.node(v).dummy) {
         g.predecessors(v).forEach(u => {
           let uNode = g.node(u);
-          if (uNode.dummy && (uNode.order < prevNorthBorder || uNode.order > nextNorthBorder)) {
+          if (uNode.dummy &&
+              (uNode.order < prevNorthBorder || uNode.order > nextNorthBorder)) {
             addConflict(conflicts, u, v);
           }
         });
       }
     });
   }
+
+
   function visitLayer(north, south) {
     let prevNorthPos = -1,
       nextNorthPos,
       southPos = 0;
+
     south.forEach((v, southLookahead) => {
       if (g.node(v).dummy === "border") {
         let predecessors = g.predecessors(v);
@@ -105,28 +117,35 @@ function findType2Conflicts(g, layering) {
       }
       scan(south, southPos, south.length, nextNorthPos, north.length);
     });
+
     return south;
   }
+
   layering.length && layering.reduce(visitLayer);
+
   return conflicts;
 }
+
 function findOtherInnerSegmentNode(g, v) {
   if (g.node(v).dummy) {
     return g.predecessors(v).find(u => g.node(u).dummy);
   }
 }
+
 function addConflict(conflicts, v, w) {
   if (v > w) {
     let tmp = v;
     v = w;
     w = tmp;
   }
+
   let conflictsV = conflicts[v];
   if (!conflictsV) {
     conflicts[v] = conflictsV = {};
   }
   conflictsV[w] = true;
 }
+
 function hasConflict(conflicts, v, w) {
   if (v > w) {
     let tmp = v;
@@ -159,6 +178,7 @@ function verticalAlignment(g, layering, conflicts, neighborFn) {
       pos[v] = order;
     });
   });
+
   layering.forEach(layer => {
     let prevIdx = -1;
     layer.forEach(v => {
@@ -168,7 +188,9 @@ function verticalAlignment(g, layering, conflicts, neighborFn) {
         let mp = (ws.length - 1) / 2;
         for (let i = Math.floor(mp), il = Math.ceil(mp); i <= il; ++i) {
           let w = ws[i];
-          if (align[v] === v && prevIdx < pos[w] && !hasConflict(conflicts, v, w)) {
+          if (align[v] === v &&
+              prevIdx < pos[w] &&
+              !hasConflict(conflicts, v, w)) {
             align[w] = v;
             align[v] = root[v] = root[w];
             prevIdx = pos[w];
@@ -177,11 +199,10 @@ function verticalAlignment(g, layering, conflicts, neighborFn) {
       }
     });
   });
-  return {
-    root: root,
-    align: align
-  };
+
+  return { root: root, align: align };
 }
+
 function horizontalCompaction(g, layering, root, align, reverseSep) {
   // This portion of the algorithm differs from BK due to a number of problems.
   // Instead of their algorithm we construct a new block graph and do two
@@ -191,6 +212,7 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
   let xs = {},
     blockG = buildBlockGraph(g, layering, root, reverseSep),
     borderType = reverseSep ? "borderLeft" : "borderRight";
+
   function iterate(setXsFunc, nextNodesFunc) {
     let stack = blockG.nodes();
     let elem = stack.pop();
@@ -203,6 +225,7 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
         stack.push(elem);
         stack = stack.concat(nextNodesFunc(elem));
       }
+
       elem = stack.pop();
     }
   }
@@ -219,22 +242,28 @@ function horizontalCompaction(g, layering, root, align, reverseSep) {
     let min = blockG.outEdges(elem).reduce((acc, e) => {
       return Math.min(acc, xs[e.w] - blockG.edge(e));
     }, Number.POSITIVE_INFINITY);
+
     let node = g.node(elem);
     if (min !== Number.POSITIVE_INFINITY && node.borderType !== borderType) {
       xs[elem] = Math.max(xs[elem], min);
     }
   }
+
   iterate(pass1, blockG.predecessors.bind(blockG));
   iterate(pass2, blockG.successors.bind(blockG));
 
   // Assign x coordinates to all nodes
   Object.keys(align).forEach(v => xs[v] = xs[root[v]]);
+
   return xs;
 }
+
+
 function buildBlockGraph(g, layering, root, reverseSep) {
-  let blockGraph = new _graphlib.Graph(),
+  let blockGraph = new Graph(),
     graphLabel = g.graph(),
     sepFn = sep(graphLabel.nodesep, graphLabel.edgesep, reverseSep);
+
   layering.forEach(layer => {
     let u;
     layer.forEach(v => {
@@ -248,6 +277,7 @@ function buildBlockGraph(g, layering, root, reverseSep) {
       u = v;
     });
   });
+
   return blockGraph;
 }
 
@@ -258,11 +288,14 @@ function findSmallestWidthAlignment(g, xss) {
   return Object.values(xss).reduce((currentMinAndXs, xs) => {
     let max = Number.NEGATIVE_INFINITY;
     let min = Number.POSITIVE_INFINITY;
+
     Object.entries(xs).forEach(([v, x]) => {
       let halfWidth = width(g, v) / 2;
+
       max = Math.max(x + halfWidth, max);
       min = Math.min(x - halfWidth, min);
     });
+
     const newMin = max - min;
     if (newMin < currentMinAndXs[0]) {
       currentMinAndXs = [newMin, xs];
@@ -282,22 +315,27 @@ function alignCoordinates(xss, alignTo) {
   let alignToVals = Object.values(alignTo),
     alignToMin = Math.min(...alignToVals),
     alignToMax = Math.max(...alignToVals);
+
   ["u", "d"].forEach(vert => {
     ["l", "r"].forEach(horiz => {
       let alignment = vert + horiz,
         xs = xss[alignment];
+
       if (xs === alignTo) return;
+
       let xsVals = Object.values(xs);
       let delta = alignToMin - Math.min(...xsVals);
       if (horiz !== "l") {
         delta = alignToMax - Math.max(...xsVals);
       }
+
       if (delta) {
         xss[alignment] = util.mapValues(xs, x => x + delta);
       }
     });
   });
 }
+
 function balance(xss, align) {
   return util.mapValues(xss.ul, (num, v) => {
     if (align) {
@@ -308,9 +346,13 @@ function balance(xss, align) {
     }
   });
 }
+
 function positionX(g) {
   let layering = util.buildLayerMatrix(g);
-  let conflicts = Object.assign(findType1Conflicts(g, layering), findType2Conflicts(g, layering));
+  let conflicts = Object.assign(
+    findType1Conflicts(g, layering),
+    findType2Conflicts(g, layering));
+
   let xss = {};
   let adjustedLayering;
   ["u", "d"].forEach(vert => {
@@ -321,60 +363,62 @@ function positionX(g) {
           return Object.values(inner).reverse();
         });
       }
+
       let neighborFn = (vert === "u" ? g.predecessors : g.successors).bind(g);
       let align = verticalAlignment(g, adjustedLayering, conflicts, neighborFn);
-      let xs = horizontalCompaction(g, adjustedLayering, align.root, align.align, horiz === "r");
+      let xs = horizontalCompaction(g, adjustedLayering,
+        align.root, align.align, horiz === "r");
       if (horiz === "r") {
         xs = util.mapValues(xs, x => -x);
       }
       xss[vert + horiz] = xs;
     });
   });
+
+
   let smallestWidth = findSmallestWidthAlignment(g, xss);
   alignCoordinates(xss, smallestWidth);
   return balance(xss, g.graph().align);
 }
+
 function sep(nodeSep, edgeSep, reverseSep) {
   return (g, v, w) => {
     let vLabel = g.node(v);
     let wLabel = g.node(w);
     let sum = 0;
     let delta;
+
     sum += vLabel.width / 2;
     if (vLabel.hasOwnProperty("labelpos")) {
       switch (vLabel.labelpos.toLowerCase()) {
-        case "l":
-          delta = -vLabel.width / 2;
-          break;
-        case "r":
-          delta = vLabel.width / 2;
-          break;
+      case "l": delta = -vLabel.width / 2; break;
+      case "r": delta = vLabel.width / 2; break;
       }
     }
     if (delta) {
       sum += reverseSep ? delta : -delta;
     }
     delta = 0;
+
     sum += (vLabel.dummy ? edgeSep : nodeSep) / 2;
     sum += (wLabel.dummy ? edgeSep : nodeSep) / 2;
+
     sum += wLabel.width / 2;
     if (wLabel.hasOwnProperty("labelpos")) {
       switch (wLabel.labelpos.toLowerCase()) {
-        case "l":
-          delta = wLabel.width / 2;
-          break;
-        case "r":
-          delta = -wLabel.width / 2;
-          break;
+      case "l": delta = wLabel.width / 2; break;
+      case "r": delta = -wLabel.width / 2; break;
       }
     }
     if (delta) {
       sum += reverseSep ? delta : -delta;
     }
     delta = 0;
+
     return sum;
   };
 }
+
 function width(g, v) {
   return g.node(v).width;
 }

package/lib/position/index.js

@@ -1,18 +1,17 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = position;
-var util = _interopRequireWildcard(require("../util.js"));
-var _bk = require("./bk.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; }
+let util = require("../util");
+let positionX = require("./bk").positionX;
+
+module.exports = position;
+
 function position(g) {
   g = util.asNonCompoundGraph(g);
+
   positionY(g);
-  Object.entries((0, _bk.positionX)(g)).forEach(([v, x]) => g.node(v).x = x);
+  Object.entries(positionX(g)).forEach(([v, x]) => g.node(v).x = x);
 }
+
 function positionY(g) {
   let layering = util.buildLayerMatrix(g);
   let rankSep = g.graph().ranksep;
@@ -30,4 +29,4 @@ function positionY(g) {
     prevY += maxHeight + rankSep;
   });
 }
-module.exports = exports.default;
+

package/lib/rank/feasible-tree.js

@@ -1,11 +1,10 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = feasibleTree;
-var _graphlib = require("@dagrejs/graphlib");
-var _util = require("./util.js");
+var Graph = require("@dagrejs/graphlib").Graph;
+var slack = require("./util").slack;
+
+module.exports = feasibleTree;
+
 /*
  * Constructs a spanning tree with tight edges and adjusted the input node's
  * ranks to achieve this. A tight edge is one that is has a length that matches
@@ -32,20 +31,20 @@ var _util = require("./util.js");
  * edges.
  */
 function feasibleTree(g) {
-  var t = new _graphlib.Graph({
-    directed: false
-  });
+  var t = new Graph({ directed: false });
 
   // Choose arbitrary node from which to start our tree
   var start = g.nodes()[0];
   var size = g.nodeCount();
   t.setNode(start, {});
+
   var edge, delta;
   while (tightTree(t, g) < size) {
     edge = findMinSlackEdge(t, g);
-    delta = t.hasNode(edge.v) ? (0, _util.slack)(g, edge) : -(0, _util.slack)(g, edge);
+    delta = t.hasNode(edge.v) ? slack(g, edge) : -slack(g, edge);
     shiftRanks(t, g, delta);
   }
+
   return t;
 }
 
@@ -57,14 +56,15 @@ function tightTree(t, g) {
   function dfs(v) {
     g.nodeEdges(v).forEach(e => {
       var edgeV = e.v,
-        w = v === edgeV ? e.w : edgeV;
-      if (!t.hasNode(w) && !(0, _util.slack)(g, e)) {
+        w = (v === edgeV) ? e.w : edgeV;
+      if (!t.hasNode(w) && !slack(g, e)) {
         t.setNode(w, {});
         t.setEdge(v, w, {});
         dfs(w);
       }
     });
   }
+
   t.nodes().forEach(dfs);
   return t.nodeCount();
 }
@@ -75,18 +75,21 @@ function tightTree(t, g) {
  */
 function findMinSlackEdge(t, g) {
   const edges = g.edges();
+
   return edges.reduce((acc, edge) => {
     let edgeSlack = Number.POSITIVE_INFINITY;
     if (t.hasNode(edge.v) !== t.hasNode(edge.w)) {
-      edgeSlack = (0, _util.slack)(g, edge);
+      edgeSlack = slack(g, edge);
     }
+
     if (edgeSlack < acc[0]) {
       return [edgeSlack, edge];
     }
+
     return acc;
   }, [Number.POSITIVE_INFINITY, null])[1];
 }
+
 function shiftRanks(t, g, delta) {
   t.nodes().forEach(v => g.node(v).rank += delta);
 }
-module.exports = exports.default;

package/lib/rank/index.js

@@ -1,16 +1,12 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = rank;
-var rankUtil = _interopRequireWildcard(require("./util.js"));
-var _feasibleTree = _interopRequireDefault(require("./feasible-tree.js"));
-var _networkSimplex = _interopRequireDefault(require("./network-simplex.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; }
+var rankUtil = require("./util");
 var longestPath = rankUtil.longestPath;
+var feasibleTree = require("./feasible-tree");
+var networkSimplex = require("./network-simplex");
+
+module.exports = rank;
+
 /*
  * Assigns a rank to each node in the input graph that respects the "minlen"
  * constraint specified on edges between nodes.
@@ -31,28 +27,22 @@ var longestPath = rankUtil.longestPath;
  *       fix them up later.
  */
 function rank(g) {
-  switch (g.graph().ranker) {
-    case "network-simplex":
-      networkSimplexRanker(g);
-      break;
-    case "tight-tree":
-      tightTreeRanker(g);
-      break;
-    case "longest-path":
-      longestPathRanker(g);
-      break;
-    default:
-      networkSimplexRanker(g);
+  switch(g.graph().ranker) {
+  case "network-simplex": networkSimplexRanker(g); break;
+  case "tight-tree": tightTreeRanker(g); break;
+  case "longest-path": longestPathRanker(g); break;
+  default: networkSimplexRanker(g);
   }
 }
 
 // A fast and simple ranker, but results are far from optimal.
 var longestPathRanker = longestPath;
+
 function tightTreeRanker(g) {
   longestPath(g);
-  (0, _feasibleTree.default)(g);
+  feasibleTree(g);
 }
+
 function networkSimplexRanker(g) {
-  (0, _networkSimplex.default)(g);
+  networkSimplex(g);
 }
-module.exports = exports.default;