@retikz/core 0.1.0-alpha.2 → 0.1.0-alpha.4

package/dist/lib/compile/node.cjs

@@ -8,6 +8,8 @@ var DEFAULT_FONT_SIZE = 14;
 var DEFAULT_PADDING = 8;
 var DEFAULT_LINE_HEIGHT_FACTOR = 1.2;
 var DEG_TO_RAD = Math.PI / 180;
+/** Node label 与 node 边界的默认距离（user units）；TikZ 默认是 0pt 但视觉上太贴 */
+var DEFAULT_LABEL_DISTANCE = 4;
 var SQRT2 = Math.SQRT2;
 /** dashed 预设：SVG stroke-dasharray "4 2"——4 px 实线 + 2 px 间隙循环 */
 var DASHED_PATTERN = "4 2";
@@ -80,6 +82,59 @@ var anchorOf = (layout, name) => {
 	}
 };
 /**
+* 8 方向 label position → (anchorName, 单位向量) 映射。
+* 视觉语义与 `at.direction` 一致——above 是视觉上方（y 减小）。
+*/
+var LABEL_DIRECTION_MAP = {
+	above: {
+		anchor: "north",
+		vec: [0, -1]
+	},
+	below: {
+		anchor: "south",
+		vec: [0, 1]
+	},
+	left: {
+		anchor: "west",
+		vec: [-1, 0]
+	},
+	right: {
+		anchor: "east",
+		vec: [1, 0]
+	},
+	"above-left": {
+		anchor: "north-west",
+		vec: [-Math.SQRT1_2, -Math.SQRT1_2]
+	},
+	"above-right": {
+		anchor: "north-east",
+		vec: [Math.SQRT1_2, -Math.SQRT1_2]
+	},
+	"below-left": {
+		anchor: "south-west",
+		vec: [-Math.SQRT1_2, Math.SQRT1_2]
+	},
+	"below-right": {
+		anchor: "south-east",
+		vec: [Math.SQRT1_2, Math.SQRT1_2]
+	}
+};
+/**
+* 算 label 中心点：
+* - 8 方向：节点对应 anchor 出发，按单位向量 × distance 外推
+* - 数字角度：先取 angleBoundary 边界点，再沿 (cos, sin) 单位向量 × distance 外推
+*/
+var labelCenter = (layout, label) => {
+	if (typeof label.position === "number") {
+		const rad = label.position * Math.PI / 180;
+		const [bx, by] = angleBoundaryOf(layout, label.position);
+		return [bx + Math.cos(rad) * label.distance, by + Math.sin(rad) * label.distance];
+	}
+	const { anchor, vec } = LABEL_DIRECTION_MAP[label.position];
+	const [bx, by] = anchorOf(layout, anchor);
+	return [bx + vec[0] * label.distance, by + vec[1] * label.distance];
+};
+/**
 * 取节点 shape 在指定角度方向上的边界点。角度约定与 PolarPosition 一致（度数）：
 *   0° = +x（east），90° = +y（screen 下方）。
 * **不应用 margin**——同 anchorOf。用于 `'A.30'` 这种语法落点。
@@ -102,7 +157,7 @@ var angleBoundaryOf = (layout, angleDeg) => {
 * - IR 的 rotate（度数）转弧度存进 Rect.rotate
 * - 透传 margin / 样式属性
 */
-var layoutNode = (node, measureText, nodeIndex) => {
+var layoutNode = (node, measureText, nodeIndex, nodeDistance) => {
 	const sx = node.xScale ?? node.scale ?? 1;
 	const sy = node.yScale ?? node.scale ?? 1;
 	const fontScale = Math.min(sx, sy);
@@ -173,8 +228,22 @@ var layoutNode = (node, measureText, nodeIndex) => {
 			break;
 	}
 	const rotateDeg = node.rotate ?? 0;
-	const center = require_position.resolvePosition(node.position, nodeIndex);
-	if (!center) throw new Error(`Cannot resolve position for node ${node.id ?? "(unnamed)"}; polar.origin may reference an undefined node`);
+	const center = require_position.resolvePosition(node.position, nodeIndex, nodeDistance);
+	if (!center) throw new Error(`Cannot resolve position for node ${node.id ?? "(unnamed)"}; polar.origin or at.of may reference an undefined node`);
+	const labels = (node.label === void 0 ? void 0 : Array.isArray(node.label) ? node.label : [node.label])?.map((lab) => {
+		const labFont = lab.font;
+		return {
+			text: lab.text,
+			position: lab.position ?? "above",
+			distance: lab.distance ?? DEFAULT_LABEL_DISTANCE,
+			textColor: lab.textColor ?? node.textColor,
+			opacity: lab.opacity,
+			fontSize: (labFont?.size ?? baseFontSize) * fontScale,
+			fontFamily: labFont?.family ?? fontFamily,
+			fontWeight: labFont?.weight ?? fontWeight,
+			fontStyle: labFont?.style ?? fontStyle
+		};
+	});
 	return {
 		id: node.id,
 		shape,
@@ -204,7 +273,8 @@ var layoutNode = (node, measureText, nodeIndex) => {
 		strokeDasharray: resolveDashArray(node.dashArray, node.dashed, node.dotted),
 		roundedCorners: node.roundedCorners,
 		textColor: node.textColor,
-		opacity: node.opacity
+		opacity: node.opacity,
+		labels
 	};
 };
 /** rectangle shape 的 RectPrim */
@@ -305,6 +375,26 @@ var emitNodePrimitives = (layout, round) => {
 			measuredHeight: round(layout.textHeight)
 		});
 	}
+	if (layout.labels) for (const lab of layout.labels) {
+		const [lx, ly] = labelCenter(layout, lab);
+		inner.push({
+			type: "text",
+			x: round(lx),
+			y: round(ly),
+			lines: [{ text: lab.text }],
+			fontSize: lab.fontSize,
+			fontFamily: lab.fontFamily,
+			fontWeight: lab.fontWeight,
+			fontStyle: lab.fontStyle,
+			align: "middle",
+			baseline: "middle",
+			lineHeight: round(lab.fontSize * DEFAULT_LINE_HEIGHT_FACTOR),
+			fill: lab.textColor ?? "currentColor",
+			opacity: lab.opacity ?? layout.opacity,
+			measuredWidth: 0,
+			measuredHeight: round(lab.fontSize)
+		});
+	}
 	if (layout.rotateDeg === 0) return inner;
 	return [{
 		type: "group",

package/dist/lib/compile/node.d.ts

@@ -1,6 +1,6 @@
 import { Position } from '../geometry/point';
 import { Rect, RectAnchor } from '../geometry/rect';
-import { IRNode, NodeShape } from '../ir';
+import { AtDirection, IRNode, NodeShape } from '../ir';
 import { ScenePrimitive, TextLine } from '../primitive';
 import { TextMeasurer } from './text-metrics';
 export type NodeLayout = {
@@ -62,6 +62,27 @@ export type NodeLayout = {
     textColor?: string;
     /** 整节点透明度 0~1；emit 时同时挂 shape 与 text primitive */
     opacity?: number;
+    /**
+     * 已解析的 label 列表（IR 层 `Node.label` 标准化后）。每条 label 已合并：
+     * - position 默认 'above'
+     * - distance 默认 DEFAULT_LABEL_DISTANCE
+     * - font 字段从 Node 继承（family / size / weight / style 任一未填则取 Node 块级值）
+     */
+    labels?: Array<NodeLabelLayout>;
+};
+/** 节点附属标签的 layout——layoutNode 阶段已合并好默认值与样式继承 */
+export type NodeLabelLayout = {
+    text: string;
+    /** 8 方向枚举或数字角度（与 IR 同形态） */
+    position: AtDirection | number;
+    /** 已应用默认值的距离 */
+    distance: number;
+    textColor?: string;
+    opacity?: number;
+    fontSize: number;
+    fontFamily?: string;
+    fontWeight?: string | number;
+    fontStyle?: 'normal' | 'italic' | 'oblique';
 };
 /**
  * 取节点 shape 在 toward 方向上的"附着点"——path 端点贴边用。
@@ -89,7 +110,7 @@ export declare const angleBoundaryOf: (layout: NodeLayout, angleDeg: number) =>
  * - IR 的 rotate（度数）转弧度存进 Rect.rotate
  * - 透传 margin / 样式属性
  */
-export declare const layoutNode: (node: IRNode, measureText: TextMeasurer, nodeIndex: Map<string, NodeLayout>) => NodeLayout;
+export declare const layoutNode: (node: IRNode, measureText: TextMeasurer, nodeIndex: Map<string, NodeLayout>, nodeDistance?: number) => NodeLayout;
 /**
  * 把 NodeLayout 翻译为 Scene primitives：
  * - shape 主体：按 shape 分发（rect / ellipse / path）

package/dist/lib/compile/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/compile/node.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,KAAK,EAAc,MAAM,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3D,OAAO,KAAK,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAE7D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AA8BnD,MAAM,MAAM,UAAU,GAAG;IACvB,2CAA2C;IAC3C,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,8CAA8C;IAC9C,KAAK,EAAE,SAAS,CAAC;IACjB;;;;;;;;OAQG;IACH,IAAI,EAAE,IAAI,CAAC;IACX,gDAAgD;IAChD,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,MAAM,EAAE,MAAM,CAAC;IACf;;;;OAIG;IACH,KAAK,CAAC,EAAE,KAAK,CAAC,QAAQ,CAAC,CAAC;IACxB,yDAAyD;IACzD,SAAS,EAAE,MAAM,CAAC;IAClB,4CAA4C;IAC5C,UAAU,EAAE,MAAM,CAAC;IACnB,4DAA4D;IAC5D,KAAK,EAAE,OAAO,GAAG,QAAQ,GAAG,KAAK,CAAC;IAClC,0DAA0D;IAC1D,UAAU,EAAE,MAAM,CAAC;IACnB,8BAA8B;IAC9B,QAAQ,EAAE,MAAM,CAAC;IACjB,6CAA6C;IAC7C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,4BAA4B;IAC5B,UAAU,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC7B,sDAAsD;IACtD,SAAS,CAAC,EAAE,QAAQ,GAAG,QAAQ,GAAG,SAAS,CAAC;IAC5C,+CAA+C;IAC/C,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,gDAAgD;IAChD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,sCAAsC;IACtC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0EAA0E;IAC1E,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,2DAA2D;IAC3D,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,qDAAqD;IACrD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,kDAAkD;IAClD,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAsCF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,UAAU,EAAE,QAAQ,QAAQ,KAAG,QAYtE,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,QAAQ,GAAI,QAAQ,UAAU,EAAE,MAAM,UAAU,KAAG,QAW/D,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,QAAQ,UAAU,EAAE,UAAU,MAAM,KAAG,QActE,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,UAAU,GACrB,MAAM,MAAM,EACZ,aAAa,YAAY,EACzB,WAAW,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KACjC,UAgJF,CAAC;AAsEF;;;;;;;GAOG;AACH,eAAO,MAAM,kBAAkB,GAC7B,QAAQ,UAAU,EAClB,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,KAC3B,KAAK,CAAC,cAAc,CAoDtB,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/compile/node.ts"],"names":[],"mappings":"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"}

package/dist/lib/compile/path.cjs

@@ -1,6 +1,10 @@
 const require_position = require("./position.cjs");
 const require_node = require("./node.cjs");
+const require_arc = require("../geometry/arc.cjs");
+const require_bend = require("../geometry/bend.cjs");
+const require_segment = require("../geometry/segment.cjs");
 const require_parseTarget = require("./parseTarget.cjs");
+const require_text_metrics = require("./text-metrics.cjs");
 //#region src/compile/path.ts
 /**
 * IR 的 path-level `arrow` + `arrowShape` 映射到 PathPrim 的
@@ -72,6 +76,7 @@ var refPointOfTarget = (target, nodeIndex) => {
 			case "angle": return require_node.angleBoundaryOf(node, ref.angle);
 		}
 	}
+	if (typeof target === "object" && !Array.isArray(target) && ("rel" in target || "relAccumulate" in target)) return null;
 	return require_position.resolvePosition(target, nodeIndex);
 };
 /**
@@ -99,11 +104,179 @@ var clipForTarget = (target, toward, nodeIndex) => {
 			case "angle": return require_node.angleBoundaryOf(node, ref.angle);
 		}
 	}
+	if (typeof target === "object" && !Array.isArray(target) && ("rel" in target || "relAccumulate" in target)) return null;
 	return require_position.resolvePosition(target, nodeIndex);
 };
 /** 浅相等：两个 IRPosition 的两个分量都精确相等（未 round） */
 var samePoint = (a, b) => !!a && !!b && a[0] === b[0] && a[1] === b[1];
 /**
+* 语义 stroke 档位 → 数值映射（user units）。
+*
+* 对齐 TikZ 比例（thin = 默认 0.4pt，retikz 默认 strokeWidth = 1，所以 thin → 1）：
+*   ultra thin  0.1pt → 0.25
+*   very thin   0.2pt → 0.5
+*   thin        0.4pt → 1     （= 默认 strokeWidth）
+*   semithick   0.6pt → 1.5
+*   thick       0.8pt → 2
+*   very thick  1.2pt → 3
+*   ultra thick 1.6pt → 4
+*
+* 显式 `strokeWidth` 始终覆盖 `thickness`——thickness 仅在 strokeWidth 缺省时生效。
+*/
+var THICKNESS_TO_WIDTH = {
+	ultraThin: .25,
+	veryThin: .5,
+	thin: 1,
+	semithick: 1.5,
+	thick: 2,
+	veryThick: 3,
+	ultraThick: 4
+};
+/** ADR-0004：边标注的默认字号 / 偏移量（user units） */
+var LABEL_FONT_SIZE = 14;
+var LABEL_LINE_HEIGHT_FACTOR = 1.2;
+var LABEL_SIDE_OFFSET = 4;
+var RAD_TO_DEG = 180 / Math.PI;
+/** label.position → 段参数 t */
+var tForLabelPosition = (pos) => pos === "near-start" ? .25 : pos === "near-end" ? .75 : .5;
+/**
+* 把 step.label + 段采样结果翻成 TextPrim（sloped 时再裹一层 group 旋转）。
+*
+* 几何（默认 side='above'，position='midway'）：
+* - 'above': 锚点 (x, y - LABEL_SIDE_OFFSET)，align=middle, baseline=bottom
+* - 'below': 锚点 (x, y + LABEL_SIDE_OFFSET)，align=middle, baseline=top
+* - 'left' : 锚点 (x - LABEL_SIDE_OFFSET, y)，align=end,    baseline=middle
+* - 'right': 锚点 (x + LABEL_SIDE_OFFSET, y)，align=start,  baseline=middle
+* - 'sloped': 锚点 (x, y) 不偏移，align=middle baseline=bottom，外裹 group
+*   `transform="rotate(angle x y)"`，angle 由切线 atan2 算出（SVG y-down，CW 正向）
+*
+* 文本宽高交给 measureText；fallbackMeasurer 时只是估算，但不影响渲染坐标。
+* 返回 primitive + 用于 viewBox 的若干外接点（sloped 时按"近似最大半径"四角扩张）。
+*/
+var emitLabelPrimitive = (label, sample, measureText, round) => {
+	const fontSize = LABEL_FONT_SIZE;
+	const lineHeight = fontSize * LABEL_LINE_HEIGHT_FACTOR;
+	const m = measureText(label.text, { size: fontSize });
+	const measuredWidth = m.width;
+	const measuredHeight = m.height || lineHeight;
+	const side = label.side ?? "above";
+	let x = sample.point[0];
+	let y = sample.point[1];
+	let align = "middle";
+	let baseline = "middle";
+	if (side === "above") {
+		y -= LABEL_SIDE_OFFSET;
+		baseline = "bottom";
+	} else if (side === "below") {
+		y += LABEL_SIDE_OFFSET;
+		baseline = "top";
+	} else if (side === "left") {
+		x -= LABEL_SIDE_OFFSET;
+		align = "end";
+	} else if (side === "right") {
+		x += LABEL_SIDE_OFFSET;
+		align = "start";
+	} else baseline = "bottom";
+	const text = {
+		type: "text",
+		x: round(x),
+		y: round(y),
+		lines: [{ text: label.text }],
+		fontSize,
+		align,
+		baseline,
+		lineHeight: round(lineHeight),
+		measuredWidth: round(measuredWidth),
+		measuredHeight: round(measuredHeight),
+		fill: "currentColor"
+	};
+	if (side === "sloped") {
+		const groupPrim = {
+			type: "group",
+			transform: `rotate(${round(Math.atan2(sample.tangent[1], sample.tangent[0]) * RAD_TO_DEG)} ${round(x)} ${round(y)})`,
+			children: [text]
+		};
+		const r = Math.max(measuredWidth / 2, measuredHeight / 2);
+		return {
+			primitive: groupPrim,
+			points: [
+				[x - r, y - r],
+				[x + r, y - r],
+				[x - r, y + r],
+				[x + r, y + r]
+			]
+		};
+	}
+	const halfW = measuredWidth / 2;
+	const halfH = measuredHeight / 2;
+	return {
+		primitive: text,
+		points: [
+			[x - halfW, y - halfH],
+			[x + halfW, y - halfH],
+			[x - halfW, y + halfH],
+			[x + halfW, y + halfH]
+		]
+	};
+};
+/**
+* 把 rel / relAccumulate 目标解析为绝对 Position，产出 step kind 不变但
+* `to` 字段全为绝对坐标的步序列。
+*
+* 决策（ADR-0003 §影响 与 §背景 文本有矛盾）：
+*   两者都相对 prevEnd 解析，区别仅在是否更新 prevEnd——
+*   rel 不更新（保持 TikZ `+` 语义），relAccumulate 更新（TikZ `++` 累积）。
+*   选这个语义因为：(1) 与 TikZ `+`/`++` 一致；(2) 与字段名"Accumulate"
+*   语义匹配；(3) 与 ADR 背景段一致；§影响 段写"pathStart + offset"是 typo。
+*
+* 跨 step kind 的 prevEnd 推进：
+* - 有 to 的 kind（move/line/step/curve/cubic/bend）：prevEnd = refPointOfTarget(to)
+* - arc：prevEnd = arcEndPoint(prevEnd, radius, endAngle)
+* - circlePath / ellipsePath：prevEnd 不变（画完留圆心，即 prevEnd 本身）
+* - cycle：prevEnd 不变（不重置到 pathStart，保持简单；后续如有需要再扩）
+*
+* prevEnd 为 null（首步是 rel）时回退到 [0, 0] 当锚点；解析失败保持原 step。
+*/
+var normalizeRelativeTargets = (steps, nodeIndex) => {
+	let prevEnd = null;
+	const out = [];
+	for (const step of steps) {
+		if (step.kind === "cycle") {
+			out.push(step);
+			continue;
+		}
+		if (step.kind === "circlePath" || step.kind === "ellipsePath") {
+			out.push(step);
+			continue;
+		}
+		if (step.kind === "arc") {
+			out.push(step);
+			if (prevEnd) prevEnd = require_arc.arcEndPoint(prevEnd, step.radius, step.endAngle);
+			continue;
+		}
+		const original = step.to;
+		let resolvedTo = original;
+		let updatePrevEnd = true;
+		if (typeof original === "object" && !Array.isArray(original) && "rel" in original) {
+			const ref = prevEnd ?? [0, 0];
+			resolvedTo = [ref[0] + original.rel[0], ref[1] + original.rel[1]];
+			updatePrevEnd = false;
+		} else if (typeof original === "object" && !Array.isArray(original) && "relAccumulate" in original) {
+			const ref = prevEnd ?? [0, 0];
+			resolvedTo = [ref[0] + original.relAccumulate[0], ref[1] + original.relAccumulate[1]];
+		}
+		out.push({
+			...step,
+			to: resolvedTo
+		});
+		if (updatePrevEnd) {
+			const pos = refPointOfTarget(resolvedTo, nodeIndex);
+			if (pos) prevEnd = pos;
+		}
+	}
+	return out;
+};
+/**
 * 把 IR Path 翻译为单个 PathPrim。
 *
 * 关键算法（v0.1.0-alpha.1）：每个绘制段（line / fold）**独立**地用节点中心
@@ -124,15 +297,27 @@ var samePoint = (a, b) => !!a && !!b && a[0] === b[0] && a[1] === b[1];
 *
 * 引用未定义节点 / 解析失败时返回 null（path 整体跳过）。
 */
-var emitPathPrimitive = (path, nodeIndex, round) => {
-	const steps = path.children;
+var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metrics.fallbackMeasurer) => {
+	const steps = normalizeRelativeTargets(path.children, nodeIndex);
 	if (steps.length < 2) return null;
-	const anchors = steps.map((s) => s.kind === "cycle" ? null : refPointOfTarget(s.to, nodeIndex));
-	/** 找 i 之前最近的"有 to 字段的 step"（跳过 cycle） + 它的 anchor */
+	/** ADR-0004：每段 step.label 翻译出的 TextPrim（或裹 sloped 旋转的 group），
+	*  与 path 主体 primitive 同级返回；调用方 push 进 scene.primitives */
+	const labelPrims = [];
+	/** 为当前 step 收 label：算 sample 后调用 emitLabelPrimitive，结果累积到 labelPrims / points */
+	const collectLabel = (step, sampleAt) => {
+		if (step.kind === "move" || step.kind === "cycle" || !("label" in step) || !step.label) return;
+		const sample = sampleAt(tForLabelPosition(step.label.position));
+		const r = emitLabelPrimitive(step.label, sample, measureText, round);
+		labelPrims.push(r.primitive);
+		for (const p of r.points) points.push(p);
+	};
+	const hasTo = (s) => s.kind !== "cycle" && s.kind !== "arc" && s.kind !== "circlePath" && s.kind !== "ellipsePath";
+	const anchors = steps.map((s) => hasTo(s) ? refPointOfTarget(s.to, nodeIndex) : null);
+	/** 找 i 之前最近的"有 to 字段的 step" + 它的 anchor */
 	const findPrev = (i) => {
 		for (let j = i - 1; j >= 0; j--) {
 			const s = steps[j];
-			if (s.kind === "cycle") continue;
+			if (!hasTo(s)) continue;
 			const a = anchors[j];
 			if (!a) return null;
 			return {
@@ -144,13 +329,27 @@ var emitPathPrimitive = (path, nodeIndex, round) => {
 	};
 	/** 找 i 之前最近的 move 的 to——cycle 闭合的目标 */
 	const findRecentMoveTo = (i) => {
-		for (let j = i - 1; j >= 0; j--) if (steps[j].kind === "move") return steps[j].to;
+		for (let j = i - 1; j >= 0; j--) {
+			const s = steps[j];
+			if (s.kind === "move") return s.to;
+		}
 		return null;
 	};
 	const ops = [];
 	const points = [];
 	let lastEnd = null;
 	let subPathStart = null;
+	/**
+	* "笔位覆盖"——arc / circlePath / ellipsePath 这种没有 `to` 字段的 step
+	* 不能通过 `prev.step.to` 重算下一段的起点。它们设置 penOverride，下一个
+	* 绘制段（line/curve/cubic/bend/step）直接用这个点当 fromClip，之后清空。
+	*
+	*   - arc：endpoint（弧终点）—— 与 SVG 实际 cursor 一致
+	*   - circlePath/ellipsePath：center（圆心）—— ADR-0002 决策"画完留在圆心"，
+	*     注意 SVG 实际 cursor 在弧端点而不在 center，必须靠 startSegment 发 M
+	*     teleport 回中心
+	*/
+	let penOverride = null;
 	const emitM = (p) => {
 		ops.push({
 			cmd: "M",
@@ -172,6 +371,40 @@ var emitPathPrimitive = (path, nodeIndex, round) => {
 		ops.push({ cmd: "Z" });
 		lastEnd = subPathStart;
 	};
+	const emitQ = (control, p) => {
+		ops.push({
+			cmd: "Q",
+			control,
+			point: p
+		});
+		points.push(control);
+		points.push(p);
+		lastEnd = p;
+	};
+	const emitC = (c1, c2, p) => {
+		ops.push({
+			cmd: "C",
+			control1: c1,
+			control2: c2,
+			point: p
+		});
+		points.push(c1);
+		points.push(c2);
+		points.push(p);
+		lastEnd = p;
+	};
+	const emitA = (rx, ry, largeArc, sweep, p) => {
+		ops.push({
+			cmd: "A",
+			rx,
+			ry,
+			largeArc,
+			sweep,
+			point: p
+		});
+		points.push(p);
+		lastEnd = p;
+	};
 	/** 段起点：与 lastEnd 相同就复用 cursor（省掉冗余 M），否则发 M */
 	const startSegment = (p) => {
 		if (samePoint(p, lastEnd)) return;
@@ -199,31 +432,114 @@ var emitPathPrimitive = (path, nodeIndex, round) => {
 		}
 		const prev = findPrev(i);
 		if (!prev) return null;
+		if (step.kind === "arc") {
+			const center = prev.anchor;
+			const startPt = require_arc.arcEndPoint(center, step.radius, step.startAngle);
+			const endPt = require_arc.arcEndPoint(center, step.radius, step.endAngle);
+			const flags = require_arc.arcSvgFlags(step.startAngle, step.endAngle);
+			startSegment(startPt);
+			emitA(step.radius, step.radius, flags.largeArc, flags.sweep, endPt);
+			for (const p of require_arc.arcBoundingPoints(center, step.radius, step.startAngle, step.endAngle)) points.push(p);
+			collectLabel(step, (t) => require_segment.arcSegmentSample(center, step.radius, step.startAngle, step.endAngle, t));
+			penOverride = endPt;
+			continue;
+		}
+		if (step.kind === "circlePath") {
+			const center = prev.anchor;
+			const r = step.radius;
+			const right = [center[0] + r, center[1]];
+			const left = [center[0] - r, center[1]];
+			startSegment(right);
+			emitA(r, r, 0, 1, left);
+			emitA(r, r, 0, 1, right);
+			points.push([center[0] + r, center[1]]);
+			points.push([center[0] - r, center[1]]);
+			points.push([center[0], center[1] + r]);
+			points.push([center[0], center[1] - r]);
+			collectLabel(step, (t) => require_segment.circleSegmentSample(center, r, t));
+			penOverride = center;
+			continue;
+		}
+		if (step.kind === "ellipsePath") {
+			const center = prev.anchor;
+			const rx = step.radiusX;
+			const ry = step.radiusY;
+			const right = [center[0] + rx, center[1]];
+			const left = [center[0] - rx, center[1]];
+			startSegment(right);
+			emitA(rx, ry, 0, 1, left);
+			emitA(rx, ry, 0, 1, right);
+			points.push([center[0] + rx, center[1]]);
+			points.push([center[0] - rx, center[1]]);
+			points.push([center[0], center[1] + ry]);
+			points.push([center[0], center[1] - ry]);
+			collectLabel(step, (t) => require_segment.ellipseSegmentSample(center, rx, ry, t));
+			penOverride = center;
+			continue;
+		}
 		const currAnchor = anchors[i];
 		if (!currAnchor) return null;
+		const usedOverride = penOverride;
+		penOverride = null;
 		if (step.kind === "line") {
-			const fromClip = clipForTarget(prev.step.to, currAnchor, nodeIndex);
+			const fromClip = usedOverride ?? clipForTarget(prev.step.to, currAnchor, nodeIndex);
 			const toClip = clipForTarget(step.to, prev.anchor, nodeIndex);
 			if (!fromClip || !toClip) return null;
 			startSegment(fromClip);
 			emitL(toClip);
+			collectLabel(step, (t) => require_segment.lineSegmentSample(fromClip, toClip, t));
+			continue;
+		}
+		if (step.kind === "curve") {
+			const fromClip = usedOverride ?? clipForTarget(prev.step.to, step.control, nodeIndex);
+			const toClip = clipForTarget(step.to, step.control, nodeIndex);
+			if (!fromClip || !toClip) return null;
+			startSegment(fromClip);
+			emitQ(step.control, toClip);
+			collectLabel(step, (t) => require_segment.quadSegmentSample(fromClip, step.control, toClip, t));
+			continue;
+		}
+		if (step.kind === "cubic") {
+			const fromClip = usedOverride ?? clipForTarget(prev.step.to, step.control1, nodeIndex);
+			const toClip = clipForTarget(step.to, step.control2, nodeIndex);
+			if (!fromClip || !toClip) return null;
+			startSegment(fromClip);
+			emitC(step.control1, step.control2, toClip);
+			collectLabel(step, (t) => require_segment.cubicSegmentSample(fromClip, step.control1, step.control2, toClip, t));
+			continue;
+		}
+		if (step.kind === "bend") {
+			const angle = step.bendAngle ?? 30;
+			const [c1, c2] = require_bend.bendControlPoints(prev.anchor, currAnchor, step.bendDirection, angle);
+			const fromClip = usedOverride ?? clipForTarget(prev.step.to, c1, nodeIndex);
+			const toClip = clipForTarget(step.to, c2, nodeIndex);
+			if (!fromClip || !toClip) return null;
+			startSegment(fromClip);
+			emitC(c1, c2, toClip);
+			collectLabel(step, (t) => require_segment.cubicSegmentSample(fromClip, c1, c2, toClip, t));
 			continue;
 		}
 		const corner = cornerOf(prev.anchor, currAnchor, step.via);
-		const fromClip = clipForTarget(prev.step.to, corner, nodeIndex);
+		const fromClip = usedOverride ?? clipForTarget(prev.step.to, corner, nodeIndex);
 		const toClip = clipForTarget(step.to, corner, nodeIndex);
 		if (!fromClip || !toClip) return null;
 		startSegment(fromClip);
 		emitL(corner);
 		emitL(toClip);
+		collectLabel(step, (t) => require_segment.foldSegmentSample(fromClip, corner, toClip, t));
 	}
-	const strokeWidth = path.strokeWidth ?? 1;
+	const strokeWidth = path.strokeWidth ?? (path.thickness ? THICKNESS_TO_WIDTH[path.thickness] : 1);
 	const baseProps = {
 		stroke: path.stroke ?? "currentColor",
 		strokeWidth,
 		fill: path.fill ?? "none",
 		fillRule: path.fillRule,
-		strokeDasharray: path.strokeDasharray
+		strokeDasharray: path.strokeDasharray,
+		strokeLinecap: path.lineCap,
+		strokeLinejoin: path.lineJoin,
+		opacity: path.opacity,
+		fillOpacity: path.fillOpacity,
+		strokeOpacity: path.drawOpacity
 	};
 	const markers = arrowMarkers(path.arrow, path.arrowShape);
 	const hasArrows = !!markers.arrowStart || !!markers.arrowEnd;
@@ -255,6 +571,9 @@ var emitPathPrimitive = (path, nodeIndex, round) => {
 	}
 	const tokens = ops.map((op) => {
 		if (op.cmd === "Z") return "Z";
+		if (op.cmd === "Q") return `Q ${round(op.control[0])} ${round(op.control[1])} ${round(op.point[0])} ${round(op.point[1])}`;
+		if (op.cmd === "C") return `C ${round(op.control1[0])} ${round(op.control1[1])} ${round(op.control2[0])} ${round(op.control2[1])} ${round(op.point[0])} ${round(op.point[1])}`;
+		if (op.cmd === "A") return `A ${round(op.rx)} ${round(op.ry)} 0 ${op.largeArc} ${op.sweep} ${round(op.point[0])} ${round(op.point[1])}`;
 		return `${op.cmd} ${round(op.point[0])} ${round(op.point[1])}`;
 	});
 	const subPathStarts = [];
@@ -262,12 +581,12 @@ var emitPathPrimitive = (path, nodeIndex, round) => {
 		if (tok.startsWith("M ")) subPathStarts.push(idx);
 	});
 	if (!hasArrows || subPathStarts.length <= 1) return {
-		primitive: {
+		primitives: [{
 			type: "path",
 			d: tokens.join(" "),
 			...baseProps,
 			...markers
-		},
+		}, ...labelPrims],
 		points
 	};
 	const subPathSlices = [];
@@ -277,7 +596,7 @@ var emitPathPrimitive = (path, nodeIndex, round) => {
 		subPathSlices.push(tokens.slice(start, end));
 	}
 	return {
-		primitive: {
+		primitives: [{
 			type: "group",
 			children: subPathSlices.map((sub, i) => {
 				const isFirst = i === 0;
@@ -290,7 +609,7 @@ var emitPathPrimitive = (path, nodeIndex, round) => {
 					...isLast && markers.arrowEnd ? { arrowEnd: markers.arrowEnd } : {}
 				};
 			})
-		},
+		}, ...labelPrims],
 		points
 	};
 };

package/dist/lib/compile/path.d.ts

@@ -1,6 +1,7 @@
 import { IRPath, IRPosition } from '../ir';
 import { ScenePrimitive } from '../primitive';
 import { NodeLayout } from './node';
+import { TextMeasurer } from './text-metrics';
 /**
  * 把 IR Path 翻译为单个 PathPrim。
  *
@@ -22,8 +23,8 @@ import { NodeLayout } from './node';
  *
  * 引用未定义节点 / 解析失败时返回 null（path 整体跳过）。
  */
-export declare const emitPathPrimitive: (path: IRPath, nodeIndex: Map<string, NodeLayout>, round: (n: number) => number) => {
-    primitive: ScenePrimitive;
+export declare const emitPathPrimitive: (path: IRPath, nodeIndex: Map<string, NodeLayout>, round: (n: number) => number, measureText?: TextMeasurer) => {
+    primitives: Array<ScenePrimitive>;
     points: Array<IRPosition>;
 } | null;
 //# sourceMappingURL=path.d.ts.map

package/dist/lib/compile/path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../../src/compile/path.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,MAAM,EAAE,UAAU,EAAoB,MAAM,OAAO,CAAC;AAC9E,OAAO,KAAK,EAAY,cAAc,EAAE,MAAM,cAAc,CAAC;AAC7D,OAAO,EAAE,KAAK,UAAU,EAA8C,MAAM,QAAQ,CAAC;AAuIrF;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,WAAW,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAClC,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,KAC3B;IAAE,SAAS,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CAAE,GAAG,IAsN7D,CAAC"}
+{"version":3,"file":"path.d.ts","sourceRoot":"","sources":["../../../src/compile/path.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAEV,MAAM,EACN,UAAU,EAIX,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAY,cAAc,EAAY,MAAM,cAAc,CAAC;AACvE,OAAO,EAAE,KAAK,UAAU,EAA8C,MAAM,QAAQ,CAAC;AAGrF,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,gBAAgB,CAAC;AAoWrE;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,WAAW,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAClC,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAC5B,cAAa,YAA+B,KAC3C;IAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CAAE,GAAG,IA8arE,CAAC"}