@knowvah/dot-engine 1.2.2 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowvah/dot-engine",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "Faithful TypeScript port of Graphviz (dot, neato, fdp, sfdp, circo, twopi, osage, patchwork) — no C: no native binary, no WASM. Oracle-verified against the C implementation, runs in the browser.",
   "keywords": [
     "graphviz",

package/src/common/arrows-shapes-poly.ts

@@ -9,6 +9,7 @@
  */
 
 import type { Point } from '../model/geom.js';
+import { ccwrotatepf, cwrotatepf } from '../model/geom.js';
 import type { GenResult } from './arrows-shapes-util.js';
 import {
   vsub, vadd, miterShape, negUnit, backwardDelta, axialProjection,
@@ -217,7 +218,25 @@ function curveControlPoints(p: Point, v: Point, w: Point, flag: number): Point[]
 }
 
 /** @see lib/common/arrows.c:arrow_type_curve */
-export function genCurve(p0: Point, u: Point, _arrowsize: number, penwidth: number, flag: number): GenResult {
+export function genCurve(
+  p0: Point, u: Point, _arrowsize: number, penwidth: number, flag: number,
+  rankdir = 0,
+): GenResult {
+  // C generates arrowheads at RENDER time, in the final (post-rankdir) frame;
+  // the port generates during routing and postproc rotates the stored ops.
+  // That round-trip is exact for every other generator, but this formula is
+  // not rotation-equivariant (0.95 shortens the x arm only; the y arm comes
+  // from AF0/AF3 verbatim), so run it in the final frame and rotate back.
+  // The rankdir maps are pure sign/swaps — rankdir 0 (TB) is untouched.
+  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));

package/src/common/arrows-shapes.ts

@@ -319,6 +319,7 @@ export function arrowLength(comps: ResolvedArrow[], arrowsize: number, penwidth:
  */
 export function dispatchSimple(
   r: ResolvedArrow, tip: Point, dir: Point, arrowsize: number, penwidth: number,
+  rankdir = 0,
 ): GenResult {
   const flag = arrowFlag(r);
   const u = componentU(dir, r.lenfact, arrowsize);
@@ -328,7 +329,9 @@ export function dispatchSimple(
     case ARR_TYPE_BOX: return genBox(tip, u, arrowsize, penwidth, flag);
     case ARR_TYPE_DIAMOND: return genDiamond(tip, u, arrowsize, penwidth, flag);
     case ARR_TYPE_DOT: return genDot(tip, u, arrowsize, penwidth, flag);
-    case ARR_TYPE_CURVE: return genCurve(tip, 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(tip, u, arrowsize, penwidth, flag, rankdir);
     case ARR_TYPE_GAP: return genGap(tip, u, arrowsize, penwidth, flag);
     case ARR_TYPE_NORM:
     default:
@@ -345,6 +348,7 @@ export function dispatchSimple(
  */
 export function arrowDrawOps(
   comps: ResolvedArrow[], tip: Point, dir: Point, arrowsize: number, penwidth: number,
+  rankdir = 0,
 ): ArrowDrawOp[] {
   const ops: ArrowDrawOp[] = [];
   let p = tip;
@@ -352,7 +356,7 @@ export function arrowDrawOps(
   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;
   }

package/src/layout/dot/edge-route-arrow.ts

@@ -56,7 +56,11 @@ export function arrowheadPolygon(arrowTip: Point, arrowDir: Point, penwidth = 1.
 // ---------------------------------------------------------------------------
 
 /** Minimal edge shape exposing the arrow-related attributes. */
-interface ArrowAttrEdge { attrs: Map<string, string> }
+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 function edgeArrowName(e: ArrowAttrEdge, end: 'head' | 'tail'): string {
@@ -81,7 +85,8 @@ export function arrowDrawOpsForEnd(
   e: ArrowAttrEdge, end: 'head' | 'tail', tip: Point, dir: Point, penwidth: number,
 ): ArrowDrawOp[] {
   const comps = parseArrow(edgeArrowName(e, end)).map(resolveArrowType);
+  const rankdir = (e.tail?.root?.info?.rankdir ?? 0) & 0x3;
   // Pass the RAW direction (not normalized): componentU reproduces arrow_gen's
   // EPSILON normalization, which is relative to the raw shaft magnitude.
-  return arrowDrawOps(comps, tip, dir, edgeArrowsize(e), penwidth);
+  return arrowDrawOps(comps, tip, dir, edgeArrowsize(e), penwidth, rankdir);
 }

package/src/model/geom.ts

@@ -144,6 +144,20 @@ export function ccwrotatepf(p: Point, ccwrot: number): Point {
   }
 }
 
+/**
+ * Clockwise counterpart — the exact inverse of {@link ccwrotatepf} per case.
+ * @see lib/common/geom.c:cwrotatepf
+ */
+export function cwrotatepf(p: Point, cwrot: number): Point {
+  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;
+  }
+}
+
 /**
  * Returns true if box `b0` completely contains box `b1`.
  *