@dagrejs/dagre 1.0.2 → 1.1.0

package/lib/normalize.js

@@ -1,12 +1,13 @@
 "use strict";
 
-var util = require("./util");
-
-module.exports = {
-  run: run,
-  undo: undo
-};
-
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.run = run;
+exports.undo = undo;
+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; }
 /*
  * Breaks any long edges in the graph into short segments that span 1 layer
  * each. This operation is undoable with the denormalize function.
@@ -27,26 +28,24 @@ function run(g) {
   g.graph().dummyChains = [];
   g.edges().forEach(edge => normalizeEdge(g, edge));
 }
-
 function normalizeEdge(g, e) {
-  var v = e.v;
-  var vRank = g.node(v).rank;
-  var w = e.w;
-  var wRank = g.node(w).rank;
-  var name = e.name;
-  var edgeLabel = g.edge(e);
-  var labelRank = edgeLabel.labelRank;
-
+  let v = e.v;
+  let vRank = g.node(v).rank;
+  let w = e.w;
+  let wRank = g.node(w).rank;
+  let name = e.name;
+  let edgeLabel = g.edge(e);
+  let labelRank = edgeLabel.labelRank;
   if (wRank === vRank + 1) return;
-
   g.removeEdge(e);
-
-  var dummy, attrs, i;
+  let dummy, attrs, i;
   for (i = 0, ++vRank; vRank < wRank; ++i, ++vRank) {
     edgeLabel.points = [];
     attrs = {
-      width: 0, height: 0,
-      edgeLabel: edgeLabel, edgeObj: e,
+      width: 0,
+      height: 0,
+      edgeLabel: edgeLabel,
+      edgeObj: e,
       rank: vRank
     };
     dummy = util.addDummyNode(g, "edge", attrs, "_d");
@@ -56,26 +55,31 @@ function normalizeEdge(g, e) {
       attrs.dummy = "edge-label";
       attrs.labelpos = edgeLabel.labelpos;
     }
-    g.setEdge(v, dummy, { weight: edgeLabel.weight }, name);
+    g.setEdge(v, dummy, {
+      weight: edgeLabel.weight
+    }, name);
     if (i === 0) {
       g.graph().dummyChains.push(dummy);
     }
     v = dummy;
   }
-
-  g.setEdge(v, w, { weight: edgeLabel.weight }, name);
+  g.setEdge(v, w, {
+    weight: edgeLabel.weight
+  }, name);
 }
-
 function undo(g) {
-  g.graph().dummyChains.forEach(function(v) {
-    var node = g.node(v);
-    var origLabel = node.edgeLabel;
-    var w;
+  g.graph().dummyChains.forEach(v => {
+    let node = g.node(v);
+    let origLabel = node.edgeLabel;
+    let w;
     g.setEdge(node.edgeObj, origLabel);
     while (node.dummy) {
       w = g.successors(v)[0];
       g.removeNode(v);
-      origLabel.points.push({ x: node.x, y: node.y });
+      origLabel.points.push({
+        x: node.x,
+        y: node.y
+      });
       if (node.dummy === "edge-label") {
         origLabel.x = node.x;
         origLabel.y = node.y;

package/lib/order/add-subgraph-constraints.js

@@ -1,11 +1,14 @@
-module.exports = addSubgraphConstraints;
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = addSubgraphConstraints;
 function addSubgraphConstraints(g, cg, vs) {
-  var prev = {},
+  let prev = {},
     rootPrev;
-
-  vs.forEach(function(v) {
-    var child = g.parent(v),
+  vs.forEach(v => {
+    let child = g.parent(v),
       parent,
       prevChild;
     while (child) {
@@ -49,3 +52,4 @@ function addSubgraphConstraints(g, cg, vs) {
   dfs(undefined);
   */
 }
+module.exports = exports.default;

package/lib/order/barycenter.js

@@ -1,20 +1,28 @@
-module.exports = barycenter;
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = barycenter;
 function barycenter(g, movable = []) {
   return movable.map(v => {
-    var inV = g.inEdges(v);
+    let inV = g.inEdges(v);
     if (!inV.length) {
-      return { v: v };
+      return {
+        v: v
+      };
     } else {
-      var result = inV.reduce((acc, e) => {
-        var edge = g.edge(e),
+      let result = inV.reduce((acc, e) => {
+        let edge = g.edge(e),
           nodeU = g.node(e.v);
         return {
-          sum: acc.sum + (edge.weight * nodeU.order),
+          sum: acc.sum + edge.weight * nodeU.order,
           weight: acc.weight + edge.weight
         };
-      }, { sum: 0, weight: 0 });
-
+      }, {
+        sum: 0,
+        weight: 0
+      });
       return {
         v: v,
         barycenter: result.sum / result.weight,
@@ -23,4 +31,4 @@ function barycenter(g, movable = []) {
     }
   });
 }
-
+module.exports = exports.default;

package/lib/order/build-layer-graph.js

@@ -1,8 +1,13 @@
-var Graph = require("@dagrejs/graphlib").Graph;
-var util = require("../util");
-
-module.exports = buildLayerGraph;
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = buildLayerGraph;
+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; }
 /*
  * Constructs a graph that can be used to sort a layer of nodes. The graph will
  * contain all base and subgraph nodes from the request layer in their original
@@ -34,26 +39,28 @@ module.exports = buildLayerGraph;
  *       graph is not a multi-graph.
  */
 function buildLayerGraph(g, rank, relationship) {
-  var root = createRootNode(g),
-    result = new Graph({ compound: true }).setGraph({ root: root })
-      .setDefaultNodeLabel(function(v) { return g.node(v); });
-
-  g.nodes().forEach(function(v) {
-    var node = g.node(v),
+  let root = createRootNode(g),
+    result = new _graphlib.Graph({
+      compound: true
+    }).setGraph({
+      root: root
+    }).setDefaultNodeLabel(v => g.node(v));
+  g.nodes().forEach(v => {
+    let node = g.node(v),
       parent = g.parent(v);
-
     if (node.rank === rank || node.minRank <= rank && rank <= node.maxRank) {
       result.setNode(v);
       result.setParent(v, parent || root);
 
       // This assumes we have only short edges!
-      g[relationship](v).forEach(function(e) {
-        var u = e.v === v ? e.w : e.v,
+      g[relationship](v).forEach(e => {
+        let u = e.v === v ? e.w : e.v,
           edge = result.edge(u, v),
           weight = edge !== undefined ? edge.weight : 0;
-        result.setEdge(u, v, { weight: g.edge(e).weight + weight });
+        result.setEdge(u, v, {
+          weight: g.edge(e).weight + weight
+        });
       });
-
       if (node.hasOwnProperty("minRank")) {
         result.setNode(v, {
           borderLeft: node.borderLeft[rank],
@@ -62,12 +69,11 @@ function buildLayerGraph(g, rank, relationship) {
       }
     }
   });
-
   return result;
 }
-
 function createRootNode(g) {
   var v;
-  while (g.hasNode((v = util.uniqueId("_root"))));
+  while (g.hasNode(v = util.uniqueId("_root")));
   return v;
 }
+module.exports = exports.default;

package/lib/order/cross-count.js

@@ -1,9 +1,10 @@
 "use strict";
 
-var zipObject = require("../util").zipObject;
-
-module.exports = crossCount;
-
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = crossCount;
+var _util = require("../util.js");
 /*
  * A function that takes a layering (an array of layers, each with an array of
  * ordererd nodes) and a graph and returns a weighted crossing count.
@@ -21,46 +22,48 @@ module.exports = crossCount;
  * This algorithm is derived from Barth, et al., "Bilayer Cross Counting."
  */
 function crossCount(g, layering) {
-  var cc = 0;
-  for (var i = 1; i < layering.length; ++i) {
-    cc += twoLayerCrossCount(g, layering[i-1], layering[i]);
+  let cc = 0;
+  for (let i = 1; i < layering.length; ++i) {
+    cc += twoLayerCrossCount(g, layering[i - 1], layering[i]);
   }
   return cc;
 }
-
 function twoLayerCrossCount(g, northLayer, southLayer) {
   // Sort all of the edges between the north and south layers by their position
   // in the north layer and then the south. Map these edges to the position of
   // their head in the south layer.
-  var southPos = zipObject(southLayer, southLayer.map((v, i) => i));
-  var southEntries = northLayer.flatMap(v => {
+  let southPos = (0, _util.zipObject)(southLayer, southLayer.map((v, i) => i));
+  let southEntries = northLayer.flatMap(v => {
     return g.outEdges(v).map(e => {
-      return { pos: southPos[e.w], weight: g.edge(e).weight };
+      return {
+        pos: southPos[e.w],
+        weight: g.edge(e).weight
+      };
     }).sort((a, b) => a.pos - b.pos);
   });
 
   // Build the accumulator tree
-  var firstIndex = 1;
+  let firstIndex = 1;
   while (firstIndex < southLayer.length) firstIndex <<= 1;
-  var treeSize = 2 * firstIndex - 1;
+  let treeSize = 2 * firstIndex - 1;
   firstIndex -= 1;
-  var tree = new Array(treeSize).fill(0);
+  let tree = new Array(treeSize).fill(0);
 
   // Calculate the weighted crossings
-  var cc = 0;
+  let cc = 0;
   southEntries.forEach(entry => {
-    var index = entry.pos + firstIndex;
+    let index = entry.pos + firstIndex;
     tree[index] += entry.weight;
-    var weightSum = 0;
+    let weightSum = 0;
     while (index > 0) {
       if (index % 2) {
         weightSum += tree[index + 1];
       }
-      index = (index - 1) >> 1;
+      index = index - 1 >> 1;
       tree[index] += entry.weight;
     }
     cc += entry.weight * weightSum;
   });
-
   return cc;
 }
+module.exports = exports.default;

package/lib/order/index.js

@@ -1,15 +1,19 @@
 "use strict";
 
-var initOrder = require("./init-order");
-var crossCount = require("./cross-count");
-var sortSubgraph = require("./sort-subgraph");
-var buildLayerGraph = require("./build-layer-graph");
-var addSubgraphConstraints = require("./add-subgraph-constraints");
-var Graph = require("@dagrejs/graphlib").Graph;
-var util = require("../util");
-
-module.exports = order;
-
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = order;
+var _initOrder = _interopRequireDefault(require("./init-order.js"));
+var _crossCount = _interopRequireDefault(require("./cross-count.js"));
+var _sortSubgraph = _interopRequireDefault(require("./sort-subgraph.js"));
+var _buildLayerGraph = _interopRequireDefault(require("./build-layer-graph.js"));
+var _addSubgraphConstraints = _interopRequireDefault(require("./add-subgraph-constraints.js"));
+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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 /*
  * Applies heuristics to minimize edge crossings in the graph and sets the best
  * order solution as an order attribute on each node.
@@ -25,48 +29,53 @@ module.exports = order;
  *    1. Graph nodes will have an "order" attribute based on the results of the
  *       algorithm.
  */
-function order(g) {
-  var maxRank = util.maxRank(g),
+function order(g, opts) {
+  if (opts && typeof opts.customOrder === 'function') {
+    opts.customOrder(g, order);
+    return;
+  }
+
+  let maxRank = util.maxRank(g),
     downLayerGraphs = buildLayerGraphs(g, util.range(1, maxRank + 1), "inEdges"),
     upLayerGraphs = buildLayerGraphs(g, util.range(maxRank - 1, -1, -1), "outEdges");
 
-  var layering = initOrder(g);
+  let layering = (0, _initOrder.default)(g);
   assignOrder(g, layering);
 
-  var bestCC = Number.POSITIVE_INFINITY,
+  if (opts && opts.disableOptimalOrderHeuristic) {
+    return;
+  }
+
+  let bestCC = Number.POSITIVE_INFINITY,
     best;
 
-  for (var i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
+  for (let i = 0, lastBest = 0; lastBest < 4; ++i, ++lastBest) {
     sweepLayerGraphs(i % 2 ? downLayerGraphs : upLayerGraphs, i % 4 >= 2);
-
     layering = util.buildLayerMatrix(g);
-    var cc = crossCount(g, layering);
+    let cc = (0, _crossCount.default)(g, layering);
     if (cc < bestCC) {
       lastBest = 0;
       best = Object.assign({}, layering);
       bestCC = cc;
     }
   }
-
   assignOrder(g, best);
 }
-
 function buildLayerGraphs(g, ranks, relationship) {
-  return ranks.map(function(rank) {
-    return buildLayerGraph(g, rank, relationship);
+  return ranks.map(function (rank) {
+    return (0, _buildLayerGraph.default)(g, rank, relationship);
   });
 }
-
 function sweepLayerGraphs(layerGraphs, biasRight) {
-  var cg = new Graph();
-  layerGraphs.forEach(function(lg) {
-    var root = lg.graph().root;
-    var sorted = sortSubgraph(lg, root, cg, biasRight);
+  let cg = new _graphlib.Graph();
+  layerGraphs.forEach(function (lg) {
+    let root = lg.graph().root;
+    let sorted = (0, _sortSubgraph.default)(lg, root, cg, biasRight);
     sorted.vs.forEach((v, i) => lg.node(v).order = i);
-    addSubgraphConstraints(lg, cg, sorted.vs);
+    (0, _addSubgraphConstraints.default)(lg, cg, sorted.vs);
   });
 }
-
 function assignOrder(g, layering) {
   Object.values(layering).forEach(layer => layer.forEach((v, i) => g.node(v).order = i));
 }
+module.exports = exports.default;

package/lib/order/init-order.js

@@ -1,9 +1,12 @@
 "use strict";
 
-var util = require("../util");
-
-module.exports = initOrder;
-
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = initOrder;
+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; }
 /*
  * Assigns an initial order value for each node by performing a DFS search
  * starting from nodes in the first rank. Nodes are assigned an order in their
@@ -16,21 +19,19 @@ module.exports = initOrder;
  * the order of its nodes.
  */
 function initOrder(g) {
-  var visited = {};
-  var simpleNodes = g.nodes().filter(v => !g.children(v).length);
-  var maxRank = Math.max(...simpleNodes.map(v => g.node(v).rank));
-  var layers = util.range(maxRank + 1).map(() => []);
-
+  let visited = {};
+  let simpleNodes = g.nodes().filter(v => !g.children(v).length);
+  let maxRank = Math.max(...simpleNodes.map(v => g.node(v).rank));
+  let layers = util.range(maxRank + 1).map(() => []);
   function dfs(v) {
     if (visited[v]) return;
     visited[v] = true;
-    var node = g.node(v);
+    let node = g.node(v);
     layers[node.rank].push(v);
     g.successors(v).forEach(dfs);
   }
-
-  var orderedVs = simpleNodes.sort((a, b) => g.node(a).rank - g.node(b).rank);
+  let orderedVs = simpleNodes.sort((a, b) => g.node(a).rank - g.node(b).rank);
   orderedVs.forEach(dfs);
-
   return layers;
 }
+module.exports = exports.default;

package/lib/order/resolve-conflicts.js

@@ -1,9 +1,12 @@
 "use strict";
 
-var util = require("../util");
-
-module.exports = resolveConflicts;
-
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = resolveConflicts;
+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; }
 /*
  * Given a list of entries of the form {v, barycenter, weight} and a
  * constraint graph this function will resolve any conflicts between the
@@ -30,9 +33,9 @@ module.exports = resolveConflicts;
  *    elements in `vs`.
  */
 function resolveConflicts(entries, cg) {
-  var mappedEntries = {};
+  let mappedEntries = {};
   entries.forEach((entry, i) => {
-    var tmp = mappedEntries[entry.v] = {
+    let tmp = mappedEntries[entry.v] = {
       indegree: 0,
       "in": [],
       out: [],
@@ -44,75 +47,62 @@ function resolveConflicts(entries, cg) {
       tmp.weight = entry.weight;
     }
   });
-
   cg.edges().forEach(e => {
-    var entryV = mappedEntries[e.v];
-    var entryW = mappedEntries[e.w];
+    let entryV = mappedEntries[e.v];
+    let entryW = mappedEntries[e.w];
     if (entryV !== undefined && entryW !== undefined) {
       entryW.indegree++;
       entryV.out.push(mappedEntries[e.w]);
     }
   });
-
-  var sourceSet = Object.values(mappedEntries).filter(entry => !entry.indegree);
-
+  let sourceSet = Object.values(mappedEntries).filter(entry => !entry.indegree);
   return doResolveConflicts(sourceSet);
 }
-
 function doResolveConflicts(sourceSet) {
-  var entries = [];
-
+  let entries = [];
   function handleIn(vEntry) {
-    return function(uEntry) {
+    return uEntry => {
       if (uEntry.merged) {
         return;
       }
-      if (uEntry.barycenter === undefined ||
-          vEntry.barycenter === undefined ||
-          uEntry.barycenter >= vEntry.barycenter) {
+      if (uEntry.barycenter === undefined || vEntry.barycenter === undefined || uEntry.barycenter >= vEntry.barycenter) {
         mergeEntries(vEntry, uEntry);
       }
     };
   }
-
   function handleOut(vEntry) {
-    return function(wEntry) {
+    return wEntry => {
       wEntry["in"].push(vEntry);
       if (--wEntry.indegree === 0) {
         sourceSet.push(wEntry);
       }
     };
   }
-
   while (sourceSet.length) {
-    var entry = sourceSet.pop();
+    let entry = sourceSet.pop();
     entries.push(entry);
     entry["in"].reverse().forEach(handleIn(entry));
     entry.out.forEach(handleOut(entry));
   }
-
   return entries.filter(entry => !entry.merged).map(entry => {
     return util.pick(entry, ["vs", "i", "barycenter", "weight"]);
   });
 }
-
 function mergeEntries(target, source) {
-  var sum = 0;
-  var weight = 0;
-
+  let sum = 0;
+  let weight = 0;
   if (target.weight) {
     sum += target.barycenter * target.weight;
     weight += target.weight;
   }
-
   if (source.weight) {
     sum += source.barycenter * source.weight;
     weight += source.weight;
   }
-
   target.vs = source.vs.concat(target.vs);
   target.barycenter = sum / weight;
   target.weight = weight;
   target.i = Math.min(source.i, target.i);
   source.merged = true;
 }
+module.exports = exports.default;