@retikz/core 0.2.0-alpha.1 → 0.2.0-alpha.3

package/dist/lib/compile/node.cjs

@@ -1,7 +1,4 @@
-const require_rect = require("../geometry/rect.cjs");
-const require_circle = require("../geometry/circle.cjs");
-const require_diamond = require("../geometry/diamond.cjs");
-const require_ellipse = require("../geometry/ellipse.cjs");
+const require_index = require("../shapes/index.cjs");
 const require_position = require("./position.cjs");
 //#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 require_rect.rect.boundaryPoint(rectOf(layout, m), toward);
-		case "circle": return require_circle.circle.boundaryPoint(circleOf(layout, m), toward);
-		case "ellipse": return require_ellipse.ellipse.boundaryPoint(ellipseOf(layout, m), toward);
-		case "diamond": return require_diamond.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 require_rect.rect.anchor(rectOf(layout, 0), name);
-		case "circle": return require_circle.circle.anchor(circleOf(layout, 0), name);
-		case "ellipse": return require_ellipse.ellipse.anchor(ellipseOf(layout, 0), name);
-		case "diamond": return require_diamond.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 = {
@@ -140,12 +103,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 require_rect.rect.boundaryPoint(rectOf(layout, 0), toward);
-		case "circle": return require_circle.circle.boundaryPoint(circleOf(layout, 0), toward);
-		case "ellipse": return require_ellipse.ellipse.boundaryPoint(ellipseOf(layout, 0), toward);
-		case "diamond": return require_diamond.diamond.boundaryPoint(diamondOf(layout, 0), toward);
-	}
+	return layout.shapeDef.boundaryPoint(layout.rect, toward);
 };
 /**
 * IR Node → 内部 NodeLayout
@@ -154,7 +112,10 @@ var angleBoundaryOf = (layout, angleDeg) => {
 *   scope 局部度量），调用方负责后续 `projectLayoutToGlobal` / `applyTransformChain` 投回全局；
 *   笛卡尔字面量 `Position` 已在 scope 局部度量，行为延续 v0.1。
 */
-var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = []) => {
+var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = [], labelDefault, shapes = require_index.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 +162,7 @@ var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = []) =
 	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 = require_position.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`);
@@ -233,17 +172,18 @@ var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = []) =
 			text: lab.text,
 			position: lab.position ?? "above",
 			distance: lab.distance ?? DEFAULT_LABEL_DISTANCE,
-			textColor: lab.textColor ?? node.textColor,
-			opacity: lab.opacity,
-			fontSize: (labFont?.size ?? baseFontSize) * fontScale,
-			fontFamily: labFont?.family ?? fontFamily,
-			fontWeight: labFont?.weight ?? fontWeight,
-			fontStyle: labFont?.style ?? fontStyle
+			textColor: lab.textColor ?? labelDefault?.textColor ?? labelDefault?.color ?? node.textColor,
+			opacity: lab.opacity ?? labelDefault?.opacity,
+			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
 		};
 	});
 	return {
 		id: node.id,
-		shape,
+		shapeName,
+		shapeDef,
 		rect: {
 			x: center[0],
 			y: center[1],
@@ -274,97 +214,28 @@ var layoutNode = (node, measureText, nameStack, nodeDistance, scopeChain = []) =
 		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 = require_diamond.diamond.anchor(diam, "east");
-	const n = require_diamond.diamond.anchor(diam, "north");
-	const w = require_diamond.diamond.anchor(diam, "west");
-	const s = require_diamond.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;
@@ -418,14 +289,6 @@ var emitNodePrimitives = (layout, round) => {
 		children: inner
 	}];
 };
-/** layout 的"未旋转"副本，让 diamond 顶点先按未旋转算，外层 group 统一旋转 */
-var unrotated = (layout) => ({
-	...layout,
-	rect: {
-		...layout.rect,
-		rotate: 0
-	}
-});
 //#endregion
 exports.anchorOf = anchorOf;
 exports.angleBoundaryOf = angleBoundaryOf;

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

@@ -1,14 +1,17 @@
 import { Position } from '../geometry/point';
-import { Rect, RectAnchor } from '../geometry/rect';
-import { AtDirection, IRNode, NodeShape } from '../ir';
+import { Rect } from '../geometry/rect';
+import { AtDirection, IRLabelDefault, IRNode } from '../ir';
 import { ScenePrimitive, TextLine, Transform } from '../primitive';
+import { ShapeDefinition } from '../shapes';
 import { NameStack } from './name-stack';
 import { TextMeasurer } from './text-metrics';
 export type NodeLayout = {
     /** 节点 id（其他位置可引用） */
     id?: string;
-    /** 节点形状，所有几何 / boundaryPoint 按 shape 多态 */
-    shape: NodeShape;
+    /** 节点形状名（诊断 / 错误信息用；几何走 shapeDef） */
+    shapeName: string;
+    /** 已解析的 shape 定义；circumscribe / boundaryPoint / anchor / emit 多点复用，取代旧 switch */
+    shapeDef: ShapeDefinition;
     /**
      * 节点视觉边界框（所有 shape 共享语义）
      * @description rectangle: rect 本身；circle: width=height=2×radius；ellipse: 2×rx,2×ry；diamond: 2×halfA,2×halfB。x,y 是几何中心，rotate 弧度
@@ -79,14 +82,15 @@ export type NodeLabelLayout = {
 };
 /**
  * 取节点 shape 在 toward 方向的附着点（path 端点贴边用）
- * @description 按 shape 多态调用各自 boundaryPoint；margin > 0 时形状先外扩，让 path 在 border 外停 margin
+ * @description 走 shapeDef.boundaryPoint；margin > 0 时先膨胀外接 Rect，让 path 在 border 外停 margin
  */
 export declare const boundaryPointOf: (layout: NodeLayout, toward: Position) => Position;
 /**
- * 取节点 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 名）
  */
-export declare const anchorOf: (layout: NodeLayout, name: RectAnchor) => Position;
+export declare const anchorOf: (layout: NodeLayout, name: string) => Position;
 /**
  * 取节点 shape 在指定角度方向的边界点
  * @description 角度是节点**局部坐标系**下的极角（度数：0°=局部 +x，90°=局部 +y）。layout.rect.rotate 把局部基绕中心旋转，得到世界系下的视觉方向；shape boundaryPoint 内部用 rotate-aware 投影，所以这里把局部 (cos, sin) 经 rect.rotate 旋转后加到中心当作世界系 toward 传入。不应用 margin（同 anchorOf）；用于 `'A.30'` 落点
@@ -99,10 +103,11 @@ export declare const angleBoundaryOf: (layout: NodeLayout, angleDeg: number) =>
  *   scope 局部度量），调用方负责后续 `projectLayoutToGlobal` / `applyTransformChain` 投回全局；
  *   笛卡尔字面量 `Position` 已在 scope 局部度量，行为延续 v0.1。
  */
-export declare const layoutNode: (node: IRNode, measureText: TextMeasurer, nameStack: NameStack, nodeDistance?: number, scopeChain?: ReadonlyArray<Transform>) => NodeLayout;
+export declare const layoutNode: (node: IRNode, measureText: TextMeasurer, nameStack: NameStack, nodeDistance?: number, scopeChain?: ReadonlyArray<Transform>, labelDefault?: IRLabelDefault, shapes?: Record<string, ShapeDefinition>) => NodeLayout;
 /**
  * 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 旋转）
  */
 export declare const emitNodePrimitives: (layout: NodeLayout, round: (n: number) => number) => Array<ScenePrimitive>;
 //# sourceMappingURL=node.d.ts.map

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

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

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

@@ -47,7 +47,7 @@ var emitPathPrimitive = (path, nameStack, 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);
 	};

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/scope.cjs

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

package/dist/lib/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"}