@dagrejs/dagre 0.8.0 → 1.0.1

package/lib/rank/network-simplex.js

@@ -1,12 +1,11 @@
 "use strict";
 
-var _ = require("../lodash"),
-    feasibleTree = require("./feasible-tree"),
-    slack = require("./util").slack,
-    initRank = require("./util").longestPath,
-    preorder = require("../graphlib").alg.preorder,
-    postorder = require("../graphlib").alg.postorder,
-    simplify = require("../util").simplify;
+var feasibleTree = require("./feasible-tree");
+var slack = require("./util").slack;
+var initRank = require("./util").longestPath;
+var preorder = require("@dagrejs/graphlib").alg.preorder;
+var postorder = require("@dagrejs/graphlib").alg.postorder;
+var simplify = require("../util").simplify;
 
 module.exports = networkSimplex;
 
@@ -71,14 +70,12 @@ function networkSimplex(g) {
 function initCutValues(t, g) {
   var vs = postorder(t, t.nodes());
   vs = vs.slice(0, vs.length - 1);
-  _.forEach(vs, function(v) {
-    assignCutValue(t, g, v);
-  });
+  vs.forEach(v => assignCutValue(t, g, v));
 }
 
 function assignCutValue(t, g, child) {
-  var childLab = t.node(child),
-      parent = childLab.parent;
+  var childLab = t.node(child);
+  var parent = childLab.parent;
   t.edge(child, parent).cutvalue = calcCutValue(t, g, child);
 }
 
@@ -87,14 +84,14 @@ function assignCutValue(t, g, child) {
  * return the cut value for the edge between the child and its parent.
  */
 function calcCutValue(t, g, child) {
-  var childLab = t.node(child),
-      parent = childLab.parent,
-      // True if the child is on the tail end of the edge in the directed graph
-      childIsTail = true,
-      // The graph's view of the tree edge we're inspecting
-      graphEdge = g.edge(child, parent),
-      // The accumulated cut value for the edge between this node and its parent
-      cutValue = 0;
+  var childLab = t.node(child);
+  var parent = childLab.parent;
+  // True if the child is on the tail end of the edge in the directed graph
+  var childIsTail = true;
+  // The graph's view of the tree edge we're inspecting
+  var graphEdge = g.edge(child, parent);
+  // The accumulated cut value for the edge between this node and its parent
+  var cutValue = 0;
 
   if (!graphEdge) {
     childIsTail = false;
@@ -103,13 +100,13 @@ function calcCutValue(t, g, child) {
 
   cutValue = graphEdge.weight;
 
-  _.forEach(g.nodeEdges(child), function(e) {
+  g.nodeEdges(child).forEach(function(e) {
     var isOutEdge = e.v === child,
-        other = isOutEdge ? e.w : e.v;
+      other = isOutEdge ? e.w : e.v;
 
     if (other !== parent) {
       var pointsToHead = isOutEdge === childIsTail,
-          otherWeight = g.edge(e).weight;
+        otherWeight = g.edge(e).weight;
 
       cutValue += pointsToHead ? otherWeight : -otherWeight;
       if (isTreeEdge(t, child, other)) {
@@ -130,12 +127,12 @@ function initLowLimValues(tree, root) {
 }
 
 function dfsAssignLowLim(tree, visited, nextLim, v, parent) {
-  var low = nextLim,
-      label = tree.node(v);
+  var low = nextLim;
+  var label = tree.node(v);
 
   visited[v] = true;
-  _.forEach(tree.neighbors(v), function(w) {
-    if (!_.has(visited, w)) {
+  tree.neighbors(v).forEach(function(w) {
+    if (!visited.hasOwnProperty(w)) {
       nextLim = dfsAssignLowLim(tree, visited, nextLim, w, v);
     }
   });
@@ -153,14 +150,12 @@ function dfsAssignLowLim(tree, visited, nextLim, v, parent) {
 }
 
 function leaveEdge(tree) {
-  return _.find(tree.edges(), function(e) {
-    return tree.edge(e).cutvalue < 0;
-  });
+  return tree.edges().find(e => tree.edge(e).cutvalue < 0);
 }
 
 function enterEdge(t, g, edge) {
-  var v = edge.v,
-      w = edge.w;
+  var v = edge.v;
+  var w = edge.w;
 
   // For the rest of this function we assume that v is the tail and w is the
   // head, so if we don't have this edge in the graph we should flip it to
@@ -170,10 +165,10 @@ function enterEdge(t, g, edge) {
     w = edge.v;
   }
 
-  var vLabel = t.node(v),
-      wLabel = t.node(w),
-      tailLabel = vLabel,
-      flip = false;
+  var vLabel = t.node(v);
+  var wLabel = t.node(w);
+  var tailLabel = vLabel;
+  var flip = false;
 
   // If the root is in the tail of the edge then we need to flip the logic that
   // checks for the head and tail nodes in the candidates function below.
@@ -182,17 +177,23 @@ function enterEdge(t, g, edge) {
     flip = true;
   }
 
-  var candidates = _.filter(g.edges(), function(edge) {
+  var candidates = g.edges().filter(function(edge) {
     return flip === isDescendant(t, t.node(edge.v), tailLabel) &&
            flip !== isDescendant(t, t.node(edge.w), tailLabel);
   });
 
-  return _.minBy(candidates, function(edge) { return slack(g, edge); });
+  return candidates.reduce((acc, edge) => {
+    if (slack(g, edge) < slack(g, acc)) {
+      return edge;
+    }
+
+    return acc;
+  });
 }
 
 function exchangeEdges(t, g, e, f) {
-  var v = e.v,
-      w = e.w;
+  var v = e.v;
+  var w = e.w;
   t.removeEdge(v, w);
   t.setEdge(f.v, f.w, {});
   initLowLimValues(t);
@@ -201,13 +202,13 @@ function exchangeEdges(t, g, e, f) {
 }
 
 function updateRanks(t, g) {
-  var root = _.find(t.nodes(), function(v) { return !g.node(v).parent; }),
-      vs = preorder(t, root);
+  var root = t.nodes().find(v => !g.node(v).parent);
+  var vs = preorder(t, root);
   vs = vs.slice(1);
-  _.forEach(vs, function(v) {
+  vs.forEach(function(v) {
     var parent = t.node(v).parent,
-        edge = g.edge(v, parent),
-        flipped = false;
+      edge = g.edge(v, parent),
+      flipped = false;
 
     if (!edge) {
       edge = g.edge(parent, v);

package/lib/rank/util.js

@@ -1,7 +1,5 @@
 "use strict";
 
-var _ = require("../lodash");
-
 module.exports = {
   longestPath: longestPath,
   slack: slack
@@ -33,25 +31,27 @@ function longestPath(g) {
 
   function dfs(v) {
     var label = g.node(v);
-    if (_.has(visited, v)) {
+    if (visited.hasOwnProperty(v)) {
       return label.rank;
     }
     visited[v] = true;
 
-    var rank = _.minBy(_.map(g.outEdges(v), function(e) {
+    var rank = Math.min(...g.outEdges(v).map(e => {
+      if (e == null) {
+        return Number.POSITIVE_INFINITY;
+      }
+
       return dfs(e.w) - g.edge(e).minlen;
     }));
 
-    if (rank === Number.POSITIVE_INFINITY || // return value of _.map([]) for Lodash 3
-        rank === undefined || // return value of _.map([]) for Lodash 4
-        rank === null) { // return value of _.map([null])
+    if (rank === Number.POSITIVE_INFINITY) {
       rank = 0;
     }
 
     return (label.rank = rank);
   }
 
-  _.forEach(g.sources(), dfs);
+  g.sources().forEach(dfs);
 }
 
 /*

package/lib/util.js

@@ -1,23 +1,29 @@
+/* eslint "no-console": off */
+
 "use strict";
 
-var _ = require("./lodash"),
-    Graph = require("./graphlib").Graph;
+var Graph = require("@dagrejs/graphlib").Graph;
 
 module.exports = {
-  addDummyNode: addDummyNode,
-  simplify: simplify,
-  asNonCompoundGraph: asNonCompoundGraph,
-  successorWeights: successorWeights,
-  predecessorWeights: predecessorWeights,
-  intersectRect: intersectRect,
-  buildLayerMatrix: buildLayerMatrix,
-  normalizeRanks: normalizeRanks,
-  removeEmptyRanks: removeEmptyRanks,
-  addBorderNode: addBorderNode,
-  maxRank: maxRank,
-  partition: partition,
-  time: time,
-  notime: notime
+  addBorderNode,
+  addDummyNode,
+  asNonCompoundGraph,
+  buildLayerMatrix,
+  intersectRect,
+  mapValues,
+  maxRank,
+  normalizeRanks,
+  notime,
+  partition,
+  pick,
+  predecessorWeights,
+  range,
+  removeEmptyRanks,
+  simplify,
+  successorWeights,
+  time,
+  uniqueId,
+  zipObject,
 };
 
 /*
@@ -26,7 +32,7 @@ module.exports = {
 function addDummyNode(g, type, attrs, name) {
   var v;
   do {
-    v = _.uniqueId(name);
+    v = uniqueId(name);
   } while (g.hasNode(v));
 
   attrs.dummy = type;
@@ -40,10 +46,10 @@ function addDummyNode(g, type, attrs, name) {
  */
 function simplify(g) {
   var simplified = new Graph().setGraph(g.graph());
-  _.forEach(g.nodes(), function(v) { simplified.setNode(v, g.node(v)); });
-  _.forEach(g.edges(), function(e) {
-    var simpleLabel = simplified.edge(e.v, e.w) || { weight: 0, minlen: 1 },
-        label = g.edge(e);
+  g.nodes().forEach(v => simplified.setNode(v, g.node(v)));
+  g.edges().forEach(e => {
+    var simpleLabel = simplified.edge(e.v, e.w) || { weight: 0, minlen: 1 };
+    var label = g.edge(e);
     simplified.setEdge(e.v, e.w, {
       weight: simpleLabel.weight + label.weight,
       minlen: Math.max(simpleLabel.minlen, label.minlen)
@@ -54,37 +60,37 @@ function simplify(g) {
 
 function asNonCompoundGraph(g) {
   var simplified = new Graph({ multigraph: g.isMultigraph() }).setGraph(g.graph());
-  _.forEach(g.nodes(), function(v) {
+  g.nodes().forEach(v => {
     if (!g.children(v).length) {
       simplified.setNode(v, g.node(v));
     }
   });
-  _.forEach(g.edges(), function(e) {
+  g.edges().forEach(e => {
     simplified.setEdge(e, g.edge(e));
   });
   return simplified;
 }
 
 function successorWeights(g) {
-  var weightMap = _.map(g.nodes(), function(v) {
+  var weightMap = g.nodes().map(v => {
     var sucs = {};
-    _.forEach(g.outEdges(v), function(e) {
+    g.outEdges(v).forEach(e => {
       sucs[e.w] = (sucs[e.w] || 0) + g.edge(e).weight;
     });
     return sucs;
   });
-  return _.zipObject(g.nodes(), weightMap);
+  return zipObject(g.nodes(), weightMap);
 }
 
 function predecessorWeights(g) {
-  var weightMap = _.map(g.nodes(), function(v) {
+  var weightMap = g.nodes().map(v => {
     var preds = {};
-    _.forEach(g.inEdges(v), function(e) {
+    g.inEdges(v).forEach(e => {
       preds[e.v] = (preds[e.v] || 0) + g.edge(e).weight;
     });
     return preds;
   });
-  return _.zipObject(g.nodes(), weightMap);
+  return zipObject(g.nodes(), weightMap);
 }
 
 /*
@@ -131,11 +137,11 @@ function intersectRect(rect, point) {
  * function will produce a matrix with the ids of each node.
  */
 function buildLayerMatrix(g) {
-  var layering = _.map(_.range(maxRank(g) + 1), function() { return []; });
-  _.forEach(g.nodes(), function(v) {
-    var node = g.node(v),
-        rank = node.rank;
-    if (!_.isUndefined(rank)) {
+  var layering = range(maxRank(g) + 1).map(() => []);
+  g.nodes().forEach(v => {
+    var node = g.node(v);
+    var rank = node.rank;
+    if (rank !== undefined) {
       layering[rank][node.order] = v;
     }
   });
@@ -147,10 +153,17 @@ function buildLayerMatrix(g) {
  * rank(v) >= 0 and at least one node w has rank(w) = 0.
  */
 function normalizeRanks(g) {
-  var min = _.minBy(_.map(g.nodes(), function(v) { return g.node(v).rank; }));
-  _.forEach(g.nodes(), function(v) {
+  var min = Math.min(...g.nodes().map(v => {
+    var rank = g.node(v).rank;
+    if (rank === undefined) {
+      return Number.MAX_VALUE;
+    }
+
+    return rank;
+  }));
+  g.nodes().forEach(v => {
     var node = g.node(v);
-    if (_.has(node, "rank")) {
+    if (node.hasOwnProperty("rank")) {
       node.rank -= min;
     }
   });
@@ -158,10 +171,10 @@ function normalizeRanks(g) {
 
 function removeEmptyRanks(g) {
   // Ranks may not start at 0, so we need to offset them
-  var offset = _.minBy(_.map(g.nodes(), function(v) { return g.node(v).rank; }));
+  var offset = Math.min(...g.nodes().map(v => g.node(v).rank));
 
   var layers = [];
-  _.forEach(g.nodes(), function(v) {
+  g.nodes().forEach(v => {
     var rank = g.node(v).rank - offset;
     if (!layers[rank]) {
       layers[rank] = [];
@@ -169,13 +182,13 @@ function removeEmptyRanks(g) {
     layers[rank].push(v);
   });
 
-  var delta = 0,
-      nodeRankFactor = g.graph().nodeRankFactor;
-  _.forEach(layers, function(vs, i) {
-    if (_.isUndefined(vs) && i % nodeRankFactor !== 0) {
+  var delta = 0;
+  var nodeRankFactor = g.graph().nodeRankFactor;
+  Array.from(layers).forEach((vs, i) => {
+    if (vs === undefined && i % nodeRankFactor !== 0) {
       --delta;
-    } else if (delta) {
-      _.forEach(vs, function(v) { g.node(v).rank += delta; });
+    } else if (vs !== undefined && delta) {
+      vs.forEach(v => g.node(v).rank += delta);
     }
   });
 }
@@ -193,11 +206,13 @@ function addBorderNode(g, prefix, rank, order) {
 }
 
 function maxRank(g) {
-  return _.max(_.map(g.nodes(), function(v) {
+  return Math.max(...g.nodes().map(v => {
     var rank = g.node(v).rank;
-    if (!_.isUndefined(rank)) {
-      return rank;
+    if (rank === undefined) {
+      return Number.MIN_VALUE;
     }
+
+    return rank;
   }));
 }
 
@@ -208,7 +223,7 @@ function maxRank(g) {
  */
 function partition(collection, fn) {
   var result = { lhs: [], rhs: [] };
-  _.forEach(collection, function(value) {
+  collection.forEach(value => {
     if (fn(value)) {
       result.lhs.push(value);
     } else {
@@ -223,14 +238,69 @@ function partition(collection, fn) {
  * time it takes to execute the function.
  */
 function time(name, fn) {
-  var start = _.now();
+  var start = Date.now();
   try {
     return fn();
   } finally {
-    console.log(name + " time: " + (_.now() - start) + "ms");
+    console.log(name + " time: " + (Date.now() - start) + "ms");
   }
 }
 
 function notime(name, fn) {
   return fn();
 }
+
+let idCounter = 0;
+function uniqueId(prefix) {
+  var id = ++idCounter;
+  return toString(prefix) + id;
+}
+
+function range(start, limit, step = 1) {
+  if (limit == null) {
+    limit = start;
+    start = 0;
+  }
+
+  let endCon = (i) => i < limit;
+  if (step < 0) {
+    endCon = (i) => limit < i;
+  }
+
+  const range = [];
+  for (let i = start; endCon(i); i += step) {
+    range.push(i);
+  }
+
+  return range;
+}
+
+function pick(source, keys) {
+  const dest = {};
+  for (const key of keys) {
+    if (source[key] !== undefined) {
+      dest[key] = source[key];
+    }
+  }
+
+  return dest;
+}
+
+function mapValues(obj, funcOrProp) {
+  let func = funcOrProp;
+  if (typeof funcOrProp === 'string') {
+    func = (val) => val[funcOrProp];
+  }
+
+  return Object.entries(obj).reduce((acc, [k, v]) => {
+    acc[k] = func(v, k);
+    return acc;
+  }, {});
+}
+
+function zipObject(props, values) {
+  return props.reduce((acc, key, i) => {
+    acc[key] = values[i];
+    return acc;
+  }, {});
+}

package/lib/version.js

@@ -1 +1 @@
-module.exports = "0.8.0";
+module.exports = "1.0.1";

package/package.json

@@ -1,45 +1,51 @@
 {
   "name": "@dagrejs/dagre",
-  "version": "0.8.0",
+  "version": "1.0.1",
   "description": "Graph layout for JavaScript",
   "author": "Chris Pettitt <cpettitt@gmail.com>",
   "contributors": [
     "Matthew Dahl (https://github.com/sandersky)"
   ],
+  "license": "MIT",
   "main": "index.js",
+  "scripts": {
+    "lint": "make lint",
+    "test": "make test"
+  },
+  "files": [
+    "index.js",
+    "dist/",
+    "lib/"
+  ],
   "keywords": [
     "graph",
     "layout"
   ],
   "dependencies": {
-    "@dagrejs/graphlib": "^2.1.4",
-    "lodash": "^4.11.1"
+    "@dagrejs/graphlib": "2.1.13"
   },
   "devDependencies": {
-    "benchmark": "^1.0.0",
-    "browserify": "^6.1.0",
-    "chai": "^1.9.2",
-    "istanbul": "^0.3.2",
-    "jscs": "^1.7.3",
-    "jshint": "^2.5.6",
-    "jshint-stylish": "^1.0.0",
-    "karma": "^0.13.22",
-    "karma-chrome-launcher": "^0.2.0",
-    "karma-firefox-launcher": "^0.1.6",
-    "karma-mocha": "^0.2.0",
-    "karma-phantomjs-launcher": "^1.0.0",
-    "karma-requirejs": "^0.2.5",
-    "karma-safari-launcher": "^0.1.1",
-    "mocha": "^1.21.5",
-    "phantomjs-prebuilt": "^2.1.7",
-    "requirejs": "^2.1.22",
-    "semver": "^4.1.0",
-    "sprintf": "^0.1.4",
-    "uglify-js": "^2.4.15"
+    "benchmark": "2.1.4",
+    "browserify": "17.0.0",
+    "chai": "4.3.6",
+    "eslint": "8.35.0",
+    "jshint": "2.13.5",
+    "jshint-stylish": "2.2.1",
+    "karma": "6.4.1",
+    "karma-chrome-launcher": "3.1.1",
+    "karma-firefox-launcher": "2.1.2",
+    "karma-mocha": "2.0.1",
+    "karma-requirejs": "1.1.0",
+    "karma-safari-launcher": "1.0.0",
+    "mocha": "10.1.0",
+    "nyc": "^15.1.0",
+    "requirejs": "2.3.6",
+    "semver": "7.3.7",
+    "sprintf": "0.1.5",
+    "uglify-js": "3.17.4"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/dagrejs/dagre.git"
-  },
-  "license": "MIT"
+  }
 }

package/.jscsrc

@@ -1,6 +0,0 @@
-{
-  "disallowSpaceAfterPrefixUnaryOperators": true,
-  "disallowTrailingWhitespace": true,
-  "maximumLineLength": 100,
-  "validateQuoteMarks": true
-}

package/.jshintrc

@@ -1,24 +0,0 @@
-{
-  "camelcase": true,
-  "eqeqeq": true,
-  "expr": true,
-  "freeze": true,
-  "immed": true,
-  "newcap": true,
-  "noarg": true,
-  "quotmark": "double",
-  "trailing": true,
-  "undef": true,
-  "unused": true,
-
-  "laxbreak": true,
-
-  "node": true,
-
-  "globals": {
-      "afterEach": false,
-      "beforeEach": false,
-      "describe": false,
-      "it": false
-  }
-}

package/.travis.yml

@@ -1,7 +0,0 @@
-language: node_js
-node_js:
-  - "lts/*"
-script: KARMA_OPTS="--browsers Firefox,PhantomJS" make -e test
-before_script:
-  - export DISPLAY=:99.0
-  - sh -e /etc/init.d/xvfb start

package/bower.json

@@ -1,26 +0,0 @@
-{
-  "name": "dagre",
-  "version": "0.8.0",
-  "main": [
-    "dist/dagre.core.js"
-  ],
-  "ignore": [
-    ".*",
-    "README.md",
-    "CHANGELOG.md",
-    "Makefile",
-    "browser.js",
-    "dist/dagre.js",
-    "dist/dagre.min.js",
-    "index.js",
-    "karma*",
-    "lib/**",
-    "package.json",
-    "src/**",
-    "test/**"
-  ],
-  "dependencies": {
-    "@dagrejs/graphlib": "^2.1.4",
-    "lodash": "^4.11.1"
-  }
-}