@knowvah/dot-engine 2.0.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@knowvah/dot-engine",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "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/async/collect.ts

@@ -19,12 +19,12 @@ import type { Edge } from '../model/edge.js';
 import type { Node } from '../model/node.js';
 import type { TextVariantFlags } from '../common/textmeasure.js';
 import { canvasFont } from '../common/css-font.js';
-import { DEFAULT_FONTNAME, DEFAULT_FONTSIZE } from '../common/make-label.js';
 import { isHtmlValue, htmlValueContent } from '../common/html-string.js';
 import { nodeAttr, readFontAttrs } from '../common/poly-init.js';
 import { initFontEdgeAttr, initFontLabelEdgeAttr } from '../common/edge-label-init.js';
 import { parseHtmlLabel } from '../common/htmltable-parse.js';
 import { isACluster } from '../layout/dot/rank.js';
+import { readFontParams } from '../layout/dot/graph-label.js';
 import type {
   HtmlCellContent, HtmlLabel, HtmlTable, HtmlTextItem,
 } from '../common/htmltable-types.js';
@@ -160,21 +160,9 @@ function collectEdge(acc: Acc, e: Edge): void {
   addLabel(acc, e.attrs.get('taillabel'), lfi);
 }
 
-/**
- * Root/cluster label font. A subgraph reads through its parse-time defaults
- * snapshot, as doGraphLabel does. @see src/layout/dot/graph-label.ts:readFontParams
- */
-function graphLabelFont(sg: Graph): LabelFont {
-  const get = (k: string): string | undefined => sg.attrs.get(k) ?? sg.graphDefaultsSnapshot?.get(k);
-  return {
-    fontname: get('fontname') ?? DEFAULT_FONTNAME,
-    fontsize: parseFloat(get('fontsize') ?? '') || DEFAULT_FONTSIZE,
-  };
-}
-
 function collectGraphLabels(acc: Acc, sg: Graph, root: Graph): void {
   if (isACluster(sg)) {
-    addLabel(acc, sg.attrs.get('label') ?? sg.graphDefaultsSnapshot?.get('label'), graphLabelFont(sg));
+    addLabel(acc, sg.attrs.get('label') ?? sg.graphDefaultsSnapshot?.get('label'), readFontParams(sg));
   }
   for (const child of sg.subgraphs.values()) collectGraphLabels(acc, child, root);
 }

package/src/async/render-async.ts

@@ -16,6 +16,7 @@ import { parse } from '../parser/index.js';
 import { invalidArgType, rethrowAtBoundary } from '../errors.js';
 import type { EngineName } from '../gvc/context.js';
 import { createDefaultContext } from '../gvc/default-context.js';
+import { checkRenderArgs } from '../render/public.js';
 import { render as deviceRender } from '../gvc/device.js';
 import type { ImageSizer } from '../common/htmltable-types.js';
 import type { ImageResolver } from '../gvc/image-resolver.js';
@@ -62,15 +63,6 @@ export interface AsyncSvgResult {
   fontIssues: FontIssue[];
 }
 
-/** Reject a bad `g` / `format` / `opts` before any work starts (mirrors `render`). */
-function checkRenderArgs(g: unknown, format: unknown, opts: unknown): void {
-  if (typeof g !== 'object' || g === null) throw invalidArgType('g', 'object', g);
-  if (typeof format !== 'string') throw invalidArgType('format', 'string', format);
-  if (opts !== undefined && (typeof opts !== 'object' || opts === null)) {
-    throw invalidArgType('opts', 'object or undefined', opts);
-  }
-}
-
 /** `document.fonts` when a document exposes one (absent in Node and Workers). */
 function defaultFontSet(): FontSetLike | undefined {
   const doc: unknown = Reflect.get(globalThis, 'document');

package/src/gvc/device-labels.ts

@@ -0,0 +1,98 @@
+// SPDX-License-Identifier: EPL-2.0
+
+/**
+ * Label emission shared by edge labels, node xlabels and cluster/graph
+ * labels (split from device.ts for the file-size cap; re-exported there).
+ *
+ * @see lib/common/labels.c:emit_label
+ * @see lib/common/emit.c:emit_label
+ */
+
+import type { Graph } from '../model/graph.js';
+import type { Node } from '../model/node.js';
+import type { RendererPlugin } from './context.js';
+import type { RenderJob } from './job.js';
+import type { TextlabelT } from '../common/types.js';
+import type { TextSpan } from '../common/emit-types.js';
+import type { PlacedHtml } from '../common/htmltable-pos.js';
+import { gvrenderTextspan, withLabelEmitState } from './textspan-emit.js';
+import { emitHtmlLabel } from '../common/htmltable-emit.js';
+
+/** valign codes stored on textlabel_t. @see lib/common/types.h:textlabel_t.valign */
+const VALIGN_TOP = 't'.charCodeAt(0);
+const VALIGN_BOTTOM = 'b'.charCodeAt(0);
+
+/** First-span baseline y per valign. @see lib/common/labels.c:emit_label (240-251) */
+function labelFirstSpanY(lp: TextlabelT): number {
+  if (lp.valign === VALIGN_TOP) return lp.pos.y + lp.space.y / 2.0 - lp.fontsize;
+  if (lp.valign === VALIGN_BOTTOM) {
+    return lp.pos.y - lp.space.y / 2.0 + lp.dimen.y - lp.fontsize;
+  }
+  return lp.pos.y + lp.dimen.y / 2.0 - lp.fontsize;
+}
+
+/** Span x position per justification. @see lib/common/labels.c:emit_label (254-266) */
+function labelSpanX(lp: TextlabelT, just: 'l' | 'n' | 'r'): number {
+  if (just === 'l') return lp.pos.x - lp.space.x / 2.0;
+  if (just === 'r') return lp.pos.x + lp.space.x / 2.0;
+  return lp.pos.x;
+}
+
+/**
+ * Emit one label's text spans if present and placed.
+ * Shared by edge-label, node-xlabel, and graph-label slots.
+ * URL/anchor/map machinery and E_decorate attachment (emit.c:emit_attachment)
+ * are not ported, matching the live path's AD-2 scope.
+ * @see lib/common/emit.c:emit_label
+ * @see lib/common/labels.c:emit_label
+ */
+export function renderOneLabel(
+  lp: TextlabelT | undefined,
+  renderer: RendererPlugin,
+  job: RenderJob,
+  requireSet = true,
+): void {
+  // C gates `->set` at the xlabel/edge-label CALL SITES (emit.c:1829,
+  // emit_edge_label:2891), but draws root-graph and cluster labels on
+  // existence alone (emit.c:3656, 3920) — an unplaced label (e.g. fdp's
+  // non-comparable-clusters abort skips gv_postprocess) still renders at its
+  // default pos. Callers mirroring the existence-only sites pass false.
+  if (!lp) return;
+  if (requireSet && !lp.set) return;
+  // HTML branch: @see lib/common/labels.c:emit_label (226-230)
+  // C routes to emit_html_label(job, lp->u.html, lp) using lp->pos as anchor.
+  if (lp.html) {
+    if (lp.u.kind === 'html') {
+      // Route the whole HTML label (table box/fill polygons + text) into the
+      // object's LABEL emit-state so its ops land in _ldraw_, not _draw_.
+      const html = lp.u.html as PlacedHtml;
+      const pos = lp.pos;
+      withLabelEmitState(job, () => emitHtmlLabel(html, pos, renderer, job));
+    }
+    return;
+  }
+  if (lp.u.kind !== 'txt' || lp.u.nspans < 1) return;
+  let y = labelFirstSpanY(lp);
+  for (let i = 0; i < lp.u.nspans; i++) {
+    const span = lp.u.span[i] as TextSpan | undefined;
+    if (!span) break;
+    // Emit only visible spans; the baseline still advances below so blank
+    // lines reserve vertical space. @see gvrender_textspan (gvrender.c:419).
+    gvrenderTextspan(renderer, { x: labelSpanX(lp, span.just), y }, span, job);
+    y -= span.size.y; // UL position for next span (unconditional)
+  }
+}
+
+/**
+ * Emit node external label (ND_xlabel) if placed.
+ * Must run inside the node group, after codefn (shape draw), matching C order.
+ * @see lib/common/emit.c:emit_node (1829-1830)
+ */
+export function renderNodeXLabel(n: Node, renderer: RendererPlugin, job: RenderJob): void {
+  renderOneLabel(n.info.xlabel as TextlabelT | undefined, renderer, job);
+}
+
+/** Cluster labels go through the single emit_label port. @see labels.c:emit_label */
+export function renderClusterLabel(sg: Graph, renderer: RendererPlugin, job: RenderJob): void {
+  renderOneLabel(sg.info.label as TextlabelT | undefined, renderer, job, false);
+}

package/src/gvc/device-transform.ts

@@ -0,0 +1,58 @@
+// SPDX-License-Identifier: EPL-2.0
+
+/**
+ * Graph-to-device point transform (split from device.ts for the file-size
+ * cap; re-exported there).
+ *
+ * @see lib/gvc/gvrender.c:gvrender_ptf
+ */
+
+import type { Point } from '../model/geom.js';
+import { type RenderJob, GVRENDER_DOES_TRANSFORM } from './job.js';
+
+// ---------------------------------------------------------------------------
+// transformPoint — @see lib/gvc/gvrender.c:gvrender_ptf
+// ---------------------------------------------------------------------------
+
+/**
+ * Transform a point from graph to device coordinates.
+ * Short-circuits when GVRENDER_DOES_TRANSFORM is set (renderer owns mapping).
+ *
+ * @see lib/gvc/gvrender.c:gvrender_ptf
+ */
+export function transformPoint(p: Point, job: RenderJob): Point {
+  if ((job.flags & GVRENDER_DOES_TRANSFORM) !== 0) {
+    return p;
+  }
+  const sx = job.zoom * job.devscale.x;
+  const sy = job.zoom * job.devscale.y;
+  const tx = job.translation.x;
+  const ty = job.translation.y;
+  // ADR-2: SVG landscape rotation lives entirely in the graph `<g>` group
+  // transform (svg_begin_page emits rotate(-job->rotation)); inner coords stay
+  // in the unrotated frame. The ptf rotation branch (applyRotation) is the
+  // raster/imagemap path and must NOT fire here, else job.rotation=90 would
+  // double-rotate every SVG coordinate. applyRotation stays exported as the
+  // faithful gvrender_ptf port (currently dead). @see ADR-2; gvrender.c:gvrender_ptf
+  return applyScale(p, tx, ty, sx, sy);
+}
+
+/** Rotation branch: out.x = -(p.y+ty)*sx, out.y = (p.x+tx)*sy @see gvrender_ptf */
+export function applyRotation(p: Point, tx: number, ty: number, sx: number, sy: number): Point {
+  const x = -(p.y + ty) * sx;
+  const y = (p.x + tx) * sy;
+  return buildPoint(x, y);
+}
+
+/** No-rotation branch: out.x = (p.x+tx)*sx, out.y = (p.y+ty)*sy @see gvrender_ptf */
+export function applyScale(p: Point, tx: number, ty: number, sx: number, sy: number): Point {
+  const x = (p.x + tx) * sx;
+  const y = (p.y + ty) * sy;
+  return buildPoint(x, y);
+}
+
+/** Construct a Point value. Extracted to avoid inline object literals in return position. */
+export function buildPoint(x: number, y: number): Point {
+  const pt: Point = { x, y };
+  return pt;
+}

package/src/gvc/device.ts

@@ -1,7 +1,8 @@
 // SPDX-License-Identifier: EPL-2.0
 
 /**
- * Device render loop and coordinate transform.
+ * Device render loop (point transform: device-transform.ts; label emission:
+ * device-labels.ts).
  *
  * Ports gvrender_ptf, gvrender_begin_graph, and gvrender_end_graph from
  * lib/gvc/gvrender.c.  render() is the top-level entry point; it lives here
@@ -11,7 +12,7 @@
  * @see lib/gvc/gvdevice.c
  */
 
-import type { Point, Box } from '../model/geom.js';
+import type { Box } from '../model/geom.js';
 import { boxOverlap, POINTS_PER_INCH } from '../model/geom.js';
 import { lateDouble } from '../common/nodeinit.js';
 import { parseDrawingSize, initJobViewportZoom, parseLandscape, parseGraphPad, parseGraphMargin } from './viewport.js';
@@ -21,22 +22,18 @@ import type { Edge } from '../model/edge.js';
 import type { RendererPlugin } from './context.js';
 import { GvcContext, PenType } from './context.js';
 import { invalidArgType } from '../errors.js';
-import { gvrenderTextspan, withLabelEmitState } from './textspan-emit.js';
 import { resolveEdgeAnchor, resolveObjAnchor, beginAnchorIf } from './anchor.js';
 import type { ShapeDesc, TextlabelT } from '../common/types.js';
-import type { TextSpan } from '../common/emit-types.js';
 import { type LayerInfo, parseLayers } from '../common/layers.js';
-import { RenderJob, GVRENDER_DOES_TRANSFORM, EMIT_CLUSTERS_LAST, createObjState, ObjType, EmitState } from './job.js';
+import { RenderJob, EMIT_CLUSTERS_LAST, createObjState, ObjType, EmitState } from './job.js';
 import { walkNodesAndEdges } from './emit-walk.js';
 import { polyInit } from '../common/poly-init.js';
-import { emitHtmlLabel } from '../common/htmltable-emit.js';
 import {
   setHtmlAnchorObj,
   setHtmlObjImgscale,
   resetHtmlAnchorIds,
 } from '../common/htmltable-emit-rules.js';
 import { nodeAttr } from '../common/poly-init.js';
-import type { PlacedHtml } from '../common/htmltable-pos.js';
 import {
   parseStyleFlags,
   resolvePenColor,
@@ -49,10 +46,10 @@ import { isPointNode } from '../common/poly-gencode.js';
 import { resolveRenderColor, withColorScheme } from '../render/color-resolve.js';
 import { emitRoundedBezier } from '../common/poly-shapes.js';
 import { applyClusterObjState, clusterStyle, clusterPeripheries } from './device-cluster.js';
-/** Cluster labels go through the single emit_label port. @see labels.c:emit_label */
-export function renderClusterLabel(sg: Graph, renderer: RendererPlugin, job: RenderJob): void {
-  renderOneLabel(sg.info.label as TextlabelT | undefined, renderer, job, false);
-}
+import { transformPoint } from './device-transform.js';
+import { renderOneLabel, renderNodeXLabel, renderClusterLabel } from './device-labels.js';
+export { transformPoint, applyRotation, applyScale, buildPoint } from './device-transform.js';
+export { renderOneLabel, renderNodeXLabel, renderClusterLabel } from './device-labels.js';
 import { svgNodeId, svgEdgeId, svgClusterId, svgGraphId } from '../render/svg-id.js';
 
 // ---------------------------------------------------------------------------
@@ -72,53 +69,6 @@ declare module './job.js' {
   }
 }
 
-// ---------------------------------------------------------------------------
-// transformPoint — @see lib/gvc/gvrender.c:gvrender_ptf
-// ---------------------------------------------------------------------------
-
-/**
- * Transform a point from graph to device coordinates.
- * Short-circuits when GVRENDER_DOES_TRANSFORM is set (renderer owns mapping).
- *
- * @see lib/gvc/gvrender.c:gvrender_ptf
- */
-export function transformPoint(p: Point, job: RenderJob): Point {
-  if ((job.flags & GVRENDER_DOES_TRANSFORM) !== 0) {
-    return p;
-  }
-  const sx = job.zoom * job.devscale.x;
-  const sy = job.zoom * job.devscale.y;
-  const tx = job.translation.x;
-  const ty = job.translation.y;
-  // ADR-2: SVG landscape rotation lives entirely in the graph `<g>` group
-  // transform (svg_begin_page emits rotate(-job->rotation)); inner coords stay
-  // in the unrotated frame. The ptf rotation branch (applyRotation) is the
-  // raster/imagemap path and must NOT fire here, else job.rotation=90 would
-  // double-rotate every SVG coordinate. applyRotation stays exported as the
-  // faithful gvrender_ptf port (currently dead). @see ADR-2; gvrender.c:gvrender_ptf
-  return applyScale(p, tx, ty, sx, sy);
-}
-
-/** Rotation branch: out.x = -(p.y+ty)*sx, out.y = (p.x+tx)*sy @see gvrender_ptf */
-export function applyRotation(p: Point, tx: number, ty: number, sx: number, sy: number): Point {
-  const x = -(p.y + ty) * sx;
-  const y = (p.x + tx) * sy;
-  return buildPoint(x, y);
-}
-
-/** No-rotation branch: out.x = (p.x+tx)*sx, out.y = (p.y+ty)*sy @see gvrender_ptf */
-export function applyScale(p: Point, tx: number, ty: number, sx: number, sy: number): Point {
-  const x = (p.x + tx) * sx;
-  const y = (p.y + ty) * sy;
-  return buildPoint(x, y);
-}
-
-/** Construct a Point value. Extracted to avoid inline object literals in return position. */
-export function buildPoint(x: number, y: number): Point {
-  const pt: Point = { x, y };
-  return pt;
-}
-
 // ---------------------------------------------------------------------------
 // Node/Edge walk helpers
 // ---------------------------------------------------------------------------
@@ -282,80 +232,6 @@ export function renderEdge(e: Edge, renderer: RendererPlugin, job: RenderJob): v
   }
 }
 
-/** valign codes stored on textlabel_t. @see lib/common/types.h:textlabel_t.valign */
-const VALIGN_TOP = 't'.charCodeAt(0);
-const VALIGN_BOTTOM = 'b'.charCodeAt(0);
-
-/** First-span baseline y per valign. @see lib/common/labels.c:emit_label (240-251) */
-function labelFirstSpanY(lp: TextlabelT): number {
-  if (lp.valign === VALIGN_TOP) return lp.pos.y + lp.space.y / 2.0 - lp.fontsize;
-  if (lp.valign === VALIGN_BOTTOM) {
-    return lp.pos.y - lp.space.y / 2.0 + lp.dimen.y - lp.fontsize;
-  }
-  return lp.pos.y + lp.dimen.y / 2.0 - lp.fontsize;
-}
-
-/** Span x position per justification. @see lib/common/labels.c:emit_label (254-266) */
-function labelSpanX(lp: TextlabelT, just: 'l' | 'n' | 'r'): number {
-  if (just === 'l') return lp.pos.x - lp.space.x / 2.0;
-  if (just === 'r') return lp.pos.x + lp.space.x / 2.0;
-  return lp.pos.x;
-}
-
-/**
- * Emit one label's text spans if present and placed.
- * Shared by edge-label, node-xlabel, and graph-label slots.
- * URL/anchor/map machinery and E_decorate attachment (emit.c:emit_attachment)
- * are not ported, matching the live path's AD-2 scope.
- * @see lib/common/emit.c:emit_label
- * @see lib/common/labels.c:emit_label
- */
-export function renderOneLabel(
-  lp: TextlabelT | undefined,
-  renderer: RendererPlugin,
-  job: RenderJob,
-  requireSet = true,
-): void {
-  // C gates `->set` at the xlabel/edge-label CALL SITES (emit.c:1829,
-  // emit_edge_label:2891), but draws root-graph and cluster labels on
-  // existence alone (emit.c:3656, 3920) — an unplaced label (e.g. fdp's
-  // non-comparable-clusters abort skips gv_postprocess) still renders at its
-  // default pos. Callers mirroring the existence-only sites pass false.
-  if (!lp) return;
-  if (requireSet && !lp.set) return;
-  // HTML branch: @see lib/common/labels.c:emit_label (226-230)
-  // C routes to emit_html_label(job, lp->u.html, lp) using lp->pos as anchor.
-  if (lp.html) {
-    if (lp.u.kind === 'html') {
-      // Route the whole HTML label (table box/fill polygons + text) into the
-      // object's LABEL emit-state so its ops land in _ldraw_, not _draw_.
-      const html = lp.u.html as PlacedHtml;
-      const pos = lp.pos;
-      withLabelEmitState(job, () => emitHtmlLabel(html, pos, renderer, job));
-    }
-    return;
-  }
-  if (lp.u.kind !== 'txt' || lp.u.nspans < 1) return;
-  let y = labelFirstSpanY(lp);
-  for (let i = 0; i < lp.u.nspans; i++) {
-    const span = lp.u.span[i] as TextSpan | undefined;
-    if (!span) break;
-    // Emit only visible spans; the baseline still advances below so blank
-    // lines reserve vertical space. @see gvrender_textspan (gvrender.c:419).
-    gvrenderTextspan(renderer, { x: labelSpanX(lp, span.just), y }, span, job);
-    y -= span.size.y; // UL position for next span (unconditional)
-  }
-}
-
-/**
- * Emit node external label (ND_xlabel) if placed.
- * Must run inside the node group, after codefn (shape draw), matching C order.
- * @see lib/common/emit.c:emit_node (1829-1830)
- */
-export function renderNodeXLabel(n: Node, renderer: RendererPlugin, job: RenderJob): void {
-  renderOneLabel(n.info.xlabel as TextlabelT | undefined, renderer, job);
-}
-
 /**
  * Emit root-graph label (GD_label) if present and placed.
  * Must run before clusters and nodes (emit_page order: background, then label,

package/src/layout/dot/graph-label.ts

@@ -60,7 +60,12 @@ function graphAttrInherited(sg: Graph, key: string): string | undefined {
   return sg.attrs.get(key) ?? sg.graphDefaultsSnapshot?.get(key);
 }
 
-function readFontParams(sg: Graph): { fontsize: number; fontname: string; fontcolor: string } {
+/**
+ * Graph/cluster label font, read through graphAttrInherited.
+ * @internal also used by src/async/collect.ts to request the same face.
+ * @see lib/common/input.c:do_graph_label
+ */
+export function readFontParams(sg: Graph): { fontsize: number; fontname: string; fontcolor: string } {
   return {
     fontsize: parseFloat(graphAttrInherited(sg, 'fontsize') ?? '') || DEFAULT_FONTSIZE,
     fontname: graphAttrInherited(sg, 'fontname') ?? DEFAULT_FONTNAME,

package/src/layout/fdp/normalize.ts

@@ -34,12 +34,12 @@ function angleSet(g: Graph): number | null {
   if (a === undefined || a === '') return null;
   const ang = parseAngle(a);
   if (ang === null) return null;
-  return wrapDegrees(ang) * (Math.PI / 180);
+  return (wrapDegrees(ang) / 180.0) * Math.PI; // RADIANS(a) = a/180.0*M_PI
 }
 
-/** strtod with the mapbool fallback of angleSet. */
+/** strtod (leading whitespace, sign) with the mapbool fallback of angleSet. */
 function parseAngle(a: string): number | null {
-  const m = /^-?[\d.]+(?:[eE][-+]?\d+)?/.exec(a);
+  const m = /^\s*[+-]?(?:\d+\.?\d*|\.\d+)(?:[eE][-+]?\d+)?/.exec(a);
   if (m !== null) return parseFloat(m[0]);
   /* no number */
   return mapbool(a) ? 0.0 : null;
@@ -55,34 +55,38 @@ function wrapDegrees(ang: number): number {
 /**
  * If "normalize" is set, move the first node to the origin, then
  * rotate the layout so the first edge sits at the given angle.
+ * Returns 1 if nodes moved, else 0.
  * @see lib/neatogen/adjust.c:normalize (15.0.0)
  */
-export function normalizeG(g: Graph): void {
+export function normalizeG(g: Graph): number {
   const phi0 = angleSet(g);
-  if (phi0 === null) return;
+  if (phi0 === null) return 0;
 
   const nodes = [...g.nodes.values()];
   const first = nodes[0];
-  if (first === undefined) return;
+  if (first === undefined) return 0;
   const px = first.info.pos![0]!;
   const py = first.info.pos![1]!;
   for (const v of nodes) {
     v.info.pos![0]! -= px;
     v.info.pos![1]! -= py;
   }
+  const ret = px || py ? 1 : 0;
 
   let e = null;
   for (const v of nodes) {
     const out = v.outEdges(g);
     if (out.length > 0) { e = out[0]!; break; }
   }
-  if (e === null) return;
+  if (e === null) return ret;
 
   /* rotation necessary; pos => ccw */
   const phi = phi0 - Math.atan2(
     e.head.info.pos![1]! - e.tail.info.pos![1]!,
     e.head.info.pos![0]! - e.tail.info.pos![0]!);
-  if (phi) rotateAll(nodes, e.tail, phi);
+  if (!phi) return ret;
+  rotateAll(nodes, e.tail, phi);
+  return 1;
 }
 
 /** Rotate all positions by phi about the orig node. */

package/src/layout/fdp/xlayout.ts

@@ -21,7 +21,7 @@ import { RenderError } from '../../errors.js';
 import type { Graph } from '../../model/graph.js';
 import type { Node } from '../../model/node.js';
 import { sepFactor, type ExpandT } from '../neato/sep-factor.js';
-import { fdpAdjust, overlapPrismTries } from '../neato/fdp-adjust.js';
+import { fdpAdjust, overlapPrismTries, warnUnrecognizedOverlap } from '../neato/fdp-adjust.js';
 import { scAdjust } from '../neato/sc-adjust.js';
 import {
   type XParams,
@@ -32,6 +32,7 @@ import {
 } from './fdp-model.js';
 import { coincidentDelta } from './tlayout.js';
 import { normalizeG } from './normalize.js';
+import { simpleScale } from '../neato/simple-scale.js';
 
 /** @see lib/fdpgen/xlayout.c:DFLT_overlap */
 const DFLT_OVERLAP = '9:prism';
@@ -294,7 +295,7 @@ function parseOverlapTries(ovlp: string): { tries: number; rest: string } {
 /**
  * Overlap-removal dispatch on the overlap attribute:
  *   ""/null → default "9:prism"; "n:mode" → n x_layout tries, then
- *   removeOverlap with mode; "true" → keep overlaps.
+ *   removeOverlapAs with mode; "true" → keep overlaps.
  * @see lib/fdpgen/xlayout.c:fdp_xLayout
  */
 export function fdpXLayout(g: Graph, xpms: XParams): void {
@@ -314,14 +315,15 @@ export function fdpXLayout(g: Graph, xpms: XParams): void {
  *   scale family (scale/scalexy/compress) → scAdjust;
  *   AM_NONE ('' / 'true') and unported modes (voronoi) → no-op.
  * normalize reads "normalize" and simpleScale reads "scale"; deriveGraph
- * copies only overlap/sep/K, so both are faithfully dead here (as noted in
- * normalize.ts / sc-adjust.ts) unless set on the derived chain — simpleScale
- * follows the project's decision to leave it unported.
+ * copies only overlap/sep/K, so both are faithfully dead here unless set on
+ * the derived chain (native fdp ignores both attributes).
  * @see lib/neatogen/adjust.c:removeOverlapAs / removeOverlapWith / getAdjustMode
  */
 function removeOverlapAs(g: Graph, flag: string): void {
   if (g.nodes.size < 2) return; // removeOverlapWith: <2 nodes short-circuits
-  normalizeG(g); // removeOverlapWith runs normalize before the mode switch
+  warnUnrecognizedOverlap(flag); // getAdjustMode
+  normalizeG(g); // removeOverlapWith runs normalize + simpleScale first
+  simpleScale(g);
   const ntry = overlapPrismTries(flag);
   if (ntry !== null) {
     fdpAdjust(g, ntry); // AM_PRISM