@knowvah/dot-engine 2.5.0 → 2.6.1

package/dist/common/bezier-arrows.d.ts

@@ -0,0 +1,14 @@
+import type { Edge } from '../model/edge.js';
+import type { Bezier } from '../model/geom.js';
+import type { ArrowDrawOp } from './arrows-types.js';
+/** Edge end: `tail` pairs with a bezier's sflag/sp, `head` with eflag/ep. */
+export type ArrowEnd = 'head' | 'tail';
+/**
+ * The ops C's per-bezier loop draws right after `bz` for `end`, when the edge
+ * has several beziers flagged at that end; undefined otherwise (the caller's
+ * edge-level path applies).
+ */
+export declare function bezierEndOps(e: Edge, bz: Bezier, end: ArrowEnd): ArrowDrawOp[] | undefined;
+/** Every arrow to draw for `end`, one op list per arrow, in bezier order. */
+export declare function endArrowOps(e: Edge, end: ArrowEnd): ArrowDrawOp[][];
+//# sourceMappingURL=bezier-arrows.d.ts.map

package/dist/common/bezier-arrows.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"bezier-arrows.d.ts","sourceRoot":"","sources":["../../src/common/bezier-arrows.ts"],"names":[],"mappings":"AAkBA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD,6EAA6E;AAC7E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG,MAAM,CAAC;AAkBvC;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,QAAQ,GAAG,WAAW,EAAE,GAAG,SAAS,CAG1F;AAED,6EAA6E;AAC7E,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,GAAG,WAAW,EAAE,EAAE,CAKnE"}

package/dist/common/postproc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"postproc.d.ts","sourceRoot":"","sources":["../../src/common/postproc.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAuJ/C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQ3D;AAyMD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAO9E;AAOD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,UAAO,GAAG,IAAI,CAiBrE"}
+{"version":3,"file":"postproc.d.ts","sourceRoot":"","sources":["../../src/common/postproc.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;GAaG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAmJ/C;;;GAGG;AACH,wBAAgB,WAAW,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAQ3D;AAyMD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE;IAAE,CAAC,EAAE,MAAM,CAAC;IAAC,CAAC,EAAE,MAAM,CAAA;CAAE,GAAG,IAAI,CAO9E;AAOD;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,aAAa,CAAC,CAAC,EAAE,KAAK,EAAE,gBAAgB,UAAO,GAAG,IAAI,CAiBrE"}

package/dist/common/splines-clip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"splines-clip.d.ts","sourceRoot":"","sources":["../../src/common/splines-clip.ts"],"names":[],"mappings":"AACA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAO,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAqB,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAS7C,gFAAgF;AAChF,eAAO,MAAM,QAAQ,IAAI,CAAC;AAia1B,2CAA2C;AAC3C,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAQrD;AAMD,iDAAiD;AACjD,wBAAgB,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CA6BlG;AAED;;;GAGG;AACH,KAAK,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AAGxF,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI,CAEvD"}
+{"version":3,"file":"splines-clip.d.ts","sourceRoot":"","sources":["../../src/common/splines-clip.ts"],"names":[],"mappings":"AACA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,KAAK,EAAO,MAAM,kBAAkB,CAAC;AACnD,OAAO,KAAK,EAAE,MAAM,EAAqB,MAAM,kBAAkB,CAAC;AAClE,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAC;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAS7C,gFAAgF;AAChF,eAAO,MAAM,QAAQ,IAAI,CAAC;AAqa1B,2CAA2C;AAC3C,wBAAgB,SAAS,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,MAAM,CAQrD;AAMD,iDAAiD;AACjD,wBAAgB,cAAc,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,IAAI,CA6BlG;AAED;;;GAGG;AACH,KAAK,UAAU,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,KAAK,IAAI,CAAC;AAGxF,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,EAAE,EAAE,UAAU,GAAG,IAAI,GAAG,IAAI,CAEvD"}

package/dist/index.js

@@ -18589,8 +18589,8 @@ var SplineClipHelper = class _SplineClipHelper {
           sflag,
           eflag
         );
-        if (sflag) _SplineClipHelper.stashArrow(orig, newspl.sp, ps[bounds.start], true, startEnd);
-        if (eflag) _SplineClipHelper.stashArrow(orig, newspl.ep, ps[bounds.end + 3], false, endEnd);
+        if (sflag) _SplineClipHelper.stashArrow(orig, newspl, newspl.sp, ps[bounds.start], true, startEnd);
+        if (eflag) _SplineClipHelper.stashArrow(orig, newspl, newspl.ep, ps[bounds.end + 3], false, endEnd);
       }
       return;
     }
@@ -18604,7 +18604,7 @@ var SplineClipHelper = class _SplineClipHelper {
         sflag,
         startEnd
       );
-      _SplineClipHelper.stashArrow(orig, newspl.sp, ps[bounds.start], true, startEnd);
+      _SplineClipHelper.stashArrow(orig, newspl, newspl.sp, ps[bounds.start], true, startEnd);
     }
     if (eflag) {
       bounds.end = _SplineClipHelper.arrowEndClip(
@@ -18616,7 +18616,7 @@ var SplineClipHelper = class _SplineClipHelper {
         eflag,
         endEnd
       );
-      _SplineClipHelper.stashArrow(orig, newspl.ep, ps[bounds.end + 3], false, endEnd);
+      _SplineClipHelper.stashArrow(orig, newspl, newspl.ep, ps[bounds.end + 3], false, endEnd);
     }
   }
   /**
@@ -18714,13 +18714,22 @@ var SplineClipHelper = class _SplineClipHelper {
       spl.sp = p;
     }
   }
-  /** Record an arrow polygon on the edge for svgArrowPolygons. */
-  static stashArrow(e, tip2, base, isTail, attrEnd) {
+  /**
+   * Record an arrow on the edge end and on the bezier being installed. The
+   * edge slot holds the latest arrow; the bezier keeps its own, since C draws
+   * one per flagged bezier (see common/bezier-arrows.ts).
+   */
+  static stashArrow(e, bz, tip2, base, isTail, attrEnd) {
     const dir = { x: base.x - tip2.x, y: base.y - tip2.y };
     const end = attrEnd ?? (isTail ? "tail" : "head");
     const ops = arrowDrawOpsForEnd(e, end, tip2, dir, _SplineClipHelper.renderPenwidth(e));
-    if (isTail) e.info.tailArrowOps = ops;
-    else e.info.headArrowOps = ops;
+    if (isTail) {
+      e.info.tailArrowOps = ops;
+      bz.sArrowOps = ops;
+    } else {
+      e.info.headArrowOps = ops;
+      bz.eArrowOps = ops;
+    }
   }
   static clipSide(n, box, ps, pn, tail) {
     const fn = _SplineClipHelper.getInsideFn(n);
@@ -25497,6 +25506,47 @@ function orthoRoundedPolylines(pts, radius) {
   return [...segmentPolylines(pts, corners), ...cornerArcPolylines(corners, radius)];
 }
 
+// src/common/bezier-arrows.ts
+var flagOf = (bz, end) => end === "head" ? bz.eflag : bz.sflag;
+var ownOps = (bz, end) => end === "head" ? bz.eArrowOps : bz.sArrowOps;
+var edgeOps = (e, end) => end === "head" ? e.info.headArrowOps : e.info.tailArrowOps;
+function flaggedBeziers(e, end) {
+  const list = e.info.spl?.list ?? [];
+  return list.filter((bz) => bz !== void 0 && flagOf(bz, end) !== 0);
+}
+function multiFlagged(e, end) {
+  return flaggedBeziers(e, end).length > 1;
+}
+function bezierEndOps(e, bz, end) {
+  if (flagOf(bz, end) === 0 || !multiFlagged(e, end)) return void 0;
+  return ownOps(bz, end) ?? edgeOps(e, end);
+}
+function endArrowOps(e, end) {
+  const lists = multiFlagged(e, end) ? flaggedBeziers(e, end).map((bz) => ownOps(bz, end) ?? edgeOps(e, end)) : [edgeOps(e, end)];
+  return lists.filter((ops) => ops !== void 0 && ops.length > 0);
+}
+
+// src/render/svg-edge-arrows.ts
+function emitBezierEndArrow(e, bz, end, st, p) {
+  const tail = end === "tail";
+  const flag = tail ? bz.sflag : bz.eflag;
+  const done = tail ? st.tailDone : st.headDone;
+  const edgeOps2 = tail ? e.info.tailArrowOps : e.info.headArrowOps;
+  const ops = bezierEndOps(e, bz, end) ?? (flag !== 0 && !done && edgeOps2?.length ? edgeOps2 : void 0);
+  if (ops === void 0) return;
+  emitArrowOps(ops, p.penColor, p.job, p.pw, p.opacity);
+  if (tail) st.tailDone = true;
+  else st.headDone = true;
+}
+function emitRemainingArrows(e, st, p) {
+  if (!st.tailDone && e.info.tailArrowOps?.length) {
+    emitArrowOps(e.info.tailArrowOps, p.penColor, p.job, p.pw, p.opacity);
+  }
+  if (!st.headDone && e.info.headArrowOps?.length) {
+    emitArrowOps(e.info.headArrowOps, p.penColor, p.job, p.pw, p.opacity);
+  }
+}
+
 // src/render/svg-graph.ts
 var SVG_XML_DECL = '<?xml version="1.0" encoding="UTF-8" standalone="no"?>\n';
 var SVG_DOCTYPE = '<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"\n "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">\n';
@@ -26028,40 +26078,21 @@ function svgEdgePath(e, job) {
   if (spl === void 0 || spl.size === 0) return;
   const obj = job.obj;
   const stroke = obj !== null ? paintStr(obj, false) : "black";
+  const paint = {
+    job,
+    penColor: stroke,
+    opacity: obj !== null ? colorOpacity(obj.penColor) : null,
+    pw: obj !== null ? obj.penWidth : 1
+  };
   const st = { tailDone: false, headDone: false };
   for (let si = 0; si < spl.size; si++) {
     const bz = spl.list[si];
     if (bz === void 0 || bz.size < 4) continue;
     emitOneBezierPath(bz, stroke, job);
-    emitBezierArrows(e, bz, job, st);
-  }
-  emitRemainingArrows(e, job, st);
-}
-function emitBezierArrows(e, bz, job, st) {
-  const obj = job.obj;
-  const penColor = obj !== null ? paintStr(obj, false) : "black";
-  const opacity = obj !== null ? colorOpacity(obj.penColor) : null;
-  const pw = obj !== null ? obj.penWidth : 1;
-  if (bz.sflag !== 0 && !st.tailDone && e.info.tailArrowOps?.length) {
-    emitArrowOps(e.info.tailArrowOps, penColor, job, pw, opacity);
-    st.tailDone = true;
-  }
-  if (bz.eflag !== 0 && !st.headDone && e.info.headArrowOps?.length) {
-    emitArrowOps(e.info.headArrowOps, penColor, job, pw, opacity);
-    st.headDone = true;
-  }
-}
-function emitRemainingArrows(e, job, st) {
-  const obj = job.obj;
-  const penColor = obj !== null ? paintStr(obj, false) : "black";
-  const opacity = obj !== null ? colorOpacity(obj.penColor) : null;
-  const pw = obj !== null ? obj.penWidth : 1;
-  if (!st.tailDone && e.info.tailArrowOps?.length) {
-    emitArrowOps(e.info.tailArrowOps, penColor, job, pw, opacity);
-  }
-  if (!st.headDone && e.info.headArrowOps?.length) {
-    emitArrowOps(e.info.headArrowOps, penColor, job, pw, opacity);
+    emitBezierEndArrow(e, bz, "tail", st, paint);
+    emitBezierEndArrow(e, bz, "head", st, paint);
   }
+  emitRemainingArrows(e, st, paint);
 }
 function emitOneBezierPath(bz, stroke, job) {
   const obj = job.obj;
@@ -33420,6 +33451,10 @@ function mapEdge(e) {
   mapLabelPos(e.info.tail_label);
   e.info.headArrowOps = mapArrowOps(e.info.headArrowOps);
   e.info.tailArrowOps = mapArrowOps(e.info.tailArrowOps);
+  for (const bz of spl.list) {
+    if (bz.sArrowOps) bz.sArrowOps = mapArrowOps(bz.sArrowOps);
+    if (bz.eArrowOps) bz.eArrowOps = mapArrowOps(bz.eArrowOps);
+  }
 }
 function rotateBb(bb, rankdir) {
   if (rankdir === RANKDIR_LR || rankdir === RANKDIR_BT) {
@@ -37345,6 +37380,11 @@ function swapBezier(b) {
   const sp = b.sp;
   b.sp = b.ep;
   b.ep = sp;
+  if (b.sArrowOps !== void 0 || b.eArrowOps !== void 0) {
+    const so = b.sArrowOps;
+    b.sArrowOps = b.eArrowOps;
+    b.eArrowOps = so;
+  }
 }
 function swapSpline(s) {
   s.list.reverse();
@@ -38471,6 +38511,10 @@ function shiftEdgePoints(e, dx, dy) {
   const shiftOps = (ops) => ops?.map((op) => mapArrowOpPoints(op, (p) => ({ x: p.x + dx, y: p.y + dy })));
   e.info.headArrowOps = shiftOps(e.info.headArrowOps);
   e.info.tailArrowOps = shiftOps(e.info.tailArrowOps);
+  for (const bz of spl.list) {
+    if (bz.sArrowOps) bz.sArrowOps = shiftOps(bz.sArrowOps);
+    if (bz.eArrowOps) bz.eArrowOps = shiftOps(bz.eArrowOps);
+  }
 }
 function shiftOneGraph(g, dx, dy) {
   for (const n of g.nodes.values()) {
@@ -54113,6 +54157,9 @@ var XdotRenderer = class extends EdgeDrawBase {
       headArrowColor = c.headColor;
     } else {
       this.emitPlainSpline(e, spl.list, edraw, job);
+      for (const ops of endArrowOps(e, "tail")) this.emitArrows(this.bufs[2 /* TDraw */], ops, job, 2 /* TDraw */);
+      for (const ops of endArrowOps(e, "head")) this.emitArrows(this.bufs[3 /* HDraw */], ops, job, 3 /* HDraw */);
+      return;
     }
     this.emitArrows(this.bufs[2 /* TDraw */], e.info.tailArrowOps, job, 2 /* TDraw */, tailArrowColor);
     this.emitArrows(this.bufs[3 /* HDraw */], e.info.headArrowOps, job, 3 /* HDraw */, headArrowColor);