@dagrejs/dagre 0.7.5 → 1.0.0

package/index.js

@@ -21,7 +21,7 @@ THE SOFTWARE.
 */
 
 module.exports = {
-  graphlib: require("./lib/graphlib"),
+  graphlib: require("@dagrejs/graphlib"),
 
   layout: require("./lib/layout"),
   debug: require("./lib/debug"),

package/lib/acyclic.js

@@ -1,7 +1,7 @@
 "use strict";
 
-var _ = require("./lodash"),
-    greedyFAS = require("./greedy-fas");
+var greedyFAS = require("./greedy-fas");
+var uniqueId = require("./util").uniqueId;
 
 module.exports = {
   run: run,
@@ -10,14 +10,14 @@ module.exports = {
 
 function run(g) {
   var fas = (g.graph().acyclicer === "greedy"
-                ? greedyFAS(g, weightFn(g))
-                : dfsFAS(g));
-  _.each(fas, function(e) {
+    ? greedyFAS(g, weightFn(g))
+    : dfsFAS(g));
+  fas.forEach(function(e) {
     var 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, uniqueId("rev"));
   });
 
   function weightFn(g) {
@@ -28,18 +28,18 @@ function run(g) {
 }
 
 function dfsFAS(g) {
-  var fas = [],
-      stack = {},
-      visited = {};
+  var fas = [];
+  var stack = {};
+  var visited = {};
 
   function dfs(v) {
-    if (_.has(visited, v)) {
+    if (visited.hasOwnProperty(v)) {
       return;
     }
     visited[v] = true;
     stack[v] = true;
-    _.each(g.outEdges(v), function(e) {
-      if (_.has(stack, e.w)) {
+    g.outEdges(v).forEach(function(e) {
+      if (stack.hasOwnProperty(e.w)) {
         fas.push(e);
       } else {
         dfs(e.w);
@@ -48,12 +48,12 @@ function dfsFAS(g) {
     delete stack[v];
   }
 
-  _.each(g.nodes(), dfs);
+  g.nodes().forEach(dfs);
   return fas;
 }
 
 function undo(g) {
-  _.each(g.edges(), function(e) {
+  g.edges().forEach(function(e) {
     var label = g.edge(e);
     if (label.reversed) {
       g.removeEdge(e);

package/lib/add-border-segments.js

@@ -1,35 +1,34 @@
-var _ = require("./lodash"),
-    util = require("./util");
+var util = require("./util");
 
 module.exports = addBorderSegments;
 
 function addBorderSegments(g) {
   function dfs(v) {
-    var children = g.children(v),
-        node = g.node(v);
+    var children = g.children(v);
+    var node = g.node(v);
     if (children.length) {
-      _.each(children, dfs);
+      children.forEach(dfs);
     }
 
-    if (_.has(node, "minRank")) {
+    if (node.hasOwnProperty("minRank")) {
       node.borderLeft = [];
       node.borderRight = [];
       for (var rank = node.minRank, maxRank = node.maxRank + 1;
-           rank < maxRank;
-           ++rank) {
+        rank < maxRank;
+        ++rank) {
         addBorderNode(g, "borderLeft", "_bl", v, node, rank);
         addBorderNode(g, "borderRight", "_br", v, node, rank);
       }
     }
   }
 
-  _.each(g.children(), dfs);
+  g.children().forEach(dfs);
 }
 
 function addBorderNode(g, prop, prefix, sg, sgNode, rank) {
-  var label = { width: 0, height: 0, rank: rank, borderType: prop },
-      prev = sgNode[prop][rank - 1],
-      curr = util.addDummyNode(g, "border", label, prefix);
+  var label = { width: 0, height: 0, rank: rank, borderType: prop };
+  var prev = sgNode[prop][rank - 1];
+  var curr = util.addDummyNode(g, "border", label, prefix);
   sgNode[prop][rank] = curr;
   g.setParent(curr, sg);
   if (prev) {

package/lib/coordinate-system.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _ = require("./lodash");
-
 module.exports = {
   adjust: adjust,
   undo: undo
@@ -27,8 +25,8 @@ function undo(g) {
 }
 
 function swapWidthHeight(g) {
-  _.each(g.nodes(), function(v) { swapWidthHeightOne(g.node(v)); });
-  _.each(g.edges(), function(e) { swapWidthHeightOne(g.edge(e)); });
+  g.nodes().forEach(v => swapWidthHeightOne(g.node(v)));
+  g.edges().forEach(e => swapWidthHeightOne(g.edge(e)));
 }
 
 function swapWidthHeightOne(attrs) {
@@ -38,12 +36,12 @@ function swapWidthHeightOne(attrs) {
 }
 
 function reverseY(g) {
-  _.each(g.nodes(), function(v) { reverseYOne(g.node(v)); });
+  g.nodes().forEach(v => reverseYOne(g.node(v)));
 
-  _.each(g.edges(), function(e) {
+  g.edges().forEach(function(e) {
     var edge = g.edge(e);
-    _.each(edge.points, reverseYOne);
-    if (_.has(edge, "y")) {
+    edge.points.forEach(reverseYOne);
+    if (edge.hasOwnProperty("y")) {
       reverseYOne(edge);
     }
   });
@@ -54,12 +52,12 @@ function reverseYOne(attrs) {
 }
 
 function swapXY(g) {
-  _.each(g.nodes(), function(v) { swapXYOne(g.node(v)); });
+  g.nodes().forEach(v => swapXYOne(g.node(v)));
 
-  _.each(g.edges(), function(e) {
+  g.edges().forEach(function(e) {
     var edge = g.edge(e);
-    _.each(edge.points, swapXYOne);
-    if (_.has(edge, "x")) {
+    edge.points.forEach(swapXYOne);
+    if (edge.hasOwnProperty("x")) {
       swapXYOne(edge);
     }
   });

package/lib/data/list.js

@@ -12,8 +12,8 @@ function List() {
 }
 
 List.prototype.dequeue = function() {
-  var sentinel = this._sentinel,
-      entry = sentinel._prev;
+  var sentinel = this._sentinel;
+  var entry = sentinel._prev;
   if (entry !== sentinel) {
     unlink(entry);
     return entry;
@@ -32,9 +32,9 @@ List.prototype.enqueue = function(entry) {
 };
 
 List.prototype.toString = function() {
-  var strs = [],
-      sentinel = this._sentinel,
-      curr = sentinel._prev;
+  var strs = [];
+  var sentinel = this._sentinel;
+  var curr = sentinel._prev;
   while (curr !== sentinel) {
     strs.push(JSON.stringify(curr, filterOutLinks));
     curr = curr._prev;

package/lib/debug.js

@@ -1,6 +1,5 @@
-var _ = require("./lodash"),
-    util = require("./util"),
-    Graph = require("./graphlib").Graph;
+var util = require("./util");
+var Graph = require("@dagrejs/graphlib").Graph;
 
 module.exports = {
   debugOrdering: debugOrdering
@@ -12,19 +11,19 @@ function debugOrdering(g) {
 
   var h = new Graph({ compound: true, multigraph: true }).setGraph({});
 
-  _.each(g.nodes(), function(v) {
+  g.nodes().forEach(function(v) {
     h.setNode(v, { label: v });
     h.setParent(v, "layer" + g.node(v).rank);
   });
 
-  _.each(g.edges(), function(e) {
+  g.edges().forEach(function(e) {
     h.setEdge(e.v, e.w, {}, e.name);
   });
 
-  _.each(layerMatrix, function(layer, i) {
+  layerMatrix.forEach(function(layer, i) {
     var layerV = "layer" + i;
     h.setNode(layerV, { rank: "same" });
-    _.reduce(layer, function(u, v) {
+    layer.reduce(function(u, v) {
       h.setEdge(u, v, { style: "invis" });
       return v;
     });

package/lib/greedy-fas.js

@@ -1,6 +1,5 @@
-var _ = require("./lodash"),
-    Graph = require("./graphlib").Graph,
-    List = require("./data/list");
+var Graph = require("@dagrejs/graphlib").Graph;
+var List = require("./data/list");
 
 /*
  * A greedy heuristic for finding a feedback arc set for a graph. A feedback
@@ -11,7 +10,7 @@ var _ = require("./lodash"),
  */
 module.exports = greedyFAS;
 
-var DEFAULT_WEIGHT_FN = _.constant(1);
+var DEFAULT_WEIGHT_FN = () => 1;
 
 function greedyFAS(g, weightFn) {
   if (g.nodeCount() <= 1) {
@@ -21,15 +20,13 @@ function greedyFAS(g, weightFn) {
   var results = doGreedyFAS(state.graph, state.buckets, state.zeroIdx);
 
   // Expand multi-edges
-  return _.flatten(_.map(results, function(e) {
-    return g.outEdges(e.v, e.w);
-  }), true);
+  return results.flatMap(e => g.outEdges(e.v, e.w));
 }
 
 function doGreedyFAS(g, buckets, zeroIdx) {
-  var results = [],
-      sources = buckets[buckets.length - 1],
-      sinks = buckets[0];
+  var results = [];
+  var sources = buckets[buckets.length - 1];
+  var sinks = buckets[0];
 
   var entry;
   while (g.nodeCount()) {
@@ -52,9 +49,9 @@ function doGreedyFAS(g, buckets, zeroIdx) {
 function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) {
   var results = collectPredecessors ? [] : undefined;
 
-  _.each(g.inEdges(entry.v), function(edge) {
-    var weight = g.edge(edge),
-        uEntry = g.node(edge.v);
+  g.inEdges(entry.v).forEach(function(edge) {
+    var weight = g.edge(edge);
+    var uEntry = g.node(edge.v);
 
     if (collectPredecessors) {
       results.push({ v: edge.v, w: edge.w });
@@ -64,10 +61,10 @@ function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) {
     assignBucket(buckets, zeroIdx, uEntry);
   });
 
-  _.each(g.outEdges(entry.v), function(edge) {
-    var weight = g.edge(edge),
-        w = edge.w,
-        wEntry = g.node(w);
+  g.outEdges(entry.v).forEach(function(edge) {
+    var weight = g.edge(edge);
+    var w = edge.w;
+    var wEntry = g.node(w);
     wEntry["in"] -= weight;
     assignBucket(buckets, zeroIdx, wEntry);
   });
@@ -78,29 +75,29 @@ function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) {
 }
 
 function buildState(g, weightFn) {
-  var fasGraph = new Graph(),
-      maxIn = 0,
-      maxOut = 0;
+  var fasGraph = new Graph();
+  var maxIn = 0;
+  var maxOut = 0;
 
-  _.each(g.nodes(), function(v) {
+  g.nodes().forEach(function(v) {
     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.
-  _.each(g.edges(), function(e) {
-    var prevWeight = fasGraph.edge(e.v, e.w) || 0,
-        weight = weightFn(e),
-        edgeWeight = prevWeight + weight;
+  g.edges().forEach(function(e) {
+    var prevWeight = fasGraph.edge(e.v, e.w) || 0;
+    var weight = weightFn(e);
+    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);
   });
 
-  var buckets = _.range(maxOut + maxIn + 3).map(function() { return new List(); });
+  var buckets = range(maxOut + maxIn + 3).map(() => new List());
   var zeroIdx = maxIn + 1;
 
-  _.each(fasGraph.nodes(), function(v) {
+  fasGraph.nodes().forEach(function(v) {
     assignBucket(buckets, zeroIdx, fasGraph.node(v));
   });
 
@@ -116,3 +113,12 @@ 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;
+}