@retikz/core 0.3.0-alpha.5 → 0.3.0-beta.2

package/dist/es/parsers/target-sugar.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"target-sugar.d.ts","sourceRoot":"","sources":["../../../src/parsers/target-sugar.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAQtC;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,OAAO,KAAG,QAkBjD,CAAC"}

package/dist/es/parsers/{parseTargetSugar.js → target-sugar.js}

@@ -1,7 +1,9 @@
-import { parseNodeTarget } from "./parseNodeTarget.js";
-//#region src/parsers/parseTargetSugar.ts
+import { parseNodeTarget } from "./node-target.js";
+//#region src/parsers/target-sugar.ts
 /** TikZ 风格相对偏移字面量正则：捕获 `+` / `++` 前缀 + dx / dy 数值 */
-var RELATIVE_OFFSET_RE = /^(\+{1,2})\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)$/;
+var RELATIVE_NUMBER = "-?(?:\\d+(?:\\.\\d*)?|\\.\\d+)(?:[eE][+-]?\\d+)?";
+var RELATIVE_OFFSET_RE = new RegExp(`^(\\+{1,2})\\s*(${RELATIVE_NUMBER})\\s*,\\s*(${RELATIVE_NUMBER})$`);
+var RELATIVE_LIKE_RE = /^\+.*,/;
 /**
 * Sugar 字符串解析：TikZ 风格字符串 shorthand → IR 对象（React DSL 层；core IR 只见对象）
 * @description `'+dx,dy'` → `{relative:[dx,dy]}`（TikZ `+`，不更新 prevEnd）；`'++dx,dy'` → `{relativeAccumulate:[dx,dy]}`（TikZ `++`，累积）；
@@ -11,7 +13,10 @@ var RELATIVE_OFFSET_RE = /^(\+{1,2})\s*(-?\d+(?:\.\d+)?)\s*,\s*(-?\d+(?:\.\d+)?)
 var parseTargetSugar = (input) => {
 	if (typeof input !== "string") return input;
 	const match = input.match(RELATIVE_OFFSET_RE);
-	if (!match) return parseNodeTarget(input);
+	if (!match) {
+		if (RELATIVE_LIKE_RE.test(input)) throw new Error(`parseTargetSugar: invalid relative offset '${input}'; expected '+x,y' or '++x,y'`);
+		return parseNodeTarget(input);
+	}
 	const plus = match[1];
 	const dx = Number(match[2]);
 	const dy = Number(match[3]);

package/dist/{lib/parsers/parseWay.d.ts → es/parsers/way.d.ts}

@@ -82,7 +82,7 @@ export type WayItem = IRTarget | string | WayRelativeItem | WayVia | WayCycle |
 export type WayDSL = Array<WayItem>;
 /**
  * way 数组 → IRStep 序列
- * @description 首元素始终 move（way[0] 是算子时降级到原点 [0,0]）；后续元素按各自规则：target/RelItem→line；Cycle→cycle；-|/|- 与下一项合并 fold；curve/cubic/bend 与下一项合并；arc/circle/ellipse 单独成 step；label 算子修饰下一段。连续 label/末尾 label/cycle 上的 label 抛错。纯函数，各框架 adapter Sugar 组件复用
+ * @description 首元素必须是 move 目标（way[0] 是算子 / label 算子时抛错，不降级）；后续元素按各自规则：target/RelItem→line；Cycle→cycle；-|/|- 与下一项合并 fold；curve/cubic/bend 与下一项合并；arc/circle/ellipse 单独成 step；label 算子修饰下一段。连续 label/末尾 label/cycle 上的 label 抛错。纯函数，各框架 adapter Sugar 组件复用
  */
 export declare const parseWay: (way: WayDSL) => Array<IRStep>;
-//# sourceMappingURL=parseWay.d.ts.map
+//# sourceMappingURL=way.d.ts.map

package/dist/es/parsers/way.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"way.d.ts","sourceRoot":"","sources":["../../../src/parsers/way.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAIV,cAAc,EAQd,MAAM,EACN,WAAW,EACX,QAAQ,EACT,MAAM,OAAO,CAAC;AAGf;;;GAGG;AACH,eAAO,MAAM,OAAO;IAClB,oDAAoD;;IAEpD,2BAA2B;;IAE3B,2BAA2B;;IAE3B,gDAAgD;;IAEhD,kDAAkD;;CAE1C,CAAC;AAEX,oBAAoB;AACpB,MAAM,MAAM,MAAM,GAAG,OAAO,OAAO,CAAC,EAAE,GAAG,OAAO,OAAO,CAAC,EAAE,CAAC;AAE3D,qBAAqB;AACrB,MAAM,MAAM,QAAQ,GAAG,OAAO,OAAO,CAAC,KAAK,CAAC;AAE5C;;;GAGG;AACH,MAAM,MAAM,eAAe,GAAG;IAC5B,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAC3B,IAAI,EAAE,OAAO,OAAO,CAAC,QAAQ,GAAG,OAAO,OAAO,CAAC,UAAU,CAAC;CAC3D,CAAC;AAOF,2DAA2D;AAC3D,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,cAAc,CAAA;CAAE,CAAC;AAEnD,+CAA+C;AAC/C,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,CAAC,cAAc,EAAE,cAAc,CAAC,CAAA;CAAE,CAAC;AAErE,qDAAqD;AACrD,MAAM,MAAM,SAAS,GAAG;IAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAAC;AAEnE;;;GAGG;AACH,MAAM,MAAM,QAAQ,GAAG;IACrB,GAAG,EAAE;QAAE,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAA;KAAE,CAAC;CAC/D,CAAC;AAEF,0CAA0C;AAC1C,MAAM,MAAM,WAAW,GAAG;IAAE,MAAM,EAAE;QAAE,MAAM,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAEzD,iDAAiD;AACjD,MAAM,MAAM,YAAY,GAAG;IAAE,OAAO,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC;AAE7E,0DAA0D;AAC1D,MAAM,MAAM,QAAQ,GAAG,WAAW,GAAG,MAAM,CAAC;AAE5C;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IAAE,KAAK,EAAE,QAAQ,CAAA;CAAE,CAAC;AAE7C;;;GAGG;AACH,MAAM,MAAM,OAAO,GACf,QAAQ,GAER,MAAM,GACN,eAAe,GACf,MAAM,GACN,QAAQ,GACR,UAAU,GACV,UAAU,GACV,SAAS,GACT,QAAQ,GACR,WAAW,GACX,YAAY,GACZ,UAAU,CAAC;AAEf,+CAA+C;AAC/C,MAAM,MAAM,MAAM,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;AA4EpC;;;GAGG;AACH,eAAO,MAAM,QAAQ,GAAI,KAAK,MAAM,KAAG,KAAK,CAAC,MAAM,CAwKlD,CAAC"}

package/dist/es/parsers/{parseWay.js → way.js}

@@ -1,5 +1,5 @@
-import { parseTargetSugar } from "./parseTargetSugar.js";
-//#region src/parsers/parseWay.ts
+import { parseTargetSugar } from "./target-sugar.js";
+//#region src/parsers/way.ts
 /**
 * Sugar 层 way 数组的关键字常量
 * @description Cycle 闭合到 way 起点（底层字符串故意写丑避节点 id 冲突，只通过 DrawWay.Cycle 引用）；Hv/Vh 折角算子（裸字面量 `-|`/`|-` 与常量等价）；Relative/Accumulate 相对偏移 way item 的 type 鉴别值（Relative=TikZ `(+x,+y)` 不推进 prevEnd，Accumulate=TikZ `(++x,++y)` 累积更新）。用 const + as const 而非 TS enum 避免 reverse-mapping 与字面量不互通
@@ -35,7 +35,10 @@ var normalizeLabel = (l) => typeof l === "string" ? { text: l } : { ...l };
 /** sugar `{position,type}` → IR `{relative}|{relativeAccumulate}`；其它形态原样返回 */
 var desugarRelativeItem = (item) => {
 	if (!isWayRelativeItem(item)) return item;
-	return item.type === DrawWay.Accumulate ? { relativeAccumulate: item.position } : { relative: item.position };
+	const candidate = item;
+	if (candidate.type === DrawWay.Accumulate) return { relativeAccumulate: candidate.position };
+	if (candidate.type === DrawWay.Relative) return { relative: candidate.position };
+	throw new Error(`parseWay: WayRelativeItem.type must be DrawWay.Relative or DrawWay.Accumulate`);
 };
 /** WayItem 归约为"目标点"，算子/关键字返回 null */
 var targetOf = (item) => {
@@ -44,7 +47,7 @@ var targetOf = (item) => {
 };
 /**
 * way 数组 → IRStep 序列
-* @description 首元素始终 move（way[0] 是算子时降级到原点 [0,0]）；后续元素按各自规则：target/RelItem→line；Cycle→cycle；-|/|- 与下一项合并 fold；curve/cubic/bend 与下一项合并；arc/circle/ellipse 单独成 step；label 算子修饰下一段。连续 label/末尾 label/cycle 上的 label 抛错。纯函数，各框架 adapter Sugar 组件复用
+* @description 首元素必须是 move 目标（way[0] 是算子 / label 算子时抛错，不降级）；后续元素按各自规则：target/RelItem→line；Cycle→cycle；-|/|- 与下一项合并 fold；curve/cubic/bend 与下一项合并；arc/circle/ellipse 单独成 step；label 算子修饰下一段。连续 label/末尾 label/cycle 上的 label 抛错。纯函数，各框架 adapter Sugar 组件复用
 */
 var parseWay = (way) => {
 	if (way.length < 2) throw new Error("parseWay: way must contain at least 2 items");
@@ -58,10 +61,11 @@ var parseWay = (way) => {
 	};
 	if (isWayLabelOp(way[0])) throw new Error(`parseWay: way[0] must be a target (move start), got label operator`);
 	const rawMove = targetOf(way[0]);
+	if (rawMove === null) throw new Error(`parseWay: way[0] must be a target (move start), got operator`);
 	const moveStep = {
 		type: "step",
 		kind: "move",
-		to: rawMove === null ? [0, 0] : parseTargetSugar(rawMove)
+		to: parseTargetSugar(rawMove)
 	};
 	out.push(moveStep);
 	for (let i = 1; i < way.length; i++) {
@@ -85,7 +89,7 @@ var parseWay = (way) => {
 			if (isWayOperator(next)) throw new Error(`parseWay: via operator '${item}' must be followed by a target, got '${String(next)}'`);
 			const fold = {
 				type: "step",
-				kind: "step",
+				kind: "fold",
 				via: item,
 				to: parseTargetSugar(desugarRelativeItem(next))
 			};

package/dist/es/path-generators/define.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/path-generators/define.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAEvD;;;;;;;;;;;;GAYG;AACH,eAAO,MAAM,mBAAmB,GAC9B,KAAK,uBAAuB,KAC3B,uBAwBF,CAAC"}

package/dist/es/{pathGenerators → path-generators}/define.js

@@ -1,4 +1,4 @@
-//#region src/pathGenerators/define.ts
+//#region src/path-generators/define.ts
 /**
 * 注册一个 path generator（注册时 best-effort 元校验）
 * @description 直通返回 def，并在注册时做轻量早报错——确认 `paramsSchema` 是个可用的 zod schema、

package/dist/es/path-generators/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/path-generators/index.ts"],"names":[],"mappings":"AAAA;;;;;GAKG;AACH,YAAY,EAAE,uBAAuB,EAAE,oBAAoB,EAAE,MAAM,SAAS,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC"}

package/dist/es/path-generators/types.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/path-generators/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,YAAY,CAAC;AAC/C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAErD;;;;;;GAMG;AACH,MAAM,MAAM,oBAAoB,GAAG;IACjC,oCAAoC;IACpC,IAAI,EAAE,QAAQ,CAAC;IACf,uDAAuD;IACvD,EAAE,CAAC,EAAE,QAAQ,CAAC;IACd,4DAA4D;IAC5D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,uDAAuD;IACvD,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC;IAC1C,8CAA8C;IAC9C,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC;CAC9B,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,MAAM,MAAM,uBAAuB,GAAG;IACpC,8DAA8D;IAC9D,YAAY,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;IACpC,qEAAqE;IACrE,YAAY,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC7B,6EAA6E;IAC7E,QAAQ,EAAE,CAAC,GAAG,EAAE,oBAAoB,KAAK,KAAK,CAAC,WAAW,CAAC,CAAC;CAC7D,CAAC"}

package/dist/es/patterns/define.d.ts

@@ -0,0 +1,9 @@
+import { PatternDefinition } from './types';
+/**
+ * 定义一个 pattern motif 注册项
+ * @description 与 `defineShape` / `definePathGenerator` 对齐的定义点 helper；当前不做额外运行时校验，
+ *   只保留 `PatternDefinition` 形态并让第三方扩展面写法一致。
+ * @returns 原样返回的 def（便于 `export const cross = definePattern({ ... })`）
+ */
+export declare const definePattern: (def: PatternDefinition) => PatternDefinition;
+//# sourceMappingURL=define.d.ts.map

package/dist/es/patterns/define.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/patterns/define.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,SAAS,CAAC;AAEjD;;;;;GAKG;AACH,eAAO,MAAM,aAAa,GAAI,KAAK,iBAAiB,KAAG,iBAAwB,CAAC"}

package/dist/es/patterns/define.js

@@ -0,0 +1,10 @@
+//#region src/patterns/define.ts
+/**
+* 定义一个 pattern motif 注册项
+* @description 与 `defineShape` / `definePathGenerator` 对齐的定义点 helper；当前不做额外运行时校验，
+*   只保留 `PatternDefinition` 形态并让第三方扩展面写法一致。
+* @returns 原样返回的 def（便于 `export const cross = definePattern({ ... })`）
+*/
+var definePattern = (def) => def;
+//#endregion
+export { definePattern };

package/dist/es/patterns/index.d.ts

@@ -7,4 +7,5 @@ import { PatternDefinition } from './types';
  */
 export declare const BUILTIN_PATTERNS: Record<BuiltinPatternName, PatternDefinition>;
 export type { PatternDefinition, PatternEmitContext } from './types';
+export { definePattern } from './define';
 //# sourceMappingURL=index.d.ts.map

package/dist/es/patterns/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/patterns/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,KAAK,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAC;AAwBrE;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,EAAE,iBAAiB,CA4C1E,CAAC;AAEF,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/patterns/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEtD,OAAO,KAAK,EAAE,iBAAiB,EAAsB,MAAM,SAAS,CAAC;AAwBrE;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,MAAM,CAAC,kBAAkB,EAAE,iBAAiB,CAmD1E,CAAC;AAEF,YAAY,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AACrE,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC"}

package/dist/es/patterns/index.js

@@ -1,3 +1,4 @@
+import "./define.js";
 //#region src/patterns/index.ts
 /** 内置 3 motif 默认 tile 周期（user units）；用户 `pattern.size` 覆盖 */
 var DEFAULT_PATTERN_SIZE = 8;
@@ -24,44 +25,50 @@ var withBackground = (ctx, motif) => ctx.background === void 0 ? [...motif] : [{
 var BUILTIN_PATTERNS = {
 	lines: {
 		defaultSize: DEFAULT_PATTERN_SIZE,
-		emit: (ctx) => withBackground(ctx, [{
-			type: "path",
-			commands: [{
-				kind: "move",
-				to: [0, 0]
-			}, {
-				kind: "line",
-				to: [ctx.size, 0]
-			}],
-			stroke: ctx.color,
-			strokeWidth: ctx.lineWidth ?? DEFAULT_STROKE_WIDTH
-		}])
+		emit: (ctx) => {
+			const half = ctx.round(ctx.size / 2);
+			return withBackground(ctx, [{
+				type: "path",
+				commands: [{
+					kind: "move",
+					to: [0, half]
+				}, {
+					kind: "line",
+					to: [ctx.size, half]
+				}],
+				stroke: ctx.color,
+				strokeWidth: ctx.lineWidth ?? DEFAULT_STROKE_WIDTH
+			}]);
+		}
 	},
 	grid: {
 		defaultSize: DEFAULT_PATTERN_SIZE,
-		emit: (ctx) => withBackground(ctx, [{
-			type: "path",
-			commands: [
-				{
-					kind: "move",
-					to: [0, 0]
-				},
-				{
-					kind: "line",
-					to: [ctx.size, 0]
-				},
-				{
-					kind: "move",
-					to: [0, 0]
-				},
-				{
-					kind: "line",
-					to: [0, ctx.size]
-				}
-			],
-			stroke: ctx.color,
-			strokeWidth: ctx.lineWidth ?? DEFAULT_STROKE_WIDTH
-		}])
+		emit: (ctx) => {
+			const half = ctx.round(ctx.size / 2);
+			return withBackground(ctx, [{
+				type: "path",
+				commands: [
+					{
+						kind: "move",
+						to: [0, half]
+					},
+					{
+						kind: "line",
+						to: [ctx.size, half]
+					},
+					{
+						kind: "move",
+						to: [half, 0]
+					},
+					{
+						kind: "line",
+						to: [half, ctx.size]
+					}
+				],
+				stroke: ctx.color,
+				strokeWidth: ctx.lineWidth ?? DEFAULT_STROKE_WIDTH
+			}]);
+		}
 	},
 	dots: {
 		defaultSize: DEFAULT_PATTERN_SIZE,

package/dist/es/presets/animation.js

@@ -97,7 +97,7 @@ var slideIn = (opts = {}) => ({
 /** 变色：`fill|stroke` from→to（oklch 插值，由 renderer 端处理） */
 var colorShift = (opts) => {
 	const { from, to } = opts;
-	if (from === void 0 || to === void 0) throw new Error("colorShift: `from` and `to` colors are required.");
+	if (from == null || to == null) throw new Error("colorShift: `from` and `to` colors are required.");
 	return {
 		property: (opts.channel ?? "fill") === "stroke" ? AnimationProperty.Stroke : AnimationProperty.Fill,
 		keyframes: [{
@@ -116,7 +116,7 @@ var colorShift = (opts) => {
 /** 镜头：scene 根 `viewBox` from→to（挂 `<Layout animations>` / IR 根 `animations`） */
 var cameraTo = (opts) => {
 	const { from, to } = opts;
-	if (from === void 0 || to === void 0) throw new Error("cameraTo: `from` and `to` viewBox [x, y, w, h] are required.");
+	if (from == null || to == null) throw new Error("cameraTo: `from` and `to` viewBox [x, y, w, h] are required.");
 	return {
 		property: AnimationProperty.ViewBox,
 		keyframes: [{

package/dist/es/primitive/marker.d.ts

@@ -24,8 +24,8 @@ export type MarkerPathPrim = {
     fillOpacity?: number;
     /** 填充规则：`nonzero`（默认）/ `evenodd`（环形 / 孔洞场景） */
     fillRule?: 'nonzero' | 'evenodd';
-    /** 描边色（纯色 CSS / `context-stroke` 由 adapter 映射） */
-    stroke?: string;
+    /** 描边色：纯色 CSS 或 `{ kind: 'contextStroke' }`（继承所在元素描边）；与 fill 同词汇，core 不持 SVG 裸关键字 */
+    stroke?: MarkerFill;
     /** 描边透明度 0~1 */
     strokeOpacity?: number;
     /** 描边宽度（marker 局部坐标） */
@@ -97,8 +97,8 @@ export type MarkerEllipsePrim = {
     fill?: MarkerFill;
     /** 填充透明度 0~1 */
     fillOpacity?: number;
-    /** 描边色 */
-    stroke?: string;
+    /** 描边色：纯色 CSS 或 `{ kind: 'contextStroke' }` */
+    stroke?: MarkerFill;
     /** 描边透明度 0~1 */
     strokeOpacity?: number;
     /** 描边宽度 */
@@ -125,8 +125,8 @@ export type MarkerRectPrim = {
     fill?: MarkerFill;
     /** 填充透明度 0~1 */
     fillOpacity?: number;
-    /** 描边色 */
-    stroke?: string;
+    /** 描边色：纯色 CSS 或 `{ kind: 'contextStroke' }` */
+    stroke?: MarkerFill;
     /** 描边透明度 0~1 */
     strokeOpacity?: number;
     /** 描边宽度 */
@@ -154,7 +154,7 @@ export type MarkerGroupPrim = {
  * @description renderer-agnostic：core 只产此结构（局部 baseSize 坐标系），react adapter 把它嵌进
  *   `<marker>`。相对 `ScenePrimitive` 的收窄——禁 `TextPrim`、禁 `arrowStart`/`arrowEnd`、禁外部
  *   `resourceRef`、禁 `clip`；`fill` 限 `MarkerFill`。这条收窄兜住"marker 内递归引用 marker / clip /
- *   文本布局"的复杂度（见 ADR-01 选项 C 的反例）。
+ *   文本布局"的复杂度。
  */
 export type MarkerPrimitive = MarkerPathPrim | MarkerEllipsePrim | MarkerRectPrim | MarkerGroupPrim;
 //# sourceMappingURL=marker.d.ts.map

package/dist/es/primitive/marker.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"marker.d.ts","sourceRoot":"","sources":["../../../src/primitive/marker.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"marker.d.ts","sourceRoot":"","sources":["../../../src/primitive/marker.ts"],"names":[],"mappings":"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"}

package/dist/es/primitive/paint.d.ts

@@ -5,7 +5,7 @@ import { MarkerPrimitive } from './marker';
  * paint 属性取值词汇表（可用于 fill / stroke，不绑定单一属性）
  * @description 渲染无关：`string` 纯色（含 var() 由 adapter 走 inline style）；`{ kind:'resourceRef' }` 指向
  *   `Scene.resources` 里的 paint server（gradient / 后续 pattern·image）；`{ kind:'contextStroke' }` 继承所在元素描边
- *   （adapter → SVG context-stroke，alpha.8 arrow 用）。
+ *   （adapter → SVG context-stroke）。
  */
 export type PaintValue = string | {
     kind: 'resourceRef';

package/dist/es/primitive/path.d.ts

@@ -91,7 +91,7 @@ export type PathCommand = MovePathCommand | LinePathCommand | QuadPathCommand |
  *   markerHeight>`，不再 switch、不调 emit、不需要 arrows 注册表。纯 JSON 数据（无函数）。
  */
 export type ArrowEndSpec = {
-    /** 形状名：内置 7 或经 `CompileOptions.arrows` 注册的扩展名；标识 / 调试用，已解析后渲染不依赖（保留） */
+    /** 形状名：内置 8 或经 `CompileOptions.arrows` 注册的扩展名；标识 / 调试用，已解析后渲染不依赖（保留） */
     shape: ArrowShapeName;
     /** marker viewBox 边长（`def.baseSize ?? 10`）；adapter 据此推 viewBox `0 0 baseSize baseSize` 与 refY = baseSize/2 */
     baseSize: number;

package/dist/es/shapes/arc.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arc.d.ts","sourceRoot":"","sources":["../../../src/shapes/arc.ts"],"names":[],"mappings":"AA8DA;;;;;GAKG;AACH,eAAO,MAAM,GAAG,mCA8Ed,CAAC"}
+{"version":3,"file":"arc.d.ts","sourceRoot":"","sources":["../../../src/shapes/arc.ts"],"names":[],"mappings":"AA4EA;;;;;GAKG;AACH,eAAO,MAAM,GAAG,mCAyFd,CAAC"}

package/dist/es/shapes/arc.js

@@ -1,11 +1,12 @@
-import { localToWorld } from "../geometry/_transform.js";
+import { localToWorld, worldToLocal } from "../geometry/transform.js";
 import { arcBoundingPoints, arcEndPoint } from "../geometry/arc.js";
 import { defineShape } from "./define.js";
-import { normalizeAngularRange } from "./_shared.js";
+import { normalizeAngularRange } from "./shared.js";
 import { z } from "zod";
 //#region src/shapes/arc.ts
+var RAD_TO_DEG = 180 / Math.PI;
 /** arc 的派生几何：圆心局部系 AABB + 圆心相对 AABB 中心偏移 */
-var arcGeometry = (params) => {
+var computeArcGeometry = (params) => {
 	const { radius } = params;
 	const range = normalizeAngularRange(params.startAngle, params.endAngle);
 	const points = arcBoundingPoints([0, 0], radius, range.start, range.end);
@@ -29,6 +30,15 @@ var arcGeometry = (params) => {
 		centerOffset: [-aabbCenter[0], -aabbCenter[1]]
 	};
 };
+/** params → 派生几何的 WeakMap 缓存（同 sector：同一 params 实例多次取几何只算一次，纯性能、行为不变） */
+var arcGeometryCache = /* @__PURE__ */ new WeakMap();
+var arcGeometry = (params) => {
+	const cached = arcGeometryCache.get(params);
+	if (cached !== void 0) return cached;
+	const geo = computeArcGeometry(params);
+	arcGeometryCache.set(params, geo);
+	return geo;
+};
 /** 圆心局部点（相对圆心）→ 世界系（+centerOffset 到相对 AABB 中心后经 rect 投影） */
 var arcLocalToWorld = (rect, centerOffset, localFromCenter) => localToWorld(rect, [localFromCenter[0] + centerOffset[0], localFromCenter[1] + centerOffset[1]]);
 /**
@@ -49,9 +59,18 @@ var arc = defineShape({
 		const { centerOffset } = arcGeometry(params);
 		return [-centerOffset[0], -centerOffset[1]];
 	},
-	boundaryPoint: (rect, _toward, params) => {
+	boundaryPoint: (rect, toward, params) => {
 		const geo = arcGeometry(params);
-		return arcLocalToWorld(rect, geo.centerOffset, arcEndPoint([0, 0], params.radius, geo.range.mid));
+		const { radius } = params;
+		const { start, end } = geo.range;
+		const local = worldToLocal(rect, toward);
+		const fx = local[0] - geo.centerOffset[0];
+		const fy = local[1] - geo.centerOffset[1];
+		let theta = Math.atan2(fy, fx) * RAD_TO_DEG;
+		while (theta < start) theta += 360;
+		while (theta >= start + 360) theta -= 360;
+		const angle = theta <= end ? theta : theta - end <= start + 360 - theta ? end : start;
+		return arcLocalToWorld(rect, geo.centerOffset, arcEndPoint([0, 0], radius, angle));
 	},
 	anchor: (rect, name, params) => {
 		const geo = arcGeometry(params);

package/dist/{lib/shapes/_contour.d.ts → es/shapes/contour.d.ts}

@@ -1,6 +1,7 @@
 import { Position } from '../geometry/point';
-import { ContourCommand, LineSegment } from '../geometry/roundedContour';
-import { PathCommand } from '../primitive';
+import { ContourCommand, LineSegment } from '../geometry/contour';
+import { PathCommand, PathPrim } from '../primitive';
+import { ShapeStyle } from './types';
 /**
  * 由顶点环构造闭合折线段序列（接缝顺序同顶点顺序）
  * @description 第 i 段 from = 顶点 i、to = 顶点 (i+1)%n；供 polygon / star 的 emit / boundaryPoint
@@ -16,4 +17,6 @@ export declare const verticesToSegments: (verts: Array<Position>) => Array<LineS
  *   polygon / star 共用此映射器（单一实现）。
  */
 export declare const contourToPathCommands: (commands: Array<ContourCommand>, round: (n: number) => number) => Array<PathCommand>;
-//# sourceMappingURL=_contour.d.ts.map
+/** contour shape 共用的 path primitive 样式落地。 */
+export declare const contourToPathPrimitive: (commands: Array<PathCommand>, style: ShapeStyle) => PathPrim;
+//# sourceMappingURL=contour.d.ts.map

package/dist/es/shapes/contour.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contour.d.ts","sourceRoot":"","sources":["../../../src/shapes/contour.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AACvE,OAAO,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAE1C;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,GAAI,OAAO,KAAK,CAAC,QAAQ,CAAC,KAAG,KAAK,CAAC,WAAW,CACQ,CAAC;AAEtF;;;;;;GAMG;AACH,eAAO,MAAM,qBAAqB,GAChC,UAAU,KAAK,CAAC,cAAc,CAAC,EAC/B,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,KAC3B,KAAK,CAAC,WAAW,CAqCnB,CAAC;AAEF,6CAA6C;AAC7C,eAAO,MAAM,sBAAsB,GACjC,UAAU,KAAK,CAAC,WAAW,CAAC,EAC5B,OAAO,UAAU,KAChB,QAUD,CAAC"}

package/dist/es/shapes/{_contour.js → contour.js}

@@ -1,4 +1,4 @@
-//#region src/shapes/_contour.ts
+//#region src/shapes/contour.ts
 /**
 * 由顶点环构造闭合折线段序列（接缝顺序同顶点顺序）
 * @description 第 i 段 from = 顶点 i、to = 顶点 (i+1)%n；供 polygon / star 的 emit / boundaryPoint
@@ -56,5 +56,17 @@ var contourToPathCommands = (commands, round) => {
 	});
 	return out;
 };
+/** contour shape 共用的 path primitive 样式落地。 */
+var contourToPathPrimitive = (commands, style) => ({
+	type: "path",
+	commands,
+	fill: style.fill ?? "transparent",
+	fillOpacity: style.fillOpacity,
+	stroke: style.stroke ?? "currentColor",
+	strokeOpacity: style.strokeOpacity,
+	strokeWidth: style.strokeWidth ?? 1,
+	dashPattern: style.dashPattern,
+	opacity: style.opacity
+});
 //#endregion
-export { contourToPathCommands, verticesToSegments };
+export { contourToPathCommands, contourToPathPrimitive, verticesToSegments };

package/dist/es/shapes/ellipse.js

@@ -1,6 +1,6 @@
 import { defineShape } from "./define.js";
-import { asRectAnchor } from "./_shared.js";
 import { ellipse as ellipse$1 } from "../geometry/ellipse.js";
+import { normalizeCompassAnchor } from "../geometry/anchor.js";
 import { z } from "zod";
 //#region src/shapes/ellipse.ts
 /** 外接框 Rect → Ellipse（rx/ry = 半宽/半高） */
@@ -29,7 +29,7 @@ var ellipse = defineShape({
 	},
 	boundaryPoint: (r, toward) => ellipse$1.boundaryPoint(toEllipse(r), toward),
 	anchor: (r, name) => {
-		const a = asRectAnchor(name);
+		const a = normalizeCompassAnchor(name);
 		return a ? ellipse$1.anchor(toEllipse(r), a) : void 0;
 	},
 	edgePoint: (r, side, t) => ellipse$1.edgePoint(toEllipse(r), side, t),

package/dist/es/shapes/index.d.ts

@@ -13,5 +13,5 @@ export { rectangle, ellipse, polygon, sector, arc, star, defineShape };
 export type { ShapeDefinition, ShapeDefinitionInput, ShapeStyle } from './types';
 export type { Rect } from '../geometry/rect';
 export type { Position } from '../geometry/point';
-export { worldToLocal, localToWorld } from '../geometry/_transform';
+export { worldToLocal, localToWorld } from '../geometry/transform';
 //# sourceMappingURL=index.d.ts.map

package/dist/es/shapes/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shapes/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,2FAA2F;AAC3F,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,EAAE,eAAe,CAO3I,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEjF,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/shapes/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AACnD,OAAO,EAAE,GAAG,EAAE,MAAM,OAAO,CAAC;AAC5B,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAC9B,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAE/C,2FAA2F;AAC3F,eAAO,MAAM,cAAc,EAAE,MAAM,CAAC,OAAO,CAAC,gBAAgB,EAAE,QAAQ,GAAG,SAAS,CAAC,GAAG,QAAQ,GAAG,KAAK,GAAG,SAAS,GAAG,MAAM,EAAE,eAAe,CAO3I,CAAC;AAEF,OAAO,EAAE,SAAS,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,CAAC;AACvE,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEjF,YAAY,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAC7C,YAAY,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC"}

package/dist/es/shapes/index.js

@@ -1,4 +1,4 @@
-import "../geometry/_transform.js";
+import "../geometry/transform.js";
 import "./define.js";
 import { arc } from "./arc.js";
 import { ellipse } from "./ellipse.js";

package/dist/es/shapes/polygon.d.ts

@@ -7,7 +7,7 @@
  *   （多边形关于中心对称，AABB 中心 = 形心 = node position）。命名 anchor 走外接 AABB 的 9 名 rect anchor（不随
  *   cornerRadius 移）；self-rotate（params.rotate）与 Node.rotate 叠加。scaleParams：cornerRadius 是长度随 scale
  *   缩（几何均值因子），sides 计数 / rotate 角度不缩。
- *   diamond ≡ `{ type: 'polygon', params: { sides: 4, rotate: 45 } }`，由 compile 规范化。
+ *   diamond ≡ `{ type: 'polygon', params: { sides: 4, rotate: 0 } }`，由 compile 规范化。
  */
 export declare const polygon: import('./types').ShapeDefinition;
 //# sourceMappingURL=polygon.d.ts.map

package/dist/es/shapes/polygon.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polygon.d.ts","sourceRoot":"","sources":["../../../src/shapes/polygon.ts"],"names":[],"mappings":"AA8EA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,OAAO,mCAiElB,CAAC"}
+{"version":3,"file":"polygon.d.ts","sourceRoot":"","sources":["../../../src/shapes/polygon.ts"],"names":[],"mappings":"AAqFA;;;;;;;;;;GAUG;AACH,eAAO,MAAM,OAAO,mCA6DlB,CAAC"}

package/dist/es/shapes/polygon.js

@@ -1,12 +1,13 @@
-import { localToWorld } from "../geometry/_transform.js";
+import { localToWorld } from "../geometry/transform.js";
 import { rect } from "../geometry/rect.js";
 import { defineShape } from "./define.js";
-import { asRectAnchor } from "./_shared.js";
-import { boundaryFromContour, contourCommands } from "../geometry/roundedContour.js";
-import { contourToPathCommands, verticesToSegments } from "./_contour.js";
+import { normalizeCompassAnchor } from "../geometry/anchor.js";
+import { boundaryFromContour, contourCommands } from "../geometry/contour.js";
+import { contourToPathCommands, contourToPathPrimitive, verticesToSegments } from "./contour.js";
 import { z } from "zod";
 //#region src/shapes/polygon.ts
 var DEG_TO_RAD = Math.PI / 180;
+var MAX_POLYGON_SIDES = 1024;
 /** 顶点角集合（度）：第 k 个顶点角 = rotate + k·(360/sides) */
 var vertexAngles = (params) => {
 	const startDeg = params.rotate ?? 0;
@@ -16,7 +17,14 @@ var vertexAngles = (params) => {
 	return out;
 };
 /** 顶点角的 |cos| 最大值（恒 >0，sides≥3 时至少一个顶点不在 ±y 轴上）；用于由 AABB 半宽反推外接半径 */
-var maxAbsCos = (params) => Math.max(...vertexAngles(params).map((a) => Math.abs(Math.cos(a * DEG_TO_RAD))));
+var maxAbsCos = (params) => {
+	let max = 0;
+	for (const angle of vertexAngles(params)) {
+		const value = Math.abs(Math.cos(angle * DEG_TO_RAD));
+		if (value > max) max = value;
+	}
+	return max;
+};
 /**
 * 能容纳内框（半轴 hw/hh）的正 sides 边形外接圆半径
 * @description rectangle / polygon 是文本容器——尺寸由内框（text + padding）驱动，circumscribe 从内框推外接。
@@ -57,20 +65,27 @@ var polygonVertices = (rect, radius, params) => vertexAngles(params).map((deg) =
 *   （多边形关于中心对称，AABB 中心 = 形心 = node position）。命名 anchor 走外接 AABB 的 9 名 rect anchor（不随
 *   cornerRadius 移）；self-rotate（params.rotate）与 Node.rotate 叠加。scaleParams：cornerRadius 是长度随 scale
 *   缩（几何均值因子），sides 计数 / rotate 角度不缩。
-*   diamond ≡ `{ type: 'polygon', params: { sides: 4, rotate: 45 } }`，由 compile 规范化。
+*   diamond ≡ `{ type: 'polygon', params: { sides: 4, rotate: 0 } }`，由 compile 规范化。
 */
 var polygon = defineShape({
 	paramsSchema: z.strictObject({
-		sides: z.number().int().min(3).describe("Number of sides of the regular polygon (>= 3)."),
+		sides: z.number().int().min(3).max(MAX_POLYGON_SIDES).describe(`Number of sides of the regular polygon (3..${MAX_POLYGON_SIDES}).`),
 		rotate: z.number().finite().optional().describe("Shape self-rotation in degrees (vertex start direction); default 0. Composes with Node.rotate."),
 		cornerRadius: z.number().finite().nonnegative().optional().describe("Corner radius in user units; 0 / omitted = sharp corners. Clamped per corner to the largest non-self-intersecting fillet.")
 	}),
 	circumscribe: (hw, hh, params) => {
 		const radius = circumradiusFor(hw, hh, params);
 		const angles = vertexAngles(params);
+		let halfWidth = 0;
+		let halfHeight = 0;
+		for (const angle of angles) {
+			const rad = angle * DEG_TO_RAD;
+			halfWidth = Math.max(halfWidth, Math.abs(radius * Math.cos(rad)));
+			halfHeight = Math.max(halfHeight, Math.abs(radius * Math.sin(rad)));
+		}
 		return {
-			halfWidth: Math.max(...angles.map((a) => Math.abs(radius * Math.cos(a * DEG_TO_RAD)))),
-			halfHeight: Math.max(...angles.map((a) => Math.abs(radius * Math.sin(a * DEG_TO_RAD))))
+			halfWidth,
+			halfHeight
 		};
 	},
 	boundaryPoint: (rect, toward, params) => {
@@ -79,21 +94,11 @@ var polygon = defineShape({
 		return boundaryFromContour(segments, params.cornerRadius, center, toward) ?? center;
 	},
 	anchor: (rect$1, name, params) => {
-		const a = asRectAnchor(name);
+		const a = normalizeCompassAnchor(name);
 		return a ? rect.anchor(rect$1, a) : void 0;
 	},
 	*emit(rect, style, round, params) {
-		yield {
-			type: "path",
-			commands: contourToPathCommands(contourCommands(verticesToSegments(polygonVertices(rect, circumradiusFromRect(rect, params), params)), params.cornerRadius), round),
-			fill: style.fill ?? "transparent",
-			fillOpacity: style.fillOpacity,
-			stroke: style.stroke ?? "currentColor",
-			strokeOpacity: style.strokeOpacity,
-			strokeWidth: style.strokeWidth ?? 1,
-			dashPattern: style.dashPattern,
-			opacity: style.opacity
-		};
+		yield contourToPathPrimitive(contourToPathCommands(contourCommands(verticesToSegments(polygonVertices(rect, circumradiusFromRect(rect, params), params)), params.cornerRadius), round), style);
 	},
 	scaleParams: (params, sx, sy) => params.cornerRadius === void 0 ? params : {
 		...params,