@dagrejs/dagre 1.1.0 → 1.1.1

package/lib/rank/network-simplex.js

@@ -1,16 +1,14 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = networkSimplex;
-var _feasibleTree = _interopRequireDefault(require("./feasible-tree.js"));
-var _util = require("./util.js");
-var _graphlib = require("@dagrejs/graphlib");
-var _util2 = require("../util.js");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-var preorder = _graphlib.alg.preorder;
-var postorder = _graphlib.alg.postorder;
+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;
+
 // Expose some internals for testing purposes
 networkSimplex.initLowLimValues = initLowLimValues;
 networkSimplex.initCutValues = initCutValues;
@@ -53,13 +51,14 @@ networkSimplex.exchangeEdges = exchangeEdges;
  * structure of the overall algorithm.
  */
 function networkSimplex(g) {
-  g = (0, _util2.simplify)(g);
-  (0, _util.longestPath)(g);
-  var t = (0, _feasibleTree.default)(g);
+  g = simplify(g);
+  initRank(g);
+  var t = feasibleTree(g);
   initLowLimValues(t);
   initCutValues(t, g);
+
   var e, f;
-  while (e = leaveEdge(t)) {
+  while ((e = leaveEdge(t))) {
     f = enterEdge(t, g, e);
     exchangeEdges(t, g, e, f);
   }
@@ -73,6 +72,7 @@ function initCutValues(t, g) {
   vs = vs.slice(0, vs.length - 1);
   vs.forEach(v => assignCutValue(t, g, v));
 }
+
 function assignCutValue(t, g, child) {
   var childLab = t.node(child);
   var parent = childLab.parent;
@@ -92,17 +92,22 @@ function calcCutValue(t, g, child) {
   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;
     graphEdge = g.edge(parent, child);
   }
+
   cutValue = graphEdge.weight;
+
   g.nodeEdges(child).forEach(e => {
     var isOutEdge = e.v === child,
       other = isOutEdge ? e.w : e.v;
+
     if (other !== parent) {
       var pointsToHead = isOutEdge === childIsTail,
         otherWeight = g.edge(e).weight;
+
       cutValue += pointsToHead ? otherWeight : -otherWeight;
       if (isTreeEdge(t, child, other)) {
         var otherCutValue = t.edge(child, other).cutvalue;
@@ -110,23 +115,28 @@ function calcCutValue(t, g, child) {
       }
     }
   });
+
   return cutValue;
 }
+
 function initLowLimValues(tree, root) {
   if (arguments.length < 2) {
     root = tree.nodes()[0];
   }
   dfsAssignLowLim(tree, {}, 1, root);
 }
+
 function dfsAssignLowLim(tree, visited, nextLim, v, parent) {
   var low = nextLim;
   var label = tree.node(v);
+
   visited[v] = true;
   tree.neighbors(v).forEach(w => {
     if (!visited.hasOwnProperty(w)) {
       nextLim = dfsAssignLowLim(tree, visited, nextLim, w, v);
     }
   });
+
   label.low = low;
   label.lim = nextLim++;
   if (parent) {
@@ -135,11 +145,14 @@ function dfsAssignLowLim(tree, visited, nextLim, v, parent) {
     // TODO should be able to remove this when we incrementally update low lim
     delete label.parent;
   }
+
   return nextLim;
 }
+
 function leaveEdge(tree) {
   return tree.edges().find(e => tree.edge(e).cutvalue < 0);
 }
+
 function enterEdge(t, g, edge) {
   var v = edge.v;
   var w = edge.w;
@@ -151,6 +164,7 @@ function enterEdge(t, g, edge) {
     v = edge.w;
     w = edge.v;
   }
+
   var vLabel = t.node(v);
   var wLabel = t.node(w);
   var tailLabel = vLabel;
@@ -162,16 +176,21 @@ function enterEdge(t, g, edge) {
     tailLabel = wLabel;
     flip = true;
   }
+
   var candidates = g.edges().filter(edge => {
-    return flip === isDescendant(t, t.node(edge.v), tailLabel) && flip !== isDescendant(t, t.node(edge.w), tailLabel);
+    return flip === isDescendant(t, t.node(edge.v), tailLabel) &&
+           flip !== isDescendant(t, t.node(edge.w), tailLabel);
   });
+
   return candidates.reduce((acc, edge) => {
-    if ((0, _util.slack)(g, edge) < (0, _util.slack)(g, acc)) {
+    if (slack(g, edge) < slack(g, acc)) {
       return edge;
     }
+
     return acc;
   });
 }
+
 function exchangeEdges(t, g, e, f) {
   var v = e.v;
   var w = e.w;
@@ -181,6 +200,7 @@ function exchangeEdges(t, g, e, f) {
   initCutValues(t, g);
   updateRanks(t, g);
 }
+
 function updateRanks(t, g) {
   var root = t.nodes().find(v => !g.node(v).parent);
   var vs = preorder(t, root);
@@ -189,10 +209,12 @@ function updateRanks(t, g) {
     var parent = t.node(v).parent,
       edge = g.edge(v, parent),
       flipped = false;
+
     if (!edge) {
       edge = g.edge(parent, v);
       flipped = true;
     }
+
     g.node(v).rank = g.node(parent).rank + (flipped ? edge.minlen : -edge.minlen);
   });
 }
@@ -211,4 +233,3 @@ function isTreeEdge(tree, u, v) {
 function isDescendant(tree, vLabel, rootLabel) {
   return rootLabel.low <= vLabel.lim && vLabel.lim <= rootLabel.lim;
 }
-module.exports = exports.default;

package/lib/rank/util.js

@@ -1,5 +1,10 @@
 "use strict";
 
+module.exports = {
+  longestPath: longestPath,
+  slack: slack
+};
+
 /*
  * Initializes ranks for the input graph using the longest path algorithm. This
  * algorithm scales well and is fast in practice, it yields rather poor
@@ -21,30 +26,31 @@
  *
  *    1. Each node will be assign an (unnormalized) "rank" property.
  */
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.longestPath = longestPath;
-exports.slack = slack;
 function longestPath(g) {
   var visited = {};
+
   function dfs(v) {
     var label = g.node(v);
     if (visited.hasOwnProperty(v)) {
       return label.rank;
     }
     visited[v] = true;
+
     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) {
       rank = 0;
     }
-    return label.rank = rank;
+
+    return (label.rank = rank);
   }
+
   g.sources().forEach(dfs);
 }
 

package/lib/util.js

@@ -2,29 +2,30 @@
 
 "use strict";
 
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.addBorderNode = addBorderNode;
-exports.addDummyNode = addDummyNode;
-exports.asNonCompoundGraph = asNonCompoundGraph;
-exports.buildLayerMatrix = buildLayerMatrix;
-exports.intersectRect = intersectRect;
-exports.mapValues = mapValues;
-exports.maxRank = maxRank;
-exports.normalizeRanks = normalizeRanks;
-exports.notime = notime;
-exports.partition = partition;
-exports.pick = pick;
-exports.predecessorWeights = predecessorWeights;
-exports.range = range;
-exports.removeEmptyRanks = removeEmptyRanks;
-exports.simplify = simplify;
-exports.successorWeights = successorWeights;
-exports.time = time;
-exports.uniqueId = uniqueId;
-exports.zipObject = zipObject;
-var _graphlib = require("@dagrejs/graphlib");
+let Graph = require("@dagrejs/graphlib").Graph;
+
+module.exports = {
+  addBorderNode,
+  addDummyNode,
+  asNonCompoundGraph,
+  buildLayerMatrix,
+  intersectRect,
+  mapValues,
+  maxRank,
+  normalizeRanks,
+  notime,
+  partition,
+  pick,
+  predecessorWeights,
+  range,
+  removeEmptyRanks,
+  simplify,
+  successorWeights,
+  time,
+  uniqueId,
+  zipObject,
+};
+
 /*
  * Adds a dummy node to the graph and return v.
  */
@@ -33,6 +34,7 @@ function addDummyNode(g, type, attrs, name) {
   do {
     v = uniqueId(name);
   } while (g.hasNode(v));
+
   attrs.dummy = type;
   g.setNode(v, attrs);
   return v;
@@ -43,13 +45,10 @@ function addDummyNode(g, type, attrs, name) {
  * associated with multi-edges.
  */
 function simplify(g) {
-  let simplified = new _graphlib.Graph().setGraph(g.graph());
+  let simplified = new Graph().setGraph(g.graph());
   g.nodes().forEach(v => simplified.setNode(v, g.node(v)));
   g.edges().forEach(e => {
-    let simpleLabel = simplified.edge(e.v, e.w) || {
-      weight: 0,
-      minlen: 1
-    };
+    let simpleLabel = simplified.edge(e.v, e.w) || { weight: 0, minlen: 1 };
     let label = g.edge(e);
     simplified.setEdge(e.v, e.w, {
       weight: simpleLabel.weight + label.weight,
@@ -58,10 +57,9 @@ function simplify(g) {
   });
   return simplified;
 }
+
 function asNonCompoundGraph(g) {
-  let simplified = new _graphlib.Graph({
-    multigraph: g.isMultigraph()
-  }).setGraph(g.graph());
+  let simplified = new Graph({ multigraph: g.isMultigraph() }).setGraph(g.graph());
   g.nodes().forEach(v => {
     if (!g.children(v).length) {
       simplified.setNode(v, g.node(v));
@@ -72,6 +70,7 @@ function asNonCompoundGraph(g) {
   });
   return simplified;
 }
+
 function successorWeights(g) {
   let weightMap = g.nodes().map(v => {
     let sucs = {};
@@ -82,6 +81,7 @@ function successorWeights(g) {
   });
   return zipObject(g.nodes(), weightMap);
 }
+
 function predecessorWeights(g) {
   let weightMap = g.nodes().map(v => {
     let preds = {};
@@ -107,9 +107,11 @@ function intersectRect(rect, point) {
   let dy = point.y - y;
   let w = rect.width / 2;
   let h = rect.height / 2;
+
   if (!dx && !dy) {
     throw new Error("Not possible to find intersection inside of the rectangle");
   }
+
   let sx, sy;
   if (Math.abs(dy) * w > Math.abs(dx) * h) {
     // Intersection is top or bottom of rect.
@@ -126,10 +128,8 @@ function intersectRect(rect, point) {
     sx = w;
     sy = w * dy / dx;
   }
-  return {
-    x: x + sx,
-    y: y + sy
-  };
+
+  return { x: x + sx, y: y + sy };
 }
 
 /*
@@ -158,6 +158,7 @@ function normalizeRanks(g) {
     if (rank === undefined) {
       return Number.MAX_VALUE;
     }
+
     return rank;
   }));
   g.nodes().forEach(v => {
@@ -167,9 +168,11 @@ function normalizeRanks(g) {
     }
   });
 }
+
 function removeEmptyRanks(g) {
   // Ranks may not start at 0, so we need to offset them
   let offset = Math.min(...g.nodes().map(v => g.node(v).rank));
+
   let layers = [];
   g.nodes().forEach(v => {
     let rank = g.node(v).rank - offset;
@@ -178,6 +181,7 @@ function removeEmptyRanks(g) {
     }
     layers[rank].push(v);
   });
+
   let delta = 0;
   let nodeRankFactor = g.graph().nodeRankFactor;
   Array.from(layers).forEach((vs, i) => {
@@ -188,6 +192,7 @@ function removeEmptyRanks(g) {
     }
   });
 }
+
 function addBorderNode(g, prefix, rank, order) {
   let node = {
     width: 0,
@@ -199,12 +204,14 @@ function addBorderNode(g, prefix, rank, order) {
   }
   return addDummyNode(g, "border", node, prefix);
 }
+
 function maxRank(g) {
   return Math.max(...g.nodes().map(v => {
     let rank = g.node(v).rank;
     if (rank === undefined) {
       return Number.MIN_VALUE;
     }
+
     return rank;
   }));
 }
@@ -215,10 +222,7 @@ function maxRank(g) {
  * into `rhs.
  */
 function partition(collection, fn) {
-  let result = {
-    lhs: [],
-    rhs: []
-  };
+  let result = { lhs: [], rhs: [] };
   collection.forEach(value => {
     if (fn(value)) {
       result.lhs.push(value);
@@ -241,29 +245,36 @@ function time(name, fn) {
     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;
+
+  let endCon = (i) => i < limit;
   if (step < 0) {
-    endCon = i => limit < i;
+    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) {
@@ -271,18 +282,22 @@ function pick(source, keys) {
       dest[key] = source[key];
     }
   }
+
   return dest;
 }
+
 function mapValues(obj, funcOrProp) {
   let func = funcOrProp;
   if (typeof funcOrProp === 'string') {
-    func = val => val[funcOrProp];
+    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];

package/lib/version.js

@@ -1,8 +1 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _default = exports.default = "1.1.0";
-module.exports = exports.default;
+module.exports = "1.1.1";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dagrejs/dagre",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Graph layout for JavaScript",
   "author": "Chris Pettitt <cpettitt@gmail.com>",
   "contributors": [
@@ -12,17 +12,11 @@
     "lint": "make lint",
     "test": "make test"
   },
-  "module": "./mjs-lib/index.js",
-  "exports": {
-    "import": "./mjs-lib/index.js",
-    "require": "./index.js"
-  },
   "files": [
     "index.js",
     "index.d.ts",
     "dist/",
-    "lib/",
-    "mjs-lib/"
+    "lib/"
   ],
   "types": "index.d.ts",
   "keywords": [
@@ -30,14 +24,9 @@
     "layout"
   ],
   "dependencies": {
-    "@dagrejs/graphlib": "2.2.0"
+    "@dagrejs/graphlib": "2.2.1"
   },
   "devDependencies": {
-    "@babel/cli": "^7.23.9",
-    "@babel/core": "^7.23.9",
-    "@babel/plugin-transform-export-namespace-from": "^7.23.4",
-    "@babel/plugin-transform-modules-commonjs": "^7.23.3",
-    "babel-plugin-add-module-exports": "^1.0.4",
     "benchmark": "2.1.4",
     "browserify": "17.0.0",
     "chai": "4.3.6",
@@ -46,7 +35,6 @@
     "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",

package/lib/index.js

@@ -1,38 +0,0 @@
-"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
-};

package/mjs-lib/acyclic.js

@@ -1,62 +0,0 @@
-"use strict";
-
-import { default as greedyFAS } from "./greedy-fas.js";
-import { uniqueId as uniqueId } from "./util.js";
-
-export function run(g) {
-  let fas = (g.graph().acyclicer === "greedy"
-    ? greedyFAS(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"));
-  });
-
-  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;
-    }
-    visited[v] = true;
-    stack[v] = true;
-    g.outEdges(v).forEach(e => {
-      if (stack.hasOwnProperty(e.w)) {
-        fas.push(e);
-      } else {
-        dfs(e.w);
-      }
-    });
-    delete stack[v];
-  }
-
-  g.nodes().forEach(dfs);
-  return fas;
-}
-
-export 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;
-      g.setEdge(e.w, e.v, label, forwardName);
-    }
-  });
-}

package/mjs-lib/add-border-segments.js

@@ -1,35 +0,0 @@
-import  * as util from "./util.js";
-
-export default function addBorderSegments(g) {
-  function dfs(v) {
-    let children = g.children(v);
-    let node = g.node(v);
-    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) {
-        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 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 });
-  }
-}