@dagrejs/dagre 1.0.2 → 1.1.0

package/lib/order/sort-subgraph.js

@@ -1,57 +1,53 @@
-var barycenter = require("./barycenter");
-var resolveConflicts = require("./resolve-conflicts");
-var sort = require("./sort");
-
-module.exports = sortSubgraph;
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = sortSubgraph;
+var _barycenter = _interopRequireDefault(require("./barycenter.js"));
+var _resolveConflicts = _interopRequireDefault(require("./resolve-conflicts.js"));
+var _sort = _interopRequireDefault(require("./sort.js"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function sortSubgraph(g, v, cg, biasRight) {
-  var movable = g.children(v);
-  var node = g.node(v);
-  var bl = node ? node.borderLeft : undefined;
-  var br = node ? node.borderRight: undefined;
-  var subgraphs = {};
-
+  let movable = g.children(v);
+  let node = g.node(v);
+  let bl = node ? node.borderLeft : undefined;
+  let br = node ? node.borderRight : undefined;
+  let subgraphs = {};
   if (bl) {
     movable = movable.filter(w => w !== bl && w !== br);
   }
-
-  var barycenters = barycenter(g, movable);
-  barycenters.forEach(function(entry) {
+  let barycenters = (0, _barycenter.default)(g, movable);
+  barycenters.forEach(entry => {
     if (g.children(entry.v).length) {
-      var subgraphResult = sortSubgraph(g, entry.v, cg, biasRight);
+      let subgraphResult = sortSubgraph(g, entry.v, cg, biasRight);
       subgraphs[entry.v] = subgraphResult;
       if (subgraphResult.hasOwnProperty("barycenter")) {
         mergeBarycenters(entry, subgraphResult);
       }
     }
   });
-
-  var entries = resolveConflicts(barycenters, cg);
+  let entries = (0, _resolveConflicts.default)(barycenters, cg);
   expandSubgraphs(entries, subgraphs);
-
-  var result = sort(entries, biasRight);
-
+  let result = (0, _sort.default)(entries, biasRight);
   if (bl) {
     result.vs = [bl, result.vs, br].flat(true);
     if (g.predecessors(bl).length) {
-      var blPred = g.node(g.predecessors(bl)[0]),
+      let blPred = g.node(g.predecessors(bl)[0]),
         brPred = g.node(g.predecessors(br)[0]);
       if (!result.hasOwnProperty("barycenter")) {
         result.barycenter = 0;
         result.weight = 0;
       }
-      result.barycenter = (result.barycenter * result.weight +
-                           blPred.order + brPred.order) / (result.weight + 2);
+      result.barycenter = (result.barycenter * result.weight + blPred.order + brPred.order) / (result.weight + 2);
       result.weight += 2;
     }
   }
-
   return result;
 }
-
 function expandSubgraphs(entries, subgraphs) {
-  entries.forEach(function(entry) {
-    entry.vs = entry.vs.flatMap(function(v) {
+  entries.forEach(entry => {
+    entry.vs = entry.vs.flatMap(v => {
       if (subgraphs[v]) {
         return subgraphs[v].vs;
       }
@@ -59,15 +55,13 @@ function expandSubgraphs(entries, subgraphs) {
     });
   });
 }
-
 function mergeBarycenters(target, other) {
   if (target.barycenter !== undefined) {
-    target.barycenter = (target.barycenter * target.weight +
-                         other.barycenter * other.weight) /
-                        (target.weight + other.weight);
+    target.barycenter = (target.barycenter * target.weight + other.barycenter * other.weight) / (target.weight + other.weight);
     target.weight += other.weight;
   } else {
     target.barycenter = other.barycenter;
     target.weight = other.weight;
   }
 }
+module.exports = exports.default;

package/lib/order/sort.js

@@ -1,40 +1,42 @@
-var util = require("../util");
-
-module.exports = sort;
-
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = sort;
+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 sort(entries, biasRight) {
-  var parts = util.partition(entries, function(entry) {
+  let parts = util.partition(entries, entry => {
     return entry.hasOwnProperty("barycenter");
   });
-  var sortable = parts.lhs,
+  let sortable = parts.lhs,
     unsortable = parts.rhs.sort((a, b) => b.i - a.i),
     vs = [],
     sum = 0,
     weight = 0,
     vsIndex = 0;
-
   sortable.sort(compareWithBias(!!biasRight));
-
   vsIndex = consumeUnsortable(vs, unsortable, vsIndex);
-
-  sortable.forEach(function (entry) {
+  sortable.forEach(entry => {
     vsIndex += entry.vs.length;
     vs.push(entry.vs);
     sum += entry.barycenter * entry.weight;
     weight += entry.weight;
     vsIndex = consumeUnsortable(vs, unsortable, vsIndex);
   });
-
-  var result = { vs: vs.flat(true) };
+  let result = {
+    vs: vs.flat(true)
+  };
   if (weight) {
     result.barycenter = sum / weight;
     result.weight = weight;
   }
   return result;
 }
-
 function consumeUnsortable(vs, unsortable, index) {
-  var last;
+  let last;
   while (unsortable.length && (last = unsortable[unsortable.length - 1]).i <= index) {
     unsortable.pop();
     vs.push(last.vs);
@@ -42,15 +44,14 @@ function consumeUnsortable(vs, unsortable, index) {
   }
   return index;
 }
-
 function compareWithBias(bias) {
-  return function(entryV, entryW) {
+  return (entryV, entryW) => {
     if (entryV.barycenter < entryW.barycenter) {
       return -1;
     } else if (entryV.barycenter > entryW.barycenter) {
       return 1;
     }
-
     return !bias ? entryV.i - entryW.i : entryW.i - entryV.i;
   };
 }
+module.exports = exports.default;

package/lib/parent-dummy-chains.js

@@ -1,40 +1,36 @@
-module.exports = parentDummyChains;
+"use strict";
 
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = parentDummyChains;
 function parentDummyChains(g) {
-  var postorderNums = postorder(g);
-
-  g.graph().dummyChains.forEach(function(v) {
-    var node = g.node(v);
-    var edgeObj = node.edgeObj;
-    var pathData = findPath(g, postorderNums, edgeObj.v, edgeObj.w);
-    var path = pathData.path;
-    var lca = pathData.lca;
-    var pathIdx = 0;
-    var pathV = path[pathIdx];
-    var ascending = true;
-
+  let postorderNums = postorder(g);
+  g.graph().dummyChains.forEach(v => {
+    let node = g.node(v);
+    let edgeObj = node.edgeObj;
+    let pathData = findPath(g, postorderNums, edgeObj.v, edgeObj.w);
+    let path = pathData.path;
+    let lca = pathData.lca;
+    let pathIdx = 0;
+    let pathV = path[pathIdx];
+    let ascending = true;
     while (v !== edgeObj.w) {
       node = g.node(v);
-
       if (ascending) {
-        while ((pathV = path[pathIdx]) !== lca &&
-               g.node(pathV).maxRank < node.rank) {
+        while ((pathV = path[pathIdx]) !== lca && g.node(pathV).maxRank < node.rank) {
           pathIdx++;
         }
-
         if (pathV === lca) {
           ascending = false;
         }
       }
-
       if (!ascending) {
-        while (pathIdx < path.length - 1 &&
-               g.node(pathV = path[pathIdx + 1]).minRank <= node.rank) {
+        while (pathIdx < path.length - 1 && g.node(pathV = path[pathIdx + 1]).minRank <= node.rank) {
           pathIdx++;
         }
         pathV = path[pathIdx];
       }
-
       g.setParent(v, pathV);
       v = g.successors(v)[0];
     }
@@ -44,20 +40,19 @@ function parentDummyChains(g) {
 // Find a path from v to w through the lowest common ancestor (LCA). Return the
 // full path and the LCA.
 function findPath(g, postorderNums, v, w) {
-  var vPath = [];
-  var wPath = [];
-  var low = Math.min(postorderNums[v].low, postorderNums[w].low);
-  var lim = Math.max(postorderNums[v].lim, postorderNums[w].lim);
-  var parent;
-  var lca;
+  let vPath = [];
+  let wPath = [];
+  let low = Math.min(postorderNums[v].low, postorderNums[w].low);
+  let lim = Math.max(postorderNums[v].lim, postorderNums[w].lim);
+  let parent;
+  let lca;
 
   // Traverse up from v to find the LCA
   parent = v;
   do {
     parent = g.parent(parent);
     vPath.push(parent);
-  } while (parent &&
-           (postorderNums[parent].low > low || lim > postorderNums[parent].lim));
+  } while (parent && (postorderNums[parent].low > low || lim > postorderNums[parent].lim));
   lca = parent;
 
   // Traverse from w to LCA
@@ -65,20 +60,23 @@ function findPath(g, postorderNums, v, w) {
   while ((parent = g.parent(parent)) !== lca) {
     wPath.push(parent);
   }
-
-  return { path: vPath.concat(wPath.reverse()), lca: lca };
+  return {
+    path: vPath.concat(wPath.reverse()),
+    lca: lca
+  };
 }
-
 function postorder(g) {
-  var result = {};
-  var lim = 0;
-
+  let result = {};
+  let lim = 0;
   function dfs(v) {
-    var low = lim;
+    let low = lim;
     g.children(v).forEach(dfs);
-    result[v] = { low: low, lim: lim++ };
+    result[v] = {
+      low: low,
+      lim: lim++
+    };
   }
   g.children().forEach(dfs);
-
   return result;
 }
+module.exports = exports.default;