@hpcc-js/graph 3.3.1 → 3.3.3

package/dist/index.js

@@ -3042,22 +3042,22 @@ function requireGraph() {
     var e2 = arguments.length === 1 ? edgeObjToId(this._isDirected, arguments[0]) : edgeArgsToId(this._isDirected, v2, w, name);
     return _2.has(this._edgeLabels, e2);
   }, Graph3.prototype.removeEdge = function(v2, w, name) {
-    var e2 = arguments.length === 1 ? edgeObjToId(this._isDirected, arguments[0]) : edgeArgsToId(this._isDirected, v2, w, name), edge = this._edgeObjs[e2];
-    return edge && (v2 = edge.v, w = edge.w, delete this._edgeLabels[e2], delete this._edgeObjs[e2], decrementOrRemoveEntry(this._preds[w], v2), decrementOrRemoveEntry(this._sucs[v2], w), delete this._in[w][e2], delete this._out[v2][e2], this._edgeCount--), this;
+    var e2 = arguments.length === 1 ? edgeObjToId(this._isDirected, arguments[0]) : edgeArgsToId(this._isDirected, v2, w, name), edge2 = this._edgeObjs[e2];
+    return edge2 && (v2 = edge2.v, w = edge2.w, delete this._edgeLabels[e2], delete this._edgeObjs[e2], decrementOrRemoveEntry(this._preds[w], v2), decrementOrRemoveEntry(this._sucs[v2], w), delete this._in[w][e2], delete this._out[v2][e2], this._edgeCount--), this;
   }, Graph3.prototype.inEdges = function(v2, u2) {
     var inV = this._in[v2];
     if (inV) {
       var edges = _2.values(inV);
-      return u2 ? _2.filter(edges, function(edge) {
-        return edge.v === u2;
+      return u2 ? _2.filter(edges, function(edge2) {
+        return edge2.v === u2;
       }) : edges;
     }
   }, Graph3.prototype.outEdges = function(v2, w) {
     var outV = this._out[v2];
     if (outV) {
       var edges = _2.values(outV);
-      return w ? _2.filter(edges, function(edge) {
-        return edge.w === w;
+      return w ? _2.filter(edges, function(edge2) {
+        return edge2.w === w;
       }) : edges;
     }
   }, Graph3.prototype.nodeEdges = function(v2, w) {
@@ -3133,8 +3133,8 @@ function requireJson() {
   }
   function writeEdges(g2) {
     return _2.map(g2.edges(), function(e2) {
-      var edgeValue = g2.edge(e2), edge = { v: e2.v, w: e2.w };
-      return _2.isUndefined(e2.name) || (edge.name = e2.name), _2.isUndefined(edgeValue) || (edge.value = edgeValue), edge;
+      var edgeValue = g2.edge(e2), edge2 = { v: e2.v, w: e2.w };
+      return _2.isUndefined(e2.name) || (edge2.name = e2.name), _2.isUndefined(edgeValue) || (edge2.value = edgeValue), edge2;
     });
   }
   function read(json2) {
@@ -3234,10 +3234,10 @@ function requireDijkstra() {
     );
   }
   function runDijkstra(g2, source, weightFn, edgeFn) {
-    var results = {}, pq = new PriorityQueue(), v2, vEntry, updateNeighbors = function(edge) {
-      var w = edge.v !== v2 ? edge.v : edge.w, wEntry = results[w], weight = weightFn(edge), distance2 = vEntry.distance + weight;
+    var results = {}, pq = new PriorityQueue(), v2, vEntry, updateNeighbors = function(edge2) {
+      var w = edge2.v !== v2 ? edge2.v : edge2.w, wEntry = results[w], weight = weightFn(edge2), distance2 = vEntry.distance + weight;
       if (weight < 0)
-        throw new Error("dijkstra does not allow negative edge weights. Bad edge: " + edge + " Weight: " + weight);
+        throw new Error("dijkstra does not allow negative edge weights. Bad edge: " + edge2 + " Weight: " + weight);
       distance2 < wEntry.distance && (wEntry.distance = distance2, wEntry.predecessor = v2, pq.decrease(w, distance2));
     };
     for (g2.nodes().forEach(function(v3) {
@@ -3326,8 +3326,8 @@ function requireFloydWarshall() {
     return nodes.forEach(function(v2) {
       results[v2] = {}, results[v2][v2] = { distance: 0 }, nodes.forEach(function(w) {
         v2 !== w && (results[v2][w] = { distance: Number.POSITIVE_INFINITY });
-      }), edgeFn(v2).forEach(function(edge) {
-        var w = edge.v === v2 ? edge.w : edge.v, d2 = weightFn(edge);
+      }), edgeFn(v2).forEach(function(edge2) {
+        var w = edge2.v === v2 ? edge2.w : edge2.v, d2 = weightFn(edge2);
         results[v2][w] = { distance: d2, predecessor: v2 };
       });
     }), nodes.forEach(function(k2) {
@@ -3434,10 +3434,10 @@ function requirePrim() {
   prim_1 = prim;
   function prim(g2, weightFunc) {
     var result = new Graph3(), parents = {}, pq = new PriorityQueue(), v2;
-    function updateNeighbors(edge) {
-      var w = edge.v === v2 ? edge.w : edge.v, pri = pq.priority(w);
+    function updateNeighbors(edge2) {
+      var w = edge2.v === v2 ? edge2.w : edge2.v, pri = pq.priority(w);
       if (pri !== void 0) {
-        var edgeWeight = weightFunc(edge);
+        var edgeWeight = weightFunc(edge2);
         edgeWeight < pri && (parents[w] = v2, pq.decrease(w, edgeWeight));
       }
     }
@@ -4195,11 +4195,11 @@ function requireGreedyFas() {
   }
   function removeNode(g2, buckets, zeroIdx, entry, collectPredecessors) {
     var results = collectPredecessors ? [] : void 0;
-    return _2.forEach(g2.inEdges(entry.v), function(edge) {
-      var weight = g2.edge(edge), uEntry = g2.node(edge.v);
-      collectPredecessors && results.push({ v: edge.v, w: edge.w }), uEntry.out -= weight, assignBucket(buckets, zeroIdx, uEntry);
-    }), _2.forEach(g2.outEdges(entry.v), function(edge) {
-      var weight = g2.edge(edge), w = edge.w, wEntry = g2.node(w);
+    return _2.forEach(g2.inEdges(entry.v), function(edge2) {
+      var weight = g2.edge(edge2), uEntry = g2.node(edge2.v);
+      collectPredecessors && results.push({ v: edge2.v, w: edge2.w }), uEntry.out -= weight, assignBucket(buckets, zeroIdx, uEntry);
+    }), _2.forEach(g2.outEdges(entry.v), function(edge2) {
+      var weight = g2.edge(edge2), w = edge2.w, wEntry = g2.node(w);
       wEntry.in -= weight, assignBucket(buckets, zeroIdx, wEntry);
     }), g2.removeNode(entry.v), results;
   }
@@ -4414,8 +4414,8 @@ function requireNormalize() {
     undo
   };
   function run(g2) {
-    g2.graph().dummyChains = [], _2.forEach(g2.edges(), function(edge) {
-      normalizeEdge(g2, edge);
+    g2.graph().dummyChains = [], _2.forEach(g2.edges(), function(edge2) {
+      normalizeEdge(g2, edge2);
     });
   }
   function normalizeEdge(g2, e2) {
@@ -4482,8 +4482,8 @@ function requireFeasibleTree() {
   function feasibleTree(g2) {
     var t2 = new Graph3({ directed: !1 }), start = g2.nodes()[0], size = g2.nodeCount();
     t2.setNode(start, {});
-    for (var edge, delta; tightTree(t2, g2) < size; )
-      edge = findMinSlackEdge(t2, g2), delta = t2.hasNode(edge.v) ? slack(g2, edge) : -slack(g2, edge), shiftRanks(t2, g2, delta);
+    for (var edge2, delta; tightTree(t2, g2) < size; )
+      edge2 = findMinSlackEdge(t2, g2), delta = t2.hasNode(edge2.v) ? slack(g2, edge2) : -slack(g2, edge2), shiftRanks(t2, g2, delta);
     return t2;
   }
   function tightTree(t2, g2) {
@@ -4558,16 +4558,16 @@ function requireNetworkSimplex() {
       return tree2.edge(e2).cutvalue < 0;
     });
   }
-  function enterEdge(t2, g2, edge) {
-    var v2 = edge.v, w = edge.w;
-    g2.hasEdge(v2, w) || (v2 = edge.w, w = edge.v);
+  function enterEdge(t2, g2, edge2) {
+    var v2 = edge2.v, w = edge2.w;
+    g2.hasEdge(v2, w) || (v2 = edge2.w, w = edge2.v);
     var vLabel = t2.node(v2), wLabel = t2.node(w), tailLabel = vLabel, flip = !1;
     vLabel.lim > wLabel.lim && (tailLabel = wLabel, flip = !0);
-    var candidates = _2.filter(g2.edges(), function(edge2) {
-      return flip === isDescendant(t2, t2.node(edge2.v), tailLabel) && flip !== isDescendant(t2, t2.node(edge2.w), tailLabel);
+    var candidates = _2.filter(g2.edges(), function(edge3) {
+      return flip === isDescendant(t2, t2.node(edge3.v), tailLabel) && flip !== isDescendant(t2, t2.node(edge3.w), tailLabel);
     });
-    return _2.minBy(candidates, function(edge2) {
-      return slack(g2, edge2);
+    return _2.minBy(candidates, function(edge3) {
+      return slack(g2, edge3);
     });
   }
   function exchangeEdges(t2, g2, e2, f2) {
@@ -4579,8 +4579,8 @@ function requireNetworkSimplex() {
       return !g2.node(v2).parent;
     }), vs = preorder(t2, root);
     vs = vs.slice(1), _2.forEach(vs, function(v2) {
-      var parent = t2.node(v2).parent, edge = g2.edge(v2, parent), flipped = !1;
-      edge || (edge = g2.edge(parent, v2), flipped = !0), g2.node(v2).rank = g2.node(parent).rank + (flipped ? edge.minlen : -edge.minlen);
+      var parent = t2.node(v2).parent, edge2 = g2.edge(v2, parent), flipped = !1;
+      edge2 || (edge2 = g2.edge(parent, v2), flipped = !0), g2.node(v2).rank = g2.node(parent).rank + (flipped ? edge2.minlen : -edge2.minlen);
     });
   }
   function isTreeEdge(tree2, u2, v2) {
@@ -4725,8 +4725,8 @@ function requireNestingGraph() {
   function cleanup(g2) {
     var graphLabel = g2.graph();
     g2.removeNode(graphLabel.nestingRoot), delete graphLabel.nestingRoot, _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      edge.nestingEdge && g2.removeEdge(e2);
+      var edge2 = g2.edge(e2);
+      edge2.nestingEdge && g2.removeEdge(e2);
     });
   }
   return nestingGraph;
@@ -4786,8 +4786,8 @@ function requireCoordinateSystem() {
     _2.forEach(g2.nodes(), function(v2) {
       reverseYOne(g2.node(v2));
     }), _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      _2.forEach(edge.points, reverseYOne), _2.has(edge, "y") && reverseYOne(edge);
+      var edge2 = g2.edge(e2);
+      _2.forEach(edge2.points, reverseYOne), _2.has(edge2, "y") && reverseYOne(edge2);
     });
   }
   function reverseYOne(attrs) {
@@ -4797,8 +4797,8 @@ function requireCoordinateSystem() {
     _2.forEach(g2.nodes(), function(v2) {
       swapXYOne(g2.node(v2));
     }), _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      _2.forEach(edge.points, swapXYOne), _2.has(edge, "x") && swapXYOne(edge);
+      var edge2 = g2.edge(e2);
+      _2.forEach(edge2.points, swapXYOne), _2.has(edge2, "x") && swapXYOne(edge2);
     });
   }
   function swapXYOne(attrs) {
@@ -4883,10 +4883,10 @@ function requireBarycenter() {
       var inV = g2.inEdges(v2);
       if (inV.length) {
         var result = _2.reduce(inV, function(acc, e2) {
-          var edge = g2.edge(e2), nodeU = g2.node(e2.v);
+          var edge2 = g2.edge(e2), nodeU = g2.node(e2.v);
           return {
-            sum: acc.sum + edge.weight * nodeU.order,
-            weight: acc.weight + edge.weight
+            sum: acc.sum + edge2.weight * nodeU.order,
+            weight: acc.weight + edge2.weight
           };
         }, { sum: 0, weight: 0 });
         return {
@@ -5039,7 +5039,7 @@ function requireBuildLayerGraph() {
     return _2.forEach(g2.nodes(), function(v2) {
       var node = g2.node(v2), parent = g2.parent(v2);
       (node.rank === rank || node.minRank <= rank && rank <= node.maxRank) && (result.setNode(v2), result.setParent(v2, parent || root), _2.forEach(g2[relationship](v2), function(e2) {
-        var u2 = e2.v === v2 ? e2.w : e2.v, edge = result.edge(u2, v2), weight = _2.isUndefined(edge) ? 0 : edge.weight;
+        var u2 = e2.v === v2 ? e2.w : e2.v, edge2 = result.edge(u2, v2), weight = _2.isUndefined(edge2) ? 0 : edge2.weight;
         result.setEdge(u2, v2, { weight: g2.edge(e2).weight + weight });
       }), _2.has(node, "minRank") && result.setNode(v2, {
         borderLeft: node.borderLeft[rank],
@@ -5459,26 +5459,26 @@ function requireLayout() {
       var node = canonicalize(inputGraph.node(v2));
       g2.setNode(v2, _2.defaults(selectNumberAttrs(node, nodeNumAttrs), nodeDefaults)), g2.setParent(v2, inputGraph.parent(v2));
     }), _2.forEach(inputGraph.edges(), function(e2) {
-      var edge = canonicalize(inputGraph.edge(e2));
+      var edge2 = canonicalize(inputGraph.edge(e2));
       g2.setEdge(e2, _2.merge(
         {},
         edgeDefaults,
-        selectNumberAttrs(edge, edgeNumAttrs),
-        _2.pick(edge, edgeAttrs)
+        selectNumberAttrs(edge2, edgeNumAttrs),
+        _2.pick(edge2, edgeAttrs)
       ));
     }), g2;
   }
   function makeSpaceForEdgeLabels(g2) {
     var graph2 = g2.graph();
     graph2.ranksep /= 2, _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      edge.minlen *= 2, edge.labelpos.toLowerCase() !== "c" && (graph2.rankdir === "TB" || graph2.rankdir === "BT" ? edge.width += edge.labeloffset : edge.height += edge.labeloffset);
+      var edge2 = g2.edge(e2);
+      edge2.minlen *= 2, edge2.labelpos.toLowerCase() !== "c" && (graph2.rankdir === "TB" || graph2.rankdir === "BT" ? edge2.width += edge2.labeloffset : edge2.height += edge2.labeloffset);
     });
   }
   function injectEdgeLabelProxies(g2) {
     _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      if (edge.width && edge.height) {
+      var edge2 = g2.edge(e2);
+      if (edge2.width && edge2.height) {
         var v2 = g2.node(e2.v), w = g2.node(e2.w), label = { rank: (w.rank - v2.rank) / 2 + v2.rank, e: e2 };
         util2.addDummyNode(g2, "edge-proxy", label, "_ep");
       }
@@ -5506,42 +5506,42 @@ function requireLayout() {
     _2.forEach(g2.nodes(), function(v2) {
       getExtremes(g2.node(v2));
     }), _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      _2.has(edge, "x") && getExtremes(edge);
+      var edge2 = g2.edge(e2);
+      _2.has(edge2, "x") && getExtremes(edge2);
     }), minX -= marginX, minY -= marginY, _2.forEach(g2.nodes(), function(v2) {
       var node = g2.node(v2);
       node.x -= minX, node.y -= minY;
     }), _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      _2.forEach(edge.points, function(p2) {
+      var edge2 = g2.edge(e2);
+      _2.forEach(edge2.points, function(p2) {
         p2.x -= minX, p2.y -= minY;
-      }), _2.has(edge, "x") && (edge.x -= minX), _2.has(edge, "y") && (edge.y -= minY);
+      }), _2.has(edge2, "x") && (edge2.x -= minX), _2.has(edge2, "y") && (edge2.y -= minY);
     }), graphLabel.width = maxX - minX + marginX, graphLabel.height = maxY2 - minY + marginY;
   }
   function assignNodeIntersects(g2) {
     _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2), nodeV = g2.node(e2.v), nodeW = g2.node(e2.w), p1, p2;
-      edge.points ? (p1 = edge.points[0], p2 = edge.points[edge.points.length - 1]) : (edge.points = [], p1 = nodeW, p2 = nodeV), edge.points.unshift(util2.intersectRect(nodeV, p1)), edge.points.push(util2.intersectRect(nodeW, p2));
+      var edge2 = g2.edge(e2), nodeV = g2.node(e2.v), nodeW = g2.node(e2.w), p1, p2;
+      edge2.points ? (p1 = edge2.points[0], p2 = edge2.points[edge2.points.length - 1]) : (edge2.points = [], p1 = nodeW, p2 = nodeV), edge2.points.unshift(util2.intersectRect(nodeV, p1)), edge2.points.push(util2.intersectRect(nodeW, p2));
     });
   }
   function fixupEdgeLabelCoords(g2) {
     _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      if (_2.has(edge, "x"))
-        switch ((edge.labelpos === "l" || edge.labelpos === "r") && (edge.width -= edge.labeloffset), edge.labelpos) {
+      var edge2 = g2.edge(e2);
+      if (_2.has(edge2, "x"))
+        switch ((edge2.labelpos === "l" || edge2.labelpos === "r") && (edge2.width -= edge2.labeloffset), edge2.labelpos) {
           case "l":
-            edge.x -= edge.width / 2 + edge.labeloffset;
+            edge2.x -= edge2.width / 2 + edge2.labeloffset;
             break;
           case "r":
-            edge.x += edge.width / 2 + edge.labeloffset;
+            edge2.x += edge2.width / 2 + edge2.labeloffset;
             break;
         }
     });
   }
   function reversePointsForReversedEdges(g2) {
     _2.forEach(g2.edges(), function(e2) {
-      var edge = g2.edge(e2);
-      edge.reversed && edge.points.reverse();
+      var edge2 = g2.edge(e2);
+      edge2.reversed && edge2.points.reverse();
     });
   }
   function removeBorderNodes(g2) {
@@ -5694,8 +5694,8 @@ class GraphData {
       (!merge || !this._g.hasNode(entity._id)) && (this._g.setNode(entity._id, entity), retVal.addedVertices.push(entity));
     }
     for (let i2 = 0; i2 < edges.length; ++i2) {
-      const edge = edges[i2];
-      (!merge || !this._g.hasEdge(edge._id)) && (edge._sourceVertex && edge._targetVertex ? (this._g.setEdge(edge._sourceVertex._id, edge._targetVertex._id, edge, edge._id), retVal.addedEdges.push(edge)) : console.warn("Bad edge definition"));
+      const edge2 = edges[i2];
+      (!merge || !this._g.hasEdge(edge2._id)) && (edge2._sourceVertex && edge2._targetVertex ? (this._g.setEdge(edge2._sourceVertex._id, edge2._targetVertex._id, edge2, edge2._id), retVal.addedEdges.push(edge2)) : console.warn("Bad edge definition"));
     }
     if (hierarchy2)
       for (let i2 = 0; i2 < hierarchy2.length; ++i2)
@@ -6354,8 +6354,8 @@ class Hierarchy {
   nodePos(u2) {
     return this.digraph.node(u2);
   }
-  edgePoints(edge) {
-    return this.digraph.edge(edge._sourceVertex.id(), edge._targetVertex.id(), edge._id).points;
+  edgePoints(edge2) {
+    return this.digraph.edge(edge2._sourceVertex.id(), edge2._targetVertex.id(), edge2._id).points;
   }
 }
 const TITLE_SIZE = 14, MINMAX_SIZE = 18;
@@ -6675,8 +6675,8 @@ const _Graph = class _Graph extends SVGZoomWidget {
       for (; nextSibling; )
         target.parentNode.insertBefore(nextSibling, target), nextSibling = target.nextSibling;
       Platform.svgMarkerGlitch && this._graphData.nodeEdges(d2.id()).forEach((glEdge) => {
-        const edge = this._graphData.edge(glEdge);
-        this._pushMarkers(edge.element());
+        const edge2 = this._graphData.edge(glEdge);
+        this._pushMarkers(edge2.element());
       });
     }
   }
@@ -6711,8 +6711,8 @@ const _Graph = class _Graph extends SVGZoomWidget {
         });
       }
       this._neighborOffsets = [], Platform.svgMarkerGlitch && this._graphData.nodeEdges(d2.id()).forEach(function(id) {
-        const edge = this._graphData.edge(id);
-        this._popMarkers(edge.element());
+        const edge2 = this._graphData.edge(id);
+        this._popMarkers(edge2.element());
       });
     }
   }
@@ -6930,8 +6930,8 @@ const _Graph = class _Graph extends SVGZoomWidget {
     if (vertex2) {
       const nedges = this._graphData.nodeEdges(vertex2.id());
       for (let i2 = 0; i2 < nedges.length; ++i2) {
-        const edge = this._graphData.edge(nedges[i2]);
-        edges[edge.id()] = edge, edge._sourceVertex.id() !== vertex2.id() && (vertices[edge._sourceVertex.id()] = edge._sourceVertex), edge._targetVertex.id() !== vertex2.id() && (vertices[edge._targetVertex.id()] = edge._targetVertex);
+        const edge2 = this._graphData.edge(nedges[i2]);
+        edges[edge2.id()] = edge2, edge2._sourceVertex.id() !== vertex2.id() && (vertices[edge2._sourceVertex.id()] = edge2._sourceVertex), edge2._targetVertex.id() !== vertex2.id() && (vertices[edge2._targetVertex.id()] = edge2._targetVertex);
       }
     }
     return {
@@ -7886,35 +7886,6 @@ function interpolatePath(a2, b2, interpolateOptions) {
     return interpolatedString;
   };
 }
-function rectEdges(rect) {
-  return [
-    { start: rect.topLeft, end: rect.topRight },
-    { start: rect.topRight, end: rect.bottomRight },
-    { start: rect.bottomRight, end: rect.bottomLeft },
-    { start: rect.bottomLeft, end: rect.topLeft }
-  ];
-}
-function lineIntersection(segment1, segment2) {
-  const { x: x1, y: y1 } = segment1.start, { x: x2, y: y2 } = segment1.end, { x: x3, y: y3 } = segment2.start, { x: x4, y: y4 } = segment2.end, denom = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
-  if (denom === 0) return null;
-  const t2 = ((x1 - x3) * (y3 - y4) - (y1 - y3) * (x3 - x4)) / denom, u2 = -((x1 - x2) * (y1 - y3) - (y1 - y2) * (x1 - x3)) / denom;
-  return t2 > 0 && t2 < 1 && u2 > 0 && u2 < 1 ? {
-    x: x1 + t2 * (x2 - x1),
-    y: y1 + t2 * (y2 - y1)
-  } : null;
-}
-function intersection(rect, line) {
-  for (const edge of rectEdges({
-    topLeft: { x: rect.x - rect.w / 2, y: rect.y - rect.h / 2 },
-    topRight: { x: rect.x + rect.w / 2, y: rect.y - rect.h / 2 },
-    bottomRight: { x: rect.x + rect.w / 2, y: rect.y + rect.h / 2 },
-    bottomLeft: { x: rect.x - rect.w / 2, y: rect.y + rect.h / 2 }
-  })) {
-    const intersectionPoint = lineIntersection(edge, line);
-    if (intersectionPoint) return intersectionPoint;
-  }
-  return null;
-}
 const lineBasis$2 = d3Line().x((d2) => d2[0]).y((d2) => d2[1]).curve(d3CurveBasis), lineCardinal = d3Line().x((d2) => d2[0]).y((d2) => d2[1]).curve(d3CurveCardinal);
 class Layout {
   constructor(graph2) {
@@ -7946,8 +7917,8 @@ class Layout {
     };
   }
   edgeLine(ep) {
-    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
-    const sPos = { ...this._graph.projectPlacholder(ep.source), w: ((_c = (_b2 = (_a2 = ep.source) == null ? void 0 : _a2.renderResult) == null ? void 0 : _b2.extent) == null ? void 0 : _c.width) ?? 0, h: ((_f = (_e = (_d = ep.source) == null ? void 0 : _d.renderResult) == null ? void 0 : _e.extent) == null ? void 0 : _f.height) ?? 0 }, tPos = { ...this._graph.projectPlacholder(ep.target), w: ((_i = (_h = (_g = ep.target) == null ? void 0 : _g.renderResult) == null ? void 0 : _h.extent) == null ? void 0 : _i.width) ?? 0, h: ((_l = (_k = (_j = ep.target) == null ? void 0 : _j.renderResult) == null ? void 0 : _k.extent) == null ? void 0 : _l.height) ?? 0 }, sIntersect = intersection(sPos, { start: sPos, end: tPos }), tIntersect = intersection(tPos, { start: sPos, end: tPos });
+    var _a2, _b2, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l, _m, _n;
+    const sPos = { ...this._graph.projectPlacholder(ep.source), w: ((_c = (_b2 = (_a2 = ep.source) == null ? void 0 : _a2.renderResult) == null ? void 0 : _b2.extent) == null ? void 0 : _c.width) ?? 0, h: ((_f = (_e = (_d = ep.source) == null ? void 0 : _d.renderResult) == null ? void 0 : _e.extent) == null ? void 0 : _f.height) ?? 0 }, tPos = { ...this._graph.projectPlacholder(ep.target), w: ((_i = (_h = (_g = ep.target) == null ? void 0 : _g.renderResult) == null ? void 0 : _h.extent) == null ? void 0 : _i.width) ?? 0, h: ((_l = (_k = (_j = ep.target) == null ? void 0 : _j.renderResult) == null ? void 0 : _k.extent) == null ? void 0 : _l.height) ?? 0 }, sIntersect = (_m = ep.source.renderResult) != null && _m.intersection ? ep.source.renderResult.intersection(sPos, { start: sPos, end: tPos }) : null, tIntersect = (_n = ep.target.renderResult) != null && _n.intersection ? ep.target.renderResult.intersection(tPos, { start: sPos, end: tPos }) : null;
     return {
       source: {
         x: sIntersect ? sIntersect.x : sPos.x,
@@ -8904,8 +8875,8 @@ class GraphT extends SVGZoomWidget {
     if (vertex2) {
       const nedges = this._graphData.vertexEdges(vertex2.id);
       for (let i2 = 0; i2 < nedges.length; ++i2) {
-        const edge = this._graphData.edge(nedges[i2].id);
-        edges[edge.id] = edge, edge.source.id !== vertex2.id && (vertices[edge.source.id] = edge.source), edge.target.id !== vertex2.id && (vertices[edge.target.id] = edge.target);
+        const edge2 = this._graphData.edge(nedges[i2].id);
+        edges[edge2.id] = edge2, edge2.source.id !== vertex2.id && (vertices[edge2.source.id] = edge2.source), edge2.target.id !== vertex2.id && (vertices[edge2.target.id] = edge2.target);
       }
     }
     return {
@@ -8991,9 +8962,7 @@ class GraphT extends SVGZoomWidget {
   }
   moveEdgePlaceholder(ep, transition) {
     const edgeLayout = {
-      ...this._layoutAlgo.edgePath(ep, this.edgeArcDepth()),
-      markerStart: `url(#${this.id()}_circleFoot)`,
-      markerEnd: `url(#${this.id()}_arrowHead)`
+      ...this._layoutAlgo.edgePath(ep, this.edgeArcDepth())
     }, context = this;
     if (this._edgeRenderer && ep.element) {
       const previousEdgeLayout = ep.previousEdgeLayout ?? edgeLayout;
@@ -9166,13 +9135,10 @@ class GraphT extends SVGZoomWidget {
       context.moveSubgraphPlaceholder(d2, !1);
     }), this;
   }
-  addMarkers(clearFirst = !1) {
-    clearFirst && (this._svgDefs.select("#" + this._id + "_arrowHead").remove(), this._svgDefs.select("#" + this._id + "_circleFoot").remove(), this._svgDefs.select("#" + this._id + "_circleHead").remove()), this._svgDefs.append("marker").attr("class", "marker").attr("id", this._id + "_arrowHead").attr("viewBox", "0 0 10 10").attr("refX", 10).attr("refY", 5).attr("markerWidth", 8).attr("markerHeight", 8).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("polyline").attr("points", "0,0 10,5 0,10 1,5"), this._svgDefs.append("marker").attr("class", "marker").attr("id", this._id + "_circleFoot").attr("viewBox", "0 0 10 10").attr("refX", 1).attr("refY", 5).attr("markerWidth", 7).attr("markerHeight", 7).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("circle").attr("cx", 5).attr("cy", 5).attr("r", 4), this._svgDefs.append("marker").attr("class", "marker").attr("id", this._id + "_circleHead").attr("viewBox", "0 0 10 10").attr("refX", 9).attr("refY", 5).attr("markerWidth", 7).attr("markerHeight", 7).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("circle").attr("cx", 5).attr("cy", 5).attr("r", 4);
-  }
   enter(domNode, element) {
     super.enter(domNode, element);
     const svg = this.locateSVGNode(domNode);
-    this._svgDefs = select(svg).select("defs"), this._centroidFilter = new SVGGlowFilter(this._svgDefs, this._id + "_glow"), this._svgDefsCat = this._svgDefs.append("g"), this._svgDefsAnn = this._svgDefs.append("g"), this.addMarkers(), this._subgraphG = this._renderElement.append("g"), this._edgeG = this._renderElement.append("g"), this._vertexG = this._renderElement.append("g"), this._tooltip.target(domNode), this.on("startMarqueeSelection", () => {
+    this._svgDefs = select(svg).select("defs"), this._centroidFilter = new SVGGlowFilter(this._svgDefs, this._id + "_glow"), this._svgDefsCat = this._svgDefs.append("g"), this._svgDefsAnn = this._svgDefs.append("g"), this._subgraphG = this._renderElement.append("g"), this._edgeG = this._renderElement.append("g"), this._vertexG = this._renderElement.append("g"), this._tooltip.target(domNode), this.on("startMarqueeSelection", () => {
     }).on("updateMarqueeSelection", (rect) => {
       const vertices = this._graphData.allVertices().filter((v2) => v2.x >= rect.x && v2.x <= rect.x + rect.width && v2.y >= rect.y && v2.y <= rect.y + rect.height);
       this.selection(vertices.map((v2) => v2.props));
@@ -10080,11 +10046,60 @@ const B = (t2, i2, s2) => {
   let h2 = e2._$litPart$;
   return h2 === void 0 && (e2._$litPart$ = h2 = new R(i2.insertBefore(l(), null), null, void 0, {})), h2._$AI(t2), h2;
 };
-function extend(result, width, height) {
+function extend(result, width, height, intersection = (pos, line) => null) {
   return {
     ...result,
-    extent: { width, height }
+    extent: { width, height },
+    intersection
+  };
+}
+function segmentSegment(s1, s2) {
+  const { x: x1, y: y1 } = s1.start, { x: x2, y: y2 } = s1.end, { x: x3, y: y3 } = s2.start, { x: x4, y: y4 } = s2.end, denom = (x1 - x2) * (y3 - y4) - (y1 - y2) * (x3 - x4);
+  if (denom === 0)
+    return;
+  const t2 = ((x1 - x3) * (y3 - y4) - (y1 - y3) * (x3 - x4)) / denom, u2 = -((x1 - x2) * (y1 - y3) - (y1 - y2) * (x1 - x3)) / denom;
+  if (t2 > 0 && t2 < 1 && u2 > 0 && u2 < 1)
+    return {
+      x: x1 + t2 * (x2 - x1),
+      y: y1 + t2 * (y2 - y1)
+    };
+}
+function rectEdges(rect) {
+  const r2 = {
+    topLeft: { x: rect.x - rect.width / 2, y: rect.y - rect.height / 2 },
+    topRight: { x: rect.x + rect.width / 2, y: rect.y - rect.height / 2 },
+    bottomRight: { x: rect.x + rect.width / 2, y: rect.y + rect.height / 2 },
+    bottomLeft: { x: rect.x - rect.width / 2, y: rect.y + rect.height / 2 }
   };
+  return [
+    { start: r2.bottomLeft, end: r2.topLeft },
+    { start: r2.topLeft, end: r2.topRight },
+    { start: r2.topRight, end: r2.bottomRight },
+    { start: r2.bottomRight, end: r2.bottomLeft }
+  ];
+}
+function rectangleSegment(rect, line) {
+  for (const edge2 of rectEdges(rect)) {
+    const intersectionPoint = segmentSegment(edge2, line);
+    if (intersectionPoint)
+      return intersectionPoint;
+  }
+}
+function sortSegment(pos, line) {
+  const distStart = Math.hypot(line.start.x - pos.x, line.start.y - pos.y), distEnd = Math.hypot(line.end.x - pos.x, line.end.y - pos.y);
+  return distStart <= distEnd ? line : { start: line.end, end: line.start };
+}
+function circleSegment(pos, r2, line) {
+  line = sortSegment(pos, line);
+  const { x: x1, y: y1 } = line.start, { x: x2, y: y2 } = line.end, dx = x2 - x1, dy = y2 - y1, a2 = dx * dx + dy * dy, b2 = 2 * (dx * (x1 - pos.x) + dy * (y1 - pos.y)), c2 = (x1 - pos.x) * (x1 - pos.x) + (y1 - pos.y) * (y1 - pos.y) - r2 * r2, discriminant = b2 * b2 - 4 * a2 * c2;
+  if (discriminant < 0)
+    return;
+  const t1 = (-b2 + Math.sqrt(discriminant)) / (2 * a2);
+  if (t1 >= 0 && t1 <= 1)
+    return {
+      x: x1 + t1 * dx,
+      y: y1 + t1 * dy
+    };
 }
 const DEFAULT_SHAPE_SIZE = 32, circle = ({
   diameter = DEFAULT_SHAPE_SIZE,
@@ -10099,7 +10114,7 @@ const DEFAULT_SHAPE_SIZE = 32, circle = ({
     stroke=${stroke}
     stroke-width=${strokeWidth}
     shape-rendering=${shapeRendering}
-/>`, diameter, diameter), rectangle = ({
+/>`, diameter, diameter, (pos, line) => circleSegment(pos, diameter / 2, line)), rectangle = ({
   width = DEFAULT_SHAPE_SIZE,
   height = DEFAULT_SHAPE_SIZE,
   cornerRadius = 4,
@@ -10119,7 +10134,7 @@ const DEFAULT_SHAPE_SIZE = 32, circle = ({
     stroke=${stroke}
     stroke-width=${strokeWidth}
     shape-rendering=${shapeRendering}
-/>`, width, height), square = ({
+/>`, width, height, (pos, line) => rectangleSegment({ x: pos.x, y: pos.y, width, height }, line)), square = ({
   width = DEFAULT_SHAPE_SIZE,
   cornerRadius,
   fill,
@@ -10223,9 +10238,14 @@ const DEFAULT_SHAPE_SIZE = 32, circle = ({
     strokeWidth,
     cornerRadius
   });
-  return extend(b`\
+  return extend(
+    b`\
 ${rectTpl}
-${textTpl}`, rectTpl.extent.width, rectTpl.extent.height);
+${textTpl}`,
+    rectTpl.extent.width,
+    rectTpl.extent.height,
+    rectTpl.intersection
+  );
 }, annotation = ({
   text,
   fontFamily = "FontAwesome",
@@ -10331,7 +10351,7 @@ function icon({
 <g>
 ${shapeTpl}
 ${imageTpl}
-</g>`, shapeTpl.extent.width, shapeTpl.extent.height);
+</g>`, shapeTpl.extent.width, shapeTpl.extent.height, shapeTpl.intersection);
 }
 function adapter(component) {
   return (props, element) => {
@@ -10348,18 +10368,23 @@ const defaultSubgraphRenderer = ({
     ${TextBox({ text: { text } })}
 `, defaultEdgeRenderer = ({
   strokeWidth,
-  path: path2,
-  markerStart,
-  markerEnd
-}) => b`<path d="${path2}" marker-start="${markerStart}" marker-end="${markerEnd}" style="stroke-width:${strokeWidth}px"></path>`;
+  path: path2
+}) => b`<path d="${path2}" style="stroke-width:${strokeWidth}px"></path>`;
 class GraphHtmlT extends GraphT {
   constructor(subgraphRenderer = defaultSubgraphRenderer, vertexRenderer = defaultVertexRenderer, edgeRenderer = defaultEdgeRenderer) {
     super(adapter(subgraphRenderer), adapter(vertexRenderer), adapter(edgeRenderer));
   }
+  enterMarkers(clearFirst = !1) {
+    clearFirst && (this._svgDefs.select("#" + this._id + "_sourceDot").remove(), this._svgDefs.select("#" + this._id + "_targetDot").remove(), this._svgDefs.select("#" + this._id + "_targetArrow").remove()), this._svgDefs.append("marker").attr("class", "marker").attr("id", this._id + "_sourceDot").attr("refX", 1).attr("refY", 3).attr("markerWidth", 6).attr("markerHeight", 6).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("circle").attr("cx", 3).attr("cy", 3).attr("r", 1.5).attr("fill", "context-stroke").attr("stroke", "context-stroke"), this._svgDefs.append("marker").attr("class", "marker").attr("id", this._id + "_targetDot").attr("refX", 5).attr("refY", 3).attr("markerWidth", 6).attr("markerHeight", 6).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("circle").attr("cx", 3).attr("cy", 3).attr("r", 1.5).attr("fill", "context-stroke").attr("stroke", "context-stroke"), this._svgDefs.append("marker").attr("class", "marker").attr("id", this._id + "_targetArrow").attr("viewBox", "0 0 10 10").attr("refX", 10).attr("refY", 5).attr("markerWidth", 5).attr("markerHeight", 5).attr("markerUnits", "strokeWidth").attr("orient", "auto").append("polyline").attr("points", "0,0 10,5 0,10 0,5").attr("fill", "context-stroke").attr("stroke", "context-stroke");
+  }
+  enter(domNode, element) {
+    super.enter(domNode, element), this.enterMarkers();
+  }
 }
 GraphHtmlT.prototype._class += " graph_GraphHtmlT";
+GraphHtmlT.prototype.publish("sourceMarker", "Dot", "set", "Target Marker", ["Dot", "None"]);
+GraphHtmlT.prototype.publish("targetMarker", "Arrow", "set", "Target Marker", ["Arrow", "Dot", "None"]);
 const vertex = ({
-  id,
   text,
   textBox,
   textBoxAnnotationsE = [],
@@ -10391,11 +10416,15 @@ ${textBoxTpl}
 <g transform="translate(${iconAnnotationsTpl.extent.width / 2 + xIconAnnotationOffset} ${yIconOffset - yIconAnnotationOffset})">
     ${iconAnnotationsTpl}
 </g>
-`, textBoxTpl.extent.width, textBoxTpl.extent.height);
-};
+`, textBoxTpl.extent.width, textBoxTpl.extent.height, (pos, line) => iconTpl.intersection({ x: pos.x, y: yIconOffset + pos.y }, line) ?? textBoxTpl.intersection({ x: pos.x, y: pos.y }, line));
+}, edge = ({
+  graphInstance,
+  strokeWidth,
+  path: path2
+}) => b`<path d="${path2}" marker-start="url(#${graphInstance.id()}_source${graphInstance.sourceMarker()})" marker-end="url(#${graphInstance.id()}_target${graphInstance.targetMarker()})" style="stroke-width:${strokeWidth}px"></path>`;
 class GraphHtml extends GraphHtmlT {
   constructor() {
-    super(void 0, vertex);
+    super(void 0, vertex, edge);
   }
 }
 GraphHtml.prototype._class += " graph_GraphHtml";