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

package/dist/es/compile/node.js

@@ -1,7 +1,4 @@
-import { rect } from "../geometry/rect.js";
-import { circle } from "../geometry/circle.js";
-import { diamond } from "../geometry/diamond.js";
-import { ellipse } from "../geometry/ellipse.js";
+import { BUILTIN_SHAPES } from "../shapes/index.js";
 import { resolvePosition } from "./position.js";
 //#region src/compile/node.ts
 var DEFAULT_FONT_SIZE = 14;
@@ -10,7 +7,6 @@ var DEFAULT_LINE_HEIGHT_FACTOR = 1.2;
 var DEG_TO_RAD = Math.PI / 180;
 /** Node label 与 node 边界默认距离（TikZ 默认 0pt 视觉太贴） */
 var DEFAULT_LABEL_DISTANCE = 12;
-var SQRT2 = Math.SQRT2;
 /** dashed 预设：4 px 实线 + 2 px 间隙循环 */
 var DASHED_PATTERN = [4, 2];
 /** dotted 预设：1 px 圆点 + 2 px 间隙 */
@@ -23,61 +19,28 @@ var resolveDashArray = (dashArray, dashed, dotted) => {
 };
 /** IR align → 文字对齐锚点（start / middle / end） */
 var alignToTextAnchor = (a) => a === "left" ? "start" : a === "right" ? "end" : "middle";
-/** 从 layout 构造 Rect（带 margin 扩张） */
-var rectOf = (layout, marginAdd) => ({
-	x: layout.rect.x,
-	y: layout.rect.y,
-	width: layout.rect.width + 2 * marginAdd,
-	height: layout.rect.height + 2 * marginAdd,
-	rotate: layout.rect.rotate
-});
-/** 从 layout 构造 Circle（radius=外接框边长/2 + margin） */
-var circleOf = (layout, marginAdd) => ({
-	x: layout.rect.x,
-	y: layout.rect.y,
-	radius: layout.rect.width / 2 + marginAdd,
-	rotate: layout.rect.rotate
-});
-/** 从 layout 构造 Ellipse（rx/ry 各加 margin） */
-var ellipseOf = (layout, marginAdd) => ({
-	x: layout.rect.x,
-	y: layout.rect.y,
-	rx: layout.rect.width / 2 + marginAdd,
-	ry: layout.rect.height / 2 + marginAdd,
-	rotate: layout.rect.rotate
-});
-/** 从 layout 构造 Diamond（halfA/halfB 各加 margin） */
-var diamondOf = (layout, marginAdd) => ({
-	x: layout.rect.x,
-	y: layout.rect.y,
-	halfA: layout.rect.width / 2 + marginAdd,
-	halfB: layout.rect.height / 2 + marginAdd,
-	rotate: layout.rect.rotate
-});
+/** 把 Rect 各方向外扩 m（margin generic：所有 shape 都 w+2m, h+2m，由 boundaryPointOf 调用前膨胀） */
+var inflateRect = (r, m) => m === 0 ? r : {
+	x: r.x,
+	y: r.y,
+	width: r.width + 2 * m,
+	height: r.height + 2 * m,
+	rotate: r.rotate
+};
 /**
 * 取节点 shape 在 toward 方向的附着点（path 端点贴边用）
-* @description 按 shape 多态调用各自 boundaryPoint；margin > 0 时形状先外扩，让 path 在 border 外停 margin
+* @description 走 shapeDef.boundaryPoint；margin > 0 时先膨胀外接 Rect，让 path 在 border 外停 margin
 */
-var boundaryPointOf = (layout, toward) => {
-	const m = layout.margin;
-	switch (layout.shape) {
-		case "rectangle": return rect.boundaryPoint(rectOf(layout, m), toward);
-		case "circle": return circle.boundaryPoint(circleOf(layout, m), toward);
-		case "ellipse": return ellipse.boundaryPoint(ellipseOf(layout, m), toward);
-		case "diamond": return diamond.boundaryPoint(diamondOf(layout, m), toward);
-	}
-};
+var boundaryPointOf = (layout, toward) => layout.shapeDef.boundaryPoint(inflateRect(layout.rect, layout.margin), toward);
 /**
-* 取节点 shape 命名 anchor（center / north / east / north-east 等 9 个）
-* @description 不应用 margin——TikZ 语义中 explicit anchor 取视觉边界点不涉及 outer sep；用于 `'A.north'` 落点
+* 取节点 shape 命名 anchor（center / north / east / north-east 等）
+* @description 不应用 margin——TikZ 语义中 explicit anchor 取视觉边界点不涉及 outer sep；用于 `'A.north'` 落点。
+*   shapeDef.anchor 不认识的名字返回 undefined，此处抛 Unknown anchor（列出 shape 名）
 */
 var anchorOf = (layout, name) => {
-	switch (layout.shape) {
-		case "rectangle": return rect.anchor(rectOf(layout, 0), name);
-		case "circle": return circle.anchor(circleOf(layout, 0), name);
-		case "ellipse": return ellipse.anchor(ellipseOf(layout, 0), name);
-		case "diamond": return diamond.anchor(diamondOf(layout, 0), name);
-	}
+	const p = layout.shapeDef.anchor(layout.rect, name);
+	if (p === void 0) throw new Error(`Unknown anchor '${name}' for shape '${layout.shapeName}'`);
+	return p;
 };
 /** 8 方向 label position → (anchorName, 单位向量)；above 视觉上方即 y 减小 */
 var LABEL_DIRECTION_MAP = {
@@ -115,19 +78,51 @@ var LABEL_DIRECTION_MAP = {
 	}
 };
 /**
-* 算 label 中心点
-* @description 8 方向：节点对应 anchor 出发按单位向量 × distance 外推；数字角度：先取 angleBoundary 边界点再沿 (cos,sin) × distance 外推
+* 算 label 中心点（节点局部坐标系，未旋转）
+* @description 8 方向：节点对应 anchor 出发按单位向量 × distance 外推；数字角度：先取 angleBoundary 边界点再沿 (cos,sin) × distance 外推。
+*   两个分支都在 **axis-aligned rect（rotate=0）** 上算——node 自身 rotate 由外层 GroupPrim 统一施加；
+*   若用带 rotate 的 rect，label 位置会被 anchorOf / angleBoundaryOf 旋转一次、再被外层 group 旋转一次（双重旋转）。
+*   anchorOf / angleBoundaryOf 本身不改（path anchor `'A.north'` / `'A.30'` 仍需带 rotate 的 rect）。
 */
 var labelCenter = (layout, label) => {
+	const aaLayout = {
+		...layout,
+		rect: {
+			...layout.rect,
+			rotate: 0
+		}
+	};
 	if (typeof label.position === "number") {
 		const rad = label.position * Math.PI / 180;
-		const [bx, by] = angleBoundaryOf(layout, label.position);
+		const [bx, by] = angleBoundaryOf(aaLayout, label.position);
 		return [bx + Math.cos(rad) * label.distance, by + Math.sin(rad) * label.distance];
 	}
 	const { anchor, vec } = LABEL_DIRECTION_MAP[label.position];
-	const [bx, by] = anchorOf(layout, anchor);
+	const [bx, by] = anchorOf(aaLayout, anchor);
 	return [bx + vec[0] * label.distance, by + vec[1] * label.distance];
 };
+/** 角度换算常量（弧度 → 度） */
+var RAD_TO_DEG = 180 / Math.PI;
+/**
+* 算 label 文本自旋角度（度，屏幕 y-down，节点局部系）
+* @description radial = atan2(label中心 − node中心)；tangent = radial + 90；number = 原值；none / 缺省 = 0。
+*   keepUpright 时把"偏离正立 > 90°"的角度翻 180° 保阅读方向。方向向量在局部坐标算，node 自身 rotate 由外层 group 叠加。
+*/
+var resolveLabelRotateDeg = (label, lx, ly, cx, cy) => {
+	const mode = label.rotate;
+	if (mode === void 0 || mode === "none") return 0;
+	let deg;
+	if (typeof mode === "number") deg = mode;
+	else {
+		const radial = Math.atan2(ly - cy, lx - cx) * RAD_TO_DEG;
+		deg = mode === "tangent" ? radial + 90 : radial;
+	}
+	if (label.keepUpright) {
+		const norm = (deg % 360 + 360) % 360;
+		if (norm > 90 && norm < 270) deg += 180;
+	}
+	return deg;
+};
 /**
 * 取节点 shape 在指定角度方向的边界点
 * @description 角度是节点**局部坐标系**下的极角（度数：0°=局部 +x，90°=局部 +y）。layout.rect.rotate 把局部基绕中心旋转，得到世界系下的视觉方向；shape boundaryPoint 内部用 rotate-aware 投影，所以这里把局部 (cos, sin) 经 rect.rotate 旋转后加到中心当作世界系 toward 传入。不应用 margin（同 anchorOf）；用于 `'A.30'` 落点
@@ -140,12 +135,7 @@ var angleBoundaryOf = (layout, angleDeg) => {
 	const cosR = Math.cos(rot);
 	const sinR = Math.sin(rot);
 	const toward = [layout.rect.x + lx * cosR - ly * sinR, layout.rect.y + lx * sinR + ly * cosR];
-	switch (layout.shape) {
-		case "rectangle": return rect.boundaryPoint(rectOf(layout, 0), toward);
-		case "circle": return circle.boundaryPoint(circleOf(layout, 0), toward);
-		case "ellipse": return ellipse.boundaryPoint(ellipseOf(layout, 0), toward);
-		case "diamond": return diamond.boundaryPoint(diamondOf(layout, 0), toward);
-	}
+	return layout.shapeDef.boundaryPoint(layout.rect, toward);
 };
 /**
 * IR Node → 内部 NodeLayout
@@ -154,7 +144,10 @@ var angleBoundaryOf = (layout, angleDeg) => {
 *   scope 局部度量），调用方负责后续 `projectLayoutToGlobal` / `applyTransformChain` 投回全局；
 *   笛卡尔字面量 `Position` 已在 scope 局部度量，行为延续 v0.1。
 */
-var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = [], labelDefault) => {
+var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = [], labelDefault, shapes = BUILTIN_SHAPES) => {
+	const shapeName = node.shape ?? "rectangle";
+	const shapeDef = Object.prototype.hasOwnProperty.call(shapes, shapeName) ? shapes[shapeName] : void 0;
+	if (!shapeDef) throw new Error(`Unknown shape '${shapeName}'; registered shapes: ${Object.keys(shapes).sort().join(", ")}`);
 	const sx = node.xScale ?? node.scale ?? 1;
 	const sy = node.yScale ?? node.scale ?? 1;
 	const fontScale = Math.min(sx, sy);
@@ -201,29 +194,7 @@ var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = [], l
 	const minH = node.minimumHeight ?? node.minimumSize ?? 0;
 	const innerHalfW = Math.max(textWidth / 2 + xSep, xSep, minW / 2);
 	const innerHalfH = Math.max(textHeight / 2 + ySep, ySep, minH / 2);
-	const shape = node.shape ?? "rectangle";
-	let boundsHalfW;
-	let boundsHalfH;
-	switch (shape) {
-		case "rectangle":
-			boundsHalfW = innerHalfW;
-			boundsHalfH = innerHalfH;
-			break;
-		case "circle": {
-			const r = Math.sqrt(innerHalfW * innerHalfW + innerHalfH * innerHalfH);
-			boundsHalfW = r;
-			boundsHalfH = r;
-			break;
-		}
-		case "ellipse":
-			boundsHalfW = innerHalfW * SQRT2;
-			boundsHalfH = innerHalfH * SQRT2;
-			break;
-		case "diamond":
-			boundsHalfW = innerHalfW * 2;
-			boundsHalfH = innerHalfH * 2;
-			break;
-	}
+	const { halfWidth: boundsHalfW, halfHeight: boundsHalfH } = shapeDef.circumscribe(innerHalfW, innerHalfH);
 	const rotateDeg = node.rotate ?? 0;
 	const center = resolvePosition(node.position, nameStack, nodeDistance, scopeChain);
 	if (!center) throw new Error(`Cannot resolve position for node ${node.id ?? "(unnamed)"}; polar.origin or at.of may reference an undefined node`);
@@ -238,12 +209,15 @@ var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = [], l
 			fontSize: (labFont?.size ?? labelDefault?.font?.size ?? baseFontSize) * fontScale,
 			fontFamily: labFont?.family ?? labelDefault?.font?.family ?? fontFamily,
 			fontWeight: labFont?.weight ?? labelDefault?.font?.weight ?? fontWeight,
-			fontStyle: labFont?.style ?? labelDefault?.font?.style ?? fontStyle
+			fontStyle: labFont?.style ?? labelDefault?.font?.style ?? fontStyle,
+			rotate: lab.rotate,
+			keepUpright: lab.keepUpright
 		};
 	});
 	return {
 		id: node.id,
-		shape,
+		shapeName,
+		shapeDef,
 		rect: {
 			x: center[0],
 			y: center[1],
@@ -274,97 +248,28 @@ var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = [], l
 		labels
 	};
 };
-/** rectangle → RectPrim */
-var emitRectShape = (layout, round) => {
-	const halfW = layout.rect.width / 2;
-	const halfH = layout.rect.height / 2;
-	return {
-		type: "rect",
-		x: round(layout.rect.x - halfW),
-		y: round(layout.rect.y - halfH),
-		width: round(layout.rect.width),
-		height: round(layout.rect.height),
-		fill: layout.fill ?? "transparent",
-		fillOpacity: layout.fillOpacity,
-		stroke: layout.stroke ?? "currentColor",
-		strokeOpacity: layout.strokeOpacity,
-		strokeWidth: layout.strokeWidth ?? 1,
-		dashPattern: layout.dashPattern,
-		cornerRadius: layout.roundedCorners,
-		opacity: layout.opacity
-	};
-};
-/** circle/ellipse → EllipsePrim（圆形 rx=ry） */
-var emitEllipseShape = (layout, round) => ({
-	type: "ellipse",
-	cx: round(layout.rect.x),
-	cy: round(layout.rect.y),
-	rx: round(layout.rect.width / 2),
-	ry: round(layout.rect.height / 2),
-	fill: layout.fill ?? "transparent",
+/** 从 NodeLayout 收敛 emit 所需的视觉样式子集（ShapeStyle，不含几何 / 文本） */
+var toShapeStyle = (layout) => ({
+	fill: layout.fill,
 	fillOpacity: layout.fillOpacity,
-	stroke: layout.stroke ?? "currentColor",
+	stroke: layout.stroke,
 	strokeOpacity: layout.strokeOpacity,
-	strokeWidth: layout.strokeWidth ?? 1,
+	strokeWidth: layout.strokeWidth,
 	dashPattern: layout.dashPattern,
+	roundedCorners: layout.roundedCorners,
 	opacity: layout.opacity
 });
-/** diamond → PathPrim（4 顶点 + close 闭合） */
-var emitDiamondShape = (layout, round) => {
-	const diam = diamondOf(layout, 0);
-	const e = diamond.anchor(diam, "east");
-	const n = diamond.anchor(diam, "north");
-	const w = diamond.anchor(diam, "west");
-	const s = diamond.anchor(diam, "south");
-	return {
-		type: "path",
-		commands: [
-			{
-				kind: "move",
-				to: [round(e[0]), round(e[1])]
-			},
-			{
-				kind: "line",
-				to: [round(n[0]), round(n[1])]
-			},
-			{
-				kind: "line",
-				to: [round(w[0]), round(w[1])]
-			},
-			{
-				kind: "line",
-				to: [round(s[0]), round(s[1])]
-			},
-			{ kind: "close" }
-		],
-		fill: layout.fill ?? "transparent",
-		fillOpacity: layout.fillOpacity,
-		stroke: layout.stroke ?? "currentColor",
-		strokeOpacity: layout.strokeOpacity,
-		strokeWidth: layout.strokeWidth ?? 1,
-		dashPattern: layout.dashPattern,
-		opacity: layout.opacity
-	};
-};
 /**
 * NodeLayout → Scene primitives
-* @description shape 主体按 shape 分发（rect/ellipse/path）；text 始终走 TextPrim；有旋转时外层 GroupPrim 用 `rotate(deg cx cy)` 统一包裹（text 必须靠 group 旋转）
+* @description shape 主体走 `shapeDef.emit`（收轴对齐 rect、可出多 primitive）；text 始终走 TextPrim；
+*   有旋转时外层 GroupPrim 用 `rotate(deg cx cy)` 统一包裹 shape + text（diamond 顶点 / text 都靠 group 旋转）
 */
 var emitNodePrimitives = (layout, round) => {
-	let shapePrim;
-	switch (layout.shape) {
-		case "rectangle":
-			shapePrim = emitRectShape(layout, round);
-			break;
-		case "circle":
-		case "ellipse":
-			shapePrim = emitEllipseShape(layout, round);
-			break;
-		case "diamond":
-			shapePrim = emitDiamondShape(unrotated(layout), round);
-			break;
-	}
-	const inner = [shapePrim];
+	const axisAlignedRect = {
+		...layout.rect,
+		rotate: 0
+	};
+	const inner = [...layout.shapeDef.emit(axisAlignedRect, toShapeStyle(layout), round)];
 	if (layout.lines) {
 		const halfBlockW = layout.textWidth / 2;
 		const xOffset = layout.align === "start" ? -halfBlockW : layout.align === "end" ? halfBlockW : 0;
@@ -386,45 +291,54 @@ var emitNodePrimitives = (layout, round) => {
 			measuredHeight: round(layout.textHeight)
 		});
 	}
-	if (layout.labels) for (const lab of layout.labels) {
-		const [lx, ly] = labelCenter(layout, lab);
-		inner.push({
-			type: "text",
-			x: round(lx),
-			y: round(ly),
-			lines: [{ text: lab.text }],
-			fontSize: lab.fontSize,
-			fontFamily: lab.fontFamily,
-			fontWeight: lab.fontWeight,
-			fontStyle: lab.fontStyle,
-			align: "middle",
-			baseline: "middle",
-			lineHeight: round(lab.fontSize * DEFAULT_LINE_HEIGHT_FACTOR),
-			fill: lab.textColor ?? "currentColor",
-			opacity: lab.opacity ?? layout.opacity,
-			measuredWidth: 0,
-			measuredHeight: round(lab.fontSize)
-		});
+	if (layout.labels) {
+		const cx = layout.rect.x;
+		const cy = layout.rect.y;
+		for (const lab of layout.labels) {
+			const [lx, ly] = labelCenter(layout, lab);
+			const textPrim = {
+				type: "text",
+				x: round(lx),
+				y: round(ly),
+				lines: [{ text: lab.text }],
+				fontSize: lab.fontSize,
+				fontFamily: lab.fontFamily,
+				fontWeight: lab.fontWeight,
+				fontStyle: lab.fontStyle,
+				align: "middle",
+				baseline: "middle",
+				lineHeight: round(lab.fontSize * DEFAULT_LINE_HEIGHT_FACTOR),
+				fill: lab.textColor ?? "currentColor",
+				opacity: lab.opacity ?? layout.opacity,
+				measuredWidth: 0,
+				measuredHeight: round(lab.fontSize)
+			};
+			const deg = resolveLabelRotateDeg(lab, lx, ly, cx, cy);
+			if (deg === 0) inner.push(textPrim);
+			else inner.push({
+				type: "group",
+				transforms: [{
+					kind: "rotate",
+					degrees: round(deg),
+					cx: round(lx),
+					cy: round(ly)
+				}],
+				children: [textPrim]
+			});
+		}
 	}
-	if (layout.rotateDeg === 0) return inner;
-	return [{
+	if (!(layout.rotateDeg !== 0 || layout.lines !== void 0)) return inner;
+	const group = {
 		type: "group",
-		transforms: [{
-			kind: "rotate",
-			degrees: round(layout.rotateDeg),
-			cx: round(layout.rect.x),
-			cy: round(layout.rect.y)
-		}],
 		children: inner
+	};
+	if (layout.rotateDeg !== 0) group.transforms = [{
+		kind: "rotate",
+		degrees: round(layout.rotateDeg),
+		cx: round(layout.rect.x),
+		cy: round(layout.rect.y)
 	}];
+	return [group];
 };
-/** layout 的"未旋转"副本，让 diamond 顶点先按未旋转算，外层 group 统一旋转 */
-var unrotated = (layout) => ({
-	...layout,
-	rect: {
-		...layout.rect,
-		rotate: 0
-	}
-});
 //#endregion
 export { anchorOf, angleBoundaryOf, boundaryPointOf, emitNodePrimitives, layoutNode };

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;AAC9C,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,UAeF,CAAC"}
+{"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,UAgBF,CAAC"}

package/dist/es/compile/scope.js

@@ -1,4 +1,5 @@
 import { rect } from "../geometry/rect.js";
+import { BUILTIN_SHAPES } from "../shapes/index.js";
 import { resolvePosition } from "./position.js";
 //#region src/compile/scope.ts
 /**
@@ -235,7 +236,8 @@ var registerScopeAsLayout = (id, bbox, fallbackOrigin) => {
 	};
 	return {
 		id,
-		shape: "rectangle",
+		shapeName: "rectangle",
+		shapeDef: BUILTIN_SHAPES.rectangle,
 		rect: {
 			x: box.x,
 			y: box.y,

package/dist/es/index.d.ts

@@ -3,7 +3,7 @@
  * @description 任何 framework adapter（@retikz/react、@retikz/vue、@retikz/canvas、@retikz/ssr）只能 import 本文件导出内容，不准走子路径。本包零 React/零 DOM 依赖
  */
 export { PositionSchema, PolarPositionSchema, AtPositionSchema, OffsetPositionSchema, AT_DIRECTIONS, TargetSchema, RelativeTargetSchema, RelativeAccumulateTargetSchema, MoveStepSchema, LineStepSchema, FoldStepSchema, CycleStepSchema, CurveStepSchema, CubicStepSchema, BendStepSchema, ArcStepSchema, CirclePathStepSchema, EllipsePathStepSchema, ControlPointSchema, StepLabelSchema, StepSchema, NodeSchema, NodeLabelSchema, CoordinateSchema, FontSchema, TextBlockSchema, LineSpecSchema, PathSchema, ArrowDetailSchema, ArrowEndDetailSchema, ScopeSchema, NodeDefaultSchema, PathDefaultSchema, LabelDefaultSchema, ArrowDefaultSchema, TransformSchema, ChildSchema, SceneSchema, CURRENT_IR_VERSION, } from './ir';
-export type { IRPosition, IRAtPosition, IROffsetPosition, AtDirection, IRTarget, IRRelativeTarget, IRRelativeAccumulateTarget, IRMoveStep, IRLineStep, IRFoldStep, IRCycleStep, IRCurveStep, IRCubicStep, IRBendStep, IRArcStep, IRCirclePathStep, IREllipsePathStep, IRControlPoint, IRStepLabel, IRStep, IRNode, IRNodeLabel, IRCoordinate, IRFont, IRLineSpec, IRTextBlock, IRPath, IRScope, IRNodeDefault, IRPathDefault, IRLabelDefault, IRArrowDefault, StyleChannel, IRTransform, IRTranslateTransform, IRPolarTranslateTransform, IRAtTranslateTransform, IROffsetTranslateTransform, IRRotateTransform, IRScaleTransform, IRChild, IR, ArrowShape, IRArrowDetail, IRArrowEndDetail, NodeShape, NodeTextAlign, } from './ir';
+export type { IRPosition, IRAtPosition, IROffsetPosition, AtDirection, IRTarget, IRRelativeTarget, IRRelativeAccumulateTarget, IRMoveStep, IRLineStep, IRFoldStep, IRCycleStep, IRCurveStep, IRCubicStep, IRBendStep, IRArcStep, IRCirclePathStep, IREllipsePathStep, IRControlPoint, IRStepLabel, IRStep, IRNode, IRNodeLabel, IRCoordinate, IRFont, IRLineSpec, IRTextBlock, IRPath, IRScope, IRNodeDefault, IRPathDefault, IRLabelDefault, IRArrowDefault, StyleChannel, IRTransform, IRTranslateTransform, IRPolarTranslateTransform, IRAtTranslateTransform, IROffsetTranslateTransform, IRRotateTransform, IRScaleTransform, IRChild, IR, ArrowShape, IRArrowDetail, IRArrowEndDetail, NodeShape, BuiltinShapeName, NodeTextAlign, } from './ir';
 export { ARROW_SHAPES, DEFAULT_ARROW_SHAPE, HOLLOW_ARROW_SHAPES, ARROW_MARKER_DEFAULT_SIZE, ARROW_MARKER_HOLLOW_DEFAULT_LINE_WIDTH, NODE_SHAPES, NODE_TEXT_ALIGNS, } from './ir';
 export type { ScenePrimitive, RectPrim, EllipsePrim, TextPrim, TextLine, PathPrim, PathCommand, 
 /** 7 个 named PathCommand 分支（便于 wrapper / Pick<>） */
@@ -16,5 +16,7 @@ export type { WayItem, WayDSL, WayCycle, WayVia, WayRelativeItem, WayLabel, WayL
 export { parseWay, DrawWay, parseTargetSugar } from './parsers';
 export type { Position, Rect, RectAnchor, Circle, Ellipse, Diamond, PolarPosition, } from './geometry';
 export { point, rect, circle, ellipse, diamond, RECT_ANCHORS, polar } from './geometry';
+export type { ShapeDefinition, ShapeStyle } from './shapes';
+export { BUILTIN_SHAPES, worldToLocal, localToWorld } from './shapes';
 export type { ValueOf, AssertEqual } from './types';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;GAGG;AAGH,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,gBAAgB,EAChB,oBAAoB,EACpB,aAAa,EACb,YAAY,EACZ,oBAAoB,EACpB,8BAA8B,EAC9B,cAAc,EACd,cAAc,EACd,cAAc,EACd,eAAe,EACf,eAAe,EACf,eAAe,EACf,cAAc,EACd,aAAa,EACb,oBAAoB,EACpB,qBAAqB,EACrB,kBAAkB,EAClB,eAAe,EACf,UAAU,EACV,UAAU,EACV,eAAe,EACf,gBAAgB,EAChB,UAAU,EACV,eAAe,EACf,cAAc,EACd,UAAU,EACV,iBAAiB,EACjB,oBAAoB,EACpB,WAAW,EACX,iBAAiB,EACjB,iBAAiB,EACjB,kBAAkB,EAClB,kBAAkB,EAClB,eAAe,EACf,WAAW,EACX,WAAW,EACX,kBAAkB,GACnB,MAAM,MAAM,CAAC;AACd,YAAY,EACV,UAAU,EACV,YAAY,EACZ,gBAAgB,EAChB,WAAW,EACX,QAAQ,EACR,gBAAgB,EAChB,0BAA0B,EAC1B,UAAU,EACV,UAAU,EACV,UAAU,EACV,WAAW,EACX,WAAW,EACX,WAAW,EACX,UAAU,EACV,SAAS,EACT,gBAAgB,EAChB,iBAAiB,EACjB,cAAc,EACd,WAAW,EACX,MAAM,EACN,MAAM,EACN,WAAW,EACX,YAAY,EACZ,MAAM,EACN,UAAU,EACV,WAAW,EACX,MAAM,EACN,OAAO,EACP,aAAa,EACb,aAAa,EACb,cAAc,EACd,cAAc,EACd,YAAY,EACZ,WAAW,EACX,oBAAoB,EACpB,yBAAyB,EACzB,sBAAsB,EACtB,0BAA0B,EAC1B,iBAAiB,EACjB,gBAAgB,EAChB,OAAO,EACP,EAAE,EACF,UAAU,EACV,aAAa,EACb,gBAAgB,EAChB,SAAS,EACT,aAAa,GACd,MAAM,MAAM,CAAC;AACd,OAAO,EACL,YAAY,EACZ,mBAAmB,EACnB,mBAAmB,EACnB,yBAAyB,EACzB,sCAAsC,EACtC,WAAW,EACX,gBAAgB,GACjB,MAAM,MAAM,CAAC;AAGd,YAAY,EACV,cAAc,EACd,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,WAAW;AACX,oDAAoD;AACpD,eAAe,EACf,eAAe,EACf,eAAe,EACf,gBAAgB,EAChB,cAAc,EACd,qBAAqB,EACrB,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,SAAS;AACT,6BAA6B;AAC7B,kBAAkB,EAClB,eAAe,EACf,cAAc,EACd,MAAM,EACN,KAAK,GACN,MAAM,aAAa,CAAC;AAGrB,YAAY,EACV,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,cAAc,EACd,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG5E,YAAY,EACV,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,EACN,eAAe,EACf,QAAQ,EACR,UAAU,GACX,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAIhE,YAAY,EACV,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,MAAM,EACN,OAAO,EACP,OAAO,EACP,aAAa,GACd,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxF,YAAY,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package/dist/es/index.js

@@ -13,10 +13,12 @@ import { CoordinateSchema } from "./ir/coordinate.js";
 import { TransformSchema } from "./ir/transform.js";
 import { ArrowDefaultSchema, LabelDefaultSchema, NodeDefaultSchema, PathDefaultSchema, ScopeSchema } from "./ir/scope.js";
 import { CURRENT_IR_VERSION, ChildSchema, SceneSchema } from "./ir/scene.js";
+import { localToWorld, worldToLocal } from "./geometry/_transform.js";
 import { RECT_ANCHORS, rect } from "./geometry/rect.js";
 import { circle } from "./geometry/circle.js";
-import { diamond } from "./geometry/diamond.js";
 import { ellipse } from "./geometry/ellipse.js";
+import { diamond } from "./geometry/diamond.js";
+import { BUILTIN_SHAPES } from "./shapes/index.js";
 import { fallbackMeasurer } from "./compile/text-metrics.js";
 import { computeLayout } from "./compile/layout.js";
 import { compileToScene } from "./compile/compile.js";
@@ -24,4 +26,4 @@ import { parseTargetSugar } from "./parsers/parseTargetSugar.js";
 import { DrawWay, parseWay } from "./parsers/parseWay.js";
 import { polar } from "./geometry/polar.js";
 import { point } from "./geometry/point.js";
-export { ARROW_MARKER_DEFAULT_SIZE, ARROW_MARKER_HOLLOW_DEFAULT_LINE_WIDTH, ARROW_SHAPES, AT_DIRECTIONS, ArcStepSchema, ArrowDefaultSchema, ArrowDetailSchema, ArrowEndDetailSchema, AtPositionSchema, BendStepSchema, CURRENT_IR_VERSION, ChildSchema, CirclePathStepSchema, ControlPointSchema, CoordinateSchema, CubicStepSchema, CurveStepSchema, CycleStepSchema, DEFAULT_ARROW_SHAPE, DrawWay, EllipsePathStepSchema, FoldStepSchema, FontSchema, HOLLOW_ARROW_SHAPES, LabelDefaultSchema, LineSpecSchema, LineStepSchema, MoveStepSchema, NODE_SHAPES, NODE_TEXT_ALIGNS, NodeDefaultSchema, NodeLabelSchema, NodeSchema, OffsetPositionSchema, PathDefaultSchema, PathSchema, PolarPositionSchema, PositionSchema, RECT_ANCHORS, RelativeAccumulateTargetSchema, RelativeTargetSchema, SceneSchema, ScopeSchema, StepLabelSchema, StepSchema, TargetSchema, TextBlockSchema, TransformSchema, circle, compileToScene, computeLayout, diamond, ellipse, fallbackMeasurer, parseTargetSugar, parseWay, point, polar, rect };
+export { ARROW_MARKER_DEFAULT_SIZE, ARROW_MARKER_HOLLOW_DEFAULT_LINE_WIDTH, ARROW_SHAPES, AT_DIRECTIONS, ArcStepSchema, ArrowDefaultSchema, ArrowDetailSchema, ArrowEndDetailSchema, AtPositionSchema, BUILTIN_SHAPES, BendStepSchema, CURRENT_IR_VERSION, ChildSchema, CirclePathStepSchema, ControlPointSchema, CoordinateSchema, CubicStepSchema, CurveStepSchema, CycleStepSchema, DEFAULT_ARROW_SHAPE, DrawWay, EllipsePathStepSchema, FoldStepSchema, FontSchema, HOLLOW_ARROW_SHAPES, LabelDefaultSchema, LineSpecSchema, LineStepSchema, MoveStepSchema, NODE_SHAPES, NODE_TEXT_ALIGNS, NodeDefaultSchema, NodeLabelSchema, NodeSchema, OffsetPositionSchema, PathDefaultSchema, PathSchema, PolarPositionSchema, PositionSchema, RECT_ANCHORS, RelativeAccumulateTargetSchema, RelativeTargetSchema, SceneSchema, ScopeSchema, StepLabelSchema, StepSchema, TargetSchema, TextBlockSchema, TransformSchema, circle, compileToScene, computeLayout, diamond, ellipse, fallbackMeasurer, localToWorld, parseTargetSugar, parseWay, point, polar, rect, worldToLocal };