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

package/dist/es/compile/scope.d.ts

@@ -1,14 +1,16 @@
 import { IRPosition, IRTransform } from '../ir';
 import { Transform } from '../primitive';
+import { ShapeDefinition } from '../shapes';
 import { NameStack } from './name-stack';
 import { NodeLayout } from './node';
+import { ResolveBetweenGlobal } from './position';
 /**
- * 把 IR 6 变体 transforms 展平为 Scene 3 变体（Cartesian translate / rotate / scale）
- * @description 4 个 translate 变体（translate / polar-translate / at-translate / offset-translate）
+ * 把 IR 7 变体 transforms 展平为 Scene 3 变体（Cartesian translate / rotate / scale）
+ * @description 5 个 translate 变体（translate / polar-translate / at-translate / offset-translate / between-translate）
  *   各自构造对应 Position 字面量并调用 `resolvePosition` 拿到 Cartesian (x, y)，再写成 Cartesian translate；
  *   rotate / scale 直接透传。referent 未解析时返回 null（上游负责发 warn / throw）
  */
-export declare const lowerScopeTransforms: (transforms: ReadonlyArray<IRTransform>, nameStack: NameStack, nodeDistance?: number) => Array<Transform> | null;
+export declare const lowerScopeTransforms: (transforms: ReadonlyArray<IRTransform>, nameStack: NameStack, nodeDistance?: number, resolveBetweenGlobal?: ResolveBetweenGlobal, onUnresolved?: (failed: IRTransform) => void) => Array<Transform> | null;
 /**
  * 把局部坐标点 (x, y) 按 Cartesian-only transform 链 apply 到全局坐标
  * @description 数组语义与 SVG `transform="t0 t1 t2"` / TikZ scope option 顺序一致：
@@ -33,7 +35,7 @@ export declare const inverseTransformChain: (global: IRPosition, chain: Readonly
  *   scale 乘进 rect.width / height / margin——这样 path 端点的 boundary clip 取的是与 SVG `<g>`
  *   实际渲染一致的视觉尺寸 / 朝向，跨 / 入 / 出 rotate / scale scope 的 path 都贴节点视觉边界。
  *   非均匀 scale 与 rotate 在 chain 中混合时，按"累加 rotate + 分量相乘 scale"近似（uniform scale 精确，
- *   anisotropic + rotate 的剪切耦合不展开——alpha 阶段限制）。
+ *   anisotropic + rotate 的剪切耦合不展开——当前投影模型限制）。
  */
 export declare const projectLayoutToGlobal: (layout: NodeLayout, chain: ReadonlyArray<Transform>) => NodeLayout;
 /** scope bbox 计算结果：bbox 几何中心 + 尺寸（width/height ≥ 0；空 scope 退化为 0×0 占位时仍合法） */
@@ -62,5 +64,5 @@ export declare const computeScopeBoundingBox: (layouts: ReadonlyArray<NodeLayout
  *   synthetic layout 完全复用 rectangle 路径：`scope.id.<keyword>` / `scope.id.<deg>` / `scope.id` 作为 referent
  *   走与普通 rectangle Node 完全一致的 anchorOf / boundaryPointOf / 中心点取值
  */
-export declare const registerScopeAsLayout: (id: string, bbox: ScopeBoundingBox | null, fallbackOrigin: IRPosition) => NodeLayout;
+export declare const registerScopeAsLayout: (id: string, bbox: ScopeBoundingBox | null, fallbackOrigin: IRPosition, shapes?: Record<string, ShapeDefinition>) => NodeLayout;
 //# sourceMappingURL=scope.d.ts.map

package/dist/es/compile/scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../../src/compile/scope.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,UAAU,EACV,WAAW,EAEZ,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGzC;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,YAAY,aAAa,CAAC,WAAW,CAAC,EACtC,WAAW,SAAS,EACpB,eAAe,MAAM,KACpB,KAAK,CAAC,SAAS,CAAC,GAAG,IAiDrB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAyBF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAgCF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAuBF,CAAC;AAEF,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,aAAa,CAAC,UAAU,CAAC,KACjC,gBAAgB,GAAG,IA2BrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,IAAI,MAAM,EACV,MAAM,gBAAgB,GAAG,IAAI,EAC7B,gBAAgB,UAAU,KACzB,UAiBF,CAAC"}
+{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../../src/compile/scope.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAIV,UAAU,EACV,WAAW,EAEZ,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,EAAE,KAAK,UAAU,EAAe,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,KAAK,oBAAoB,EAAmB,MAAM,YAAY,CAAC;AAExE;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,YAAY,aAAa,CAAC,WAAW,CAAC,EACtC,WAAW,SAAS,EACpB,eAAe,MAAM,EACrB,uBAAuB,oBAAoB,EAC3C,eAAe,CAAC,MAAM,EAAE,WAAW,KAAK,IAAI,KAC3C,KAAK,CAAC,SAAS,CAAC,GAAG,IAoErB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAyBF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UA+BF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UA4BF,CAAC;AAEF,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,aAAa,CAAC,UAAU,CAAC,KACjC,gBAAgB,GAAG,IA6BrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,IAAI,MAAM,EACV,MAAM,gBAAgB,GAAG,IAAI,EAC7B,gBAAgB,UAAU,EAC1B,SAAQ,MAAM,CAAC,MAAM,EAAE,eAAe,CAAkB,KACvD,UAiBF,CAAC"}

package/dist/es/compile/scope.js

@@ -1,14 +1,15 @@
 import { rect } from "../geometry/rect.js";
 import { BUILTIN_SHAPES } from "../shapes/index.js";
 import { resolvePosition } from "./position.js";
+import { outerRectOf } from "./node.js";
 //#region src/compile/scope.ts
 /**
-* 把 IR 6 变体 transforms 展平为 Scene 3 变体（Cartesian translate / rotate / scale）
-* @description 4 个 translate 变体（translate / polar-translate / at-translate / offset-translate）
+* 把 IR 7 变体 transforms 展平为 Scene 3 变体（Cartesian translate / rotate / scale）
+* @description 5 个 translate 变体（translate / polar-translate / at-translate / offset-translate / between-translate）
 *   各自构造对应 Position 字面量并调用 `resolvePosition` 拿到 Cartesian (x, y)，再写成 Cartesian translate；
 *   rotate / scale 直接透传。referent 未解析时返回 null（上游负责发 warn / throw）
 */
-var lowerScopeTransforms = (transforms, nameStack, nodeDistance) => {
+var lowerScopeTransforms = (transforms, nameStack, nodeDistance, resolveBetweenGlobal, onUnresolved) => {
 	const out = [];
 	for (const t of transforms) switch (t.kind) {
 		case "translate":
@@ -25,7 +26,10 @@ var lowerScopeTransforms = (transforms, nameStack, nodeDistance) => {
 			};
 			if (t.origin !== void 0) polar.origin = t.origin;
 			const resolved = resolvePosition(polar, nameStack, nodeDistance);
-			if (!resolved) return null;
+			if (!resolved) {
+				onUnresolved?.(t);
+				return null;
+			}
 			out.push({
 				kind: "translate",
 				x: resolved[0],
@@ -40,7 +44,10 @@ var lowerScopeTransforms = (transforms, nameStack, nodeDistance) => {
 			};
 			if (t.distance !== void 0) at.distance = t.distance;
 			const resolved = resolvePosition(at, nameStack, nodeDistance);
-			if (!resolved) return null;
+			if (!resolved) {
+				onUnresolved?.(t);
+				return null;
+			}
 			out.push({
 				kind: "translate",
 				x: resolved[0],
@@ -53,7 +60,26 @@ var lowerScopeTransforms = (transforms, nameStack, nodeDistance) => {
 				of: t.of,
 				offset: t.offset ?? [0, 0]
 			}, nameStack, nodeDistance);
-			if (!resolved) return null;
+			if (!resolved) {
+				onUnresolved?.(t);
+				return null;
+			}
+			out.push({
+				kind: "translate",
+				x: resolved[0],
+				y: resolved[1]
+			});
+			break;
+		}
+		case "between-translate": {
+			const resolved = resolvePosition({
+				between: t.between,
+				t: t.t
+			}, nameStack, nodeDistance, [], resolveBetweenGlobal);
+			if (!resolved) {
+				onUnresolved?.(t);
+				return null;
+			}
 			out.push({
 				kind: "translate",
 				x: resolved[0],
@@ -159,7 +185,7 @@ var inverseTransformChain = (global, chain) => {
 *   scale 乘进 rect.width / height / margin——这样 path 端点的 boundary clip 取的是与 SVG `<g>`
 *   实际渲染一致的视觉尺寸 / 朝向，跨 / 入 / 出 rotate / scale scope 的 path 都贴节点视觉边界。
 *   非均匀 scale 与 rotate 在 chain 中混合时，按"累加 rotate + 分量相乘 scale"近似（uniform scale 精确，
-*   anisotropic + rotate 的剪切耦合不展开——alpha 阶段限制）。
+*   anisotropic + rotate 的剪切耦合不展开——当前投影模型限制）。
 */
 var projectLayoutToGlobal = (layout, chain) => {
 	const [gx, gy] = applyTransformChain([layout.rect.x, layout.rect.y], chain);
@@ -176,13 +202,14 @@ var projectLayoutToGlobal = (layout, chain) => {
 		x: gx,
 		y: gy,
 		rotate: (layout.rect.rotate ?? 0) + rotateAccumRad,
-		width: layout.rect.width * scaleX,
-		height: layout.rect.height * scaleY
+		width: layout.rect.width * Math.abs(scaleX),
+		height: layout.rect.height * Math.abs(scaleY)
 	};
 	const marginScale = Math.max(Math.abs(scaleX), Math.abs(scaleY));
 	return {
 		...layout,
 		rect: globalRect,
+		rotateDeg: layout.rotateDeg + rotateAccumRad * (180 / Math.PI),
 		margin: layout.margin * marginScale
 	};
 };
@@ -201,11 +228,12 @@ var computeScopeBoundingBox = (layouts) => {
 	let maxX = -Infinity;
 	let maxY = -Infinity;
 	for (const layout of layouts) {
+		const outerRect = outerRectOf(layout);
 		const corners = [
-			rect.anchor(layout.rect, "north-west"),
-			rect.anchor(layout.rect, "north-east"),
-			rect.anchor(layout.rect, "south-west"),
-			rect.anchor(layout.rect, "south-east")
+			rect.anchor(outerRect, "north-west"),
+			rect.anchor(outerRect, "north-east"),
+			rect.anchor(outerRect, "south-west"),
+			rect.anchor(outerRect, "south-east")
 		];
 		for (const [cx, cy] of corners) {
 			if (cx < minX) minX = cx;
@@ -227,7 +255,7 @@ var computeScopeBoundingBox = (layouts) => {
 *   synthetic layout 完全复用 rectangle 路径：`scope.id.<keyword>` / `scope.id.<deg>` / `scope.id` 作为 referent
 *   走与普通 rectangle Node 完全一致的 anchorOf / boundaryPointOf / 中心点取值
 */
-var registerScopeAsLayout = (id, bbox, fallbackOrigin) => {
+var registerScopeAsLayout = (id, bbox, fallbackOrigin, shapes = BUILTIN_SHAPES) => {
 	const box = bbox ?? {
 		x: fallbackOrigin[0],
 		y: fallbackOrigin[1],
@@ -237,7 +265,7 @@ var registerScopeAsLayout = (id, bbox, fallbackOrigin) => {
 	return {
 		id,
 		shapeName: "rectangle",
-		shapeDef: BUILTIN_SHAPES.rectangle,
+		shapeDef: shapes.rectangle,
 		rect: {
 			x: box.x,
 			y: box.y,
@@ -252,7 +280,7 @@ var registerScopeAsLayout = (id, bbox, fallbackOrigin) => {
 		align: "middle",
 		lineHeight: 0,
 		fontSize: 0,
-		shapes: BUILTIN_SHAPES
+		shapes
 	};
 };
 //#endregion

package/dist/es/compile/style.d.ts

@@ -6,7 +6,7 @@ import { IRArrowDetail, IRLabelDefault, IRNode, IRPath, IRScope } from '../ir';
 type CascadeState = Pick<IRScope, 'color' | 'stroke' | 'fill' | 'strokeWidth' | 'opacity' | 'fillOpacity' | 'drawOpacity'>;
 /**
  * 单层 scope 的样式 frame——compile 维护 frame 栈做 inside-out per-field 解析
- * @description 级联 graphic state + 四通道 every-X 默认 + resetStyle 屏障；从 IRScope 抽取（buildStyleFrame）
+ * @description 级联 graphic state + 四通道 every-X 默认 + resetStyle 屏障；从 IRScope 抽取（createStyleFrame）
  */
 export type StyleFrame = {
     /** 级联 graphic state（主色 + 跨类共享分项） */
@@ -26,7 +26,7 @@ export type StyleFrame = {
  * 从 IRScope 抽取样式 frame
  * @description 只摘样式相关字段（级联 graphic state + 四通道 + resetStyle）；transforms / id / localNamespace 与样式正交，不进 frame
  */
-export declare const buildStyleFrame: (scope: IRScope) => StyleFrame;
+export declare const createStyleFrame: (scope: IRScope) => StyleFrame;
 /**
  * 解析 node 最终样式——fold 外→内 frame 栈 + 元素显式
  * @description 优先级链（每分项就近 model A）：元素显式分项 > 元素 color > nodeDefault 分项 > nodeDefault color

package/dist/es/compile/style.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../../src/compile/style.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACd,MAAM,EACN,MAAM,EACN,OAAO,EAIR,MAAM,OAAO,CAAC;AAEf;;;GAGG;AACH,KAAK,YAAY,GAAG,IAAI,CACtB,OAAO,EACP,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,GAAG,aAAa,GAAG,aAAa,CACxF,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,oCAAoC;IACpC,OAAO,EAAE,YAAY,CAAC;IACtB,oBAAoB;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,oBAAoB;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,iDAAiD;IACjD,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,qBAAqB;IACrB,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,sBAAsB;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CACpC,CAAC;AAYF;;;GAGG;AACH,eAAO,MAAM,eAAe,GAAI,OAAO,OAAO,KAAG,UAgBhD,CAAC;AAiEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,MAAM,EACZ,OAAO,aAAa,CAAC,UAAU,CAAC,KAC/B,MAYF,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,GAC9B,OAAO,aAAa,CAAC,UAAU,CAAC,KAC/B,cAOF,CAAC;AAyHF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,MAAM,EACZ,OAAO,aAAa,CAAC,UAAU,CAAC,KAC/B,MA2BF,CAAC"}
+{"version":3,"file":"style.d.ts","sourceRoot":"","sources":["../../../src/compile/style.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,aAAa,EAGb,cAAc,EACd,MAAM,EACN,MAAM,EACN,OAAO,EAIR,MAAM,OAAO,CAAC;AAEf;;;GAGG;AACH,KAAK,YAAY,GAAG,IAAI,CACtB,OAAO,EACP,OAAO,GAAG,QAAQ,GAAG,MAAM,GAAG,aAAa,GAAG,SAAS,GAAG,aAAa,GAAG,aAAa,CACxF,CAAC;AAEF;;;GAGG;AACH,MAAM,MAAM,UAAU,GAAG;IACvB,oCAAoC;IACpC,OAAO,EAAE,YAAY,CAAC;IACtB,oBAAoB;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,oBAAoB;IACpB,WAAW,CAAC,EAAE,OAAO,CAAC,aAAa,CAAC,CAAC;IACrC,iDAAiD;IACjD,YAAY,CAAC,EAAE,cAAc,CAAC;IAC9B,qBAAqB;IACrB,YAAY,CAAC,EAAE,aAAa,CAAC;IAC7B,sBAAsB;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC;CACpC,CAAC;AAYF;;;GAGG;AACH,eAAO,MAAM,gBAAgB,GAAI,OAAO,OAAO,KAAG,UAgBjD,CAAC;AAiEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,GAC3B,MAAM,MAAM,EACZ,OAAO,aAAa,CAAC,UAAU,CAAC,KAC/B,MAYF,CAAC;AAEF,+EAA+E;AAC/E,eAAO,MAAM,mBAAmB,GAC9B,OAAO,aAAa,CAAC,UAAU,CAAC,KAC/B,cAOF,CAAC;AAyHF;;;;GAIG;AACH,eAAO,MAAM,oBAAoB,GAC/B,MAAM,MAAM,EACZ,OAAO,aAAa,CAAC,UAAU,CAAC,KAC/B,MA2BF,CAAC"}

package/dist/es/compile/style.js

@@ -12,7 +12,7 @@ var pickDefinedKeys = (src) => {
 * 从 IRScope 抽取样式 frame
 * @description 只摘样式相关字段（级联 graphic state + 四通道 + resetStyle）；transforms / id / localNamespace 与样式正交，不进 frame
 */
-var buildStyleFrame = (scope) => {
+var createStyleFrame = (scope) => {
 	const cascade = {};
 	if (scope.color !== void 0) cascade.color = scope.color;
 	if (scope.stroke !== void 0) cascade.stroke = scope.stroke;
@@ -256,4 +256,4 @@ var resolveEffectivePath = (path, stack) => {
 	return effective;
 };
 //#endregion
-export { buildStyleFrame, resolveEffectivePath, resolveLabelDefault, resolveNodeStyle };
+export { createStyleFrame, resolveEffectivePath, resolveLabelDefault, resolveNodeStyle };

package/dist/es/compile/text-metrics.d.ts

@@ -27,7 +27,7 @@ export type TextMetrics = {
 export type TextMeasurer = (text: string, font: FontSpec) => TextMetrics;
 /**
  * 默认 fallback 度量：基于平均字宽估算，不准但保证可运行
- * @description size=0 → 退化返回 (0, 0)（与 text='' 一致）；负 size 或 NaN size → throw（非法输入早 fail，避免 NaN 噪音传播到 Scene）
+ * @description size=0 → 退化返回 (0, 0)（与 text='' 一致）；负 size 或非有限（NaN / Infinity）size → throw（非法输入早 fail，避免 NaN / Infinity 传播到 Scene）
  */
 export declare const fallbackMeasurer: TextMeasurer;
 //# sourceMappingURL=text-metrics.d.ts.map

package/dist/es/compile/text-metrics.js

@@ -1,10 +1,10 @@
 //#region src/compile/text-metrics.ts
 /**
 * 默认 fallback 度量：基于平均字宽估算，不准但保证可运行
-* @description size=0 → 退化返回 (0, 0)（与 text='' 一致）；负 size 或 NaN size → throw（非法输入早 fail，避免 NaN 噪音传播到 Scene）
+* @description size=0 → 退化返回 (0, 0)（与 text='' 一致）；负 size 或非有限（NaN / Infinity）size → throw（非法输入早 fail，避免 NaN / Infinity 传播到 Scene）
 */
 var fallbackMeasurer = (text, font) => {
-	if (Number.isNaN(font.size) || font.size < 0) throw new Error(`fallbackMeasurer: invalid font.size '${font.size}'; must be a non-negative finite number`);
+	if (!Number.isFinite(font.size) || font.size < 0) throw new Error(`fallbackMeasurer: invalid font.size '${font.size}'; must be a non-negative finite number`);
 	return {
 		width: text.length * font.size * .55,
 		height: font.size * 1.2

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

@@ -0,0 +1,8 @@
+import { CompositeDefinition } from './types';
+/**
+ * 注册一个 Tier 2 composite（保留 `expand` 的强类型节点参数）
+ * @description domain 包用它注册：`expand` 的 node 自动推断为 `z.infer<typeof schema>`；返回值擦除泛型，
+ *   可放进 `CompileOptions.composites: Array<CompositeDefinition>`。对齐其他扩展面的 `define*` helper。
+ */
+export declare const defineComposite: <T>(definition: CompositeDefinition<T>) => CompositeDefinition;
+//# sourceMappingURL=define.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/composites/define.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC;AAEnD;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,YAAY,mBAAmB,CAAC,CAAC,CAAC,KAAG,mBACrC,CAAC"}

package/dist/es/composites/{types.js → define.js}

@@ -1,8 +1,8 @@
-//#region src/composites/types.ts
+//#region src/composites/define.ts
 /**
 * 注册一个 Tier 2 composite（保留 `expand` 的强类型节点参数）
 * @description domain 包用它注册：`expand` 的 node 自动推断为 `z.infer<typeof schema>`；返回值擦除泛型，
-*   可放进 `CompileOptions.composites: Array<CompositeDefinition>`。对齐 `definePathGenerator`。
+*   可放进 `CompileOptions.composites: Array<CompositeDefinition>`。对齐其他扩展面的 `define*` helper。
 */
 var defineComposite = (definition) => definition;
 //#endregion

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

@@ -1,3 +1,3 @@
-export { defineComposite } from './types';
+export { defineComposite } from './define';
 export type { CompositeDefinition } from './types';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/composites/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,YAAY,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/composites/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,UAAU,CAAC;AAC3C,YAAY,EAAE,mBAAmB,EAAE,MAAM,SAAS,CAAC"}

package/dist/es/composites/types.d.ts

@@ -12,10 +12,4 @@ export type CompositeDefinition<T = unknown> = {
     /** 把该 composite 节点展开成 Tier 1 IR 的纯函数；据节点字段不同产不同子树 */
     expand: (node: T) => IRChild | Array<IRChild>;
 };
-/**
- * 注册一个 Tier 2 composite（保留 `expand` 的强类型节点参数）
- * @description domain 包用它注册：`expand` 的 node 自动推断为 `z.infer<typeof schema>`；返回值擦除泛型，
- *   可放进 `CompileOptions.composites: Array<CompositeDefinition>`。对齐 `definePathGenerator`。
- */
-export declare const defineComposite: <T>(definition: CompositeDefinition<T>) => CompositeDefinition;
 //# sourceMappingURL=types.d.ts.map

package/dist/es/composites/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/composites/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,OAAO,IAAI;IAC7C,yEAAyE;IACzE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACnB,qDAAqD;IACrD,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;CAC/C,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAAI,CAAC,EAAE,YAAY,mBAAmB,CAAC,CAAC,CAAC,KAAG,mBACrC,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/composites/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,KAAK,CAAC;AACnC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC;;;;;GAKG;AACH,MAAM,MAAM,mBAAmB,CAAC,CAAC,GAAG,OAAO,IAAI;IAC7C,yEAAyE;IACzE,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC;IACnB,qDAAqD;IACrD,MAAM,EAAE,CAAC,IAAI,EAAE,CAAC,KAAK,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;CAC/C,CAAC"}

package/dist/es/geometry/anchor.d.ts

@@ -0,0 +1,33 @@
+import { ValueOf } from '../types';
+/** 9 个标准方位 anchor，采用 TikZ 语义作为 canonical 值。 */
+export declare const CompassAnchor: {
+    readonly Center: "center";
+    readonly North: "north";
+    readonly South: "south";
+    readonly East: "east";
+    readonly West: "west";
+    readonly NorthEast: "north-east";
+    readonly NorthWest: "north-west";
+    readonly SouthEast: "south-east";
+    readonly SouthWest: "south-west";
+};
+export type CompassAnchorValue = ValueOf<typeof CompassAnchor>;
+/** Web/CSS 心智下的方位 anchor 输入别名，编译前归一到 CompassAnchor。 */
+export declare const WebAnchor: {
+    readonly Top: "top";
+    readonly Bottom: "bottom";
+    readonly Right: "right";
+    readonly Left: "left";
+    readonly TopRight: "top-right";
+    readonly TopLeft: "top-left";
+    readonly BottomRight: "bottom-right";
+    readonly BottomLeft: "bottom-left";
+};
+export type WebAnchorValue = ValueOf<typeof WebAnchor>;
+export type AnchorInput = CompassAnchorValue | WebAnchorValue;
+/**
+ * 标准化方位 anchor 名。
+ * @description TikZ canonical 名原样返回；Web alias（top / top-left 等）归一到 north / north-west 等。
+ */
+export declare const normalizeCompassAnchor: (name: string) => CompassAnchorValue | undefined;
+//# sourceMappingURL=anchor.d.ts.map

package/dist/es/geometry/anchor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"anchor.d.ts","sourceRoot":"","sources":["../../../src/geometry/anchor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAExC,+CAA+C;AAC/C,eAAO,MAAM,aAAa;;;;;;;;;;CAUhB,CAAC;AAEX,MAAM,MAAM,kBAAkB,GAAG,OAAO,CAAC,OAAO,aAAa,CAAC,CAAC;AAE/D,uDAAuD;AACvD,eAAO,MAAM,SAAS;;;;;;;;;CASZ,CAAC;AAEX,MAAM,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,SAAS,CAAC,CAAC;AAEvD,MAAM,MAAM,WAAW,GAAG,kBAAkB,GAAG,cAAc,CAAC;AAe9D;;;GAGG;AACH,eAAO,MAAM,sBAAsB,GAAI,MAAM,MAAM,KAAG,kBAAkB,GAAG,SAG1E,CAAC"}

package/dist/es/geometry/anchor.js

@@ -0,0 +1,45 @@
+//#region src/geometry/anchor.ts
+/** 9 个标准方位 anchor，采用 TikZ 语义作为 canonical 值。 */
+var CompassAnchor = {
+	Center: "center",
+	North: "north",
+	South: "south",
+	East: "east",
+	West: "west",
+	NorthEast: "north-east",
+	NorthWest: "north-west",
+	SouthEast: "south-east",
+	SouthWest: "south-west"
+};
+/** Web/CSS 心智下的方位 anchor 输入别名，编译前归一到 CompassAnchor。 */
+var WebAnchor = {
+	Top: "top",
+	Bottom: "bottom",
+	Right: "right",
+	Left: "left",
+	TopRight: "top-right",
+	TopLeft: "top-left",
+	BottomRight: "bottom-right",
+	BottomLeft: "bottom-left"
+};
+var CompassAnchorSet = new Set(Object.values(CompassAnchor));
+var AnchorAliases = {
+	top: CompassAnchor.North,
+	bottom: CompassAnchor.South,
+	right: CompassAnchor.East,
+	left: CompassAnchor.West,
+	"top-right": CompassAnchor.NorthEast,
+	"top-left": CompassAnchor.NorthWest,
+	"bottom-right": CompassAnchor.SouthEast,
+	"bottom-left": CompassAnchor.SouthWest
+};
+/**
+* 标准化方位 anchor 名。
+* @description TikZ canonical 名原样返回；Web alias（top / top-left 等）归一到 north / north-west 等。
+*/
+var normalizeCompassAnchor = (name) => {
+	if (CompassAnchorSet.has(name)) return name;
+	return AnchorAliases[name];
+};
+//#endregion
+export { CompassAnchor, WebAnchor, normalizeCompassAnchor };

package/dist/es/geometry/bend.d.ts

@@ -1,7 +1,7 @@
 import { Position } from './point';
 /**
  * cubic Bezier 拟合 from→to 的弧形 bend
- * @description apex offset = chord × tan(bendAngle/2)；控制点取 chord 1/3 与 2/3 处沿法向偏移，让 cubic 在 t=0.5 穿过 apex 故 ctlOffset = 4/3 × apexOffset。法向（screen y-down）：visual-left=(dy,-dx)/|chord|，visual-right=(-dy,dx)/|chord|。chord=0 时两控制点都返回 from
+ * @description apex offset =（chord/2）× tan(bendAngle/2)，即弦切角为 bendAngle 的圆弧 sagitta；控制点取 chord 1/3 与 2/3 处沿法向偏移，让 cubic 在 t=0.5 穿过 apex 故 ctlOffset = 4/3 × apexOffset。法向（screen y-down）：visual-left=(dy,-dx)/|chord|，visual-right=(-dy,dx)/|chord|。chord=0 时两控制点都返回 from
  */
 export declare const bendControlPoints: (from: Position, to: Position, direction: "left" | "right", bendAngle: number) => [Position, Position];
 /**

package/dist/es/geometry/bend.js

@@ -1,7 +1,7 @@
 //#region src/geometry/bend.ts
 /**
 * cubic Bezier 拟合 from→to 的弧形 bend
-* @description apex offset = chord × tan(bendAngle/2)；控制点取 chord 1/3 与 2/3 处沿法向偏移，让 cubic 在 t=0.5 穿过 apex 故 ctlOffset = 4/3 × apexOffset。法向（screen y-down）：visual-left=(dy,-dx)/|chord|，visual-right=(-dy,dx)/|chord|。chord=0 时两控制点都返回 from
+* @description apex offset =（chord/2）× tan(bendAngle/2)，即弦切角为 bendAngle 的圆弧 sagitta；控制点取 chord 1/3 与 2/3 处沿法向偏移，让 cubic 在 t=0.5 穿过 apex 故 ctlOffset = 4/3 × apexOffset。法向（screen y-down）：visual-left=(dy,-dx)/|chord|，visual-right=(-dy,dx)/|chord|。chord=0 时两控制点都返回 from
 */
 var bendControlPoints = (from, to, direction, bendAngle) => {
 	const dx = to[0] - from[0];
@@ -11,14 +11,14 @@ var bendControlPoints = (from, to, direction, bendAngle) => {
 	const sign = direction === "left" ? 1 : -1;
 	const nx = dy / chord * sign;
 	const ny = -dx / chord * sign;
-	const ctlOffset = 4 / 3 * (chord * Math.tan(bendAngle * Math.PI / 180 / 2));
+	const ctlOffset = 4 / 3 * (chord / 2 * Math.tan(bendAngle * Math.PI / 180 / 2));
 	return [[from[0] + dx / 3 + ctlOffset * nx, from[1] + dy / 3 + ctlOffset * ny], [from[0] + 2 * dx / 3 + ctlOffset * nx, from[1] + 2 * dy / 3 + ctlOffset * ny]];
 };
 /** 默认 looseness（looseness 缺省时） */
 var DEFAULT_LOOSENESS = 1;
 /** self-loop（from==to）默认环大小（user units，受 looseness 缩放） */
 var DEFAULT_LOOP_SIZE = 1;
-/** 直边 cubic 控制点距离系数（chord 的几分之一） */
+/** 直边 cubic 控制点距离系数（chord 的几分之一）；retikz 取 1/3，TikZ 默认 looseness 对应 ≈0.3915，本库简化为 1/3 */
 var OUTIN_DISTANCE_FACTOR = 1 / 3;
 /** 角度（度）转单位方向向量（0°=+x，90°=+y screen-down，与 IR 角度约定一致） */
 var dirOf = (angleDeg) => {

package/dist/es/geometry/circle.d.ts

@@ -1,6 +1,6 @@
-import { Side } from './_edge';
+import { Side } from './edge';
+import { CompassAnchorValue } from './anchor';
 import { Position } from './point';
-import { RectAnchor } from './rect';
 /** 圆形：几何中心 + 半径，预留旋转字段保持与 Rect 同形 API */
 export type Circle = {
     x: number;
@@ -16,8 +16,8 @@ export declare const circle: {
     center: (c: Circle) => Position;
     /** 判断点是否在圆内（含边界） */
     contains: (c: Circle, p: Position) => boolean;
-    /** 9 个标准 anchor 之一的世界坐标 */
-    anchor: (c: Circle, name: RectAnchor) => Position;
+    /** 9 个标准方位 anchor 之一的世界坐标 */
+    anchor: (c: Circle, name: CompassAnchorValue) => Position;
     /** 从圆心向 toward 方向射线与圆周交点（Path 端点贴 Node 边界用） */
     boundaryPoint: (c: Circle, toward: Position) => Position;
     /** 边上比例点：side 的 90° 周长弧段 t∈[0,1] 处（等角，落真实圆周；含旋转） */

package/dist/es/geometry/circle.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"circle.d.ts","sourceRoot":"","sources":["../../../src/geometry/circle.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,IAAI,EAAgB,MAAM,SAAS,CAAC;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAIzC,yCAAyC;AACzC,MAAM,MAAM,MAAM,GAAG;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS;IACT,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAIF,eAAe;AACf,eAAO,MAAM,MAAM;IACjB,SAAS;gBACG,MAAM,KAAG,QAAQ;IAC7B,oBAAoB;kBACN,MAAM,KAAK,QAAQ,KAAG,OAAO;IAI3C,2BAA2B;gBACf,MAAM,QAAQ,UAAU,KAAG,QAAQ;IAsC/C,+CAA+C;uBAC5B,MAAM,UAAU,QAAQ,KAAG,QAAQ;IAOtD,oDAAoD;mBACrC,MAAM,QAAQ,IAAI,KAAK,MAAM,KAAG,QAAQ;CAIxD,CAAC"}
+{"version":3,"file":"circle.d.ts","sourceRoot":"","sources":["../../../src/geometry/circle.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAgB,MAAM,QAAQ,CAAC;AAEjD,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAC;AACnD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIxC,yCAAyC;AACzC,MAAM,MAAM,MAAM,GAAG;IACnB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,SAAS;IACT,MAAM,EAAE,MAAM,CAAC;IACf,iCAAiC;IACjC,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAIF,eAAe;AACf,eAAO,MAAM,MAAM;IACjB,SAAS;gBACG,MAAM,KAAG,QAAQ;IAC7B,oBAAoB;kBACN,MAAM,KAAK,QAAQ,KAAG,OAAO;IAI3C,6BAA6B;gBACjB,MAAM,QAAQ,kBAAkB,KAAG,QAAQ;IAsCvD,+CAA+C;uBAC5B,MAAM,UAAU,QAAQ,KAAG,QAAQ;IAOtD,oDAAoD;mBACrC,MAAM,QAAQ,IAAI,KAAK,MAAM,KAAG,QAAQ;CAIxD,CAAC"}

package/dist/es/geometry/circle.js

@@ -1,5 +1,5 @@
-import { localToWorld, worldToLocal } from "./_transform.js";
-import { edgeAngleDeg } from "./_edge.js";
+import { edgeAngleDeg } from "./edge.js";
+import { localToWorld, worldToLocal } from "./transform.js";
 //#region src/geometry/circle.ts
 var DEG_TO_RAD = Math.PI / 180;
 var SQRT_HALF = Math.SQRT1_2;
@@ -12,7 +12,7 @@ var circle = {
 		const [lx, ly] = worldToLocal(c, p);
 		return lx * lx + ly * ly <= c.radius * c.radius;
 	},
-	/** 9 个标准 anchor 之一的世界坐标 */
+	/** 9 个标准方位 anchor 之一的世界坐标 */
 	anchor: (c, name) => {
 		const r = c.radius;
 		let lx = 0;

package/dist/es/geometry/{roundedContour.d.ts → contour.d.ts}

@@ -47,7 +47,7 @@ export type ContourCommand = {
  * @description tangentInPoint = 前段被裁短到此点（前段新终点）；tangentOutPoint = 后段从此点起（后段新起点）；
  *   filletArc 描述连接两切点的圆弧。clampedToZero=true 表示该角夹紧后 r→0，不倒角（保持尖角）。
  */
-type FilletSolution = {
+export type FilletSolution = {
     /** 前段切点（前段新终点） */
     tangentInPoint: Position;
     /** 后段切点（后段新起点） */
@@ -76,13 +76,17 @@ export declare const filletContour: (segments: Array<ContourSegment>, cornerRadi
  *   fillet 出点」走到「本接缝的 fillet 入点」（line 缩短 / arc 裁剪角度），接缝处插 fillet 弧。
  *   夹紧到 0 的角不插弧、按原尖角连接。
  */
-export declare const contourCommands: (segments: Array<ContourSegment>, cornerRadius?: number) => Array<ContourCommand>;
+export declare const contourCommands: (segments: Array<ContourSegment>, cornerRadius?: number, fillets?: Array<FilletSolution>) => Array<ContourCommand>;
+/** 调整 endAngle 使「start→end」沿给定扫描方向（ccw: 递减 / 否则递增），保持裁剪后弧方向不变 */
+export declare const alignSweep: (start: number, end: number, ccw: boolean) => {
+    start: number;
+    end: number;
+};
 /**
  * 从 rayOrigin 朝 toward 射线 ∩ fillet 后轮廓全部段，返回最近正向交点
  * @description rayOrigin 显式传（不假设中心）；toward 是射线指向的目标点（方向 = toward − rayOrigin）。
  *   遍历 fillet 后的有效段（缩短 line / 裁剪 arc / fillet arc），对每段求 ray∩段、取最小正参数命中点。
  *   cornerRadius 省略 / ≤0 → 走原尖角轮廓。无命中返回 undefined（调用方兜底）。
  */
-export declare const boundaryFromContour: (segments: Array<ContourSegment>, cornerRadius: number | undefined, rayOrigin: Position, toward: Position) => Position | undefined;
-export {};
-//# sourceMappingURL=roundedContour.d.ts.map
+export declare const boundaryFromContour: (segments: Array<ContourSegment>, cornerRadius: number | undefined, rayOrigin: Position, toward: Position, fillets?: Array<FilletSolution>) => Position | undefined;
+//# sourceMappingURL=contour.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"contour.d.ts","sourceRoot":"","sources":["../../../src/geometry/contour.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,QAAQ,EAAS,MAAM,SAAS,CAAC;AAkB/C,4BAA4B;AAC5B,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB;IAChB,EAAE,EAAE,QAAQ,CAAC;CACd,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY;IACZ,IAAI,EAAE,KAAK,CAAC;IACZ,gBAAgB;IAChB,MAAM,EAAE,QAAQ,CAAC;IACjB,qBAAqB;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,6BAA6B;AAC7B,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,UAAU,CAAC;AAEtD,qFAAqF;AACrF,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GACD;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AA6BtB;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG;IAC3B,kBAAkB;IAClB,cAAc,EAAE,QAAQ,CAAC;IACzB,kBAAkB;IAClB,eAAe,EAAE,QAAQ,CAAC;IAC1B,gBAAgB;IAChB,MAAM,EAAE,QAAQ,CAAC;IACjB,gBAAgB;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB;IACpB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,8BAA8B;IAC9B,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAoTF;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,UAAU,KAAK,CAAC,cAAc,CAAC,EAC/B,eAAe,MAAM,KACpB,KAAK,CAAC,cAAc,CAUtB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,KAAK,CAAC,cAAc,CAAC,EAC/B,eAAe,MAAM,EACrB,UAAS,KAAK,CAAC,cAAc,CAAyC,KACrE,KAAK,CAAC,cAAc,CAsCtB,CAAC;AA2BF,iEAAiE;AACjE,eAAO,MAAM,UAAU,GAAI,OAAO,MAAM,EAAE,KAAK,MAAM,EAAE,KAAK,OAAO,KAAG;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,MAAM,CAAA;CAUjG,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,KAAK,CAAC,cAAc,CAAC,EAC/B,cAAc,MAAM,GAAG,SAAS,EAChC,WAAW,QAAQ,EACnB,QAAQ,QAAQ,EAChB,UAAS,KAAK,CAAC,cAAc,CAAyC,KACrE,QAAQ,GAAG,SA0Eb,CAAC"}