@retikz/core 0.1.0 → 0.2.0-alpha.2

package/dist/lib/compile/path/anchor.cjs

@@ -1,44 +1,55 @@
+const require_scope = require("../scope.cjs");
 const require_position = require("../position.cjs");
 const require_node = require("../node.cjs");
+const require_anchor_cache = require("../anchor-cache.cjs");
 const require_parseTarget = require("../parseTarget.cjs");
 //#region src/compile/path/anchor.ts
 /**
 * 求 step.to 的参考点（给 boundary clip 算方向 / 折角 corner 用）
-* @description 三态：`'A'`(auto) 节点中心；`'A.<anchor>'`/`'A.<deg>'` 显式锚点 refPoint=endpoint 位置不随邻居变。直接坐标/极坐标解析为笛卡尔
+* @description 三态：`'A'`(auto) 节点中心；`'A.<anchor>'`/`'A.<deg>'` 显式锚点 refPoint=endpoint 位置不随邻居变。直接坐标/极坐标解析为笛卡尔。
+*   string id lookup 拿到的 layout 已是全局坐标——不走 scopeChain 投影；Position / Polar /
+*   At / Offset 字面量经 `resolvePosition(..., scopeChain)` 拿到当前 scope 局部坐标后
+*   `applyTransformChain` 投回全局。`scopeChain=[]` 等价 v0.1（恒等）。
 */
-var refPointOfTarget = (target, nodeIndex) => {
+var refPointOfTarget = (target, nameStack, scopeChain = []) => {
 	if (typeof target === "string") {
 		const ref = require_parseTarget.parseNodeRef(target);
-		const node = nodeIndex.get(ref.id);
+		const node = nameStack.lookup(ref.id);
 		if (!node) return null;
 		switch (ref.kind) {
 			case "node": return [node.rect.x, node.rect.y];
-			case "anchor": return require_node.anchorOf(node, ref.anchor);
-			case "angle": return require_node.angleBoundaryOf(node, ref.angle);
+			case "anchor": return require_anchor_cache.resolveAnchor(node, ref.anchor);
+			case "angle": return require_anchor_cache.resolveAnchor(node, String(ref.angle));
 		}
 	}
 	if (typeof target === "object" && !Array.isArray(target) && ("relative" in target || "relativeAccumulate" in target)) return null;
-	return require_position.resolvePosition(target, nodeIndex);
+	const local = require_position.resolvePosition(target, nameStack, void 0, scopeChain);
+	if (!local) return null;
+	return scopeChain.length === 0 ? local : require_scope.applyTransformChain(local, scopeChain);
 };
 /** 折角中间点：`-|` → (curr.x, prev.y)；`|-` → (prev.x, curr.y) */
 var cornerOf = (prev, curr, via) => via === "-|" ? [curr[0], prev[1]] : [prev[0], curr[1]];
 /**
 * 在 toward 方向算 step.to 的实际绘制端点
-* @description 节点 auto `'A'`：按 shape 走 boundaryPointOf 求中心→toward 射线交点；命名 anchor/角度：位置已定不受 toward 影响；直接坐标/极坐标：解析后返回；失败返回 null
+* @description 节点 auto `'A'`：按 shape 走 boundaryPointOf 求中心→toward 射线交点；命名 anchor/角度：位置已定不受 toward 影响；直接坐标/极坐标：解析后返回；失败返回 null。
+*   string id lookup 拿到的 layout 已是全局坐标；Position / Polar / At / Offset 字面量经
+*   `resolvePosition(..., scopeChain)` 拿到当前 scope 局部坐标后 `applyTransformChain` 投回全局。
 */
-var clipForTarget = (target, toward, nodeIndex) => {
+var clipForTarget = (target, toward, nameStack, scopeChain = []) => {
 	if (typeof target === "string") {
 		const ref = require_parseTarget.parseNodeRef(target);
-		const node = nodeIndex.get(ref.id);
+		const node = nameStack.lookup(ref.id);
 		if (!node) return null;
 		switch (ref.kind) {
 			case "node": return require_node.boundaryPointOf(node, toward);
-			case "anchor": return require_node.anchorOf(node, ref.anchor);
-			case "angle": return require_node.angleBoundaryOf(node, ref.angle);
+			case "anchor": return require_anchor_cache.resolveAnchor(node, ref.anchor);
+			case "angle": return require_anchor_cache.resolveAnchor(node, String(ref.angle));
 		}
 	}
 	if (typeof target === "object" && !Array.isArray(target) && ("relative" in target || "relativeAccumulate" in target)) return null;
-	return require_position.resolvePosition(target, nodeIndex);
+	const local = require_position.resolvePosition(target, nameStack, void 0, scopeChain);
+	if (!local) return null;
+	return scopeChain.length === 0 ? local : require_scope.applyTransformChain(local, scopeChain);
 };
 /** 两个 IRPosition 两分量精确相等（未 round） */
 var samePoint = (a, b) => !!a && !!b && a[0] === b[0] && a[1] === b[1];

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

@@ -1,17 +1,23 @@
 import { IRPosition, IRTarget } from '../../ir';
-import { NodeLayout } from '../node';
+import { Transform } from '../../primitive';
+import { NameStack } from '../name-stack';
 /**
  * 求 step.to 的参考点（给 boundary clip 算方向 / 折角 corner 用）
- * @description 三态：`'A'`(auto) 节点中心；`'A.<anchor>'`/`'A.<deg>'` 显式锚点 refPoint=endpoint 位置不随邻居变。直接坐标/极坐标解析为笛卡尔
+ * @description 三态：`'A'`(auto) 节点中心；`'A.<anchor>'`/`'A.<deg>'` 显式锚点 refPoint=endpoint 位置不随邻居变。直接坐标/极坐标解析为笛卡尔。
+ *   string id lookup 拿到的 layout 已是全局坐标——不走 scopeChain 投影；Position / Polar /
+ *   At / Offset 字面量经 `resolvePosition(..., scopeChain)` 拿到当前 scope 局部坐标后
+ *   `applyTransformChain` 投回全局。`scopeChain=[]` 等价 v0.1（恒等）。
  */
-export declare const refPointOfTarget: (target: IRTarget, nodeIndex: Map<string, NodeLayout>) => IRPosition | null;
+export declare const refPointOfTarget: (target: IRTarget, nameStack: NameStack, scopeChain?: ReadonlyArray<Transform>) => IRPosition | null;
 /** 折角中间点：`-|` → (curr.x, prev.y)；`|-` → (prev.x, curr.y) */
 export declare const cornerOf: (prev: IRPosition, curr: IRPosition, via: "-|" | "|-") => IRPosition;
 /**
  * 在 toward 方向算 step.to 的实际绘制端点
- * @description 节点 auto `'A'`：按 shape 走 boundaryPointOf 求中心→toward 射线交点；命名 anchor/角度：位置已定不受 toward 影响；直接坐标/极坐标：解析后返回；失败返回 null
+ * @description 节点 auto `'A'`：按 shape 走 boundaryPointOf 求中心→toward 射线交点；命名 anchor/角度：位置已定不受 toward 影响；直接坐标/极坐标：解析后返回；失败返回 null。
+ *   string id lookup 拿到的 layout 已是全局坐标；Position / Polar / At / Offset 字面量经
+ *   `resolvePosition(..., scopeChain)` 拿到当前 scope 局部坐标后 `applyTransformChain` 投回全局。
  */
-export declare const clipForTarget: (target: IRTarget, toward: IRPosition, nodeIndex: Map<string, NodeLayout>) => IRPosition | null;
+export declare const clipForTarget: (target: IRTarget, toward: IRPosition, nameStack: NameStack, scopeChain?: ReadonlyArray<Transform>) => IRPosition | null;
 /** 两个 IRPosition 两分量精确相等（未 round） */
 export declare const samePoint: (a: IRPosition | null, b: IRPosition | null) => boolean;
 /** 把 p 朝 target 方向移动 dist */

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

@@ -1 +1 @@
-{"version":3,"file":"anchor.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/anchor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,KAAK,UAAU,EAA8C,MAAM,SAAS,CAAC;AAItF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,QAAQ,EAChB,WAAW,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KACjC,UAAU,GAAG,IAmBf,CAAC;AAEF,4DAA4D;AAC5D,eAAO,MAAM,QAAQ,GACnB,MAAM,UAAU,EAChB,MAAM,UAAU,EAChB,KAAK,IAAI,GAAG,IAAI,KACf,UACqD,CAAC;AAEzD;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,QAAQ,QAAQ,EAChB,QAAQ,UAAU,EAClB,WAAW,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KACjC,UAAU,GAAG,IAmBf,CAAC;AAEF,qCAAqC;AACrC,eAAO,MAAM,SAAS,GAAI,GAAG,UAAU,GAAG,IAAI,EAAE,GAAG,UAAU,GAAG,IAAI,KAAG,OACzB,CAAC;AAE/C,6BAA6B;AAC7B,eAAO,MAAM,WAAW,GAAI,GAAG,UAAU,EAAE,QAAQ,UAAU,EAAE,MAAM,MAAM,KAAG,UAM7E,CAAC"}
+{"version":3,"file":"anchor.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/anchor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAEjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAM/C;;;;;;GAMG;AACH,eAAO,MAAM,gBAAgB,GAC3B,QAAQ,QAAQ,EAChB,WAAW,SAAS,EACpB,aAAY,aAAa,CAAC,SAAS,CAAM,KACxC,UAAU,GAAG,IAqBf,CAAC;AAEF,4DAA4D;AAC5D,eAAO,MAAM,QAAQ,GACnB,MAAM,UAAU,EAChB,MAAM,UAAU,EAChB,KAAK,IAAI,GAAG,IAAI,KACf,UACqD,CAAC;AAEzD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GACxB,QAAQ,QAAQ,EAChB,QAAQ,UAAU,EAClB,WAAW,SAAS,EACpB,aAAY,aAAa,CAAC,SAAS,CAAM,KACxC,UAAU,GAAG,IAqBf,CAAC;AAEF,qCAAqC;AACrC,eAAO,MAAM,SAAS,GAAI,GAAG,UAAU,GAAG,IAAI,EAAE,GAAG,UAAU,GAAG,IAAI,KAAG,OACzB,CAAC;AAE/C,6BAA6B;AAC7B,eAAO,MAAM,WAAW,GAAI,GAAG,UAAU,EAAE,QAAQ,UAAU,EAAE,MAAM,MAAM,KAAG,UAM7E,CAAC"}

package/dist/lib/compile/path/index.cjs

@@ -26,7 +26,7 @@ var THICKNESS_TO_WIDTH = {
 * IR Path → PathPrim
 * @description 每个绘制段独立用节点中心算两端 boundary clip——中段节点的入/出 boundary 点通常不同，path 在该节点可见"断开"（与 TikZ `\draw (A)--(B)--(C);` 段独立 clip 一致）。仍产一个 PathPrim：commands 用多组 move/line 表达 sub-path；段起点等于上段终点时复用 cursor 省 move。cycle 段闭回最近 move 起点，起点==lastEnd && 终点==subPathStart 时输出 close，否则显式画段 line。引用未定义节点/解析失败返回 null，并通过 `warnHook.onWarn` 同步触发 warning
 */
-var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metrics.fallbackMeasurer, warnHook = {}) => {
+var emitPathPrimitive = (path, nameStack, round, measureText = require_text_metrics.fallbackMeasurer, warnHook = {}) => {
 	const irPath = warnHook.irPath ?? "path";
 	const warn = (code, message, subPath = "") => {
 		warnHook.onWarn?.({
@@ -35,7 +35,8 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 			path: subPath ? `${irPath}.${subPath}` : irPath
 		});
 	};
-	const steps = require_relative.normalizeRelativeTargets(path.children, nodeIndex);
+	const scopeChain = warnHook.scopeChain ?? [];
+	const steps = require_relative.normalizeRelativeTargets(path.children, nameStack, scopeChain);
 	if (steps.length < 2) {
 		warn("PATH_TOO_SHORT", `Path requires at least 2 steps (got ${steps.length}); the entire path is skipped`, "children");
 		return null;
@@ -46,14 +47,14 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 	const collectLabel = (step, sampleAt) => {
 		if (step.kind === "move" || step.kind === "cycle" || !("label" in step) || !step.label) return;
 		const sample = sampleAt(require_label.tForLabelPosition(step.label.position));
-		const r = require_label.emitLabelPrimitive(step.label, sample, measureText, round);
+		const r = require_label.emitLabelPrimitive(step.label, sample, measureText, round, path.opacity);
 		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, idx) => {
 		if (!hasTo(s)) return null;
-		const ref = require_anchor.refPointOfTarget(s.to, nodeIndex);
+		const ref = require_anchor.refPointOfTarget(s.to, nameStack, scopeChain);
 		if (!ref && typeof s.to === "string") warn("UNRESOLVED_NODE_REFERENCE", `Step.to references undefined node id '${s.to}'; the entire path is skipped`, `children[${idx}].to`);
 		return ref;
 	});
@@ -179,10 +180,10 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 			const moveTo = lastMoveTo;
 			const prev = findPrev();
 			if (!moveTo || !prev) continue;
-			const moveAnchor = require_anchor.refPointOfTarget(moveTo, nodeIndex);
+			const moveAnchor = require_anchor.refPointOfTarget(moveTo, nameStack, scopeChain);
 			if (!moveAnchor) return null;
-			const fromClip = require_anchor.clipForTarget(prev.step.to, moveAnchor, nodeIndex);
-			const toClip = require_anchor.clipForTarget(moveTo, prev.anchor, nodeIndex);
+			const fromClip = require_anchor.clipForTarget(prev.step.to, moveAnchor, nameStack, scopeChain);
+			const toClip = require_anchor.clipForTarget(moveTo, prev.anchor, nameStack, scopeChain);
 			if (!fromClip || !toClip) return null;
 			if (require_anchor.samePoint(fromClip, lastEnd) && require_anchor.samePoint(toClip, subPathStart)) {
 				emitClose();
@@ -237,8 +238,8 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 		const usedOverride = penOverride;
 		penOverride = null;
 		if (step.kind === "line") {
-			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, currAnchor, nodeIndex);
-			const toClip = require_anchor.clipForTarget(step.to, prev.anchor, nodeIndex);
+			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, currAnchor, nameStack, scopeChain);
+			const toClip = require_anchor.clipForTarget(step.to, prev.anchor, nameStack, scopeChain);
 			if (!fromClip || !toClip) return null;
 			startSegment(fromClip);
 			emitLine(toClip);
@@ -246,8 +247,8 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 			continue;
 		}
 		if (step.kind === "curve") {
-			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, step.control, nodeIndex);
-			const toClip = require_anchor.clipForTarget(step.to, step.control, nodeIndex);
+			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, step.control, nameStack, scopeChain);
+			const toClip = require_anchor.clipForTarget(step.to, step.control, nameStack, scopeChain);
 			if (!fromClip || !toClip) return null;
 			startSegment(fromClip);
 			emitQuad(step.control, toClip);
@@ -255,8 +256,8 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 			continue;
 		}
 		if (step.kind === "cubic") {
-			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, step.control1, nodeIndex);
-			const toClip = require_anchor.clipForTarget(step.to, step.control2, nodeIndex);
+			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, step.control1, nameStack, scopeChain);
+			const toClip = require_anchor.clipForTarget(step.to, step.control2, nameStack, scopeChain);
 			if (!fromClip || !toClip) return null;
 			startSegment(fromClip);
 			emitCubic(step.control1, step.control2, toClip);
@@ -266,8 +267,8 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 		if (step.kind === "bend") {
 			const angle = step.bendAngle ?? 30;
 			const [c1, c2] = require_bend.bendControlPoints(prev.anchor, currAnchor, step.bendDirection, angle);
-			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, c1, nodeIndex);
-			const toClip = require_anchor.clipForTarget(step.to, c2, nodeIndex);
+			const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, c1, nameStack, scopeChain);
+			const toClip = require_anchor.clipForTarget(step.to, c2, nameStack, scopeChain);
 			if (!fromClip || !toClip) return null;
 			startSegment(fromClip);
 			emitCubic(c1, c2, toClip);
@@ -275,8 +276,8 @@ var emitPathPrimitive = (path, nodeIndex, round, measureText = require_text_metr
 			continue;
 		}
 		const corner = require_anchor.cornerOf(prev.anchor, currAnchor, step.via);
-		const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, corner, nodeIndex);
-		const toClip = require_anchor.clipForTarget(step.to, corner, nodeIndex);
+		const fromClip = usedOverride ?? require_anchor.clipForTarget(prev.step.to, corner, nameStack, scopeChain);
+		const toClip = require_anchor.clipForTarget(step.to, corner, nameStack, scopeChain);
 		if (!fromClip || !toClip) return null;
 		startSegment(fromClip);
 		emitLine(corner);

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

@@ -1,6 +1,6 @@
 import { IRPath, IRPosition } from '../../ir';
-import { ScenePrimitive } from '../../primitive';
-import { NodeLayout } from '../node';
+import { ScenePrimitive, Transform } from '../../primitive';
+import { NameStack } from '../name-stack';
 import { TextMeasurer } from '../text-metrics';
 /** emitPathPrimitive 可选 warn 钩子 */
 export type EmitPathWarnHook = {
@@ -12,12 +12,18 @@ export type EmitPathWarnHook = {
     }) => void;
     /** 当前 path 在 IR 中的 locator 前缀（如 `'children[3].path'`） */
     irPath?: string;
+    /**
+     * 该 path 所属 scope 的累积 Cartesian-only transform 链
+     * @description step.to 内的 polar/at/offset 字面量按"当前 scope 局部度量 + 末端 apply chain"
+     *   投影回全局；顶层 path / 无 scope chain 时为 `[]`（恒等，等价 v0.1 行为）
+     */
+    scopeChain?: ReadonlyArray<Transform>;
 };
 /**
  * IR Path → PathPrim
  * @description 每个绘制段独立用节点中心算两端 boundary clip——中段节点的入/出 boundary 点通常不同，path 在该节点可见"断开"（与 TikZ `\draw (A)--(B)--(C);` 段独立 clip 一致）。仍产一个 PathPrim：commands 用多组 move/line 表达 sub-path；段起点等于上段终点时复用 cursor 省 move。cycle 段闭回最近 move 起点，起点==lastEnd && 终点==subPathStart 时输出 close，否则显式画段 line。引用未定义节点/解析失败返回 null，并通过 `warnHook.onWarn` 同步触发 warning
  */
-export declare const emitPathPrimitive: (path: IRPath, nodeIndex: Map<string, NodeLayout>, round: (n: number) => number, measureText?: TextMeasurer, warnHook?: EmitPathWarnHook) => {
+export declare const emitPathPrimitive: (path: IRPath, nameStack: NameStack, round: (n: number) => number, measureText?: TextMeasurer, warnHook?: EmitPathWarnHook) => {
     primitives: Array<ScenePrimitive>;
     points: Array<IRPosition>;
 } | null;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,MAAM,EACN,UAAU,EAGX,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAEV,cAAc,EACf,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AA8BtE,mCAAmC;AACnC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iCAAiC;IACjC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,IAAI,CAAC;IACX,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF;;;GAGG;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,EAC5C,WAAU,gBAAqB,KAC9B;IAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CAAE,GAAG,IA0XrE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/index.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EACV,MAAM,EACN,UAAU,EAGX,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAEV,cAAc,EACd,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AA8BtE,mCAAmC;AACnC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iCAAiC;IACjC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,IAAI,CAAC;IACX,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;CACvC,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,WAAW,SAAS,EACpB,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAC5B,cAAa,YAA+B,EAC5C,WAAU,gBAAqB,KAC9B;IAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CAAE,GAAG,IA2XrE,CAAC"}

package/dist/lib/compile/path/label.cjs

@@ -27,13 +27,22 @@ var tForLabelPosition = (pos) => {
 * step.label + 段采样 → TextPrim（sloped 时裹一层 group 旋转）
 * @description 默认 side='above'/position='midway'：above/below 锚点 y±offset、align=middle、baseline=bottom/top；left/right x±offset、align=end/start、baseline=middle；sloped 不偏移裹 group rotate(angle, cx, cy) 由切线 atan2 算（SVG y-down CW 正）。返回 primitive + layout 外接点
 */
-var emitLabelPrimitive = (label, sample, measureText, round) => {
-	const fontSize = LABEL_FONT_SIZE;
+var emitLabelPrimitive = (label, sample, measureText, round, hostOpacity) => {
+	const fontSize = label.font?.size ?? LABEL_FONT_SIZE;
+	const fontFamily = label.font?.family;
+	const fontWeight = label.font?.weight;
+	const fontStyle = label.font?.style;
 	const lineHeight = fontSize * LABEL_LINE_HEIGHT_FACTOR;
-	const m = measureText(label.text, { size: fontSize });
+	const m = measureText(label.text, {
+		size: fontSize,
+		family: fontFamily,
+		weight: fontWeight,
+		style: fontStyle
+	});
 	const measuredWidth = m.width;
 	const measuredHeight = m.height || lineHeight;
 	const side = label.side ?? "above";
+	const labelOpacity = label.opacity !== void 0 ? hostOpacity !== void 0 ? label.opacity * hostOpacity : label.opacity : hostOpacity;
 	let x = sample.point[0];
 	let y = sample.point[1];
 	let align = "middle";
@@ -62,8 +71,12 @@ var emitLabelPrimitive = (label, sample, measureText, round) => {
 		lineHeight: round(lineHeight),
 		measuredWidth: round(measuredWidth),
 		measuredHeight: round(measuredHeight),
-		fill: "currentColor"
+		fill: label.textColor ?? "currentColor"
 	};
+	if (fontFamily !== void 0) text.fontFamily = fontFamily;
+	if (fontWeight !== void 0) text.fontWeight = fontWeight;
+	if (fontStyle !== void 0) text.fontStyle = fontStyle;
+	if (labelOpacity !== void 0) text.opacity = labelOpacity;
 	if (side === "sloped") {
 		const groupPrim = {
 			type: "group",

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

@@ -11,7 +11,7 @@ export declare const tForLabelPosition: (pos: IRStepLabel["position"]) => number
  * step.label + 段采样 → TextPrim（sloped 时裹一层 group 旋转）
  * @description 默认 side='above'/position='midway'：above/below 锚点 y±offset、align=middle、baseline=bottom/top；left/right x±offset、align=end/start、baseline=middle；sloped 不偏移裹 group rotate(angle, cx, cy) 由切线 atan2 算（SVG y-down CW 正）。返回 primitive + layout 外接点
  */
-export declare const emitLabelPrimitive: (label: IRStepLabel, sample: SegmentSample, measureText: TextMeasurer, round: (n: number) => number) => {
+export declare const emitLabelPrimitive: (label: IRStepLabel, sample: SegmentSample, measureText: TextMeasurer, round: (n: number) => number, hostOpacity?: number) => {
     primitive: ScenePrimitive;
     points: Array<IRPosition>;
 };

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

@@ -1 +1 @@
-{"version":3,"file":"label.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/label.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAY,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAmBpD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,KAAK,WAAW,CAAC,UAAU,CAAC,KAAG,MAIhE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,WAAW,EAClB,QAAQ,aAAa,EACrB,aAAa,YAAY,EACzB,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,KAC3B;IAAE,SAAS,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CA8ExD,CAAC"}
+{"version":3,"file":"label.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/label.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAC;AAC5D,OAAO,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACxD,OAAO,KAAK,EAAE,cAAc,EAAY,MAAM,iBAAiB,CAAC;AAChE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AAmBpD;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAAI,KAAK,WAAW,CAAC,UAAU,CAAC,KAAG,MAIhE,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,kBAAkB,GAC7B,OAAO,WAAW,EAClB,QAAQ,aAAa,EACrB,aAAa,YAAY,EACzB,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAC5B,cAAc,MAAM,KACnB;IAAE,SAAS,EAAE,cAAc,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CAkGxD,CAAC"}

package/dist/lib/compile/path/relative.cjs

@@ -1,11 +1,17 @@
+const require_scope = require("../scope.cjs");
 const require_arc = require("../../geometry/arc.cjs");
 const require_anchor = require("./anchor.cjs");
 //#region src/compile/path/relative.ts
 /**
-* relative/relativeAccumulate 目标解析为绝对 Position（step kind 不变，to 全为绝对坐标）
-* @description relative 不更新 prevEnd（TikZ `+`），relativeAccumulate 更新（TikZ `++`）。prevEnd 推进：有 to 的 kind 用 refPointOfTarget(to)；arc 用 arcEndPoint；circlePath/ellipsePath/cycle 不变。首步 relative 时 prevEnd 回退 [0,0]；解析失败保持原 step
+* relative/relativeAccumulate 目标解析为绝对 Position（step kind 不变，to 为局部坐标 tuple）
+* @description relative 不更新 prevEnd（TikZ `+`），relativeAccumulate 更新（TikZ `++`）。prevEnd 推进：有 to 的 kind 用 refPointOfTarget(to)；arc 用 arcEndPoint；circlePath/ellipsePath/cycle 不变。首步 relative 时 prevEnd 回退 [0,0]；解析失败保持原 step。
+*   prevEnd 始终是全局坐标系下的 cursor；relative 形态 `[dx, dy]` 在**当前 scope 局部度量**——
+*   先反向投影 prevEnd 到 scope 局部 + 加 (dx, dy) 得局部 tuple，写回 step.to。下游
+*   `refPointOfTarget` / `clipForTarget` 把 tuple 视作 scope 局部字面量，统一 `applyTransformChain` 投回全局——
+*   relative 分支只负责"折算到局部"，不能在此处提前投影到全局，否则与下游 chain apply 形成 double-apply。
+*   `scopeChain=[]` 时 inverse 恒等，等价 v0.1 行为。
 */
-var normalizeRelativeTargets = (steps, nodeIndex) => {
+var normalizeRelativeTargets = (steps, nameStack, scopeChain = []) => {
 	let prevEnd = null;
 	const out = [];
 	for (const step of steps) {
@@ -26,19 +32,21 @@ var normalizeRelativeTargets = (steps, nodeIndex) => {
 		let resolvedTo = original;
 		let updatePrevEnd = true;
 		if (typeof original === "object" && !Array.isArray(original) && "relative" in original) {
-			const ref = prevEnd ?? [0, 0];
-			resolvedTo = [ref[0] + original.relative[0], ref[1] + original.relative[1]];
+			const refGlobal = prevEnd ?? [0, 0];
+			const refLocal = scopeChain.length === 0 ? refGlobal : require_scope.inverseTransformChain(refGlobal, scopeChain);
+			resolvedTo = [refLocal[0] + original.relative[0], refLocal[1] + original.relative[1]];
 			updatePrevEnd = false;
 		} else if (typeof original === "object" && !Array.isArray(original) && "relativeAccumulate" in original) {
-			const ref = prevEnd ?? [0, 0];
-			resolvedTo = [ref[0] + original.relativeAccumulate[0], ref[1] + original.relativeAccumulate[1]];
+			const refGlobal = prevEnd ?? [0, 0];
+			const refLocal = scopeChain.length === 0 ? refGlobal : require_scope.inverseTransformChain(refGlobal, scopeChain);
+			resolvedTo = [refLocal[0] + original.relativeAccumulate[0], refLocal[1] + original.relativeAccumulate[1]];
 		}
 		out.push({
 			...step,
 			to: resolvedTo
 		});
 		if (updatePrevEnd) {
-			const pos = require_anchor.refPointOfTarget(resolvedTo, nodeIndex);
+			const pos = require_anchor.refPointOfTarget(resolvedTo, nameStack, scopeChain);
 			if (pos) prevEnd = pos;
 		}
 	}

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

@@ -1,8 +1,14 @@
 import { IRStep } from '../../ir';
-import { NodeLayout } from '../node';
+import { Transform } from '../../primitive';
+import { NameStack } from '../name-stack';
 /**
- * relative/relativeAccumulate 目标解析为绝对 Position（step kind 不变，to 全为绝对坐标）
- * @description relative 不更新 prevEnd（TikZ `+`），relativeAccumulate 更新（TikZ `++`）。prevEnd 推进：有 to 的 kind 用 refPointOfTarget(to)；arc 用 arcEndPoint；circlePath/ellipsePath/cycle 不变。首步 relative 时 prevEnd 回退 [0,0]；解析失败保持原 step
+ * relative/relativeAccumulate 目标解析为绝对 Position（step kind 不变，to 为局部坐标 tuple）
+ * @description relative 不更新 prevEnd（TikZ `+`），relativeAccumulate 更新（TikZ `++`）。prevEnd 推进：有 to 的 kind 用 refPointOfTarget(to)；arc 用 arcEndPoint；circlePath/ellipsePath/cycle 不变。首步 relative 时 prevEnd 回退 [0,0]；解析失败保持原 step。
+ *   prevEnd 始终是全局坐标系下的 cursor；relative 形态 `[dx, dy]` 在**当前 scope 局部度量**——
+ *   先反向投影 prevEnd 到 scope 局部 + 加 (dx, dy) 得局部 tuple，写回 step.to。下游
+ *   `refPointOfTarget` / `clipForTarget` 把 tuple 视作 scope 局部字面量，统一 `applyTransformChain` 投回全局——
+ *   relative 分支只负责"折算到局部"，不能在此处提前投影到全局，否则与下游 chain apply 形成 double-apply。
+ *   `scopeChain=[]` 时 inverse 恒等，等价 v0.1 行为。
  */
-export declare const normalizeRelativeTargets: (steps: ReadonlyArray<IRStep>, nodeIndex: Map<string, NodeLayout>) => Array<IRStep>;
+export declare const normalizeRelativeTargets: (steps: ReadonlyArray<IRStep>, nameStack: NameStack, scopeChain?: ReadonlyArray<Transform>) => Array<IRStep>;
 //# sourceMappingURL=relative.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"relative.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/relative.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,MAAM,EAAY,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAG1C;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,OAAO,aAAa,CAAC,MAAM,CAAC,EAC5B,WAAW,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,KACjC,KAAK,CAAC,MAAM,CA0Dd,CAAC"}
+{"version":3,"file":"relative.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/relative.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAc,MAAM,EAAY,MAAM,UAAU,CAAC;AAC7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAI/C;;;;;;;;GAQG;AACH,eAAO,MAAM,wBAAwB,GACnC,OAAO,aAAa,CAAC,MAAM,CAAC,EAC5B,WAAW,SAAS,EACpB,aAAY,aAAa,CAAC,SAAS,CAAM,KACxC,KAAK,CAAC,MAAM,CAuEd,CAAC"}

package/dist/lib/compile/position.cjs

@@ -1,3 +1,4 @@
+const require_scope = require("./scope.cjs");
 //#region src/compile/position.ts
 /** 默认相对定位距离（CompileOptions.nodeDistance 未配时使用） */
 var DEFAULT_NODE_DISTANCE = 1;
@@ -17,30 +18,49 @@ var DIRECTION_VECTOR = {
 };
 /**
 * IR 各种位置形态（笛卡尔/极坐标/相对定位/偏移定位/节点 id）→ 笛卡尔位置
-* @description 极坐标 origin / 偏移定位 of 均可递归引用节点 id 或字面坐标；relative `AtPosition` of 必须引用已定义节点/coordinate；解析失败返回 null。nodeDistance 为容器 prop 注入默认距离，AtPosition 自带 distance 优先
+* @description
+*   - **返回值语义**：当 `scopeChain` 非空时，返回**当前 scope 局部坐标系**下的笛卡尔位置；
+*     调用方负责走 `applyTransformChain(local, scopeChain)` 投回全局。当 `scopeChain` 为空时
+*     等价于 v0.1 行为（全局坐标）。
+*   - **referent 处理**：node id lookup 拿到的 layout.rect 已是全局坐标；本函数内部用
+*     `inverseTransformChain` 把全局 referent 反向投影到当前 scope 局部坐标系作为"在当前
+*     scope 局部的固定点"基准。relative 部分（polar 的 angle/radius、at 的 direction/distance、
+*     offset 的 dx/dy）在当前 scope 局部度量后加到 referent 局部坐标上。
+*   - **嵌套**：PolarPosition.origin / OffsetPosition.of 是嵌套 polar 时，递归调用传同样
+*     scopeChain——整条嵌套链都在当前 scope 局部度量。
+*   - **笛卡尔字面量**：`Position` 形态直接返回（v0.1 行为延续：scope 内笛卡尔字面量在
+*     当前 scope 局部度量；调用方走 applyTransformChain 投全局）。
+*   - 极坐标 origin / 偏移定位 of 均可递归引用节点 id 或字面坐标；relative `AtPosition` of
+*     必须引用已定义节点/coordinate；解析失败返回 null。
+*   - 节点 id lookup 走 NameStack.lookup 进行 inside-out 搜索（内层 frame 可见外层 frame）；
+*     nodeDistance 为容器 prop 注入默认距离，AtPosition 自带 distance 优先
 */
-var resolvePosition = (pos, nodeMap, nodeDistance = DEFAULT_NODE_DISTANCE) => {
+var resolvePosition = (pos, nameStack, nodeDistance = DEFAULT_NODE_DISTANCE, scopeChain = []) => {
 	if (typeof pos === "string") {
-		const node = nodeMap.get(pos);
-		return node ? [node.rect.x, node.rect.y] : null;
+		const node = nameStack.lookup(pos);
+		if (!node) return null;
+		const global = [node.rect.x, node.rect.y];
+		return scopeChain.length === 0 ? global : require_scope.inverseTransformChain(global, scopeChain);
 	}
 	if (Array.isArray(pos)) return pos;
 	if ("direction" in pos) {
-		const ref = nodeMap.get(pos.of);
+		const ref = nameStack.lookup(pos.of);
 		if (!ref) return null;
+		const refGlobal = [ref.rect.x, ref.rect.y];
+		const refLocal = scopeChain.length === 0 ? refGlobal : require_scope.inverseTransformChain(refGlobal, scopeChain);
 		const distance = pos.distance ?? nodeDistance;
 		const [dx, dy] = DIRECTION_VECTOR[pos.direction];
-		return [ref.rect.x + dx * distance, ref.rect.y + dy * distance];
+		return [refLocal[0] + dx * distance, refLocal[1] + dy * distance];
 	}
 	if ("offset" in pos) {
-		const base = resolvePosition(pos.of, nodeMap, nodeDistance);
+		const base = resolvePosition(pos.of, nameStack, nodeDistance, scopeChain);
 		if (!base) return null;
 		return [base[0] + pos.offset[0], base[1] + pos.offset[1]];
 	}
 	let origin;
 	if (!pos.origin) origin = [0, 0];
 	else {
-		const resolved = resolvePosition(pos.origin, nodeMap, nodeDistance);
+		const resolved = resolvePosition(pos.origin, nameStack, nodeDistance, scopeChain);
 		if (!resolved) return null;
 		origin = resolved;
 	}

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

@@ -1,8 +1,24 @@
 import { IRAtPosition, IROffsetPosition, IRPosition, PolarPosition } from '../ir';
-import { NodeLayout } from './node';
+import { Transform } from '../primitive';
+import { NameStack } from './name-stack';
 /**
  * IR 各种位置形态（笛卡尔/极坐标/相对定位/偏移定位/节点 id）→ 笛卡尔位置
- * @description 极坐标 origin / 偏移定位 of 均可递归引用节点 id 或字面坐标；relative `AtPosition` of 必须引用已定义节点/coordinate；解析失败返回 null。nodeDistance 为容器 prop 注入默认距离，AtPosition 自带 distance 优先
+ * @description
+ *   - **返回值语义**：当 `scopeChain` 非空时，返回**当前 scope 局部坐标系**下的笛卡尔位置；
+ *     调用方负责走 `applyTransformChain(local, scopeChain)` 投回全局。当 `scopeChain` 为空时
+ *     等价于 v0.1 行为（全局坐标）。
+ *   - **referent 处理**：node id lookup 拿到的 layout.rect 已是全局坐标；本函数内部用
+ *     `inverseTransformChain` 把全局 referent 反向投影到当前 scope 局部坐标系作为"在当前
+ *     scope 局部的固定点"基准。relative 部分（polar 的 angle/radius、at 的 direction/distance、
+ *     offset 的 dx/dy）在当前 scope 局部度量后加到 referent 局部坐标上。
+ *   - **嵌套**：PolarPosition.origin / OffsetPosition.of 是嵌套 polar 时，递归调用传同样
+ *     scopeChain——整条嵌套链都在当前 scope 局部度量。
+ *   - **笛卡尔字面量**：`Position` 形态直接返回（v0.1 行为延续：scope 内笛卡尔字面量在
+ *     当前 scope 局部度量；调用方走 applyTransformChain 投全局）。
+ *   - 极坐标 origin / 偏移定位 of 均可递归引用节点 id 或字面坐标；relative `AtPosition` of
+ *     必须引用已定义节点/coordinate；解析失败返回 null。
+ *   - 节点 id lookup 走 NameStack.lookup 进行 inside-out 搜索（内层 frame 可见外层 frame）；
+ *     nodeDistance 为容器 prop 注入默认距离，AtPosition 自带 distance 优先
  */
-export declare const resolvePosition: (pos: IRPosition | PolarPosition | IRAtPosition | IROffsetPosition | string, nodeMap: Map<string, NodeLayout>, nodeDistance?: number) => IRPosition | null;
+export declare const resolvePosition: (pos: IRPosition | PolarPosition | IRAtPosition | IROffsetPosition | string, nameStack: NameStack, nodeDistance?: number, scopeChain?: ReadonlyArray<Transform>) => IRPosition | null;
 //# sourceMappingURL=position.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../../src/compile/position.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACpG,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAoBzC;;;GAGG;AACH,eAAO,MAAM,eAAe,GAC1B,KAAK,UAAU,GAAG,aAAa,GAAG,YAAY,GAAG,gBAAgB,GAAG,MAAM,EAC1E,SAAS,GAAG,CAAC,MAAM,EAAE,UAAU,CAAC,EAChC,eAAc,MAA8B,KAC3C,UAAU,GAAG,IAkCf,CAAC"}
+{"version":3,"file":"position.d.ts","sourceRoot":"","sources":["../../../src/compile/position.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAe,YAAY,EAAE,gBAAgB,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AACpG,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAqB9C;;;;;;;;;;;;;;;;;;GAkBG;AACH,eAAO,MAAM,eAAe,GAC1B,KAAK,UAAU,GAAG,aAAa,GAAG,YAAY,GAAG,gBAAgB,GAAG,MAAM,EAC1E,WAAW,SAAS,EACpB,eAAc,MAA8B,EAC5C,aAAY,aAAa,CAAC,SAAS,CAAM,KACxC,UAAU,GAAG,IAyCf,CAAC"}