diff --git a/bower.json b/bower.json index ceb4d3a1..8e3110d5 100644 --- a/bower.json +++ b/bower.json @@ -1,6 +1,6 @@ { "name": "dagre", - "version": "1.0.2", + "version": "1.0.4", "main": [ "dist/dagre.core.js" ], diff --git a/dist/dagre.js b/dist/dagre.js index ccaf6eef..fa10bb1a 100644 --- a/dist/dagre.js +++ b/dist/dagre.js @@ -36,8 +36,8 @@ module.exports = { },{"./lib/debug":6,"./lib/layout":8,"./lib/util":27,"./lib/version":28,"@dagrejs/graphlib":29}],2:[function(require,module,exports){ "use strict"; -var greedyFAS = require("./greedy-fas"); -var uniqueId = require("./util").uniqueId; +let greedyFAS = require("./greedy-fas"); +let uniqueId = require("./util").uniqueId; module.exports = { run: run, @@ -45,11 +45,11 @@ module.exports = { }; function run(g) { - var fas = (g.graph().acyclicer === "greedy" + let fas = (g.graph().acyclicer === "greedy" ? greedyFAS(g, weightFn(g)) : dfsFAS(g)); - fas.forEach(function(e) { - var label = g.edge(e); + fas.forEach(e => { + let label = g.edge(e); g.removeEdge(e); label.forwardName = e.name; label.reversed = true; @@ -57,16 +57,16 @@ function run(g) { }); function weightFn(g) { - return function(e) { + return e => { return g.edge(e).weight; }; } } function dfsFAS(g) { - var fas = []; - var stack = {}; - var visited = {}; + let fas = []; + let stack = {}; + let visited = {}; function dfs(v) { if (visited.hasOwnProperty(v)) { @@ -74,7 +74,7 @@ function dfsFAS(g) { } visited[v] = true; stack[v] = true; - g.outEdges(v).forEach(function(e) { + g.outEdges(v).forEach(e => { if (stack.hasOwnProperty(e.w)) { fas.push(e); } else { @@ -89,12 +89,12 @@ function dfsFAS(g) { } function undo(g) { - g.edges().forEach(function(e) { - var label = g.edge(e); + g.edges().forEach(e => { + let label = g.edge(e); if (label.reversed) { g.removeEdge(e); - var forwardName = label.forwardName; + let forwardName = label.forwardName; delete label.reversed; delete label.forwardName; g.setEdge(e.w, e.v, label, forwardName); @@ -103,14 +103,14 @@ function undo(g) { } },{"./greedy-fas":7,"./util":27}],3:[function(require,module,exports){ -var util = require("./util"); +let util = require("./util"); module.exports = addBorderSegments; function addBorderSegments(g) { function dfs(v) { - var children = g.children(v); - var node = g.node(v); + let children = g.children(v); + let node = g.node(v); if (children.length) { children.forEach(dfs); } @@ -118,7 +118,7 @@ function addBorderSegments(g) { if (node.hasOwnProperty("minRank")) { node.borderLeft = []; node.borderRight = []; - for (var rank = node.minRank, maxRank = node.maxRank + 1; + for (let rank = node.minRank, maxRank = node.maxRank + 1; rank < maxRank; ++rank) { addBorderNode(g, "borderLeft", "_bl", v, node, rank); @@ -131,9 +131,9 @@ function addBorderSegments(g) { } function addBorderNode(g, prop, prefix, sg, sgNode, rank) { - var label = { width: 0, height: 0, rank: rank, borderType: prop }; - var prev = sgNode[prop][rank - 1]; - var curr = util.addDummyNode(g, "border", label, prefix); + 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) { @@ -150,14 +150,14 @@ module.exports = { }; function adjust(g) { - var rankDir = g.graph().rankdir.toLowerCase(); + let rankDir = g.graph().rankdir.toLowerCase(); if (rankDir === "lr" || rankDir === "rl") { swapWidthHeight(g); } } function undo(g) { - var rankDir = g.graph().rankdir.toLowerCase(); + let rankDir = g.graph().rankdir.toLowerCase(); if (rankDir === "bt" || rankDir === "rl") { reverseY(g); } @@ -174,7 +174,7 @@ function swapWidthHeight(g) { } function swapWidthHeightOne(attrs) { - var w = attrs.width; + let w = attrs.width; attrs.width = attrs.height; attrs.height = w; } @@ -182,8 +182,8 @@ function swapWidthHeightOne(attrs) { function reverseY(g) { g.nodes().forEach(v => reverseYOne(g.node(v))); - g.edges().forEach(function(e) { - var edge = g.edge(e); + g.edges().forEach(e => { + let edge = g.edge(e); edge.points.forEach(reverseYOne); if (edge.hasOwnProperty("y")) { reverseYOne(edge); @@ -198,8 +198,8 @@ function reverseYOne(attrs) { function swapXY(g) { g.nodes().forEach(v => swapXYOne(g.node(v))); - g.edges().forEach(function(e) { - var edge = g.edge(e); + g.edges().forEach(e => { + let edge = g.edge(e); edge.points.forEach(swapXYOne); if (edge.hasOwnProperty("x")) { swapXYOne(edge); @@ -208,7 +208,7 @@ function swapXY(g) { } function swapXYOne(attrs) { - var x = attrs.x; + let x = attrs.x; attrs.x = attrs.y; attrs.y = x; } @@ -219,44 +219,44 @@ function swapXYOne(attrs) { * "Introduction to Algorithms". */ -module.exports = List; - -function List() { - var sentinel = {}; - sentinel._next = sentinel._prev = sentinel; - this._sentinel = sentinel; -} - -List.prototype.dequeue = function() { - var sentinel = this._sentinel; - var entry = sentinel._prev; - if (entry !== sentinel) { - unlink(entry); - return entry; +class List { + constructor() { + let sentinel = {}; + sentinel._next = sentinel._prev = sentinel; + this._sentinel = sentinel; } -}; -List.prototype.enqueue = function(entry) { - var sentinel = this._sentinel; - if (entry._prev && entry._next) { - unlink(entry); + dequeue() { + let sentinel = this._sentinel; + let entry = sentinel._prev; + if (entry !== sentinel) { + unlink(entry); + return entry; + } } - entry._next = sentinel._next; - sentinel._next._prev = entry; - sentinel._next = entry; - entry._prev = sentinel; -}; -List.prototype.toString = function() { - var strs = []; - var sentinel = this._sentinel; - var curr = sentinel._prev; - while (curr !== sentinel) { - strs.push(JSON.stringify(curr, filterOutLinks)); - curr = curr._prev; + enqueue(entry) { + let sentinel = this._sentinel; + if (entry._prev && entry._next) { + unlink(entry); + } + entry._next = sentinel._next; + sentinel._next._prev = entry; + sentinel._next = entry; + entry._prev = sentinel; + } + + toString() { + let strs = []; + let sentinel = this._sentinel; + let curr = sentinel._prev; + while (curr !== sentinel) { + strs.push(JSON.stringify(curr, filterOutLinks)); + curr = curr._prev; + } + return "[" + strs.join(", ") + "]"; } - return "[" + strs.join(", ") + "]"; -}; +} function unlink(entry) { entry._prev._next = entry._next; @@ -271,9 +271,11 @@ function filterOutLinks(k, v) { } } +module.exports = List; + },{}],6:[function(require,module,exports){ -var util = require("./util"); -var Graph = require("@dagrejs/graphlib").Graph; +let util = require("./util"); +let Graph = require("@dagrejs/graphlib").Graph; module.exports = { debugOrdering: debugOrdering @@ -281,23 +283,21 @@ module.exports = { /* istanbul ignore next */ function debugOrdering(g) { - var layerMatrix = util.buildLayerMatrix(g); + let layerMatrix = util.buildLayerMatrix(g); - var h = new Graph({ compound: true, multigraph: true }).setGraph({}); + let h = new Graph({ compound: true, multigraph: true }).setGraph({}); - g.nodes().forEach(function(v) { + g.nodes().forEach(v => { h.setNode(v, { label: v }); h.setParent(v, "layer" + g.node(v).rank); }); - g.edges().forEach(function(e) { - h.setEdge(e.v, e.w, {}, e.name); - }); + g.edges().forEach(e => h.setEdge(e.v, e.w, {}, e.name)); - layerMatrix.forEach(function(layer, i) { - var layerV = "layer" + i; + layerMatrix.forEach((layer, i) => { + let layerV = "layer" + i; h.setNode(layerV, { rank: "same" }); - layer.reduce(function(u, v) { + layer.reduce((u, v) => { h.setEdge(u, v, { style: "invis" }); return v; }); @@ -307,8 +307,8 @@ function debugOrdering(g) { } },{"./util":27,"@dagrejs/graphlib":29}],7:[function(require,module,exports){ -var Graph = require("@dagrejs/graphlib").Graph; -var List = require("./data/list"); +let Graph = require("@dagrejs/graphlib").Graph; +let List = require("./data/list"); /* * A greedy heuristic for finding a feedback arc set for a graph. A feedback @@ -319,30 +319,30 @@ var List = require("./data/list"); */ module.exports = greedyFAS; -var DEFAULT_WEIGHT_FN = () => 1; +let DEFAULT_WEIGHT_FN = () => 1; function greedyFAS(g, weightFn) { if (g.nodeCount() <= 1) { return []; } - var state = buildState(g, weightFn || DEFAULT_WEIGHT_FN); - var results = doGreedyFAS(state.graph, state.buckets, state.zeroIdx); + let state = buildState(g, weightFn || DEFAULT_WEIGHT_FN); + let results = doGreedyFAS(state.graph, state.buckets, state.zeroIdx); // Expand multi-edges return results.flatMap(e => g.outEdges(e.v, e.w)); } function doGreedyFAS(g, buckets, zeroIdx) { - var results = []; - var sources = buckets[buckets.length - 1]; - var sinks = buckets[0]; + let results = []; + let sources = buckets[buckets.length - 1]; + let sinks = buckets[0]; - var entry; + let entry; while (g.nodeCount()) { while ((entry = sinks.dequeue())) { removeNode(g, buckets, zeroIdx, entry); } while ((entry = sources.dequeue())) { removeNode(g, buckets, zeroIdx, entry); } if (g.nodeCount()) { - for (var i = buckets.length - 2; i > 0; --i) { + for (let i = buckets.length - 2; i > 0; --i) { entry = buckets[i].dequeue(); if (entry) { results = results.concat(removeNode(g, buckets, zeroIdx, entry, true)); @@ -356,11 +356,11 @@ function doGreedyFAS(g, buckets, zeroIdx) { } function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) { - var results = collectPredecessors ? [] : undefined; + let results = collectPredecessors ? [] : undefined; - g.inEdges(entry.v).forEach(function(edge) { - var weight = g.edge(edge); - var uEntry = g.node(edge.v); + g.inEdges(entry.v).forEach(edge => { + let weight = g.edge(edge); + let uEntry = g.node(edge.v); if (collectPredecessors) { results.push({ v: edge.v, w: edge.w }); @@ -370,10 +370,10 @@ function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) { assignBucket(buckets, zeroIdx, uEntry); }); - g.outEdges(entry.v).forEach(function(edge) { - var weight = g.edge(edge); - var w = edge.w; - var wEntry = g.node(w); + g.outEdges(entry.v).forEach(edge => { + let weight = g.edge(edge); + let w = edge.w; + let wEntry = g.node(w); wEntry["in"] -= weight; assignBucket(buckets, zeroIdx, wEntry); }); @@ -384,29 +384,29 @@ function removeNode(g, buckets, zeroIdx, entry, collectPredecessors) { } function buildState(g, weightFn) { - var fasGraph = new Graph(); - var maxIn = 0; - var maxOut = 0; + let fasGraph = new Graph(); + let maxIn = 0; + let maxOut = 0; - g.nodes().forEach(function(v) { + g.nodes().forEach(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. - g.edges().forEach(function(e) { - var prevWeight = fasGraph.edge(e.v, e.w) || 0; - var weight = weightFn(e); - var edgeWeight = prevWeight + weight; + g.edges().forEach(e => { + let prevWeight = fasGraph.edge(e.v, e.w) || 0; + let weight = weightFn(e); + let 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(() => new List()); - var zeroIdx = maxIn + 1; + let buckets = range(maxOut + maxIn + 3).map(() => new List()); + let zeroIdx = maxIn + 1; - fasGraph.nodes().forEach(function(v) { + fasGraph.nodes().forEach(v => { assignBucket(buckets, zeroIdx, fasGraph.node(v)); }); @@ -435,60 +435,60 @@ function range(limit) { },{"./data/list":5,"@dagrejs/graphlib":29}],8:[function(require,module,exports){ "use strict"; -var acyclic = require("./acyclic"); -var normalize = require("./normalize"); -var rank = require("./rank"); -var normalizeRanks = require("./util").normalizeRanks; -var parentDummyChains = require("./parent-dummy-chains"); -var removeEmptyRanks = require("./util").removeEmptyRanks; -var nestingGraph = require("./nesting-graph"); -var addBorderSegments = require("./add-border-segments"); -var coordinateSystem = require("./coordinate-system"); -var order = require("./order"); -var position = require("./position"); -var util = require("./util"); -var Graph = require("@dagrejs/graphlib").Graph; +let acyclic = require("./acyclic"); +let normalize = require("./normalize"); +let rank = require("./rank"); +let normalizeRanks = require("./util").normalizeRanks; +let parentDummyChains = require("./parent-dummy-chains"); +let removeEmptyRanks = require("./util").removeEmptyRanks; +let nestingGraph = require("./nesting-graph"); +let addBorderSegments = require("./add-border-segments"); +let coordinateSystem = require("./coordinate-system"); +let order = require("./order"); +let position = require("./position"); +let util = require("./util"); +let Graph = require("@dagrejs/graphlib").Graph; module.exports = layout; function layout(g, opts) { - var time = opts && opts.debugTiming ? util.time : util.notime; - time("layout", function() { - var layoutGraph = - time(" buildLayoutGraph", function() { return buildLayoutGraph(g); }); - time(" runLayout", function() { runLayout(layoutGraph, time); }); - time(" updateInputGraph", function() { updateInputGraph(g, layoutGraph); }); + let time = opts && opts.debugTiming ? util.time : util.notime; + time("layout", () => { + let layoutGraph = + time(" buildLayoutGraph", () => buildLayoutGraph(g)); + time(" runLayout", () => runLayout(layoutGraph, time)); + time(" updateInputGraph", () => updateInputGraph(g, layoutGraph)); }); } function runLayout(g, time) { - time(" makeSpaceForEdgeLabels", function() { makeSpaceForEdgeLabels(g); }); - time(" removeSelfEdges", function() { removeSelfEdges(g); }); - time(" acyclic", function() { acyclic.run(g); }); - time(" nestingGraph.run", function() { nestingGraph.run(g); }); - time(" rank", function() { rank(util.asNonCompoundGraph(g)); }); - time(" injectEdgeLabelProxies", function() { injectEdgeLabelProxies(g); }); - time(" removeEmptyRanks", function() { removeEmptyRanks(g); }); - time(" nestingGraph.cleanup", function() { nestingGraph.cleanup(g); }); - time(" normalizeRanks", function() { normalizeRanks(g); }); - time(" assignRankMinMax", function() { assignRankMinMax(g); }); - time(" removeEdgeLabelProxies", function() { removeEdgeLabelProxies(g); }); - time(" normalize.run", function() { normalize.run(g); }); - time(" parentDummyChains", function() { parentDummyChains(g); }); - time(" addBorderSegments", function() { addBorderSegments(g); }); - time(" order", function() { order(g); }); - time(" insertSelfEdges", function() { insertSelfEdges(g); }); - time(" adjustCoordinateSystem", function() { coordinateSystem.adjust(g); }); - time(" position", function() { position(g); }); - time(" positionSelfEdges", function() { positionSelfEdges(g); }); - time(" removeBorderNodes", function() { removeBorderNodes(g); }); - time(" normalize.undo", function() { normalize.undo(g); }); - time(" fixupEdgeLabelCoords", function() { fixupEdgeLabelCoords(g); }); - time(" undoCoordinateSystem", function() { coordinateSystem.undo(g); }); - time(" translateGraph", function() { translateGraph(g); }); - time(" assignNodeIntersects", function() { assignNodeIntersects(g); }); - time(" reversePoints", function() { reversePointsForReversedEdges(g); }); - time(" acyclic.undo", function() { acyclic.undo(g); }); + time(" makeSpaceForEdgeLabels", () => makeSpaceForEdgeLabels(g)); + time(" removeSelfEdges", () => removeSelfEdges(g)); + time(" acyclic", () => acyclic.run(g)); + time(" nestingGraph.run", () => nestingGraph.run(g)); + time(" rank", () => rank(util.asNonCompoundGraph(g))); + time(" injectEdgeLabelProxies", () => injectEdgeLabelProxies(g)); + time(" removeEmptyRanks", () => removeEmptyRanks(g)); + time(" nestingGraph.cleanup", () => nestingGraph.cleanup(g)); + time(" normalizeRanks", () => normalizeRanks(g)); + time(" assignRankMinMax", () => assignRankMinMax(g)); + time(" removeEdgeLabelProxies", () => removeEdgeLabelProxies(g)); + time(" normalize.run", () => normalize.run(g)); + time(" parentDummyChains", () => parentDummyChains(g)); + time(" addBorderSegments", () => addBorderSegments(g)); + time(" order", () => order(g)); + time(" insertSelfEdges", () => insertSelfEdges(g)); + time(" adjustCoordinateSystem", () => coordinateSystem.adjust(g)); + time(" position", () => position(g)); + time(" positionSelfEdges", () => positionSelfEdges(g)); + time(" removeBorderNodes", () => removeBorderNodes(g)); + time(" normalize.undo", () => normalize.undo(g)); + time(" fixupEdgeLabelCoords", () => fixupEdgeLabelCoords(g)); + time(" undoCoordinateSystem", () => coordinateSystem.undo(g)); + time(" translateGraph", () => translateGraph(g)); + time(" assignNodeIntersects", () => assignNodeIntersects(g)); + time(" reversePoints", () => reversePointsForReversedEdges(g)); + time(" acyclic.undo", () => acyclic.undo(g)); } /* @@ -499,8 +499,8 @@ function runLayout(g, time) { */ function updateInputGraph(inputGraph, layoutGraph) { inputGraph.nodes().forEach(v => { - var inputLabel = inputGraph.node(v); - var layoutLabel = layoutGraph.node(v); + let inputLabel = inputGraph.node(v); + let layoutLabel = layoutGraph.node(v); if (inputLabel) { inputLabel.x = layoutLabel.x; @@ -515,8 +515,8 @@ function updateInputGraph(inputGraph, layoutGraph) { }); inputGraph.edges().forEach(e => { - var inputLabel = inputGraph.edge(e); - var layoutLabel = layoutGraph.edge(e); + let inputLabel = inputGraph.edge(e); + let layoutLabel = layoutGraph.edge(e); inputLabel.points = layoutLabel.points; if (layoutLabel.hasOwnProperty("x")) { @@ -529,17 +529,17 @@ function updateInputGraph(inputGraph, layoutGraph) { inputGraph.graph().height = layoutGraph.graph().height; } -var graphNumAttrs = ["nodesep", "edgesep", "ranksep", "marginx", "marginy"]; -var graphDefaults = { ranksep: 50, edgesep: 20, nodesep: 50, rankdir: "tb" }; -var graphAttrs = ["acyclicer", "ranker", "rankdir", "align"]; -var nodeNumAttrs = ["width", "height"]; -var nodeDefaults = { width: 0, height: 0 }; -var edgeNumAttrs = ["minlen", "weight", "width", "height", "labeloffset"]; -var edgeDefaults = { +let graphNumAttrs = ["nodesep", "edgesep", "ranksep", "marginx", "marginy"]; +let graphDefaults = { ranksep: 50, edgesep: 20, nodesep: 50, rankdir: "tb" }; +let graphAttrs = ["acyclicer", "ranker", "rankdir", "align"]; +let nodeNumAttrs = ["width", "height"]; +let nodeDefaults = { width: 0, height: 0 }; +let edgeNumAttrs = ["minlen", "weight", "width", "height", "labeloffset"]; +let edgeDefaults = { minlen: 1, weight: 1, width: 0, height: 0, labeloffset: 10, labelpos: "r" }; -var edgeAttrs = ["labelpos"]; +let edgeAttrs = ["labelpos"]; /* * Constructs a new graph from the input graph, which can be used for layout. @@ -548,8 +548,8 @@ var edgeAttrs = ["labelpos"]; * attributes can influence layout. */ function buildLayoutGraph(inputGraph) { - var g = new Graph({ multigraph: true, compound: true }); - var graph = canonicalize(inputGraph.graph()); + let g = new Graph({ multigraph: true, compound: true }); + let graph = canonicalize(inputGraph.graph()); g.setGraph(Object.assign({}, graphDefaults, @@ -557,7 +557,7 @@ function buildLayoutGraph(inputGraph) { util.pick(graph, graphAttrs))); inputGraph.nodes().forEach(v => { - var node = canonicalize(inputGraph.node(v)); + let node = canonicalize(inputGraph.node(v)); const newNode = selectNumberAttrs(node, nodeNumAttrs); Object.keys(nodeDefaults).forEach(k => { if (newNode[k] === undefined) { @@ -570,7 +570,7 @@ function buildLayoutGraph(inputGraph) { }); inputGraph.edges().forEach(e => { - var edge = canonicalize(inputGraph.edge(e)); + let edge = canonicalize(inputGraph.edge(e)); g.setEdge(e, Object.assign({}, edgeDefaults, selectNumberAttrs(edge, edgeNumAttrs), @@ -589,10 +589,10 @@ function buildLayoutGraph(inputGraph) { * away from the edge itself a bit. */ function makeSpaceForEdgeLabels(g) { - var graph = g.graph(); + let graph = g.graph(); graph.ranksep /= 2; g.edges().forEach(e => { - var edge = g.edge(e); + let edge = g.edge(e); edge.minlen *= 2; if (edge.labelpos.toLowerCase() !== "c") { if (graph.rankdir === "TB" || graph.rankdir === "BT") { @@ -612,20 +612,20 @@ function makeSpaceForEdgeLabels(g) { */ function injectEdgeLabelProxies(g) { g.edges().forEach(e => { - var edge = g.edge(e); + let edge = g.edge(e); if (edge.width && edge.height) { - var v = g.node(e.v); - var w = g.node(e.w); - var label = { rank: (w.rank - v.rank) / 2 + v.rank, e: e }; + let v = g.node(e.v); + let w = g.node(e.w); + let label = { rank: (w.rank - v.rank) / 2 + v.rank, e: e }; util.addDummyNode(g, "edge-proxy", label, "_ep"); } }); } function assignRankMinMax(g) { - var maxRank = 0; + let maxRank = 0; g.nodes().forEach(v => { - var node = g.node(v); + let node = g.node(v); if (node.borderTop) { node.minRank = g.node(node.borderTop).rank; node.maxRank = g.node(node.borderBottom).rank; @@ -637,7 +637,7 @@ function assignRankMinMax(g) { function removeEdgeLabelProxies(g) { g.nodes().forEach(v => { - var node = g.node(v); + let node = g.node(v); if (node.dummy === "edge-proxy") { g.edge(node.e).labelRank = node.rank; g.removeNode(v); @@ -646,19 +646,19 @@ function removeEdgeLabelProxies(g) { } function translateGraph(g) { - var minX = Number.POSITIVE_INFINITY; - var maxX = 0; - var minY = Number.POSITIVE_INFINITY; - var maxY = 0; - var graphLabel = g.graph(); - var marginX = graphLabel.marginx || 0; - var marginY = graphLabel.marginy || 0; + let minX = Number.POSITIVE_INFINITY; + let maxX = 0; + let minY = Number.POSITIVE_INFINITY; + let maxY = 0; + let graphLabel = g.graph(); + let marginX = graphLabel.marginx || 0; + let marginY = graphLabel.marginy || 0; function getExtremes(attrs) { - var x = attrs.x; - var y = attrs.y; - var w = attrs.width; - var h = attrs.height; + let x = attrs.x; + let y = attrs.y; + let w = attrs.width; + let h = attrs.height; minX = Math.min(minX, x - w / 2); maxX = Math.max(maxX, x + w / 2); minY = Math.min(minY, y - h / 2); @@ -667,7 +667,7 @@ function translateGraph(g) { g.nodes().forEach(v => getExtremes(g.node(v))); g.edges().forEach(e => { - var edge = g.edge(e); + let edge = g.edge(e); if (edge.hasOwnProperty("x")) { getExtremes(edge); } @@ -677,13 +677,13 @@ function translateGraph(g) { minY -= marginY; g.nodes().forEach(v => { - var node = g.node(v); + let node = g.node(v); node.x -= minX; node.y -= minY; }); g.edges().forEach(e => { - var edge = g.edge(e); + let edge = g.edge(e); edge.points.forEach(p => { p.x -= minX; p.y -= minY; @@ -698,10 +698,10 @@ function translateGraph(g) { function assignNodeIntersects(g) { g.edges().forEach(e => { - var edge = g.edge(e); - var nodeV = g.node(e.v); - var nodeW = g.node(e.w); - var p1, p2; + let edge = g.edge(e); + let nodeV = g.node(e.v); + let nodeW = g.node(e.w); + let p1, p2; if (!edge.points) { edge.points = []; p1 = nodeW; @@ -717,7 +717,7 @@ function assignNodeIntersects(g) { function fixupEdgeLabelCoords(g) { g.edges().forEach(e => { - var edge = g.edge(e); + let edge = g.edge(e); if (edge.hasOwnProperty("x")) { if (edge.labelpos === "l" || edge.labelpos === "r") { edge.width -= edge.labeloffset; @@ -732,7 +732,7 @@ function fixupEdgeLabelCoords(g) { function reversePointsForReversedEdges(g) { g.edges().forEach(e => { - var edge = g.edge(e); + let edge = g.edge(e); if (edge.reversed) { edge.points.reverse(); } @@ -742,11 +742,11 @@ function reversePointsForReversedEdges(g) { function removeBorderNodes(g) { g.nodes().forEach(v => { if (g.children(v).length) { - var node = g.node(v); - var t = g.node(node.borderTop); - var b = g.node(node.borderBottom); - var l = g.node(node.borderLeft[node.borderLeft.length - 1]); - var r = g.node(node.borderRight[node.borderRight.length - 1]); + let node = g.node(v); + let t = g.node(node.borderTop); + let b = g.node(node.borderBottom); + let l = g.node(node.borderLeft[node.borderLeft.length - 1]); + let r = g.node(node.borderRight[node.borderRight.length - 1]); node.width = Math.abs(r.x - l.x); node.height = Math.abs(b.y - t.y); @@ -840,17 +840,17 @@ function canonicalize(attrs) { } },{"./acyclic":2,"./add-border-segments":3,"./coordinate-system":4,"./nesting-graph":9,"./normalize":10,"./order":15,"./parent-dummy-chains":20,"./position":22,"./rank":24,"./util":27,"@dagrejs/graphlib":29}],9:[function(require,module,exports){ -var util = require("./util"); +let util = require("./util"); module.exports = { - run: run, - cleanup: cleanup + run, + cleanup, }; /* * A nesting graph creates dummy nodes for the tops and bottoms of subgraphs, * adds appropriate edges to ensure that all cluster nodes are placed between - * these boundries, and ensures that the graph is connected. + * these boundaries, and ensures that the graph is connected. * * In addition we ensure, through the use of the minlen property, that nodes * and subgraph border nodes to not end up on the same rank. @@ -871,10 +871,10 @@ module.exports = { * Graphs." */ function run(g) { - var root = util.addDummyNode(g, "root", {}, "_root"); - var depths = treeDepths(g); - var height = Math.max(...Object.values(depths)) - 1; // Note: depths is an Object not an array - var nodeSep = 2 * height + 1; + let root = util.addDummyNode(g, "root", {}, "_root"); + let depths = treeDepths(g); + let height = Math.max(...Object.values(depths)) - 1; // Note: depths is an Object not an array + let nodeSep = 2 * height + 1; g.graph().nestingRoot = root; @@ -882,12 +882,10 @@ function run(g) { g.edges().forEach(e => g.edge(e).minlen *= nodeSep); // Calculate a weight that is sufficient to keep subgraphs vertically compact - var weight = sumWeights(g) + 1; + let weight = sumWeights(g) + 1; // Create border nodes and link them up - g.children().forEach(function(child) { - dfs(g, root, nodeSep, weight, height, depths, child); - }); + g.children().forEach(child => dfs(g, root, nodeSep, weight, height, depths, child)); // Save the multiplier for node layers for later removal of empty border // layers. @@ -895,7 +893,7 @@ function run(g) { } function dfs(g, root, nodeSep, weight, height, depths, v) { - var children = g.children(v); + let children = g.children(v); if (!children.length) { if (v !== root) { g.setEdge(root, v, { weight: 0, minlen: nodeSep }); @@ -903,23 +901,23 @@ function dfs(g, root, nodeSep, weight, height, depths, v) { return; } - var top = util.addBorderNode(g, "_bt"); - var bottom = util.addBorderNode(g, "_bb"); - var label = g.node(v); + let top = util.addBorderNode(g, "_bt"); + let bottom = util.addBorderNode(g, "_bb"); + let label = g.node(v); g.setParent(top, v); label.borderTop = top; g.setParent(bottom, v); label.borderBottom = bottom; - children.forEach(function(child) { + children.forEach(child => { dfs(g, root, nodeSep, weight, height, depths, child); - var childNode = g.node(child); - var childTop = childNode.borderTop ? childNode.borderTop : child; - var childBottom = childNode.borderBottom ? childNode.borderBottom : child; - var thisWeight = childNode.borderTop ? weight : 2 * weight; - var minlen = childTop !== childBottom ? 1 : height - depths[v] + 1; + let childNode = g.node(child); + let childTop = childNode.borderTop ? childNode.borderTop : child; + let childBottom = childNode.borderBottom ? childNode.borderBottom : child; + let thisWeight = childNode.borderTop ? weight : 2 * weight; + let minlen = childTop !== childBottom ? 1 : height - depths[v] + 1; g.setEdge(top, childTop, { weight: thisWeight, @@ -971,7 +969,7 @@ function cleanup(g) { },{"./util":27}],10:[function(require,module,exports){ "use strict"; -var util = require("./util"); +let util = require("./util"); module.exports = { run: run, @@ -1000,19 +998,19 @@ function run(g) { } 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 = { @@ -1038,10 +1036,10 @@ function normalizeEdge(g, e) { } 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]; @@ -1063,11 +1061,11 @@ function undo(g) { module.exports = 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) { @@ -1117,12 +1115,12 @@ module.exports = 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 }; } 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), @@ -1141,8 +1139,8 @@ function barycenter(g, movable = []) { },{}],13:[function(require,module,exports){ -var Graph = require("@dagrejs/graphlib").Graph; -var util = require("../util"); +let Graph = require("@dagrejs/graphlib").Graph; +let util = require("../util"); module.exports = buildLayerGraph; @@ -1177,12 +1175,12 @@ module.exports = buildLayerGraph; * graph is not a multi-graph. */ function buildLayerGraph(g, rank, relationship) { - var root = createRootNode(g), + let root = createRootNode(g), result = new Graph({ compound: true }).setGraph({ root: root }) - .setDefaultNodeLabel(function(v) { return g.node(v); }); + .setDefaultNodeLabel(v => g.node(v)); - g.nodes().forEach(function(v) { - var node = 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) { @@ -1190,8 +1188,8 @@ function buildLayerGraph(g, rank, relationship) { 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 }); @@ -1218,7 +1216,7 @@ function createRootNode(g) { },{"../util":27,"@dagrejs/graphlib":29}],14:[function(require,module,exports){ "use strict"; -var zipObject = require("../util").zipObject; +let zipObject = require("../util").zipObject; module.exports = crossCount; @@ -1239,8 +1237,8 @@ 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) { + let cc = 0; + for (let i = 1; i < layering.length; ++i) { cc += twoLayerCrossCount(g, layering[i-1], layering[i]); } return cc; @@ -1250,26 +1248,26 @@ 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 = 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 }; }).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]; @@ -1286,13 +1284,13 @@ function twoLayerCrossCount(g, northLayer, southLayer) { },{"../util":27}],15:[function(require,module,exports){ "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"); +let initOrder = require("./init-order"); +let crossCount = require("./cross-count"); +let sortSubgraph = require("./sort-subgraph"); +let buildLayerGraph = require("./build-layer-graph"); +let addSubgraphConstraints = require("./add-subgraph-constraints"); +let Graph = require("@dagrejs/graphlib").Graph; +let util = require("../util"); module.exports = order; @@ -1312,21 +1310,21 @@ module.exports = order; * algorithm. */ function order(g) { - var maxRank = util.maxRank(g), + 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 = initOrder(g); assignOrder(g, layering); - var bestCC = Number.POSITIVE_INFINITY, + 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 = crossCount(g, layering); if (cc < bestCC) { lastBest = 0; best = Object.assign({}, layering); @@ -1344,10 +1342,10 @@ function buildLayerGraphs(g, ranks, relationship) { } function sweepLayerGraphs(layerGraphs, biasRight) { - var cg = new Graph(); + let cg = new Graph(); layerGraphs.forEach(function(lg) { - var root = lg.graph().root; - var sorted = sortSubgraph(lg, root, cg, biasRight); + let root = lg.graph().root; + let sorted = sortSubgraph(lg, root, cg, biasRight); sorted.vs.forEach((v, i) => lg.node(v).order = i); addSubgraphConstraints(lg, cg, sorted.vs); }); @@ -1360,7 +1358,7 @@ function assignOrder(g, layering) { },{"../util":27,"./add-subgraph-constraints":11,"./build-layer-graph":13,"./cross-count":14,"./init-order":16,"./sort-subgraph":18,"@dagrejs/graphlib":29}],16:[function(require,module,exports){ "use strict"; -var util = require("../util"); +let util = require("../util"); module.exports = initOrder; @@ -1376,20 +1374,20 @@ 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; @@ -1398,7 +1396,7 @@ function initOrder(g) { },{"../util":27}],17:[function(require,module,exports){ "use strict"; -var util = require("../util"); +let util = require("../util"); module.exports = resolveConflicts; @@ -1428,9 +1426,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: [], @@ -1444,24 +1442,24 @@ function resolveConflicts(entries, cg) { }); 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; } @@ -1474,7 +1472,7 @@ function doResolveConflicts(sourceSet) { } function handleOut(vEntry) { - return function(wEntry) { + return wEntry => { wEntry["in"].push(vEntry); if (--wEntry.indegree === 0) { sourceSet.push(wEntry); @@ -1483,7 +1481,7 @@ function doResolveConflicts(sourceSet) { } 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)); @@ -1495,8 +1493,8 @@ function doResolveConflicts(sourceSet) { } function mergeEntries(target, source) { - var sum = 0; - var weight = 0; + let sum = 0; + let weight = 0; if (target.weight) { sum += target.barycenter * target.weight; @@ -1516,27 +1514,27 @@ function mergeEntries(target, source) { } },{"../util":27}],18:[function(require,module,exports){ -var barycenter = require("./barycenter"); -var resolveConflicts = require("./resolve-conflicts"); -var sort = require("./sort"); +let barycenter = require("./barycenter"); +let resolveConflicts = require("./resolve-conflicts"); +let sort = require("./sort"); module.exports = sortSubgraph; 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 = barycenter(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); @@ -1544,15 +1542,15 @@ function sortSubgraph(g, v, cg, biasRight) { } }); - var entries = resolveConflicts(barycenters, cg); + let entries = resolveConflicts(barycenters, cg); expandSubgraphs(entries, subgraphs); - var result = sort(entries, biasRight); + let result = sort(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; @@ -1568,8 +1566,8 @@ function sortSubgraph(g, v, cg, biasRight) { } 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; } @@ -1591,15 +1589,15 @@ function mergeBarycenters(target, other) { } },{"./barycenter":12,"./resolve-conflicts":17,"./sort":19}],19:[function(require,module,exports){ -var util = require("../util"); +let util = require("../util"); module.exports = sort; 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, @@ -1610,7 +1608,7 @@ function sort(entries, 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; @@ -1618,7 +1616,7 @@ function sort(entries, biasRight) { 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; @@ -1627,7 +1625,7 @@ function sort(entries, biasRight) { } 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); @@ -1637,7 +1635,7 @@ function consumeUnsortable(vs, unsortable, index) { } function compareWithBias(bias) { - return function(entryV, entryW) { + return (entryV, entryW) => { if (entryV.barycenter < entryW.barycenter) { return -1; } else if (entryV.barycenter > entryW.barycenter) { @@ -1652,17 +1650,17 @@ function compareWithBias(bias) { module.exports = 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); @@ -1695,12 +1693,12 @@ 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; @@ -1721,11 +1719,11 @@ function findPath(g, postorderNums, v, w) { } 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++ }; } @@ -1737,8 +1735,8 @@ function postorder(g) { },{}],21:[function(require,module,exports){ "use strict"; -var Graph = require("@dagrejs/graphlib").Graph; -var util = require("../util"); +let Graph = require("@dagrejs/graphlib").Graph; +let util = require("../util"); /* * This module provides coordinate assignment based on Brandes and Köpf, "Fast @@ -1776,10 +1774,10 @@ module.exports = { * single node in the layers being scanned. */ function findType1Conflicts(g, layering) { - var conflicts = {}; + let conflicts = {}; function visitLayer(prevLayer, layer) { - var + let // last visited node in the previous layer that is incident on an inner // segment. k0 = 0, @@ -1789,14 +1787,14 @@ function findType1Conflicts(g, layering) { prevLayerLength = prevLayer.length, lastNode = layer[layer.length - 1]; - layer.forEach(function(v, i) { - var w = findOtherInnerSegmentNode(g, v), + layer.forEach((v, i) => { + let w = findOtherInnerSegmentNode(g, v), k1 = w ? g.node(w).order : prevLayerLength; if (w || v === lastNode) { - layer.slice(scanPos, i+1).forEach(function(scanNode) { - g.predecessors(scanNode).forEach(function(u) { - var uLabel = g.node(u), + layer.slice(scanPos, i+1).forEach(scanNode => { + g.predecessors(scanNode).forEach(u => { + let uLabel = g.node(u), uPos = uLabel.order; if ((uPos < k0 || k1 < uPos) && !(uLabel.dummy && g.node(scanNode).dummy)) { @@ -1817,15 +1815,15 @@ function findType1Conflicts(g, layering) { } function findType2Conflicts(g, layering) { - var conflicts = {}; + let conflicts = {}; function scan(south, southPos, southEnd, prevNorthBorder, nextNorthBorder) { - var v; - util.range(southPos, southEnd).forEach(function(i) { + let v; + util.range(southPos, southEnd).forEach(i => { v = south[i]; if (g.node(v).dummy) { - g.predecessors(v).forEach(function(u) { - var uNode = g.node(u); + g.predecessors(v).forEach(u => { + let uNode = g.node(u); if (uNode.dummy && (uNode.order < prevNorthBorder || uNode.order > nextNorthBorder)) { addConflict(conflicts, u, v); @@ -1837,13 +1835,13 @@ function findType2Conflicts(g, layering) { function visitLayer(north, south) { - var prevNorthPos = -1, + let prevNorthPos = -1, nextNorthPos, southPos = 0; - south.forEach(function(v, southLookahead) { + south.forEach((v, southLookahead) => { if (g.node(v).dummy === "border") { - var predecessors = g.predecessors(v); + let predecessors = g.predecessors(v); if (predecessors.length) { nextNorthPos = g.node(predecessors[0]).order; scan(south, southPos, southLookahead, prevNorthPos, nextNorthPos); @@ -1869,12 +1867,12 @@ function findOtherInnerSegmentNode(g, v) { function addConflict(conflicts, v, w) { if (v > w) { - var tmp = v; + let tmp = v; v = w; w = tmp; } - var conflictsV = conflicts[v]; + let conflictsV = conflicts[v]; if (!conflictsV) { conflicts[v] = conflictsV = {}; } @@ -1883,7 +1881,7 @@ function addConflict(conflicts, v, w) { function hasConflict(conflicts, v, w) { if (v > w) { - var tmp = v; + let tmp = v; v = w; w = tmp; } @@ -1899,30 +1897,30 @@ function hasConflict(conflicts, v, w) { * blocks would be split in that scenario. */ function verticalAlignment(g, layering, conflicts, neighborFn) { - var root = {}, + let root = {}, align = {}, pos = {}; // We cache the position here based on the layering because the graph and // layering may be out of sync. The layering matrix is manipulated to // generate different extreme alignments. - layering.forEach(function(layer) { - layer.forEach(function(v, order) { + layering.forEach(layer => { + layer.forEach((v, order) => { root[v] = v; align[v] = v; pos[v] = order; }); }); - layering.forEach(function(layer) { - var prevIdx = -1; - layer.forEach(function(v) { - var ws = neighborFn(v); + layering.forEach(layer => { + let prevIdx = -1; + layer.forEach(v => { + let ws = neighborFn(v); if (ws.length) { ws = ws.sort((a, b) => pos[a] - pos[b]); - var mp = (ws.length - 1) / 2; - for (var i = Math.floor(mp), il = Math.ceil(mp); i <= il; ++i) { - var w = ws[i]; + let mp = (ws.length - 1) / 2; + for (let i = Math.floor(mp), il = Math.ceil(mp); i <= il; ++i) { + let w = ws[i]; if (align[v] === v && prevIdx < pos[w] && !hasConflict(conflicts, v, w)) { @@ -1944,14 +1942,14 @@ function horizontalCompaction(g, layering, root, align, reverseSep) { // sweeps. The first sweep places blocks with the smallest possible // coordinates. The second sweep removes unused space by moving blocks to the // greatest coordinates without violating separation. - var xs = {}, + let xs = {}, blockG = buildBlockGraph(g, layering, root, reverseSep), borderType = reverseSep ? "borderLeft" : "borderRight"; function iterate(setXsFunc, nextNodesFunc) { - var stack = blockG.nodes(); - var elem = stack.pop(); - var visited = {}; + let stack = blockG.nodes(); + let elem = stack.pop(); + let visited = {}; while (elem) { if (visited[elem]) { setXsFunc(elem); @@ -1967,18 +1965,18 @@ function horizontalCompaction(g, layering, root, align, reverseSep) { // First pass, assign smallest coordinates function pass1(elem) { - xs[elem] = blockG.inEdges(elem).reduce(function(acc, e) { + xs[elem] = blockG.inEdges(elem).reduce((acc, e) => { return Math.max(acc, xs[e.v] + blockG.edge(e)); }, 0); } // Second pass, assign greatest coordinates function pass2(elem) { - var min = blockG.outEdges(elem).reduce(function(acc, e) { + let min = blockG.outEdges(elem).reduce((acc, e) => { return Math.min(acc, xs[e.w] - blockG.edge(e)); }, Number.POSITIVE_INFINITY); - var node = g.node(elem); + let node = g.node(elem); if (min !== Number.POSITIVE_INFINITY && node.borderType !== borderType) { xs[elem] = Math.max(xs[elem], min); } @@ -1995,14 +1993,14 @@ function horizontalCompaction(g, layering, root, align, reverseSep) { function buildBlockGraph(g, layering, root, reverseSep) { - var blockGraph = new Graph(), + let blockGraph = new Graph(), graphLabel = g.graph(), sepFn = sep(graphLabel.nodesep, graphLabel.edgesep, reverseSep); - layering.forEach(function(layer) { - var u; - layer.forEach(function(v) { - var vRoot = root[v]; + layering.forEach(layer => { + let u; + layer.forEach(v => { + let vRoot = root[v]; blockGraph.setNode(vRoot); if (u) { var uRoot = root[u], @@ -2021,11 +2019,11 @@ function buildBlockGraph(g, layering, root, reverseSep) { */ function findSmallestWidthAlignment(g, xss) { return Object.values(xss).reduce((currentMinAndXs, xs) => { - var max = Number.NEGATIVE_INFINITY; - var min = Number.POSITIVE_INFINITY; + let max = Number.NEGATIVE_INFINITY; + let min = Number.POSITIVE_INFINITY; Object.entries(xs).forEach(([v, x]) => { - var halfWidth = width(g, v) / 2; + let halfWidth = width(g, v) / 2; max = Math.max(x + halfWidth, max); min = Math.min(x - halfWidth, min); @@ -2047,18 +2045,18 @@ function findSmallestWidthAlignment(g, xss) { * coordinate of the smallest width alignment. */ function alignCoordinates(xss, alignTo) { - var alignToVals = Object.values(alignTo), + let alignToVals = Object.values(alignTo), alignToMin = Math.min(...alignToVals), alignToMax = Math.max(...alignToVals); - ["u", "d"].forEach(function(vert) { - ["l", "r"].forEach(function(horiz) { - var alignment = vert + horiz, + ["u", "d"].forEach(vert => { + ["l", "r"].forEach(horiz => { + let alignment = vert + horiz, xs = xss[alignment]; if (xs === alignTo) return; - var xsVals = Object.values(xs); + let xsVals = Object.values(xs); let delta = alignToMin - Math.min(...xsVals); if (horiz !== "l") { delta = alignToMax - Math.max(...xsVals); @@ -2072,36 +2070,36 @@ function alignCoordinates(xss, alignTo) { } function balance(xss, align) { - return util.mapValues(xss.ul, function(num, v) { + return util.mapValues(xss.ul, (num, v) => { if (align) { return xss[align.toLowerCase()][v]; } else { - var xs = Object.values(xss).map(xs => xs[v]).sort((a, b) => a - b); + let xs = Object.values(xss).map(xs => xs[v]).sort((a, b) => a - b); return (xs[1] + xs[2]) / 2; } }); } function positionX(g) { - var layering = util.buildLayerMatrix(g); - var conflicts = Object.assign( + let layering = util.buildLayerMatrix(g); + let conflicts = Object.assign( findType1Conflicts(g, layering), findType2Conflicts(g, layering)); - var xss = {}; - var adjustedLayering; - ["u", "d"].forEach(function(vert) { + let xss = {}; + let adjustedLayering; + ["u", "d"].forEach(vert => { adjustedLayering = vert === "u" ? layering : Object.values(layering).reverse(); - ["l", "r"].forEach(function(horiz) { + ["l", "r"].forEach(horiz => { if (horiz === "r") { adjustedLayering = adjustedLayering.map(inner => { return Object.values(inner).reverse(); }); } - var neighborFn = (vert === "u" ? g.predecessors : g.successors).bind(g); - var align = verticalAlignment(g, adjustedLayering, conflicts, neighborFn); - var xs = horizontalCompaction(g, adjustedLayering, + let neighborFn = (vert === "u" ? g.predecessors : g.successors).bind(g); + let align = verticalAlignment(g, adjustedLayering, conflicts, neighborFn); + let xs = horizontalCompaction(g, adjustedLayering, align.root, align.align, horiz === "r"); if (horiz === "r") { xs = util.mapValues(xs, x => -x); @@ -2111,17 +2109,17 @@ function positionX(g) { }); - var smallestWidth = findSmallestWidthAlignment(g, xss); + let smallestWidth = findSmallestWidthAlignment(g, xss); alignCoordinates(xss, smallestWidth); return balance(xss, g.graph().align); } function sep(nodeSep, edgeSep, reverseSep) { - return function(g, v, w) { - var vLabel = g.node(v); - var wLabel = g.node(w); - var sum = 0; - var delta; + return (g, v, w) => { + let vLabel = g.node(v); + let wLabel = g.node(w); + let sum = 0; + let delta; sum += vLabel.width / 2; if (vLabel.hasOwnProperty("labelpos")) { @@ -2161,8 +2159,8 @@ function width(g, v) { },{"../util":27,"@dagrejs/graphlib":29}],22:[function(require,module,exports){ "use strict"; -var util = require("../util"); -var positionX = require("./bk").positionX; +let util = require("../util"); +let positionX = require("./bk").positionX; module.exports = position; @@ -2174,10 +2172,10 @@ function position(g) { } function positionY(g) { - var layering = util.buildLayerMatrix(g); - var rankSep = g.graph().ranksep; - var prevY = 0; - layering.forEach(function(layer) { + let layering = util.buildLayerMatrix(g); + let rankSep = g.graph().ranksep; + let prevY = 0; + layering.forEach(layer => { const maxHeight = layer.reduce((acc, v) => { const height = g.node(v).height; if (acc > height) { @@ -2249,7 +2247,7 @@ function feasibleTree(g) { */ function tightTree(t, g) { function dfs(v) { - g.nodeEdges(v).forEach(function(e) { + g.nodeEdges(v).forEach(e => { var edgeV = e.v, w = (v === edgeV) ? e.w : edgeV; if (!t.hasNode(w) && !slack(g, e)) { @@ -2442,7 +2440,7 @@ function calcCutValue(t, g, child) { cutValue = graphEdge.weight; - g.nodeEdges(child).forEach(function(e) { + g.nodeEdges(child).forEach(e => { var isOutEdge = e.v === child, other = isOutEdge ? e.w : e.v; @@ -2473,7 +2471,7 @@ function dfsAssignLowLim(tree, visited, nextLim, v, parent) { var label = tree.node(v); visited[v] = true; - tree.neighbors(v).forEach(function(w) { + tree.neighbors(v).forEach(w => { if (!visited.hasOwnProperty(w)) { nextLim = dfsAssignLowLim(tree, visited, nextLim, w, v); } @@ -2519,7 +2517,7 @@ function enterEdge(t, g, edge) { flip = true; } - var candidates = g.edges().filter(function(edge) { + var candidates = g.edges().filter(edge => { return flip === isDescendant(t, t.node(edge.v), tailLabel) && flip !== isDescendant(t, t.node(edge.w), tailLabel); }); @@ -2547,7 +2545,7 @@ function updateRanks(t, g) { var root = t.nodes().find(v => !g.node(v).parent); var vs = preorder(t, root); vs = vs.slice(1); - vs.forEach(function(v) { + vs.forEach(v => { var parent = t.node(v).parent, edge = g.edge(v, parent), flipped = false; @@ -2646,7 +2644,7 @@ function slack(g, e) { "use strict"; -var Graph = require("@dagrejs/graphlib").Graph; +let Graph = require("@dagrejs/graphlib").Graph; module.exports = { addBorderNode, @@ -2674,7 +2672,7 @@ module.exports = { * Adds a dummy node to the graph and return v. */ function addDummyNode(g, type, attrs, name) { - var v; + let v; do { v = uniqueId(name); } while (g.hasNode(v)); @@ -2689,11 +2687,11 @@ function addDummyNode(g, type, attrs, name) { * associated with multi-edges. */ function simplify(g) { - var simplified = new 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 => { - var simpleLabel = simplified.edge(e.v, e.w) || { weight: 0, minlen: 1 }; - var label = g.edge(e); + 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, minlen: Math.max(simpleLabel.minlen, label.minlen) @@ -2703,7 +2701,7 @@ function simplify(g) { } function asNonCompoundGraph(g) { - var simplified = new 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)); @@ -2716,8 +2714,8 @@ function asNonCompoundGraph(g) { } function successorWeights(g) { - var weightMap = g.nodes().map(v => { - var sucs = {}; + let weightMap = g.nodes().map(v => { + let sucs = {}; g.outEdges(v).forEach(e => { sucs[e.w] = (sucs[e.w] || 0) + g.edge(e).weight; }); @@ -2727,8 +2725,8 @@ function successorWeights(g) { } function predecessorWeights(g) { - var weightMap = g.nodes().map(v => { - var preds = {}; + let weightMap = g.nodes().map(v => { + let preds = {}; g.inEdges(v).forEach(e => { preds[e.v] = (preds[e.v] || 0) + g.edge(e).weight; }); @@ -2742,21 +2740,21 @@ function predecessorWeights(g) { * ({x, y, width, height}) if it were pointing at the rectangle's center. */ function intersectRect(rect, point) { - var x = rect.x; - var y = rect.y; + let x = rect.x; + let y = rect.y; // Rectangle intersection algorithm from: // http://math.stackexchange.com/questions/108113/find-edge-between-two-boxes - var dx = point.x - x; - var dy = point.y - y; - var w = rect.width / 2; - var h = rect.height / 2; + let dx = point.x - x; + 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"); } - var sx, sy; + let sx, sy; if (Math.abs(dy) * w > Math.abs(dx) * h) { // Intersection is top or bottom of rect. if (dy < 0) { @@ -2781,10 +2779,10 @@ function intersectRect(rect, point) { * function will produce a matrix with the ids of each node. */ function buildLayerMatrix(g) { - var layering = range(maxRank(g) + 1).map(() => []); + let layering = range(maxRank(g) + 1).map(() => []); g.nodes().forEach(v => { - var node = g.node(v); - var rank = node.rank; + let node = g.node(v); + let rank = node.rank; if (rank !== undefined) { layering[rank][node.order] = v; } @@ -2797,8 +2795,8 @@ function buildLayerMatrix(g) { * rank(v) >= 0 and at least one node w has rank(w) = 0. */ function normalizeRanks(g) { - var min = Math.min(...g.nodes().map(v => { - var rank = g.node(v).rank; + let min = Math.min(...g.nodes().map(v => { + let rank = g.node(v).rank; if (rank === undefined) { return Number.MAX_VALUE; } @@ -2806,7 +2804,7 @@ function normalizeRanks(g) { return rank; })); g.nodes().forEach(v => { - var node = g.node(v); + let node = g.node(v); if (node.hasOwnProperty("rank")) { node.rank -= min; } @@ -2815,19 +2813,19 @@ function normalizeRanks(g) { function removeEmptyRanks(g) { // Ranks may not start at 0, so we need to offset them - var offset = Math.min(...g.nodes().map(v => g.node(v).rank)); + let offset = Math.min(...g.nodes().map(v => g.node(v).rank)); - var layers = []; + let layers = []; g.nodes().forEach(v => { - var rank = g.node(v).rank - offset; + let rank = g.node(v).rank - offset; if (!layers[rank]) { layers[rank] = []; } layers[rank].push(v); }); - var delta = 0; - var nodeRankFactor = g.graph().nodeRankFactor; + let delta = 0; + let nodeRankFactor = g.graph().nodeRankFactor; Array.from(layers).forEach((vs, i) => { if (vs === undefined && i % nodeRankFactor !== 0) { --delta; @@ -2838,7 +2836,7 @@ function removeEmptyRanks(g) { } function addBorderNode(g, prefix, rank, order) { - var node = { + let node = { width: 0, height: 0 }; @@ -2851,7 +2849,7 @@ function addBorderNode(g, prefix, rank, order) { function maxRank(g) { return Math.max(...g.nodes().map(v => { - var rank = g.node(v).rank; + let rank = g.node(v).rank; if (rank === undefined) { return Number.MIN_VALUE; } @@ -2866,7 +2864,7 @@ function maxRank(g) { * into `rhs. */ function partition(collection, fn) { - var result = { lhs: [], rhs: [] }; + let result = { lhs: [], rhs: [] }; collection.forEach(value => { if (fn(value)) { result.lhs.push(value); @@ -2882,7 +2880,7 @@ function partition(collection, fn) { * time it takes to execute the function. */ function time(name, fn) { - var start = Date.now(); + let start = Date.now(); try { return fn(); } finally { @@ -2950,7 +2948,7 @@ function zipObject(props, values) { } },{"@dagrejs/graphlib":29}],28:[function(require,module,exports){ -module.exports = "1.0.2"; +module.exports = "1.0.4"; },{}],29:[function(require,module,exports){ /** diff --git a/dist/dagre.min.js b/dist/dagre.min.js index b10d4840..4e08965e 100644 --- a/dist/dagre.min.js +++ b/dist/dagre.min.js @@ -20,37 +20,37 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -module.exports={graphlib:require("@dagrejs/graphlib"),layout:require("./lib/layout"),debug:require("./lib/debug"),util:{time:require("./lib/util").time,notime:require("./lib/util").notime},version:require("./lib/version")}},{"./lib/debug":6,"./lib/layout":8,"./lib/util":27,"./lib/version":28,"@dagrejs/graphlib":29}],2:[function(require,module,exports){"use strict";var greedyFAS=require("./greedy-fas");var uniqueId=require("./util").uniqueId;module.exports={run:run,undo:undo};function run(g){var fas=g.graph().acyclicer==="greedy"?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"))});function weightFn(g){return function(e){return g.edge(e).weight}}}function dfsFAS(g){var fas=[];var stack={};var visited={};function dfs(v){if(visited.hasOwnProperty(v)){return}visited[v]=true;stack[v]=true;g.outEdges(v).forEach(function(e){if(stack.hasOwnProperty(e.w)){fas.push(e)}else{dfs(e.w)}});delete stack[v]}g.nodes().forEach(dfs);return fas}function undo(g){g.edges().forEach(function(e){var label=g.edge(e);if(label.reversed){g.removeEdge(e);var forwardName=label.forwardName;delete label.reversed;delete label.forwardName;g.setEdge(e.w,e.v,label,forwardName)}})}},{"./greedy-fas":7,"./util":27}],3:[function(require,module,exports){var util=require("./util");module.exports=addBorderSegments;function addBorderSegments(g){function dfs(v){var children=g.children(v);var node=g.node(v);if(children.length){children.forEach(dfs)}if(node.hasOwnProperty("minRank")){node.borderLeft=[];node.borderRight=[];for(var rank=node.minRank,maxRank=node.maxRank+1;rankswapWidthHeightOne(g.node(v)));g.edges().forEach(e=>swapWidthHeightOne(g.edge(e)))}function swapWidthHeightOne(attrs){var w=attrs.width;attrs.width=attrs.height;attrs.height=w}function reverseY(g){g.nodes().forEach(v=>reverseYOne(g.node(v)));g.edges().forEach(function(e){var edge=g.edge(e);edge.points.forEach(reverseYOne);if(edge.hasOwnProperty("y")){reverseYOne(edge)}})}function reverseYOne(attrs){attrs.y=-attrs.y}function swapXY(g){g.nodes().forEach(v=>swapXYOne(g.node(v)));g.edges().forEach(function(e){var edge=g.edge(e);edge.points.forEach(swapXYOne);if(edge.hasOwnProperty("x")){swapXYOne(edge)}})}function swapXYOne(attrs){var x=attrs.x;attrs.x=attrs.y;attrs.y=x}},{}],5:[function(require,module,exports){ +module.exports={graphlib:require("@dagrejs/graphlib"),layout:require("./lib/layout"),debug:require("./lib/debug"),util:{time:require("./lib/util").time,notime:require("./lib/util").notime},version:require("./lib/version")}},{"./lib/debug":6,"./lib/layout":8,"./lib/util":27,"./lib/version":28,"@dagrejs/graphlib":29}],2:[function(require,module,exports){"use strict";let greedyFAS=require("./greedy-fas");let uniqueId=require("./util").uniqueId;module.exports={run:run,undo:undo};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}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)}})}},{"./greedy-fas":7,"./util":27}],3:[function(require,module,exports){let util=require("./util");module.exports=addBorderSegments;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;rankswapWidthHeightOne(g.node(v)));g.edges().forEach(e=>swapWidthHeightOne(g.edge(e)))}function swapWidthHeightOne(attrs){let w=attrs.width;attrs.width=attrs.height;attrs.height=w}function reverseY(g){g.nodes().forEach(v=>reverseYOne(g.node(v)));g.edges().forEach(e=>{let edge=g.edge(e);edge.points.forEach(reverseYOne);if(edge.hasOwnProperty("y")){reverseYOne(edge)}})}function reverseYOne(attrs){attrs.y=-attrs.y}function swapXY(g){g.nodes().forEach(v=>swapXYOne(g.node(v)));g.edges().forEach(e=>{let edge=g.edge(e);edge.points.forEach(swapXYOne);if(edge.hasOwnProperty("x")){swapXYOne(edge)}})}function swapXYOne(attrs){let x=attrs.x;attrs.x=attrs.y;attrs.y=x}},{}],5:[function(require,module,exports){ /* * Simple doubly linked list implementation derived from Cormen, et al., * "Introduction to Algorithms". */ -module.exports=List;function List(){var sentinel={};sentinel._next=sentinel._prev=sentinel;this._sentinel=sentinel}List.prototype.dequeue=function(){var sentinel=this._sentinel;var entry=sentinel._prev;if(entry!==sentinel){unlink(entry);return entry}};List.prototype.enqueue=function(entry){var sentinel=this._sentinel;if(entry._prev&&entry._next){unlink(entry)}entry._next=sentinel._next;sentinel._next._prev=entry;sentinel._next=entry;entry._prev=sentinel};List.prototype.toString=function(){var strs=[];var sentinel=this._sentinel;var curr=sentinel._prev;while(curr!==sentinel){strs.push(JSON.stringify(curr,filterOutLinks));curr=curr._prev}return"["+strs.join(", ")+"]"};function unlink(entry){entry._prev._next=entry._next;entry._next._prev=entry._prev;delete entry._next;delete entry._prev}function filterOutLinks(k,v){if(k!=="_next"&&k!=="_prev"){return v}}},{}],6:[function(require,module,exports){var util=require("./util");var Graph=require("@dagrejs/graphlib").Graph;module.exports={debugOrdering:debugOrdering}; -/* istanbul ignore next */function debugOrdering(g){var layerMatrix=util.buildLayerMatrix(g);var h=new Graph({compound:true,multigraph:true}).setGraph({});g.nodes().forEach(function(v){h.setNode(v,{label:v});h.setParent(v,"layer"+g.node(v).rank)});g.edges().forEach(function(e){h.setEdge(e.v,e.w,{},e.name)});layerMatrix.forEach(function(layer,i){var layerV="layer"+i;h.setNode(layerV,{rank:"same"});layer.reduce(function(u,v){h.setEdge(u,v,{style:"invis"});return v})});return h}},{"./util":27,"@dagrejs/graphlib":29}],7:[function(require,module,exports){var Graph=require("@dagrejs/graphlib").Graph;var List=require("./data/list"); +class List{constructor(){let sentinel={};sentinel._next=sentinel._prev=sentinel;this._sentinel=sentinel}dequeue(){let sentinel=this._sentinel;let entry=sentinel._prev;if(entry!==sentinel){unlink(entry);return entry}}enqueue(entry){let sentinel=this._sentinel;if(entry._prev&&entry._next){unlink(entry)}entry._next=sentinel._next;sentinel._next._prev=entry;sentinel._next=entry;entry._prev=sentinel}toString(){let strs=[];let sentinel=this._sentinel;let curr=sentinel._prev;while(curr!==sentinel){strs.push(JSON.stringify(curr,filterOutLinks));curr=curr._prev}return"["+strs.join(", ")+"]"}}function unlink(entry){entry._prev._next=entry._next;entry._next._prev=entry._prev;delete entry._next;delete entry._prev}function filterOutLinks(k,v){if(k!=="_next"&&k!=="_prev"){return v}}module.exports=List},{}],6:[function(require,module,exports){let util=require("./util");let Graph=require("@dagrejs/graphlib").Graph;module.exports={debugOrdering:debugOrdering}; +/* istanbul ignore next */function debugOrdering(g){let layerMatrix=util.buildLayerMatrix(g);let h=new Graph({compound:true,multigraph:true}).setGraph({});g.nodes().forEach(v=>{h.setNode(v,{label:v});h.setParent(v,"layer"+g.node(v).rank)});g.edges().forEach(e=>h.setEdge(e.v,e.w,{},e.name));layerMatrix.forEach((layer,i)=>{let layerV="layer"+i;h.setNode(layerV,{rank:"same"});layer.reduce((u,v)=>{h.setEdge(u,v,{style:"invis"});return v})});return h}},{"./util":27,"@dagrejs/graphlib":29}],7:[function(require,module,exports){let Graph=require("@dagrejs/graphlib").Graph;let List=require("./data/list"); /* * A greedy heuristic for finding a feedback arc set for a graph. A feedback * arc set is a set of edges that can be removed to make a graph acyclic. * The algorithm comes from: P. Eades, X. Lin, and W. F. Smyth, "A fast and * effective heuristic for the feedback arc set problem." This implementation * adjusts that from the paper to allow for weighted edges. - */module.exports=greedyFAS;var DEFAULT_WEIGHT_FN=()=>1;function greedyFAS(g,weightFn){if(g.nodeCount()<=1){return[]}var state=buildState(g,weightFn||DEFAULT_WEIGHT_FN);var results=doGreedyFAS(state.graph,state.buckets,state.zeroIdx); + */module.exports=greedyFAS;let DEFAULT_WEIGHT_FN=()=>1;function greedyFAS(g,weightFn){if(g.nodeCount()<=1){return[]}let state=buildState(g,weightFn||DEFAULT_WEIGHT_FN);let results=doGreedyFAS(state.graph,state.buckets,state.zeroIdx); // Expand multi-edges -return results.flatMap(e=>g.outEdges(e.v,e.w))}function doGreedyFAS(g,buckets,zeroIdx){var results=[];var sources=buckets[buckets.length-1];var sinks=buckets[0];var entry;while(g.nodeCount()){while(entry=sinks.dequeue()){removeNode(g,buckets,zeroIdx,entry)}while(entry=sources.dequeue()){removeNode(g,buckets,zeroIdx,entry)}if(g.nodeCount()){for(var i=buckets.length-2;i>0;--i){entry=buckets[i].dequeue();if(entry){results=results.concat(removeNode(g,buckets,zeroIdx,entry,true));break}}}}return results}function removeNode(g,buckets,zeroIdx,entry,collectPredecessors){var results=collectPredecessors?[]:undefined;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})}uEntry.out-=weight;assignBucket(buckets,zeroIdx,uEntry)});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)});g.removeNode(entry.v);return results}function buildState(g,weightFn){var fasGraph=new Graph;var maxIn=0;var maxOut=0;g.nodes().forEach(function(v){fasGraph.setNode(v,{v:v,in:0,out:0})}); +return results.flatMap(e=>g.outEdges(e.v,e.w))}function doGreedyFAS(g,buckets,zeroIdx){let results=[];let sources=buckets[buckets.length-1];let sinks=buckets[0];let entry;while(g.nodeCount()){while(entry=sinks.dequeue()){removeNode(g,buckets,zeroIdx,entry)}while(entry=sources.dequeue()){removeNode(g,buckets,zeroIdx,entry)}if(g.nodeCount()){for(let i=buckets.length-2;i>0;--i){entry=buckets[i].dequeue();if(entry){results=results.concat(removeNode(g,buckets,zeroIdx,entry,true));break}}}}return results}function removeNode(g,buckets,zeroIdx,entry,collectPredecessors){let results=collectPredecessors?[]:undefined;g.inEdges(entry.v).forEach(edge=>{let weight=g.edge(edge);let uEntry=g.node(edge.v);if(collectPredecessors){results.push({v:edge.v,w:edge.w})}uEntry.out-=weight;assignBucket(buckets,zeroIdx,uEntry)});g.outEdges(entry.v).forEach(edge=>{let weight=g.edge(edge);let w=edge.w;let wEntry=g.node(w);wEntry["in"]-=weight;assignBucket(buckets,zeroIdx,wEntry)});g.removeNode(entry.v);return results}function buildState(g,weightFn){let fasGraph=new Graph;let maxIn=0;let maxOut=0;g.nodes().forEach(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. -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(()=>new List);var zeroIdx=maxIn+1;fasGraph.nodes().forEach(function(v){assignBucket(buckets,zeroIdx,fasGraph.node(v))});return{graph:fasGraph,buckets:buckets,zeroIdx:zeroIdx}}function assignBucket(buckets,zeroIdx,entry){if(!entry.out){buckets[0].enqueue(entry)}else if(!entry["in"]){buckets[buckets.length-1].enqueue(entry)}else{buckets[entry.out-entry["in"]+zeroIdx].enqueue(entry)}}function range(limit){const range=[];for(let i=0;i{let prevWeight=fasGraph.edge(e.v,e.w)||0;let weight=weightFn(e);let 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)});let buckets=range(maxOut+maxIn+3).map(()=>new List);let zeroIdx=maxIn+1;fasGraph.nodes().forEach(v=>{assignBucket(buckets,zeroIdx,fasGraph.node(v))});return{graph:fasGraph,buckets:buckets,zeroIdx:zeroIdx}}function assignBucket(buckets,zeroIdx,entry){if(!entry.out){buckets[0].enqueue(entry)}else if(!entry["in"]){buckets[buckets.length-1].enqueue(entry)}else{buckets[entry.out-entry["in"]+zeroIdx].enqueue(entry)}}function range(limit){const range=[];for(let i=0;i{let layoutGraph=time(" buildLayoutGraph",()=>buildLayoutGraph(g));time(" runLayout",()=>runLayout(layoutGraph,time));time(" updateInputGraph",()=>updateInputGraph(g,layoutGraph))})}function runLayout(g,time){time(" makeSpaceForEdgeLabels",()=>makeSpaceForEdgeLabels(g));time(" removeSelfEdges",()=>removeSelfEdges(g));time(" acyclic",()=>acyclic.run(g));time(" nestingGraph.run",()=>nestingGraph.run(g));time(" rank",()=>rank(util.asNonCompoundGraph(g)));time(" injectEdgeLabelProxies",()=>injectEdgeLabelProxies(g));time(" removeEmptyRanks",()=>removeEmptyRanks(g));time(" nestingGraph.cleanup",()=>nestingGraph.cleanup(g));time(" normalizeRanks",()=>normalizeRanks(g));time(" assignRankMinMax",()=>assignRankMinMax(g));time(" removeEdgeLabelProxies",()=>removeEdgeLabelProxies(g));time(" normalize.run",()=>normalize.run(g));time(" parentDummyChains",()=>parentDummyChains(g));time(" addBorderSegments",()=>addBorderSegments(g));time(" order",()=>order(g));time(" insertSelfEdges",()=>insertSelfEdges(g));time(" adjustCoordinateSystem",()=>coordinateSystem.adjust(g));time(" position",()=>position(g));time(" positionSelfEdges",()=>positionSelfEdges(g));time(" removeBorderNodes",()=>removeBorderNodes(g));time(" normalize.undo",()=>normalize.undo(g));time(" fixupEdgeLabelCoords",()=>fixupEdgeLabelCoords(g));time(" undoCoordinateSystem",()=>coordinateSystem.undo(g));time(" translateGraph",()=>translateGraph(g));time(" assignNodeIntersects",()=>assignNodeIntersects(g));time(" reversePoints",()=>reversePointsForReversedEdges(g));time(" acyclic.undo",()=>acyclic.undo(g))} /* * Copies final layout information from the layout graph back to the input * graph. This process only copies whitelisted attributes from the layout graph * to the input graph, so it serves as a good place to determine what * attributes can influence layout. - */function updateInputGraph(inputGraph,layoutGraph){inputGraph.nodes().forEach(v=>{var inputLabel=inputGraph.node(v);var layoutLabel=layoutGraph.node(v);if(inputLabel){inputLabel.x=layoutLabel.x;inputLabel.y=layoutLabel.y;inputLabel.rank=layoutLabel.rank;if(layoutGraph.children(v).length){inputLabel.width=layoutLabel.width;inputLabel.height=layoutLabel.height}}});inputGraph.edges().forEach(e=>{var inputLabel=inputGraph.edge(e);var layoutLabel=layoutGraph.edge(e);inputLabel.points=layoutLabel.points;if(layoutLabel.hasOwnProperty("x")){inputLabel.x=layoutLabel.x;inputLabel.y=layoutLabel.y}});inputGraph.graph().width=layoutGraph.graph().width;inputGraph.graph().height=layoutGraph.graph().height}var graphNumAttrs=["nodesep","edgesep","ranksep","marginx","marginy"];var graphDefaults={ranksep:50,edgesep:20,nodesep:50,rankdir:"tb"};var graphAttrs=["acyclicer","ranker","rankdir","align"];var nodeNumAttrs=["width","height"];var nodeDefaults={width:0,height:0};var edgeNumAttrs=["minlen","weight","width","height","labeloffset"];var edgeDefaults={minlen:1,weight:1,width:0,height:0,labeloffset:10,labelpos:"r"};var edgeAttrs=["labelpos"]; + */function updateInputGraph(inputGraph,layoutGraph){inputGraph.nodes().forEach(v=>{let inputLabel=inputGraph.node(v);let layoutLabel=layoutGraph.node(v);if(inputLabel){inputLabel.x=layoutLabel.x;inputLabel.y=layoutLabel.y;inputLabel.rank=layoutLabel.rank;if(layoutGraph.children(v).length){inputLabel.width=layoutLabel.width;inputLabel.height=layoutLabel.height}}});inputGraph.edges().forEach(e=>{let inputLabel=inputGraph.edge(e);let layoutLabel=layoutGraph.edge(e);inputLabel.points=layoutLabel.points;if(layoutLabel.hasOwnProperty("x")){inputLabel.x=layoutLabel.x;inputLabel.y=layoutLabel.y}});inputGraph.graph().width=layoutGraph.graph().width;inputGraph.graph().height=layoutGraph.graph().height}let graphNumAttrs=["nodesep","edgesep","ranksep","marginx","marginy"];let graphDefaults={ranksep:50,edgesep:20,nodesep:50,rankdir:"tb"};let graphAttrs=["acyclicer","ranker","rankdir","align"];let nodeNumAttrs=["width","height"];let nodeDefaults={width:0,height:0};let edgeNumAttrs=["minlen","weight","width","height","labeloffset"];let edgeDefaults={minlen:1,weight:1,width:0,height:0,labeloffset:10,labelpos:"r"};let edgeAttrs=["labelpos"]; /* * Constructs a new graph from the input graph, which can be used for layout. * This process copies only whitelisted attributes from the input graph to the * layout graph. Thus this function serves as a good place to determine what * attributes can influence layout. - */function buildLayoutGraph(inputGraph){var g=new Graph({multigraph:true,compound:true});var graph=canonicalize(inputGraph.graph());g.setGraph(Object.assign({},graphDefaults,selectNumberAttrs(graph,graphNumAttrs),util.pick(graph,graphAttrs)));inputGraph.nodes().forEach(v=>{var node=canonicalize(inputGraph.node(v));const newNode=selectNumberAttrs(node,nodeNumAttrs);Object.keys(nodeDefaults).forEach(k=>{if(newNode[k]===undefined){newNode[k]=nodeDefaults[k]}});g.setNode(v,newNode);g.setParent(v,inputGraph.parent(v))});inputGraph.edges().forEach(e=>{var edge=canonicalize(inputGraph.edge(e));g.setEdge(e,Object.assign({},edgeDefaults,selectNumberAttrs(edge,edgeNumAttrs),util.pick(edge,edgeAttrs)))});return g} + */function buildLayoutGraph(inputGraph){let g=new Graph({multigraph:true,compound:true});let graph=canonicalize(inputGraph.graph());g.setGraph(Object.assign({},graphDefaults,selectNumberAttrs(graph,graphNumAttrs),util.pick(graph,graphAttrs)));inputGraph.nodes().forEach(v=>{let node=canonicalize(inputGraph.node(v));const newNode=selectNumberAttrs(node,nodeNumAttrs);Object.keys(nodeDefaults).forEach(k=>{if(newNode[k]===undefined){newNode[k]=nodeDefaults[k]}});g.setNode(v,newNode);g.setParent(v,inputGraph.parent(v))});inputGraph.edges().forEach(e=>{let edge=canonicalize(inputGraph.edge(e));g.setEdge(e,Object.assign({},edgeDefaults,selectNumberAttrs(edge,edgeNumAttrs),util.pick(edge,edgeAttrs)))});return g} /* * This idea comes from the Gansner paper: to account for edge labels in our * layout we split each rank in half by doubling minlen and halving ranksep. @@ -58,13 +58,13 @@ g.edges().forEach(function(e){var prevWeight=fasGraph.edge(e.v,e.w)||0;var weigh * * We also add some minimal padding to the width to push the label for the edge * away from the edge itself a bit. - */function makeSpaceForEdgeLabels(g){var graph=g.graph();graph.ranksep/=2;g.edges().forEach(e=>{var edge=g.edge(e);edge.minlen*=2;if(edge.labelpos.toLowerCase()!=="c"){if(graph.rankdir==="TB"||graph.rankdir==="BT"){edge.width+=edge.labeloffset}else{edge.height+=edge.labeloffset}}})} + */function makeSpaceForEdgeLabels(g){let graph=g.graph();graph.ranksep/=2;g.edges().forEach(e=>{let edge=g.edge(e);edge.minlen*=2;if(edge.labelpos.toLowerCase()!=="c"){if(graph.rankdir==="TB"||graph.rankdir==="BT"){edge.width+=edge.labeloffset}else{edge.height+=edge.labeloffset}}})} /* * Creates temporary dummy nodes that capture the rank in which each edge's * label is going to, if it has one of non-zero width and height. We do this * so that we can safely remove empty ranks while preserving balance for the * label's position. - */function injectEdgeLabelProxies(g){g.edges().forEach(e=>{var edge=g.edge(e);if(edge.width&&edge.height){var v=g.node(e.v);var w=g.node(e.w);var label={rank:(w.rank-v.rank)/2+v.rank,e:e};util.addDummyNode(g,"edge-proxy",label,"_ep")}})}function assignRankMinMax(g){var maxRank=0;g.nodes().forEach(v=>{var node=g.node(v);if(node.borderTop){node.minRank=g.node(node.borderTop).rank;node.maxRank=g.node(node.borderBottom).rank;maxRank=Math.max(maxRank,node.maxRank)}});g.graph().maxRank=maxRank}function removeEdgeLabelProxies(g){g.nodes().forEach(v=>{var node=g.node(v);if(node.dummy==="edge-proxy"){g.edge(node.e).labelRank=node.rank;g.removeNode(v)}})}function translateGraph(g){var minX=Number.POSITIVE_INFINITY;var maxX=0;var minY=Number.POSITIVE_INFINITY;var maxY=0;var graphLabel=g.graph();var marginX=graphLabel.marginx||0;var marginY=graphLabel.marginy||0;function getExtremes(attrs){var x=attrs.x;var y=attrs.y;var w=attrs.width;var h=attrs.height;minX=Math.min(minX,x-w/2);maxX=Math.max(maxX,x+w/2);minY=Math.min(minY,y-h/2);maxY=Math.max(maxY,y+h/2)}g.nodes().forEach(v=>getExtremes(g.node(v)));g.edges().forEach(e=>{var edge=g.edge(e);if(edge.hasOwnProperty("x")){getExtremes(edge)}});minX-=marginX;minY-=marginY;g.nodes().forEach(v=>{var node=g.node(v);node.x-=minX;node.y-=minY});g.edges().forEach(e=>{var edge=g.edge(e);edge.points.forEach(p=>{p.x-=minX;p.y-=minY});if(edge.hasOwnProperty("x")){edge.x-=minX}if(edge.hasOwnProperty("y")){edge.y-=minY}});graphLabel.width=maxX-minX+marginX;graphLabel.height=maxY-minY+marginY}function assignNodeIntersects(g){g.edges().forEach(e=>{var edge=g.edge(e);var nodeV=g.node(e.v);var nodeW=g.node(e.w);var p1,p2;if(!edge.points){edge.points=[];p1=nodeW;p2=nodeV}else{p1=edge.points[0];p2=edge.points[edge.points.length-1]}edge.points.unshift(util.intersectRect(nodeV,p1));edge.points.push(util.intersectRect(nodeW,p2))})}function fixupEdgeLabelCoords(g){g.edges().forEach(e=>{var edge=g.edge(e);if(edge.hasOwnProperty("x")){if(edge.labelpos==="l"||edge.labelpos==="r"){edge.width-=edge.labeloffset}switch(edge.labelpos){case"l":edge.x-=edge.width/2+edge.labeloffset;break;case"r":edge.x+=edge.width/2+edge.labeloffset;break}}})}function reversePointsForReversedEdges(g){g.edges().forEach(e=>{var edge=g.edge(e);if(edge.reversed){edge.points.reverse()}})}function removeBorderNodes(g){g.nodes().forEach(v=>{if(g.children(v).length){var node=g.node(v);var t=g.node(node.borderTop);var b=g.node(node.borderBottom);var l=g.node(node.borderLeft[node.borderLeft.length-1]);var r=g.node(node.borderRight[node.borderRight.length-1]);node.width=Math.abs(r.x-l.x);node.height=Math.abs(b.y-t.y);node.x=l.x+node.width/2;node.y=t.y+node.height/2}});g.nodes().forEach(v=>{if(g.node(v).dummy==="border"){g.removeNode(v)}})}function removeSelfEdges(g){g.edges().forEach(e=>{if(e.v===e.w){var node=g.node(e.v);if(!node.selfEdges){node.selfEdges=[]}node.selfEdges.push({e:e,label:g.edge(e)});g.removeEdge(e)}})}function insertSelfEdges(g){var layers=util.buildLayerMatrix(g);layers.forEach(layer=>{var orderShift=0;layer.forEach((v,i)=>{var node=g.node(v);node.order=i+orderShift;(node.selfEdges||[]).forEach(selfEdge=>{util.addDummyNode(g,"selfedge",{width:selfEdge.label.width,height:selfEdge.label.height,rank:node.rank,order:i+ ++orderShift,e:selfEdge.e,label:selfEdge.label},"_se")});delete node.selfEdges})})}function positionSelfEdges(g){g.nodes().forEach(v=>{var node=g.node(v);if(node.dummy==="selfedge"){var selfNode=g.node(node.e.v);var x=selfNode.x+selfNode.width/2;var y=selfNode.y;var dx=node.x-x;var dy=selfNode.height/2;g.setEdge(node.e,node.label);g.removeNode(v);node.label.points=[{x:x+2*dx/3,y:y-dy},{x:x+5*dx/6,y:y-dy},{x:x+dx,y:y},{x:x+5*dx/6,y:y+dy},{x:x+2*dx/3,y:y+dy}];node.label.x=node.x;node.label.y=node.y}})}function selectNumberAttrs(obj,attrs){return util.mapValues(util.pick(obj,attrs),Number)}function canonicalize(attrs){var newAttrs={};if(attrs){Object.entries(attrs).forEach(([k,v])=>{if(typeof k==="string"){k=k.toLowerCase()}newAttrs[k]=v})}return newAttrs}},{"./acyclic":2,"./add-border-segments":3,"./coordinate-system":4,"./nesting-graph":9,"./normalize":10,"./order":15,"./parent-dummy-chains":20,"./position":22,"./rank":24,"./util":27,"@dagrejs/graphlib":29}],9:[function(require,module,exports){var util=require("./util");module.exports={run:run,cleanup:cleanup}; + */function injectEdgeLabelProxies(g){g.edges().forEach(e=>{let edge=g.edge(e);if(edge.width&&edge.height){let v=g.node(e.v);let w=g.node(e.w);let label={rank:(w.rank-v.rank)/2+v.rank,e:e};util.addDummyNode(g,"edge-proxy",label,"_ep")}})}function assignRankMinMax(g){let maxRank=0;g.nodes().forEach(v=>{let node=g.node(v);if(node.borderTop){node.minRank=g.node(node.borderTop).rank;node.maxRank=g.node(node.borderBottom).rank;maxRank=Math.max(maxRank,node.maxRank)}});g.graph().maxRank=maxRank}function removeEdgeLabelProxies(g){g.nodes().forEach(v=>{let node=g.node(v);if(node.dummy==="edge-proxy"){g.edge(node.e).labelRank=node.rank;g.removeNode(v)}})}function translateGraph(g){let minX=Number.POSITIVE_INFINITY;let maxX=0;let minY=Number.POSITIVE_INFINITY;let maxY=0;let graphLabel=g.graph();let marginX=graphLabel.marginx||0;let marginY=graphLabel.marginy||0;function getExtremes(attrs){let x=attrs.x;let y=attrs.y;let w=attrs.width;let h=attrs.height;minX=Math.min(minX,x-w/2);maxX=Math.max(maxX,x+w/2);minY=Math.min(minY,y-h/2);maxY=Math.max(maxY,y+h/2)}g.nodes().forEach(v=>getExtremes(g.node(v)));g.edges().forEach(e=>{let edge=g.edge(e);if(edge.hasOwnProperty("x")){getExtremes(edge)}});minX-=marginX;minY-=marginY;g.nodes().forEach(v=>{let node=g.node(v);node.x-=minX;node.y-=minY});g.edges().forEach(e=>{let edge=g.edge(e);edge.points.forEach(p=>{p.x-=minX;p.y-=minY});if(edge.hasOwnProperty("x")){edge.x-=minX}if(edge.hasOwnProperty("y")){edge.y-=minY}});graphLabel.width=maxX-minX+marginX;graphLabel.height=maxY-minY+marginY}function assignNodeIntersects(g){g.edges().forEach(e=>{let edge=g.edge(e);let nodeV=g.node(e.v);let nodeW=g.node(e.w);let p1,p2;if(!edge.points){edge.points=[];p1=nodeW;p2=nodeV}else{p1=edge.points[0];p2=edge.points[edge.points.length-1]}edge.points.unshift(util.intersectRect(nodeV,p1));edge.points.push(util.intersectRect(nodeW,p2))})}function fixupEdgeLabelCoords(g){g.edges().forEach(e=>{let edge=g.edge(e);if(edge.hasOwnProperty("x")){if(edge.labelpos==="l"||edge.labelpos==="r"){edge.width-=edge.labeloffset}switch(edge.labelpos){case"l":edge.x-=edge.width/2+edge.labeloffset;break;case"r":edge.x+=edge.width/2+edge.labeloffset;break}}})}function reversePointsForReversedEdges(g){g.edges().forEach(e=>{let edge=g.edge(e);if(edge.reversed){edge.points.reverse()}})}function removeBorderNodes(g){g.nodes().forEach(v=>{if(g.children(v).length){let node=g.node(v);let t=g.node(node.borderTop);let b=g.node(node.borderBottom);let l=g.node(node.borderLeft[node.borderLeft.length-1]);let r=g.node(node.borderRight[node.borderRight.length-1]);node.width=Math.abs(r.x-l.x);node.height=Math.abs(b.y-t.y);node.x=l.x+node.width/2;node.y=t.y+node.height/2}});g.nodes().forEach(v=>{if(g.node(v).dummy==="border"){g.removeNode(v)}})}function removeSelfEdges(g){g.edges().forEach(e=>{if(e.v===e.w){var node=g.node(e.v);if(!node.selfEdges){node.selfEdges=[]}node.selfEdges.push({e:e,label:g.edge(e)});g.removeEdge(e)}})}function insertSelfEdges(g){var layers=util.buildLayerMatrix(g);layers.forEach(layer=>{var orderShift=0;layer.forEach((v,i)=>{var node=g.node(v);node.order=i+orderShift;(node.selfEdges||[]).forEach(selfEdge=>{util.addDummyNode(g,"selfedge",{width:selfEdge.label.width,height:selfEdge.label.height,rank:node.rank,order:i+ ++orderShift,e:selfEdge.e,label:selfEdge.label},"_se")});delete node.selfEdges})})}function positionSelfEdges(g){g.nodes().forEach(v=>{var node=g.node(v);if(node.dummy==="selfedge"){var selfNode=g.node(node.e.v);var x=selfNode.x+selfNode.width/2;var y=selfNode.y;var dx=node.x-x;var dy=selfNode.height/2;g.setEdge(node.e,node.label);g.removeNode(v);node.label.points=[{x:x+2*dx/3,y:y-dy},{x:x+5*dx/6,y:y-dy},{x:x+dx,y:y},{x:x+5*dx/6,y:y+dy},{x:x+2*dx/3,y:y+dy}];node.label.x=node.x;node.label.y=node.y}})}function selectNumberAttrs(obj,attrs){return util.mapValues(util.pick(obj,attrs),Number)}function canonicalize(attrs){var newAttrs={};if(attrs){Object.entries(attrs).forEach(([k,v])=>{if(typeof k==="string"){k=k.toLowerCase()}newAttrs[k]=v})}return newAttrs}},{"./acyclic":2,"./add-border-segments":3,"./coordinate-system":4,"./nesting-graph":9,"./normalize":10,"./order":15,"./parent-dummy-chains":20,"./position":22,"./rank":24,"./util":27,"@dagrejs/graphlib":29}],9:[function(require,module,exports){let util=require("./util");module.exports={run:run,cleanup:cleanup}; /* * A nesting graph creates dummy nodes for the tops and bottoms of subgraphs, * adds appropriate edges to ensure that all cluster nodes are placed between @@ -87,17 +87,17 @@ g.edges().forEach(function(e){var prevWeight=fasGraph.edge(e.v,e.w)||0;var weigh * * The nesting graph idea comes from Sander, "Layout of Compound Directed * Graphs." - */function run(g){var root=util.addDummyNode(g,"root",{},"_root");var depths=treeDepths(g);var height=Math.max(...Object.values(depths))-1;// Note: depths is an Object not an array -var nodeSep=2*height+1;g.graph().nestingRoot=root; + */function run(g){let root=util.addDummyNode(g,"root",{},"_root");let depths=treeDepths(g);let height=Math.max(...Object.values(depths))-1;// Note: depths is an Object not an array +let nodeSep=2*height+1;g.graph().nestingRoot=root; // Multiply minlen by nodeSep to align nodes on non-border ranks. g.edges().forEach(e=>g.edge(e).minlen*=nodeSep); // Calculate a weight that is sufficient to keep subgraphs vertically compact -var weight=sumWeights(g)+1; +let weight=sumWeights(g)+1; // Create border nodes and link them up -g.children().forEach(function(child){dfs(g,root,nodeSep,weight,height,depths,child)}); +g.children().forEach(child=>dfs(g,root,nodeSep,weight,height,depths,child)); // Save the multiplier for node layers for later removal of empty border // layers. -g.graph().nodeRankFactor=nodeSep}function dfs(g,root,nodeSep,weight,height,depths,v){var children=g.children(v);if(!children.length){if(v!==root){g.setEdge(root,v,{weight:0,minlen:nodeSep})}return}var top=util.addBorderNode(g,"_bt");var bottom=util.addBorderNode(g,"_bb");var label=g.node(v);g.setParent(top,v);label.borderTop=top;g.setParent(bottom,v);label.borderBottom=bottom;children.forEach(function(child){dfs(g,root,nodeSep,weight,height,depths,child);var childNode=g.node(child);var childTop=childNode.borderTop?childNode.borderTop:child;var childBottom=childNode.borderBottom?childNode.borderBottom:child;var thisWeight=childNode.borderTop?weight:2*weight;var minlen=childTop!==childBottom?1:height-depths[v]+1;g.setEdge(top,childTop,{weight:thisWeight,minlen:minlen,nestingEdge:true});g.setEdge(childBottom,bottom,{weight:thisWeight,minlen:minlen,nestingEdge:true})});if(!g.parent(v)){g.setEdge(root,top,{weight:0,minlen:height+depths[v]})}}function treeDepths(g){var depths={};function dfs(v,depth){var children=g.children(v);if(children&&children.length){children.forEach(child=>dfs(child,depth+1))}depths[v]=depth}g.children().forEach(v=>dfs(v,1));return depths}function sumWeights(g){return g.edges().reduce((acc,e)=>acc+g.edge(e).weight,0)}function cleanup(g){var graphLabel=g.graph();g.removeNode(graphLabel.nestingRoot);delete graphLabel.nestingRoot;g.edges().forEach(e=>{var edge=g.edge(e);if(edge.nestingEdge){g.removeEdge(e)}})}},{"./util":27}],10:[function(require,module,exports){"use strict";var util=require("./util");module.exports={run:run,undo:undo}; +g.graph().nodeRankFactor=nodeSep}function dfs(g,root,nodeSep,weight,height,depths,v){let children=g.children(v);if(!children.length){if(v!==root){g.setEdge(root,v,{weight:0,minlen:nodeSep})}return}let top=util.addBorderNode(g,"_bt");let bottom=util.addBorderNode(g,"_bb");let label=g.node(v);g.setParent(top,v);label.borderTop=top;g.setParent(bottom,v);label.borderBottom=bottom;children.forEach(child=>{dfs(g,root,nodeSep,weight,height,depths,child);let childNode=g.node(child);let childTop=childNode.borderTop?childNode.borderTop:child;let childBottom=childNode.borderBottom?childNode.borderBottom:child;let thisWeight=childNode.borderTop?weight:2*weight;let minlen=childTop!==childBottom?1:height-depths[v]+1;g.setEdge(top,childTop,{weight:thisWeight,minlen:minlen,nestingEdge:true});g.setEdge(childBottom,bottom,{weight:thisWeight,minlen:minlen,nestingEdge:true})});if(!g.parent(v)){g.setEdge(root,top,{weight:0,minlen:height+depths[v]})}}function treeDepths(g){var depths={};function dfs(v,depth){var children=g.children(v);if(children&&children.length){children.forEach(child=>dfs(child,depth+1))}depths[v]=depth}g.children().forEach(v=>dfs(v,1));return depths}function sumWeights(g){return g.edges().reduce((acc,e)=>acc+g.edge(e).weight,0)}function cleanup(g){var graphLabel=g.graph();g.removeNode(graphLabel.nestingRoot);delete graphLabel.nestingRoot;g.edges().forEach(e=>{var edge=g.edge(e);if(edge.nestingEdge){g.removeEdge(e)}})}},{"./util":27}],10:[function(require,module,exports){"use strict";let util=require("./util");module.exports={run:run,undo:undo}; /* * Breaks any long edges in the graph into short segments that span 1 layer * each. This operation is undoable with the denormalize function. @@ -113,7 +113,7 @@ g.graph().nodeRankFactor=nodeSep}function dfs(g,root,nodeSep,weight,height,depth * 2. Dummy nodes are added where edges have been split into segments. * 3. The graph is augmented with a "dummyChains" attribute which contains * the first dummy in each chain of dummy nodes produced. - */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;if(wRank===vRank+1)return;g.removeEdge(e);var dummy,attrs,i;for(i=0,++vRank;vRanknormalizeEdge(g,edge))}function normalizeEdge(g,e){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);let dummy,attrs,i;for(i=0,++vRank;vRank{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});if(node.dummy==="edge-label"){origLabel.x=node.x;origLabel.y=node.y;origLabel.width=node.width;origLabel.height=node.height}v=w;node=g.node(v)}})}},{"./util":27}],11:[function(require,module,exports){module.exports=addSubgraphConstraints;function addSubgraphConstraints(g,cg,vs){let prev={},rootPrev;vs.forEach(v=>{let child=g.parent(v),parent,prevChild;while(child){parent=g.parent(child);if(parent){prevChild=prev[parent];prev[parent]=child}else{prevChild=rootPrev;rootPrev=child}if(prevChild&&prevChild!==child){cg.setEdge(prevChild,child);return}child=parent}}); /* function dfs(v) { var children = v ? g.children(v) : g.children(); @@ -136,7 +136,7 @@ g.graph().nodeRankFactor=nodeSep}function dfs(g,root,nodeSep,weight,height,depth return g.node(v).order; } dfs(undefined); - */}},{}],12:[function(require,module,exports){module.exports=barycenter;function barycenter(g,movable=[]){return movable.map(v=>{var inV=g.inEdges(v);if(!inV.length){return{v:v}}else{var result=inV.reduce((acc,e)=>{var edge=g.edge(e),nodeU=g.node(e.v);return{sum:acc.sum+edge.weight*nodeU.order,weight:acc.weight+edge.weight}},{sum:0,weight:0});return{v:v,barycenter:result.sum/result.weight,weight:result.weight}}})}},{}],13:[function(require,module,exports){var Graph=require("@dagrejs/graphlib").Graph;var util=require("../util");module.exports=buildLayerGraph; + */}},{}],12:[function(require,module,exports){module.exports=barycenter;function barycenter(g,movable=[]){return movable.map(v=>{let inV=g.inEdges(v);if(!inV.length){return{v:v}}else{let result=inV.reduce((acc,e)=>{let edge=g.edge(e),nodeU=g.node(e.v);return{sum:acc.sum+edge.weight*nodeU.order,weight:acc.weight+edge.weight}},{sum:0,weight:0});return{v:v,barycenter:result.sum/result.weight,weight:result.weight}}})}},{}],13:[function(require,module,exports){let Graph=require("@dagrejs/graphlib").Graph;let util=require("../util");module.exports=buildLayerGraph; /* * 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 @@ -166,9 +166,9 @@ g.graph().nodeRankFactor=nodeSep}function dfs(g,root,nodeSep,weight,height,depth * parameter, are added to the output graph. * 5. The weights for copied edges are aggregated as need, since the output * 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),parent=g.parent(v);if(node.rank===rank||node.minRank<=rank&&rank<=node.maxRank){result.setNode(v);result.setParent(v,parent||root); + */function buildLayerGraph(g,rank,relationship){let root=createRootNode(g),result=new 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,edge=result.edge(u,v),weight=edge!==undefined?edge.weight:0;result.setEdge(u,v,{weight:g.edge(e).weight+weight})});if(node.hasOwnProperty("minRank")){result.setNode(v,{borderLeft:node.borderLeft[rank],borderRight:node.borderRight[rank]})}}});return result}function createRootNode(g){var v;while(g.hasNode(v=util.uniqueId("_root")));return v}},{"../util":27,"@dagrejs/graphlib":29}],14:[function(require,module,exports){"use strict";var zipObject=require("../util").zipObject;module.exports=crossCount; +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})});if(node.hasOwnProperty("minRank")){result.setNode(v,{borderLeft:node.borderLeft[rank],borderRight:node.borderRight[rank]})}}});return result}function createRootNode(g){var v;while(g.hasNode(v=util.uniqueId("_root")));return v}},{"../util":27,"@dagrejs/graphlib":29}],14:[function(require,module,exports){"use strict";let zipObject=require("../util").zipObject;module.exports=crossCount; /* * 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. @@ -184,15 +184,15 @@ g[relationship](v).forEach(function(e){var u=e.v===v?e.w:e.v,edge=result.edge(u, * 1. The graph and layering matrix are left unchanged. * * This algorithm is derived from Barth, et al., "Bilayer Cross Counting." - */function crossCount(g,layering){var cc=0;for(var i=1;ii));var southEntries=northLayer.flatMap(v=>{return g.outEdges(v).map(e=>{return{pos:southPos[e.w],weight:g.edge(e).weight}}).sort((a,b)=>a.pos-b.pos)}); +let southPos=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}}).sort((a,b)=>a.pos-b.pos)}); // Build the accumulator tree -var firstIndex=1;while(firstIndex{var index=entry.pos+firstIndex;tree[index]+=entry.weight;var weightSum=0;while(index>0){if(index%2){weightSum+=tree[index+1]}index=index-1>>1;tree[index]+=entry.weight}cc+=entry.weight*weightSum});return cc}},{"../util":27}],15:[function(require,module,exports){"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; +let cc=0;southEntries.forEach(entry=>{let index=entry.pos+firstIndex;tree[index]+=entry.weight;let weightSum=0;while(index>0){if(index%2){weightSum+=tree[index+1]}index=index-1>>1;tree[index]+=entry.weight}cc+=entry.weight*weightSum});return cc}},{"../util":27}],15:[function(require,module,exports){"use strict";let initOrder=require("./init-order");let crossCount=require("./cross-count");let sortSubgraph=require("./sort-subgraph");let buildLayerGraph=require("./build-layer-graph");let addSubgraphConstraints=require("./add-subgraph-constraints");let Graph=require("@dagrejs/graphlib").Graph;let util=require("../util");module.exports=order; /* * Applies heuristics to minimize edge crossings in the graph and sets the best * order solution as an order attribute on each node. @@ -207,7 +207,7 @@ var cc=0;southEntries.forEach(entry=>{var index=entry.pos+firstIndex;tree[index] * * 1. Graph nodes will have an "order" attribute based on the results of the * algorithm. - */function order(g){var 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);assignOrder(g,layering);var bestCC=Number.POSITIVE_INFINITY,best;for(var 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);if(cclg.node(v).order=i);addSubgraphConstraints(lg,cg,sorted.vs)})}function assignOrder(g,layering){Object.values(layering).forEach(layer=>layer.forEach((v,i)=>g.node(v).order=i))}},{"../util":27,"./add-subgraph-constraints":11,"./build-layer-graph":13,"./cross-count":14,"./init-order":16,"./sort-subgraph":18,"@dagrejs/graphlib":29}],16:[function(require,module,exports){"use strict";var util=require("../util");module.exports=initOrder; + */function order(g){let maxRank=util.maxRank(g),downLayerGraphs=buildLayerGraphs(g,util.range(1,maxRank+1),"inEdges"),upLayerGraphs=buildLayerGraphs(g,util.range(maxRank-1,-1,-1),"outEdges");let layering=initOrder(g);assignOrder(g,layering);let bestCC=Number.POSITIVE_INFINITY,best;for(let i=0,lastBest=0;lastBest<4;++i,++lastBest){sweepLayerGraphs(i%2?downLayerGraphs:upLayerGraphs,i%4>=2);layering=util.buildLayerMatrix(g);let cc=crossCount(g,layering);if(cclg.node(v).order=i);addSubgraphConstraints(lg,cg,sorted.vs)})}function assignOrder(g,layering){Object.values(layering).forEach(layer=>layer.forEach((v,i)=>g.node(v).order=i))}},{"../util":27,"./add-subgraph-constraints":11,"./build-layer-graph":13,"./cross-count":14,"./init-order":16,"./sort-subgraph":18,"@dagrejs/graphlib":29}],16:[function(require,module,exports){"use strict";let util=require("../util");module.exports=initOrder; /* * 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 @@ -218,7 +218,7 @@ var cc=0;southEntries.forEach(entry=>{var index=entry.pos+firstIndex;tree[index] * * Returns a layering matrix with an array per layer and each layer sorted by * 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(()=>[]);function dfs(v){if(visited[v])return;visited[v]=true;var 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);orderedVs.forEach(dfs);return layers}},{"../util":27}],17:[function(require,module,exports){"use strict";var util=require("../util");module.exports=resolveConflicts; + */function initOrder(g){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;let node=g.node(v);layers[node.rank].push(v);g.successors(v).forEach(dfs)}let orderedVs=simpleNodes.sort((a,b)=>g.node(a).rank-g.node(b).rank);orderedVs.forEach(dfs);return layers}},{"../util":27}],17:[function(require,module,exports){"use strict";let util=require("../util");module.exports=resolveConflicts; /* * Given a list of entries of the form {v, barycenter, weight} and a * constraint graph this function will resolve any conflicts between the @@ -243,14 +243,14 @@ var cc=0;southEntries.forEach(entry=>{var index=entry.pos+firstIndex;tree[index] * ordered such that they do not violate constraints from the constraint * graph. The property `i` is the lowest original index of any of the * elements in `vs`. - */function resolveConflicts(entries,cg){var mappedEntries={};entries.forEach((entry,i)=>{var tmp=mappedEntries[entry.v]={indegree:0,in:[],out:[],vs:[entry.v],i:i};if(entry.barycenter!==undefined){tmp.barycenter=entry.barycenter;tmp.weight=entry.weight}});cg.edges().forEach(e=>{var entryV=mappedEntries[e.v];var 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);return doResolveConflicts(sourceSet)}function doResolveConflicts(sourceSet){var entries=[];function handleIn(vEntry){return function(uEntry){if(uEntry.merged){return}if(uEntry.barycenter===undefined||vEntry.barycenter===undefined||uEntry.barycenter>=vEntry.barycenter){mergeEntries(vEntry,uEntry)}}}function handleOut(vEntry){return function(wEntry){wEntry["in"].push(vEntry);if(--wEntry.indegree===0){sourceSet.push(wEntry)}}}while(sourceSet.length){var 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;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}},{"../util":27}],18:[function(require,module,exports){var barycenter=require("./barycenter");var resolveConflicts=require("./resolve-conflicts");var sort=require("./sort");module.exports=sortSubgraph;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={};if(bl){movable=movable.filter(w=>w!==bl&&w!==br)}var barycenters=barycenter(g,movable);barycenters.forEach(function(entry){if(g.children(entry.v).length){var subgraphResult=sortSubgraph(g,entry.v,cg,biasRight);subgraphs[entry.v]=subgraphResult;if(subgraphResult.hasOwnProperty("barycenter")){mergeBarycenters(entry,subgraphResult)}}});var entries=resolveConflicts(barycenters,cg);expandSubgraphs(entries,subgraphs);var result=sort(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]),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.weight+=2}}return result}function expandSubgraphs(entries,subgraphs){entries.forEach(function(entry){entry.vs=entry.vs.flatMap(function(v){if(subgraphs[v]){return subgraphs[v].vs}return v})})}function mergeBarycenters(target,other){if(target.barycenter!==undefined){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}}},{"./barycenter":12,"./resolve-conflicts":17,"./sort":19}],19:[function(require,module,exports){var util=require("../util");module.exports=sort;function sort(entries,biasRight){var parts=util.partition(entries,function(entry){return entry.hasOwnProperty("barycenter")});var 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){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)};if(weight){result.barycenter=sum/weight;result.weight=weight}return result}function consumeUnsortable(vs,unsortable,index){var last;while(unsortable.length&&(last=unsortable[unsortable.length-1]).i<=index){unsortable.pop();vs.push(last.vs);index++}return index}function compareWithBias(bias){return function(entryV,entryW){if(entryV.barycenterentryW.barycenter){return 1}return!bias?entryV.i-entryW.i:entryW.i-entryV.i}}},{"../util":27}],20:[function(require,module,exports){module.exports=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;while(v!==edgeObj.w){node=g.node(v);if(ascending){while((pathV=path[pathIdx])!==lca&&g.node(pathV).maxRank{let tmp=mappedEntries[entry.v]={indegree:0,in:[],out:[],vs:[entry.v],i:i};if(entry.barycenter!==undefined){tmp.barycenter=entry.barycenter;tmp.weight=entry.weight}});cg.edges().forEach(e=>{let entryV=mappedEntries[e.v];let entryW=mappedEntries[e.w];if(entryV!==undefined&&entryW!==undefined){entryW.indegree++;entryV.out.push(mappedEntries[e.w])}});let sourceSet=Object.values(mappedEntries).filter(entry=>!entry.indegree);return doResolveConflicts(sourceSet)}function doResolveConflicts(sourceSet){let entries=[];function handleIn(vEntry){return uEntry=>{if(uEntry.merged){return}if(uEntry.barycenter===undefined||vEntry.barycenter===undefined||uEntry.barycenter>=vEntry.barycenter){mergeEntries(vEntry,uEntry)}}}function handleOut(vEntry){return wEntry=>{wEntry["in"].push(vEntry);if(--wEntry.indegree===0){sourceSet.push(wEntry)}}}while(sourceSet.length){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){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}},{"../util":27}],18:[function(require,module,exports){let barycenter=require("./barycenter");let resolveConflicts=require("./resolve-conflicts");let sort=require("./sort");module.exports=sortSubgraph;function sortSubgraph(g,v,cg,biasRight){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)}let barycenters=barycenter(g,movable);barycenters.forEach(entry=>{if(g.children(entry.v).length){let subgraphResult=sortSubgraph(g,entry.v,cg,biasRight);subgraphs[entry.v]=subgraphResult;if(subgraphResult.hasOwnProperty("barycenter")){mergeBarycenters(entry,subgraphResult)}}});let entries=resolveConflicts(barycenters,cg);expandSubgraphs(entries,subgraphs);let result=sort(entries,biasRight);if(bl){result.vs=[bl,result.vs,br].flat(true);if(g.predecessors(bl).length){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.weight+=2}}return result}function expandSubgraphs(entries,subgraphs){entries.forEach(entry=>{entry.vs=entry.vs.flatMap(v=>{if(subgraphs[v]){return subgraphs[v].vs}return v})})}function mergeBarycenters(target,other){if(target.barycenter!==undefined){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}}},{"./barycenter":12,"./resolve-conflicts":17,"./sort":19}],19:[function(require,module,exports){let util=require("../util");module.exports=sort;function sort(entries,biasRight){let parts=util.partition(entries,entry=>{return entry.hasOwnProperty("barycenter")});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(entry=>{vsIndex+=entry.vs.length;vs.push(entry.vs);sum+=entry.barycenter*entry.weight;weight+=entry.weight;vsIndex=consumeUnsortable(vs,unsortable,vsIndex)});let result={vs:vs.flat(true)};if(weight){result.barycenter=sum/weight;result.weight=weight}return result}function consumeUnsortable(vs,unsortable,index){let last;while(unsortable.length&&(last=unsortable[unsortable.length-1]).i<=index){unsortable.pop();vs.push(last.vs);index++}return index}function compareWithBias(bias){return(entryV,entryW)=>{if(entryV.barycenterentryW.barycenter){return 1}return!bias?entryV.i-entryW.i:entryW.i-entryV.i}}},{"../util":27}],20:[function(require,module,exports){module.exports=parentDummyChains;function parentDummyChains(g){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).maxRanklow||lim>postorderNums[parent].lim));lca=parent; // Traverse from w to LCA -parent=w;while((parent=g.parent(parent))!==lca){wPath.push(parent)}return{path:vPath.concat(wPath.reverse()),lca:lca}}function postorder(g){var result={};var lim=0;function dfs(v){var low=lim;g.children(v).forEach(dfs);result[v]={low:low,lim:lim++}}g.children().forEach(dfs);return result}},{}],21:[function(require,module,exports){"use strict";var Graph=require("@dagrejs/graphlib").Graph;var util=require("../util"); +parent=w;while((parent=g.parent(parent))!==lca){wPath.push(parent)}return{path:vPath.concat(wPath.reverse()),lca:lca}}function postorder(g){let result={};let lim=0;function dfs(v){let low=lim;g.children(v).forEach(dfs);result[v]={low:low,lim:lim++}}g.children().forEach(dfs);return result}},{}],21:[function(require,module,exports){"use strict";let Graph=require("@dagrejs/graphlib").Graph;let util=require("../util"); /* * This module provides coordinate assignment based on Brandes and Köpf, "Fast * and Simple Horizontal Coordinate Assignment." @@ -271,13 +271,13 @@ parent=w;while((parent=g.parent(parent))!==lca){wPath.push(parent)}return{path:v * * This algorithm (safely) assumes that a dummy node will only be incident on a * single node in the layers being scanned. - */function findType1Conflicts(g,layering){var conflicts={};function visitLayer(prevLayer,layer){var + */function findType1Conflicts(g,layering){let conflicts={};function visitLayer(prevLayer,layer){let // last visited node in the previous layer that is incident on an inner // segment. k0=0, // Tracks the last node in this layer scanned for crossings with a type-1 // segment. -scanPos=0,prevLayerLength=prevLayer.length,lastNode=layer[layer.length-1];layer.forEach(function(v,i){var w=findOtherInnerSegmentNode(g,v),k1=w?g.node(w).order:prevLayerLength;if(w||v===lastNode){layer.slice(scanPos,i+1).forEach(function(scanNode){g.predecessors(scanNode).forEach(function(u){var uLabel=g.node(u),uPos=uLabel.order;if((uPosnextNorthBorder)){addConflict(conflicts,u,v)}})}})}function visitLayer(north,south){var prevNorthPos=-1,nextNorthPos,southPos=0;south.forEach(function(v,southLookahead){if(g.node(v).dummy==="border"){var predecessors=g.predecessors(v);if(predecessors.length){nextNorthPos=g.node(predecessors[0]).order;scan(south,southPos,southLookahead,prevNorthPos,nextNorthPos);southPos=southLookahead;prevNorthPos=nextNorthPos}}scan(south,southPos,south.length,nextNorthPos,north.length)});return south}layering.reduce(visitLayer);return conflicts}function findOtherInnerSegmentNode(g,v){if(g.node(v).dummy){return g.predecessors(v).find(u=>g.node(u).dummy)}}function addConflict(conflicts,v,w){if(v>w){var tmp=v;v=w;w=tmp}var conflictsV=conflicts[v];if(!conflictsV){conflicts[v]=conflictsV={}}conflictsV[w]=true}function hasConflict(conflicts,v,w){if(v>w){var tmp=v;v=w;w=tmp}return!!conflicts[v]&&conflicts[v].hasOwnProperty(w)} +scanPos=0,prevLayerLength=prevLayer.length,lastNode=layer[layer.length-1];layer.forEach((v,i)=>{let w=findOtherInnerSegmentNode(g,v),k1=w?g.node(w).order:prevLayerLength;if(w||v===lastNode){layer.slice(scanPos,i+1).forEach(scanNode=>{g.predecessors(scanNode).forEach(u=>{let uLabel=g.node(u),uPos=uLabel.order;if((uPos{v=south[i];if(g.node(v).dummy){g.predecessors(v).forEach(u=>{let uNode=g.node(u);if(uNode.dummy&&(uNode.ordernextNorthBorder)){addConflict(conflicts,u,v)}})}})}function visitLayer(north,south){let prevNorthPos=-1,nextNorthPos,southPos=0;south.forEach((v,southLookahead)=>{if(g.node(v).dummy==="border"){let predecessors=g.predecessors(v);if(predecessors.length){nextNorthPos=g.node(predecessors[0]).order;scan(south,southPos,southLookahead,prevNorthPos,nextNorthPos);southPos=southLookahead;prevNorthPos=nextNorthPos}}scan(south,southPos,south.length,nextNorthPos,north.length)});return south}layering.reduce(visitLayer);return conflicts}function findOtherInnerSegmentNode(g,v){if(g.node(v).dummy){return g.predecessors(v).find(u=>g.node(u).dummy)}}function addConflict(conflicts,v,w){if(v>w){let tmp=v;v=w;w=tmp}let conflictsV=conflicts[v];if(!conflictsV){conflicts[v]=conflictsV={}}conflictsV[w]=true}function hasConflict(conflicts,v,w){if(v>w){let tmp=v;v=w;w=tmp}return!!conflicts[v]&&conflicts[v].hasOwnProperty(w)} /* * Try to align nodes into vertical "blocks" where possible. This algorithm * attempts to align a node with one of its median neighbors. If the edge @@ -285,33 +285,33 @@ scanPos=0,prevLayerLength=prevLayer.length,lastNode=layer[layer.length-1];layer. * If a previous node has already formed a block with a node after the node * we're trying to form a block with, we also ignore that possibility - our * blocks would be split in that scenario. - */function verticalAlignment(g,layering,conflicts,neighborFn){var root={},align={},pos={}; + */function verticalAlignment(g,layering,conflicts,neighborFn){let root={},align={},pos={}; // We cache the position here based on the layering because the graph and // layering may be out of sync. The layering matrix is manipulated to // generate different extreme alignments. -layering.forEach(function(layer){layer.forEach(function(v,order){root[v]=v;align[v]=v;pos[v]=order})});layering.forEach(function(layer){var prevIdx=-1;layer.forEach(function(v){var ws=neighborFn(v);if(ws.length){ws=ws.sort((a,b)=>pos[a]-pos[b]);var mp=(ws.length-1)/2;for(var i=Math.floor(mp),il=Math.ceil(mp);i<=il;++i){var w=ws[i];if(align[v]===v&&prevIdx{layer.forEach((v,order)=>{root[v]=v;align[v]=v;pos[v]=order})});layering.forEach(layer=>{let prevIdx=-1;layer.forEach(v=>{let ws=neighborFn(v);if(ws.length){ws=ws.sort((a,b)=>pos[a]-pos[b]);let mp=(ws.length-1)/2;for(let i=Math.floor(mp),il=Math.ceil(mp);i<=il;++i){let w=ws[i];if(align[v]===v&&prevIdx{return Math.max(acc,xs[e.v]+blockG.edge(e))},0)} // Second pass, assign greatest coordinates -function pass2(elem){var min=blockG.outEdges(elem).reduce(function(acc,e){return Math.min(acc,xs[e.w]-blockG.edge(e))},Number.POSITIVE_INFINITY);var node=g.node(elem);if(min!==Number.POSITIVE_INFINITY&&node.borderType!==borderType){xs[elem]=Math.max(xs[elem],min)}}iterate(pass1,blockG.predecessors.bind(blockG));iterate(pass2,blockG.successors.bind(blockG)); +function pass2(elem){let min=blockG.outEdges(elem).reduce((acc,e)=>{return Math.min(acc,xs[e.w]-blockG.edge(e))},Number.POSITIVE_INFINITY);let node=g.node(elem);if(min!==Number.POSITIVE_INFINITY&&node.borderType!==borderType){xs[elem]=Math.max(xs[elem],min)}}iterate(pass1,blockG.predecessors.bind(blockG));iterate(pass2,blockG.successors.bind(blockG)); // Assign x coordinates to all nodes -Object.keys(align).forEach(v=>xs[v]=xs[root[v]]);return xs}function buildBlockGraph(g,layering,root,reverseSep){var blockGraph=new Graph,graphLabel=g.graph(),sepFn=sep(graphLabel.nodesep,graphLabel.edgesep,reverseSep);layering.forEach(function(layer){var u;layer.forEach(function(v){var vRoot=root[v];blockGraph.setNode(vRoot);if(u){var uRoot=root[u],prevMax=blockGraph.edge(uRoot,vRoot);blockGraph.setEdge(uRoot,vRoot,Math.max(sepFn(g,v,u),prevMax||0))}u=v})});return blockGraph} +Object.keys(align).forEach(v=>xs[v]=xs[root[v]]);return xs}function buildBlockGraph(g,layering,root,reverseSep){let blockGraph=new Graph,graphLabel=g.graph(),sepFn=sep(graphLabel.nodesep,graphLabel.edgesep,reverseSep);layering.forEach(layer=>{let u;layer.forEach(v=>{let vRoot=root[v];blockGraph.setNode(vRoot);if(u){var uRoot=root[u],prevMax=blockGraph.edge(uRoot,vRoot);blockGraph.setEdge(uRoot,vRoot,Math.max(sepFn(g,v,u),prevMax||0))}u=v})});return blockGraph} /* * Returns the alignment that has the smallest width of the given alignments. - */function findSmallestWidthAlignment(g,xss){return Object.values(xss).reduce((currentMinAndXs,xs)=>{var max=Number.NEGATIVE_INFINITY;var min=Number.POSITIVE_INFINITY;Object.entries(xs).forEach(([v,x])=>{var halfWidth=width(g,v)/2;max=Math.max(x+halfWidth,max);min=Math.min(x-halfWidth,min)});const newMin=max-min;if(newMin{let max=Number.NEGATIVE_INFINITY;let min=Number.POSITIVE_INFINITY;Object.entries(xs).forEach(([v,x])=>{let halfWidth=width(g,v)/2;max=Math.max(x+halfWidth,max);min=Math.min(x-halfWidth,min)});const newMin=max-min;if(newMinx+delta)}})})}function balance(xss,align){return util.mapValues(xss.ul,function(num,v){if(align){return xss[align.toLowerCase()][v]}else{var xs=Object.values(xss).map(xs=>xs[v]).sort((a,b)=>a-b);return(xs[1]+xs[2])/2}})}function positionX(g){var layering=util.buildLayerMatrix(g);var conflicts=Object.assign(findType1Conflicts(g,layering),findType2Conflicts(g,layering));var xss={};var adjustedLayering;["u","d"].forEach(function(vert){adjustedLayering=vert==="u"?layering:Object.values(layering).reverse();["l","r"].forEach(function(horiz){if(horiz==="r"){adjustedLayering=adjustedLayering.map(inner=>{return Object.values(inner).reverse()})}var neighborFn=(vert==="u"?g.predecessors:g.successors).bind(g);var align=verticalAlignment(g,adjustedLayering,conflicts,neighborFn);var xs=horizontalCompaction(g,adjustedLayering,align.root,align.align,horiz==="r");if(horiz==="r"){xs=util.mapValues(xs,x=>-x)}xss[vert+horiz]=xs})});var smallestWidth=findSmallestWidthAlignment(g,xss);alignCoordinates(xss,smallestWidth);return balance(xss,g.graph().align)}function sep(nodeSep,edgeSep,reverseSep){return function(g,v,w){var vLabel=g.node(v);var wLabel=g.node(w);var sum=0;var delta;sum+=vLabel.width/2;if(vLabel.hasOwnProperty("labelpos")){switch(vLabel.labelpos.toLowerCase()){case"l":delta=-vLabel.width/2;break;case"r":delta=vLabel.width/2;break}}if(delta){sum+=reverseSep?delta:-delta}delta=0;sum+=(vLabel.dummy?edgeSep:nodeSep)/2;sum+=(wLabel.dummy?edgeSep:nodeSep)/2;sum+=wLabel.width/2;if(wLabel.hasOwnProperty("labelpos")){switch(wLabel.labelpos.toLowerCase()){case"l":delta=wLabel.width/2;break;case"r":delta=-wLabel.width/2;break}}if(delta){sum+=reverseSep?delta:-delta}delta=0;return sum}}function width(g,v){return g.node(v).width}},{"../util":27,"@dagrejs/graphlib":29}],22:[function(require,module,exports){"use strict";var util=require("../util");var positionX=require("./bk").positionX;module.exports=position;function position(g){g=util.asNonCompoundGraph(g);positionY(g);Object.entries(positionX(g)).forEach(([v,x])=>g.node(v).x=x)}function positionY(g){var layering=util.buildLayerMatrix(g);var rankSep=g.graph().ranksep;var prevY=0;layering.forEach(function(layer){const maxHeight=layer.reduce((acc,v)=>{const height=g.node(v).height;if(acc>height){return acc}else{return height}},0);layer.forEach(v=>g.node(v).y=prevY+maxHeight/2);prevY+=maxHeight+rankSep})}},{"../util":27,"./bk":21}],23:[function(require,module,exports){"use strict";var Graph=require("@dagrejs/graphlib").Graph;var slack=require("./util").slack;module.exports=feasibleTree; + */function alignCoordinates(xss,alignTo){let alignToVals=Object.values(alignTo),alignToMin=Math.min(...alignToVals),alignToMax=Math.max(...alignToVals);["u","d"].forEach(vert=>{["l","r"].forEach(horiz=>{let alignment=vert+horiz,xs=xss[alignment];if(xs===alignTo)return;let xsVals=Object.values(xs);let delta=alignToMin-Math.min(...xsVals);if(horiz!=="l"){delta=alignToMax-Math.max(...xsVals)}if(delta){xss[alignment]=util.mapValues(xs,x=>x+delta)}})})}function balance(xss,align){return util.mapValues(xss.ul,(num,v)=>{if(align){return xss[align.toLowerCase()][v]}else{let xs=Object.values(xss).map(xs=>xs[v]).sort((a,b)=>a-b);return(xs[1]+xs[2])/2}})}function positionX(g){let layering=util.buildLayerMatrix(g);let conflicts=Object.assign(findType1Conflicts(g,layering),findType2Conflicts(g,layering));let xss={};let adjustedLayering;["u","d"].forEach(vert=>{adjustedLayering=vert==="u"?layering:Object.values(layering).reverse();["l","r"].forEach(horiz=>{if(horiz==="r"){adjustedLayering=adjustedLayering.map(inner=>{return Object.values(inner).reverse()})}let neighborFn=(vert==="u"?g.predecessors:g.successors).bind(g);let align=verticalAlignment(g,adjustedLayering,conflicts,neighborFn);let xs=horizontalCompaction(g,adjustedLayering,align.root,align.align,horiz==="r");if(horiz==="r"){xs=util.mapValues(xs,x=>-x)}xss[vert+horiz]=xs})});let smallestWidth=findSmallestWidthAlignment(g,xss);alignCoordinates(xss,smallestWidth);return balance(xss,g.graph().align)}function sep(nodeSep,edgeSep,reverseSep){return(g,v,w)=>{let vLabel=g.node(v);let wLabel=g.node(w);let sum=0;let delta;sum+=vLabel.width/2;if(vLabel.hasOwnProperty("labelpos")){switch(vLabel.labelpos.toLowerCase()){case"l":delta=-vLabel.width/2;break;case"r":delta=vLabel.width/2;break}}if(delta){sum+=reverseSep?delta:-delta}delta=0;sum+=(vLabel.dummy?edgeSep:nodeSep)/2;sum+=(wLabel.dummy?edgeSep:nodeSep)/2;sum+=wLabel.width/2;if(wLabel.hasOwnProperty("labelpos")){switch(wLabel.labelpos.toLowerCase()){case"l":delta=wLabel.width/2;break;case"r":delta=-wLabel.width/2;break}}if(delta){sum+=reverseSep?delta:-delta}delta=0;return sum}}function width(g,v){return g.node(v).width}},{"../util":27,"@dagrejs/graphlib":29}],22:[function(require,module,exports){"use strict";let util=require("../util");let positionX=require("./bk").positionX;module.exports=position;function position(g){g=util.asNonCompoundGraph(g);positionY(g);Object.entries(positionX(g)).forEach(([v,x])=>g.node(v).x=x)}function positionY(g){let layering=util.buildLayerMatrix(g);let rankSep=g.graph().ranksep;let prevY=0;layering.forEach(layer=>{const maxHeight=layer.reduce((acc,v)=>{const height=g.node(v).height;if(acc>height){return acc}else{return height}},0);layer.forEach(v=>g.node(v).y=prevY+maxHeight/2);prevY+=maxHeight+rankSep})}},{"../util":27,"./bk":21}],23:[function(require,module,exports){"use strict";var Graph=require("@dagrejs/graphlib").Graph;var slack=require("./util").slack;module.exports=feasibleTree; /* * Constructs a spanning tree with tight edges and adjusted the input node's * ranks to achieve this. A tight edge is one that is has a length that matches @@ -342,7 +342,7 @@ var start=g.nodes()[0];var size=g.nodeCount();t.setNode(start,{});var edge,delta /* * Finds a maximal tree of tight edges and returns the number of nodes in the * tree. - */function tightTree(t,g){function dfs(v){g.nodeEdges(v).forEach(function(e){var edgeV=e.v,w=v===edgeV?e.w:edgeV;if(!t.hasNode(w)&&!slack(g,e)){t.setNode(w,{});t.setEdge(v,w,{});dfs(w)}})}t.nodes().forEach(dfs);return t.nodeCount()} + */function tightTree(t,g){function dfs(v){g.nodeEdges(v).forEach(e=>{var edgeV=e.v,w=v===edgeV?e.w:edgeV;if(!t.hasNode(w)&&!slack(g,e)){t.setNode(w,{});t.setEdge(v,w,{});dfs(w)}})}t.nodes().forEach(dfs);return t.nodeCount()} /* * Finds the edge with the smallest slack that is incident on tree and returns * it. @@ -415,7 +415,7 @@ 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;graphEdge=g.edge(parent,child)}cutValue=graphEdge.weight;g.nodeEdges(child).forEach(function(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;cutValue+=pointsToHead?-otherCutValue:otherCutValue}}});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(function(w){if(!visited.hasOwnProperty(w)){nextLim=dfsAssignLowLim(tree,visited,nextLim,w,v)}});label.low=low;label.lim=nextLim++;if(parent){label.parent=parent}else{ +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;cutValue+=pointsToHead?-otherCutValue:otherCutValue}}});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){label.parent=parent}else{ // 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; // For the rest of this function we assume that v is the tail and w is the @@ -424,7 +424,7 @@ delete label.parent}return nextLim}function leaveEdge(tree){return tree.edges(). if(!g.hasEdge(v,w)){v=edge.w;w=edge.v}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. -if(vLabel.lim>wLabel.lim){tailLabel=wLabel;flip=true}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 candidates.reduce((acc,edge)=>{if(slack(g,edge)!g.node(v).parent);var vs=preorder(t,root);vs=vs.slice(1);vs.forEach(function(v){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)})} +if(vLabel.lim>wLabel.lim){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 candidates.reduce((acc,edge)=>{if(slack(g,edge)!g.node(v).parent);var vs=preorder(t,root);vs=vs.slice(1);vs.forEach(v=>{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)})} /* * Returns true if the edge is in the tree. */function isTreeEdge(tree,u,v){return tree.hasEdge(u,v)} @@ -458,21 +458,21 @@ if(vLabel.lim>wLabel.lim){tailLabel=wLabel;flip=true}var candidates=g.edges().fi * difference between the length of the edge and its minimum length. */function slack(g,e){return g.node(e.w).rank-g.node(e.v).rank-g.edge(e).minlen}},{}],27:[function(require,module,exports){ /* eslint "no-console": off */ -"use strict";var Graph=require("@dagrejs/graphlib").Graph;module.exports={addBorderNode:addBorderNode,addDummyNode:addDummyNode,asNonCompoundGraph:asNonCompoundGraph,buildLayerMatrix:buildLayerMatrix,intersectRect:intersectRect,mapValues:mapValues,maxRank:maxRank,normalizeRanks:normalizeRanks,notime:notime,partition:partition,pick:pick,predecessorWeights:predecessorWeights,range:range,removeEmptyRanks:removeEmptyRanks,simplify:simplify,successorWeights:successorWeights,time:time,uniqueId:uniqueId,zipObject:zipObject}; +"use strict";let Graph=require("@dagrejs/graphlib").Graph;module.exports={addBorderNode:addBorderNode,addDummyNode:addDummyNode,asNonCompoundGraph:asNonCompoundGraph,buildLayerMatrix:buildLayerMatrix,intersectRect:intersectRect,mapValues:mapValues,maxRank:maxRank,normalizeRanks:normalizeRanks,notime:notime,partition:partition,pick:pick,predecessorWeights:predecessorWeights,range:range,removeEmptyRanks:removeEmptyRanks,simplify:simplify,successorWeights:successorWeights,time:time,uniqueId:uniqueId,zipObject:zipObject}; /* * Adds a dummy node to the graph and return v. - */function addDummyNode(g,type,attrs,name){var v;do{v=uniqueId(name)}while(g.hasNode(v));attrs.dummy=type;g.setNode(v,attrs);return v} + */function addDummyNode(g,type,attrs,name){let v;do{v=uniqueId(name)}while(g.hasNode(v));attrs.dummy=type;g.setNode(v,attrs);return v} /* * Returns a new graph with only simple edges. Handles aggregation of data * associated with multi-edges. - */function simplify(g){var simplified=(new Graph).setGraph(g.graph());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)})});return simplified}function asNonCompoundGraph(g){var simplified=new Graph({multigraph:g.isMultigraph()}).setGraph(g.graph());g.nodes().forEach(v=>{if(!g.children(v).length){simplified.setNode(v,g.node(v))}});g.edges().forEach(e=>{simplified.setEdge(e,g.edge(e))});return simplified}function successorWeights(g){var weightMap=g.nodes().map(v=>{var sucs={};g.outEdges(v).forEach(e=>{sucs[e.w]=(sucs[e.w]||0)+g.edge(e).weight});return sucs});return zipObject(g.nodes(),weightMap)}function predecessorWeights(g){var weightMap=g.nodes().map(v=>{var preds={};g.inEdges(v).forEach(e=>{preds[e.v]=(preds[e.v]||0)+g.edge(e).weight});return preds});return zipObject(g.nodes(),weightMap)} + */function simplify(g){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 label=g.edge(e);simplified.setEdge(e.v,e.w,{weight:simpleLabel.weight+label.weight,minlen:Math.max(simpleLabel.minlen,label.minlen)})});return simplified}function asNonCompoundGraph(g){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))}});g.edges().forEach(e=>{simplified.setEdge(e,g.edge(e))});return simplified}function successorWeights(g){let weightMap=g.nodes().map(v=>{let sucs={};g.outEdges(v).forEach(e=>{sucs[e.w]=(sucs[e.w]||0)+g.edge(e).weight});return sucs});return zipObject(g.nodes(),weightMap)}function predecessorWeights(g){let weightMap=g.nodes().map(v=>{let preds={};g.inEdges(v).forEach(e=>{preds[e.v]=(preds[e.v]||0)+g.edge(e).weight});return preds});return zipObject(g.nodes(),weightMap)} /* * Finds where a line starting at point ({x, y}) would intersect a rectangle * ({x, y, width, height}) if it were pointing at the rectangle's center. - */function intersectRect(rect,point){var x=rect.x;var y=rect.y; + */function intersectRect(rect,point){let x=rect.x;let y=rect.y; // Rectangle intersection algorithm from: // http://math.stackexchange.com/questions/108113/find-edge-between-two-boxes -var dx=point.x-x;var dy=point.y-y;var w=rect.width/2;var h=rect.height/2;if(!dx&&!dy){throw new Error("Not possible to find intersection inside of the rectangle")}var sx,sy;if(Math.abs(dy)*w>Math.abs(dx)*h){ +let dx=point.x-x;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. if(dy<0){h=-h}sx=h*dx/dy;sy=h}else{ // Intersection is left or right of rect. @@ -480,22 +480,22 @@ if(dx<0){w=-w}sx=w;sy=w*dy/dx}return{x:x+sx,y:y+sy}} /* * Given a DAG with each node assigned "rank" and "order" properties, this * function will produce a matrix with the ids of each node. - */function buildLayerMatrix(g){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}});return layering} + */function buildLayerMatrix(g){let layering=range(maxRank(g)+1).map(()=>[]);g.nodes().forEach(v=>{let node=g.node(v);let rank=node.rank;if(rank!==undefined){layering[rank][node.order]=v}});return layering} /* * Adjusts the ranks for all nodes in the graph such that all nodes v have * rank(v) >= 0 and at least one node w has rank(w) = 0. - */function normalizeRanks(g){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(node.hasOwnProperty("rank")){node.rank-=min}})}function removeEmptyRanks(g){ + */function normalizeRanks(g){let min=Math.min(...g.nodes().map(v=>{let rank=g.node(v).rank;if(rank===undefined){return Number.MAX_VALUE}return rank}));g.nodes().forEach(v=>{let node=g.node(v);if(node.hasOwnProperty("rank")){node.rank-=min}})}function removeEmptyRanks(g){ // Ranks may not start at 0, so we need to offset them -var offset=Math.min(...g.nodes().map(v=>g.node(v).rank));var layers=[];g.nodes().forEach(v=>{var rank=g.node(v).rank-offset;if(!layers[rank]){layers[rank]=[]}layers[rank].push(v)});var delta=0;var nodeRankFactor=g.graph().nodeRankFactor;Array.from(layers).forEach((vs,i)=>{if(vs===undefined&&i%nodeRankFactor!==0){--delta}else if(vs!==undefined&&delta){vs.forEach(v=>g.node(v).rank+=delta)}})}function addBorderNode(g,prefix,rank,order){var node={width:0,height:0};if(arguments.length>=4){node.rank=rank;node.order=order}return addDummyNode(g,"border",node,prefix)}function maxRank(g){return Math.max(...g.nodes().map(v=>{var rank=g.node(v).rank;if(rank===undefined){return Number.MIN_VALUE}return rank}))} +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;if(!layers[rank]){layers[rank]=[]}layers[rank].push(v)});let delta=0;let nodeRankFactor=g.graph().nodeRankFactor;Array.from(layers).forEach((vs,i)=>{if(vs===undefined&&i%nodeRankFactor!==0){--delta}else if(vs!==undefined&&delta){vs.forEach(v=>g.node(v).rank+=delta)}})}function addBorderNode(g,prefix,rank,order){let node={width:0,height:0};if(arguments.length>=4){node.rank=rank;node.order=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}))} /* * Partition a collection into two groups: `lhs` and `rhs`. If the supplied * function returns true for an entry it goes into `lhs`. Otherwise it goes * into `rhs. - */function partition(collection,fn){var result={lhs:[],rhs:[]};collection.forEach(value=>{if(fn(value)){result.lhs.push(value)}else{result.rhs.push(value)}});return result} + */function partition(collection,fn){let result={lhs:[],rhs:[]};collection.forEach(value=>{if(fn(value)){result.lhs.push(value)}else{result.rhs.push(value)}});return result} /* * Returns a new function that wraps `fn` with a timer. The wrapper logs the * time it takes to execute the function. - */function time(name,fn){var start=Date.now();try{return fn()}finally{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=>ilimitval[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},{})}},{"@dagrejs/graphlib":29}],28:[function(require,module,exports){module.exports="1.0.2"},{}],29:[function(require,module,exports){ + */function time(name,fn){let start=Date.now();try{return fn()}finally{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=>ilimitval[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},{})}},{"@dagrejs/graphlib":29}],28:[function(require,module,exports){module.exports="1.0.4"},{}],29:[function(require,module,exports){ /** * Copyright (c) 2014, Chris Pettitt * All rights reserved. diff --git a/lib/version.js b/lib/version.js index bbe25b5d..03e9c412 100644 --- a/lib/version.js +++ b/lib/version.js @@ -1 +1 @@ -module.exports = "1.0.3-pre"; +module.exports = "1.0.4"; diff --git a/package-lock.json b/package-lock.json index 58a7a574..cc3eb4f1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@dagrejs/dagre", - "version": "1.0.2", + "version": "1.0.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@dagrejs/dagre", - "version": "1.0.2", + "version": "1.0.4", "license": "MIT", "dependencies": { "@dagrejs/graphlib": "2.1.13" diff --git a/package.json b/package.json index 85594e27..5347ddb7 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@dagrejs/dagre", - "version": "1.0.3-pre", + "version": "1.0.4", "description": "Graph layout for JavaScript", "author": "Chris Pettitt ", "contributors": [ @@ -50,4 +50,4 @@ "type": "git", "url": "https://github.com/dagrejs/dagre.git" } -} \ No newline at end of file +}