@knowvah/dot-engine 1.2.2 → 1.2.4

package/dist/layout/dot/edge-route-arrow.d.ts

@@ -28,6 +28,14 @@ export declare function arrowheadPolygon(arrowTip: Point, arrowDir: Point, penwi
 /** Minimal edge shape exposing the arrow-related attributes. */
 interface ArrowAttrEdge {
     attrs: Map<string, string>;
+    /** Present on real edges; the curve generator needs the rankdir frame. */
+    tail?: {
+        root?: {
+            info?: {
+                rankdir?: number;
+            };
+        };
+    };
 }
 /** The arrowhead/arrowtail name for an edge end (default "normal"). */
 export declare function edgeArrowName(e: ArrowAttrEdge, end: 'head' | 'tail'): string;

package/dist/layout/dot/edge-route-arrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"edge-route-arrow.d.ts","sourceRoot":"","sources":["../../../src/layout/dot/edge-route-arrow.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAIjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,gFAAgF;AAChF,eAAO,MAAM,YAAY,KAAK,CAAC;AAE/B,qEAAqE;AACrE,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAEvC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,SAAM,GAAG,KAAK,EAAE,CAe1F;AAOD,gEAAgE;AAChE,UAAU,aAAa;IAAG,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;CAAE;AAEtD,uEAAuE;AACvE,wBAAgB,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAE5E;AAED,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CAGtD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,GAC/E,WAAW,EAAE,CAKf"}
+{"version":3,"file":"edge-route-arrow.d.ts","sourceRoot":"","sources":["../../../src/layout/dot/edge-route-arrow.ts"],"names":[],"mappings":"AAEA;;;;;GAKG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AAIjD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAEhE,gFAAgF;AAChF,eAAO,MAAM,YAAY,KAAK,CAAC;AAE/B,qEAAqE;AACrE,eAAO,MAAM,kBAAkB,OAAO,CAAC;AAEvC;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,SAAM,GAAG,KAAK,EAAE,CAe1F;AAOD,gEAAgE;AAChE,UAAU,aAAa;IACrB,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,0EAA0E;IAC1E,IAAI,CAAC,EAAE;QAAE,IAAI,CAAC,EAAE;YAAE,IAAI,CAAC,EAAE;gBAAE,OAAO,CAAC,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC;CACnD;AAED,uEAAuE;AACvE,wBAAgB,aAAa,CAAC,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAE5E;AAED,oFAAoF;AACpF,wBAAgB,aAAa,CAAC,CAAC,EAAE,aAAa,GAAG,MAAM,CAGtD;AAED;;;;;;;GAOG;AACH,wBAAgB,kBAAkB,CAChC,CAAC,EAAE,aAAa,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,GAC/E,WAAW,EAAE,CAMf"}

package/dist/model/geom.d.ts

@@ -109,6 +109,11 @@ export type Port = {
  * @see lib/common/geom.c:ccwrotatepf
  */
 export declare function ccwrotatepf(p: Point, ccwrot: number): Point;
+/**
+ * Clockwise counterpart — the exact inverse of {@link ccwrotatepf} per case.
+ * @see lib/common/geom.c:cwrotatepf
+ */
+export declare function cwrotatepf(p: Point, cwrot: number): Point;
 /**
  * Returns true if box `b0` completely contains box `b1`.
  *

package/dist/model/geom.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"geom.d.ts","sourceRoot":"","sources":["../../src/model/geom.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AAMH;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAM7C;;;;;;;;GAQG;AACH,MAAM,MAAM,GAAG,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC;AAM3C;;;;GAIG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,4CAA4C;IAC5C,IAAI,EAAE,KAAK,EAAE,CAAC;IACd,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,KAAK,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,EAAE,EAAE,KAAK,CAAC;IACV,yCAAyC;IACzC,EAAE,EAAE,KAAK,CAAC;CACX,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,uCAAuC;IACvC,EAAE,EAAE,GAAG,CAAC;CACT,CAAC;AAMF;;;;GAIG;AACH,MAAM,MAAM,IAAI,GAAG;IACjB,8EAA8E;IAC9E,CAAC,EAAE,KAAK,CAAC;IACT,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,EAAE,EAAE,GAAG,GAAG,IAAI,CAAC;IACf,qFAAqF;IACrF,OAAO,EAAE,OAAO,CAAC;IACjB,4FAA4F;IAC5F,WAAW,EAAE,OAAO,CAAC;IACrB,+EAA+E;IAC/E,IAAI,EAAE,OAAO,CAAC;IACd,oFAAoF;IACpF,IAAI,EAAE,OAAO,CAAC;IACd,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAUF;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAQ3D;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,OAAO,CAOrD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,OAAO,CAOpD;AAMD;;;;GAIG;AACH,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC;;;;GAIG;AACH,eAAO,MAAM,WAAW,MAAO,CAAC"}
+{"version":3,"file":"geom.d.ts","sourceRoot":"","sources":["../../src/model/geom.ts"],"names":[],"mappings":"AAEA;;;;;;GAMG;AAMH;;;;GAIG;AACH,MAAM,MAAM,KAAK,GAAG;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAM7C;;;;;;;;GAQG;AACH,MAAM,MAAM,GAAG,GAAG;IAAE,EAAE,EAAE,KAAK,CAAC;IAAC,EAAE,EAAE,KAAK,CAAA;CAAE,CAAC;AAM3C;;;;GAIG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,4CAA4C;IAC5C,IAAI,EAAE,KAAK,EAAE,CAAC;IACd,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,8CAA8C;IAC9C,KAAK,EAAE,MAAM,CAAC;IACd,8CAA8C;IAC9C,KAAK,EAAE,MAAM,CAAC;IACd,yCAAyC;IACzC,EAAE,EAAE,KAAK,CAAC;IACV,yCAAyC;IACzC,EAAE,EAAE,KAAK,CAAC;CACX,CAAC;AAEF;;;;;GAKG;AACH,MAAM,MAAM,MAAM,GAAG;IACnB,4CAA4C;IAC5C,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,uCAAuC;IACvC,EAAE,EAAE,GAAG,CAAC;CACT,CAAC;AAMF;;;;GAIG;AACH,MAAM,MAAM,IAAI,GAAG;IACjB,8EAA8E;IAC9E,CAAC,EAAE,KAAK,CAAC;IACT,8DAA8D;IAC9D,KAAK,EAAE,MAAM,CAAC;IACd;;;OAGG;IACH,EAAE,EAAE,GAAG,GAAG,IAAI,CAAC;IACf,qFAAqF;IACrF,OAAO,EAAE,OAAO,CAAC;IACjB,4FAA4F;IAC5F,WAAW,EAAE,OAAO,CAAC;IACrB,+EAA+E;IAC/E,IAAI,EAAE,OAAO,CAAC;IACd,oFAAoF;IACpF,IAAI,EAAE,OAAO,CAAC;IACd,iEAAiE;IACjE,KAAK,EAAE,MAAM,CAAC;IACd;;;;OAIG;IACH,IAAI,EAAE,MAAM,CAAC;IACb;;;OAGG;IACH,IAAI,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAUF;;;;;;;;;;GAUG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,KAAK,CAQ3D;AAED;;;GAGG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,GAAG,KAAK,CAQzD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,WAAW,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,OAAO,CAOrD;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,UAAU,CAAC,EAAE,EAAE,GAAG,EAAE,EAAE,EAAE,GAAG,GAAG,OAAO,CAOpD;AAMD;;;;GAIG;AACH,eAAO,MAAM,eAAe,KAAK,CAAC;AAElC;;;;GAIG;AACH,eAAO,MAAM,WAAW,MAAO,CAAC"}

package/dist/render.js

@@ -5450,12 +5450,15 @@ function parseAttrs(raw) {
   }
   return out;
 }
+function normalizeTag(tag) {
+  return tag === "TH" ? "TR" : tag;
+}
 function parseCloseToken(inner) {
   const body = inner.slice(1).trim();
   const sp = body.search(/\s/);
   const tag = (sp === -1 ? body : body.slice(0, sp)).toUpperCase();
   checkTag(tag);
-  return { type: "close", tag };
+  return { type: "close", tag: normalizeTag(tag) };
 }
 function cleanText(raw) {
   const isKeep = (c) => c === " " || c === "	" || c === "\n" || c === "\r";
@@ -5489,12 +5492,13 @@ function scanTag(src, start, tokens) {
 function parseOpenToken(inner) {
   const sp = inner.search(/\s/);
   if (sp === -1) {
-    checkTag(inner.toUpperCase());
-    return { type: "open", tag: inner.toUpperCase(), attrs: parseAttrs("") };
+    const tag2 = inner.toUpperCase();
+    checkTag(tag2);
+    return { type: "open", tag: normalizeTag(tag2), attrs: parseAttrs("") };
   }
   const tag = inner.slice(0, sp).toUpperCase();
   checkTag(tag);
-  return { type: "open", tag, attrs: parseAttrs(inner.slice(sp + 1)) };
+  return { type: "open", tag: normalizeTag(tag), attrs: parseAttrs(inner.slice(sp + 1)) };
 }
 function tokenize(src) {
   const tokens = [];
@@ -5719,7 +5723,7 @@ var buildCell = (content, a) => ({
 });
 var parseCell = (s, attrs, fontStack) => buildCell(parseCellContent(s, attrs, fontStack), attrs);
 var processRowToken = (s, t, cells, fontStack) => {
-  if (t.type === "open" && (t.tag === "TD" || t.tag === "TH")) {
+  if (t.type === "open" && t.tag === "TD") {
     consume(s);
     cells.push(parseCell(s, t.attrs, fontStack));
     return;
@@ -7597,6 +7601,40 @@ function miterShape(baseLeft, P, baseRight, penwidth) {
   return [{ x: P1.x + l * a.cos, y: P1.y + l * a.sin }, P1, P2];
 }
 
+// src/model/geom.ts
+function ccwrotatepf(p, ccwrot) {
+  switch (ccwrot) {
+    case 0:
+      return p;
+    case 90:
+      return { x: -p.y, y: p.x };
+    case 180:
+      return { x: p.x, y: -p.y };
+    case 270:
+      return { x: p.y, y: p.x };
+    default:
+      return p;
+  }
+}
+function cwrotatepf(p, cwrot) {
+  switch (cwrot) {
+    case 0:
+      return p;
+    case 90:
+      return { x: p.y, y: -p.x };
+    case 180:
+      return { x: p.x, y: -p.y };
+    case 270:
+      return { x: p.y, y: p.x };
+    default:
+      return p;
+  }
+}
+function boxOverlap(b0, b1) {
+  return b0.ur.x >= b1.ll.x && b1.ur.x >= b0.ll.x && b0.ur.y >= b1.ll.y && b1.ur.y >= b0.ll.y;
+}
+var POINTS_PER_INCH = 72;
+
 // src/common/arrows-shapes-poly.ts
 var CROW_ARROWWIDTH = 0.45;
 function crowBasePoints(u, v, flag) {
@@ -7758,7 +7796,15 @@ function curveControlPoints(p, v, w, flag) {
   const AF2 = { x: p.x - 0.95 * v.x + w.x + s * w.x * (4 / 3), y: AF3.y + s * w.y * (4 / 3) };
   return [AF0, AF1, AF2, AF3];
 }
-function genCurve(p0, u, _arrowsize, penwidth, flag) {
+function genCurve(p0, u, _arrowsize, penwidth, flag, rankdir = 0) {
+  if (rankdir !== 0) {
+    const rot = rankdir * 90;
+    const fin = genCurve(ccwrotatepf(p0, rot), ccwrotatepf(u, rot), _arrowsize, penwidth, flag);
+    return {
+      ops: fin.ops.map((op) => "points" in op ? { ...op, points: op.points.map((pt) => cwrotatepf(pt, rot)) } : op),
+      q: cwrotatepf(fin.q, rot)
+    };
+  }
   const arrowwidth = penwidth > 4 ? 0.5 * penwidth / 4 : 0.5;
   const noShift = flag & ARR_MOD_INV || u.x === 0 && u.y === 0;
   const p = noShift ? p0 : vsub(p0, backwardDelta(u, penwidth));
@@ -7973,7 +8019,7 @@ function arrowLength(comps, arrowsize, penwidth) {
   for (let i = 0; i < n; i++) length += arrowLengthOne(comps[i], arrowsize, penwidth);
   return length;
 }
-function dispatchSimple(r, tip2, dir, arrowsize, penwidth) {
+function dispatchSimple(r, tip2, dir, arrowsize, penwidth, rankdir = 0) {
   const flag = arrowFlag(r);
   const u = componentU(dir, r.lenfact, arrowsize);
   switch (r.type & ARR_TYPE_MASK) {
@@ -7987,8 +8033,10 @@ function dispatchSimple(r, tip2, dir, arrowsize, penwidth) {
       return genDiamond(tip2, u, arrowsize, penwidth, flag);
     case ARR_TYPE_DOT:
       return genDot(tip2, u, arrowsize, penwidth, flag);
+    // curve is the one generator that is not rotation-equivariant; it needs
+    // the rankdir to reproduce C's render-time (final-frame) generation.
     case ARR_TYPE_CURVE:
-      return genCurve(tip2, u, arrowsize, penwidth, flag);
+      return genCurve(tip2, u, arrowsize, penwidth, flag, rankdir);
     case ARR_TYPE_GAP:
       return genGap(tip2, u, arrowsize, penwidth, flag);
     case ARR_TYPE_NORM:
@@ -7996,14 +8044,14 @@ function dispatchSimple(r, tip2, dir, arrowsize, penwidth) {
       return genNormal(tip2, u, arrowsize, penwidth, flag);
   }
 }
-function arrowDrawOps(comps, tip2, dir, arrowsize, penwidth) {
+function arrowDrawOps(comps, tip2, dir, arrowsize, penwidth, rankdir = 0) {
   const ops = [];
   let p = tip2;
   const n = Math.min(comps.length, 4);
   for (let i = 0; i < n; i++) {
     const r = comps[i];
     if ((r.type & ARR_TYPE_MASK) === ARR_TYPE_NONE) break;
-    const res = dispatchSimple(r, p, dir, arrowsize, penwidth);
+    const res = dispatchSimple(r, p, dir, arrowsize, penwidth, rankdir);
     ops.push(...res.ops);
     p = res.q;
   }
@@ -8147,7 +8195,8 @@ function edgeArrowsize(e) {
 }
 function arrowDrawOpsForEnd(e, end, tip2, dir, penwidth) {
   const comps = parseArrow(edgeArrowName(e, end)).map(resolveArrowType);
-  return arrowDrawOps(comps, tip2, dir, edgeArrowsize(e), penwidth);
+  const rankdir = (e.tail?.root?.info?.rankdir ?? 0) & 3;
+  return arrowDrawOps(comps, tip2, dir, edgeArrowsize(e), penwidth, rankdir);
 }
 
 // src/model/layoutParams.ts
@@ -8501,26 +8550,6 @@ var RenderJob = class {
   }
 };
 
-// src/model/geom.ts
-function ccwrotatepf(p, ccwrot) {
-  switch (ccwrot) {
-    case 0:
-      return p;
-    case 90:
-      return { x: -p.y, y: p.x };
-    case 180:
-      return { x: p.x, y: -p.y };
-    case 270:
-      return { x: p.y, y: p.x };
-    default:
-      return p;
-  }
-}
-function boxOverlap(b0, b1) {
-  return b0.ur.x >= b1.ll.x && b1.ur.x >= b0.ll.x && b0.ur.y >= b1.ll.y && b1.ur.y >= b0.ll.y;
-}
-var POINTS_PER_INCH = 72;
-
 // src/model/graphInfo.ts
 function makeGraphInfo() {
   return {
@@ -10724,10 +10753,7 @@ function posReclbl(f, ul, sides) {
   }
 }
 function attrBool(n, g, key) {
-  const s = nodeAttr(n, g, key);
-  if (!s || s.toLowerCase() === "false" || s.toLowerCase() === "no") return false;
-  if (s.toLowerCase() === "true" || s.toLowerCase() === "yes") return true;
-  return parseInt(s, 10) !== 0;
+  return mapbool2(nodeAttr(n, g, key));
 }
 function recAttrSize(n, g) {
   const w = nodeAttr(n, g, "width");
@@ -16296,7 +16322,7 @@ function class2(g) {
 
 // src/common/edge-label-init.ts
 var MIN_FONTSIZE = 1;
-function mapbool2(s) {
+function mapbool3(s) {
   if (!s || s.toLowerCase() === "false" || s.toLowerCase() === "no") return false;
   if (s.toLowerCase() === "true" || s.toLowerCase() === "yes") return true;
   const n = parseInt(s, 10);
@@ -16327,7 +16353,7 @@ function applyLabel(e, g, fi, measurer) {
   const content = isHtml ? htmlValueContent(str) : str;
   e.info.label = makeAnyLabel(content, isHtml, fi, measurer, e);
   g.root.info.has_labels |= EDGE_LABEL;
-  e.info.label_ontop = mapbool2(e.attrs.get("labelfloat")) ? 1 : 0;
+  e.info.label_ontop = mapbool3(e.attrs.get("labelfloat")) ? 1 : 0;
 }
 function applyXLabel(e, g, fi, measurer) {
   const str = e.attrs.get("xlabel");
@@ -16523,7 +16549,7 @@ function graphInit(g, useRankdir) {
   if (fn !== -1) g.info.fontnames = fn;
   parseRatioDrawing(g);
   setClType(maptoken(g.attrs.get("clusterrank"), RANK_NAMES, rankCodes()));
-  g.info.concentrate = mapbool3(g.attrs.get("concentrate"));
+  g.info.concentrate = mapbool2(g.attrs.get("concentrate"));
   g.info.edgeLabelsDone = false;
   doGraphLabel(g, layoutMeasurer(g));
 }
@@ -16565,7 +16591,7 @@ function sameNonemptyGroup(e) {
 }
 function initEdgeConstraint(e) {
   const s = e.attrs.get("constraint");
-  if (s !== void 0 && s !== "") e.info.constraint = mapbool3(s);
+  if (s !== void 0 && s !== "") e.info.constraint = mapbool2(s);
 }
 function applyGroupPenalty(e) {
   if (!sameNonemptyGroup(e)) return;
@@ -16663,7 +16689,7 @@ function gdRankdir(n) {
 function gdFlip(n) {
   return (gdRankdir(n) & 1) !== 0;
 }
-function cwrotatepf(p, cwrot) {
+function cwrotatepf2(p, cwrot) {
   switch (cwrot) {
     case 90:
       return { x: p.y, y: -p.x };
@@ -16810,7 +16836,7 @@ function setOrder(pp, q) {
   pp.order = MC_SCALE * a / (2 * Math.PI) | 0;
 }
 function applyDir(pp, bp, dir, rd, definedFinal) {
-  const q = cwrotatepf(dir.p, 90 * rd);
+  const q = cwrotatepf2(dir.p, 90 * rd);
   pp.p = q;
   pp.bp = bp;
   pp.side = dir.dyna ? dir.side : invflipSide(dir.side, rd);
@@ -16826,7 +16852,7 @@ function nodeInsideFn(n) {
 }
 function compassPoint(n, insideFn, yArg, xArg, rd) {
   let p = { x: xArg, y: yArg };
-  if (rd) p = cwrotatepf(p, 90 * rd);
+  if (rd) p = cwrotatepf2(p, 90 * rd);
   const curve = [{ x: 0, y: 0 }, { x: 0, y: 0 }, { x: p.x, y: p.y }, { x: p.x, y: p.y }];
   const ctx = { nodeCoord: n.info.coord, rw: n.info.rw, bp: null, node: n };
   bezierClip(ctx, insideFn, curve, true);
@@ -21956,10 +21982,10 @@ function xgWeak(Xg, t, h, orig, st) {
 function isNonConstraint(e) {
   const v = e.attrs.get("constraint");
   if (!v) return false;
-  return !mapbool3(v);
+  return !mapbool2(v);
 }
 function isAStrongCluster(g) {
-  return mapbool3(g.attrs.get("compact") ?? "");
+  return mapbool2(g.attrs.get("compact") ?? "");
 }
 function dotLca(c0, c1) {
   let a = c0;
@@ -22234,7 +22260,7 @@ var clType = LOCAL;
 function setClType(t) {
   clType = t;
 }
-function mapbool3(s) {
+function mapbool2(s) {
   if (!s || s === "") return false;
   const l = s.toLowerCase();
   if (l === "false" || l === "no") return false;
@@ -22250,7 +22276,7 @@ function scaleClamp(nnodes, scale) {
 function isACluster(g) {
   if (g === g.root) return true;
   if (g.name.toLowerCase().startsWith("cluster")) return true;
-  return mapbool3(g.attrs.get("cluster"));
+  return mapbool2(g.attrs.get("cluster"));
 }
 function cleanup1ClearNode(n) {
   if (n.info.in) n.info.in.size = 0;
@@ -22598,7 +22624,7 @@ function dot1Rank(g) {
   cleanup1(g);
 }
 function dotRank(g) {
-  if (mapbool3(g.attrs.get("newrank"))) {
+  if (mapbool2(g.attrs.get("newrank"))) {
     g.info.flags = (g.info.flags ?? 0) | NEW_RANK;
     dot2Rank(g);
   } else {
@@ -28142,31 +28168,13 @@ function splay(root, key, keyOf, compare) {
 }
 
 // src/cdt/bag.ts
-function findByIdentity(start, target, key, keyOf, compare) {
-  let cur = start;
-  let parent = null;
-  while (cur !== null) {
-    if (cur.obj === target) return [cur, parent];
-    if (compare(key, keyOf(cur.obj)) !== 0) return [null, null];
-    parent = cur;
-    cur = cur.left;
-  }
-  return [null, null];
-}
-function unlinkNode(root, cur, parent) {
-  const left = cur.left;
-  const right = cur.right;
-  let replacement;
-  if (left === null) {
-    replacement = right;
-  } else {
-    const maxLeft = splayMax(left);
-    maxLeft.right = right;
-    replacement = maxLeft;
-  }
-  if (parent === null) return replacement;
-  parent.left = replacement;
-  return root;
+function removeRoot(root) {
+  const left = root.left;
+  const right = root.right;
+  if (left === null) return right;
+  const maxLeft = splayMax(left);
+  maxLeft.right = right;
+  return maxLeft;
 }
 var DtBag = class {
   _root = null;
@@ -28205,16 +28213,13 @@ var DtBag = class {
     const key = this._keyOf(obj);
     this._root = splay(this._root, key, this._keyOf, this._compare);
     if (this._compare(key, this._keyOf(this._root.obj)) !== 0) return false;
-    const [cur, parent] = findByIdentity(
-      this._root,
-      obj,
-      key,
-      this._keyOf,
-      this._compare
-    );
-    if (cur === null) return false;
-    const newRoot = unlinkNode(this._root, cur, parent);
-    this._root = newRoot;
+    while (this._root.obj !== obj) {
+      const nxt = this.next(this._root.obj);
+      if (nxt === void 0 || this._compare(key, this._keyOf(nxt)) !== 0) {
+        return false;
+      }
+    }
+    this._root = removeRoot(this._root);
     this._size--;
     return true;
   }
@@ -29065,7 +29070,7 @@ function runPlacement(gp) {
   const nObjs = gp.nodes.size + nSetLbls + nClbls + nElbls;
   const { ctx } = buildArrays(gp, nObjs, nLbls, nClbls, et);
   const forceStr = gp.attrs.get("forcelabels");
-  const force = forceStr === void 0 ? true : mapbool3(forceStr);
+  const force = forceStr === void 0 ? true : mapbool2(forceStr);
   const params = { bb: { ll: ctx.bb.ll, ur: ctx.bb.ur }, force };
   placeLabels(ctx.objs, ctx.lbls, params);
   writeBackLabels(gp, ctx.lbls, nLbls);
@@ -34295,7 +34300,7 @@ function dotPhasePostNoFinish(g) {
   removeFill(g);
   dotSameports(g);
   dotSplines(g);
-  if (mapbool3(g.attrs.get("compound") ?? g.root.attrs.get("compound"))) dotCompoundEdges(g);
+  if (mapbool2(g.attrs.get("compound") ?? g.root.attrs.get("compound"))) dotCompoundEdges(g);
 }
 function dotPhasePost(g) {
   dotPhasePostNoFinish(g);
@@ -35286,7 +35291,7 @@ function userPos(n) {
   n.info.pos = [Number(m[1]), Number(m[2])];
   n.info.posSet = true;
   const pin = n.attrs.get("pin");
-  if (m[3] === "!" || pin !== void 0 && mapbool3(pin)) n.info.pinned = true;
+  if (m[3] === "!" || pin !== void 0 && mapbool2(pin)) n.info.pinned = true;
   return true;
 }
 function assignNodeIds2(g) {
@@ -38537,7 +38542,7 @@ function splineEdgesImpl(g, sep, edgetype) {
 function splineEdges(g) {
   const edgetype = g.info.flags & 15;
   if (edgetype === EDGETYPE_NONE) return;
-  g.root.info.concentrate = mapbool3(g.root.attrs.get("concentrate"));
+  g.root.info.concentrate = mapbool2(g.root.attrs.get("concentrate"));
   for (const n of nodesInSeq(g)) {
     for (const e of n.outEdges(g)) {
       if (e.info.tail_port.dyna) e.info.tail_port = resolvePort(e.tail, e.head, e.info.tail_port);
@@ -45433,7 +45438,7 @@ function PARENT(n) {
 function isCluster(g) {
   if (g === g.root) return true;
   if (g.name.toLowerCase().startsWith("cluster")) return true;
-  return mapbool3(g.attrs.get("cluster"));
+  return mapbool2(g.attrs.get("cluster"));
 }
 function clusterInitGraph(g) {
   graphInit(g, false);
@@ -45960,7 +45965,7 @@ function walkTree(tree) {
 function isCluster2(g) {
   if (g === g.root) return true;
   if (g.name.toLowerCase().startsWith("cluster")) return true;
-  return mapbool3(g.attrs.get("cluster"));
+  return mapbool2(g.attrs.get("cluster"));
 }
 function collectClusters2(g, clusters) {
   for (const subg of g.subgraphs.values()) {
@@ -46040,7 +46045,7 @@ var PATCHWORK_LAYOUT_ENGINE = {
 // src/gvc/edge-labels.ts
 function renderEdgeLabels(e, renderer, job) {
   const obj = job.obj;
-  const spl = mapbool3(e.attrs.get("decorate") ?? "false") ? e.info.spl : void 0;
+  const spl = mapbool2(e.attrs.get("decorate") ?? "false") ? e.info.spl : void 0;
   if (obj === null) {
     renderOneLabel(e.info.label, renderer, job);
     if (spl) emitAttachment(e.info.label, spl, renderer, job);
@@ -52452,7 +52457,7 @@ var XdotParser = class _XdotParser {
     let accounted = 0;
     let j = 0;
     while (accounted < len) {
-      if (cur + j >= s.length) break;
+      if (cur + j >= s.length) return null;
       const ch = s[cur + j];
       const prev = j > 0 ? s[cur + j - 1] : "";
       out += ch;