@retikz/react 0.1.0-alpha.1 → 0.1.0-alpha.3

package/dist/es/kernel/_displayNames.js

@@ -5,5 +5,9 @@ var TIKZ_NODE = "@retikz/Node";
 var TIKZ_PATH = "@retikz/Path";
 /** <Step> 组件的 displayName */
 var TIKZ_STEP = "@retikz/Step";
+/** <Text> 组件的 displayName（Node 内多行文本带样式） */
+var TIKZ_TEXT = "@retikz/Text";
+/** <EdgeLabel> 组件的 displayName（Step 内边标注，ADR-0004） */
+var TIKZ_EDGE_LABEL = "@retikz/EdgeLabel";
 //#endregion
-export { TIKZ_NODE, TIKZ_PATH, TIKZ_STEP };
+export { TIKZ_EDGE_LABEL, TIKZ_NODE, TIKZ_PATH, TIKZ_STEP, TIKZ_TEXT };

package/dist/es/kernel/_unbuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"_unbuilder.d.ts","sourceRoot":"","sources":["../../../src/kernel/_unbuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,EAAE,EAA2B,MAAM,cAAc,CAAC;AA2DhE;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAI,IAAI,EAAE,KAAG,SACW,CAAC"}
+{"version":3,"file":"_unbuilder.d.ts","sourceRoot":"","sources":["../../../src/kernel/_unbuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,SAAS,EAAiB,MAAM,OAAO,CAAC;AACtD,OAAO,KAAK,EAAE,EAAE,EAA2B,MAAM,cAAc,CAAC;AA2JhE;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAI,IAAI,EAAE,KAAG,SACW,CAAC"}

package/dist/es/kernel/_unbuilder.js

@@ -10,12 +10,31 @@ var nodePropsFromIR = (n) => {
 	if (n.shape !== void 0) props.shape = n.shape;
 	if (n.rotate !== void 0) props.rotate = n.rotate;
 	if (n.text !== void 0) props.text = n.text;
-	if (n.fontSize !== void 0) props.fontSize = n.fontSize;
+	if (n.align !== void 0) props.align = n.align;
+	if (n.lineHeight !== void 0) props.lineHeight = n.lineHeight;
+	if (n.font !== void 0) props.font = n.font;
+	if (n.innerXSep !== void 0) props.innerXSep = n.innerXSep;
+	if (n.innerYSep !== void 0) props.innerYSep = n.innerYSep;
+	if (n.outerSep !== void 0) props.outerSep = n.outerSep;
 	if (n.padding !== void 0) props.padding = n.padding;
 	if (n.margin !== void 0) props.margin = n.margin;
 	if (n.fill !== void 0) props.fill = n.fill;
+	if (n.fillOpacity !== void 0) props.fillOpacity = n.fillOpacity;
 	if (n.stroke !== void 0) props.stroke = n.stroke;
+	if (n.drawOpacity !== void 0) props.drawOpacity = n.drawOpacity;
 	if (n.strokeWidth !== void 0) props.strokeWidth = n.strokeWidth;
+	if (n.dashed !== void 0) props.dashed = n.dashed;
+	if (n.dotted !== void 0) props.dotted = n.dotted;
+	if (n.dashArray !== void 0) props.dashArray = n.dashArray;
+	if (n.roundedCorners !== void 0) props.roundedCorners = n.roundedCorners;
+	if (n.minimumWidth !== void 0) props.minimumWidth = n.minimumWidth;
+	if (n.minimumHeight !== void 0) props.minimumHeight = n.minimumHeight;
+	if (n.minimumSize !== void 0) props.minimumSize = n.minimumSize;
+	if (n.scale !== void 0) props.scale = n.scale;
+	if (n.xScale !== void 0) props.xScale = n.xScale;
+	if (n.yScale !== void 0) props.yScale = n.yScale;
+	if (n.textColor !== void 0) props.textColor = n.textColor;
+	if (n.opacity !== void 0) props.opacity = n.opacity;
 	return props;
 };
 /** 单个 IRStep → <Step /> element */
@@ -28,12 +47,63 @@ var stepToElement = (step, key) => {
 		key,
 		kind: "step",
 		via: step.via,
+		to: step.to,
+		...step.label !== void 0 && { label: step.label }
+	});
+	if (step.kind === "curve") return createElement(Step, {
+		key,
+		kind: "curve",
+		to: step.to,
+		control: step.control,
+		...step.label !== void 0 && { label: step.label }
+	});
+	if (step.kind === "cubic") return createElement(Step, {
+		key,
+		kind: "cubic",
+		to: step.to,
+		control1: step.control1,
+		control2: step.control2,
+		...step.label !== void 0 && { label: step.label }
+	});
+	if (step.kind === "bend") return createElement(Step, {
+		key,
+		kind: "bend",
+		to: step.to,
+		bendDirection: step.bendDirection,
+		...step.bendAngle !== void 0 && { bendAngle: step.bendAngle },
+		...step.label !== void 0 && { label: step.label }
+	});
+	if (step.kind === "arc") return createElement(Step, {
+		key,
+		kind: "arc",
+		startAngle: step.startAngle,
+		endAngle: step.endAngle,
+		radius: step.radius,
+		...step.label !== void 0 && { label: step.label }
+	});
+	if (step.kind === "circlePath") return createElement(Step, {
+		key,
+		kind: "circlePath",
+		radius: step.radius,
+		...step.label !== void 0 && { label: step.label }
+	});
+	if (step.kind === "ellipsePath") return createElement(Step, {
+		key,
+		kind: "ellipsePath",
+		radiusX: step.radiusX,
+		radiusY: step.radiusY,
+		...step.label !== void 0 && { label: step.label }
+	});
+	if (step.kind === "move") return createElement(Step, {
+		key,
+		kind: "move",
 		to: step.to
 	});
 	return createElement(Step, {
 		key,
 		kind: step.kind,
-		to: step.to
+		to: step.to,
+		...step.label !== void 0 && { label: step.label }
 	});
 };
 /** discriminated union 兜底：编译期保证不漏 case，运行时给出明确错误 */
@@ -52,10 +122,16 @@ var childToElement = (child, key) => {
 			stroke: child.stroke,
 			strokeWidth: child.strokeWidth,
 			strokeDasharray: child.strokeDasharray,
+			lineCap: child.lineCap,
+			lineJoin: child.lineJoin,
+			thickness: child.thickness,
 			arrow: child.arrow,
 			arrowShape: child.arrowShape,
 			fill: child.fill,
 			fillRule: child.fillRule,
+			opacity: child.opacity,
+			fillOpacity: child.fillOpacity,
+			drawOpacity: child.drawOpacity,
 			children: child.children.map((s, j) => stepToElement(s, j))
 		});
 		default: return assertNever(child);

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

@@ -2,4 +2,5 @@ export * from './Tikz';
 export * from './Node';
 export * from './Path';
 export * from './Step';
+export * from './Text';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/kernel/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC;AACvB,cAAc,QAAQ,CAAC"}

package/dist/es/kernel/index.js

@@ -2,3 +2,4 @@ import "./Tikz.js";
 import "./Node.js";
 import "./Path.js";
 import "./Step.js";
+import "./Text.js";

package/dist/es/render/renderPrim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"renderPrim.d.ts","sourceRoot":"","sources":["../../../src/render/renderPrim.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AA6B/D;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,iDAAiD;IACjD,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,MAAM,CAAC;CAClD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GACrB,GAAG,cAAc,EACjB,KAAK,GAAG,EACR,MAAK,aAAkB,KACtB,YAsFF,CAAC"}
+{"version":3,"file":"renderPrim.d.ts","sourceRoot":"","sources":["../../../src/render/renderPrim.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,OAAO,CAAC;AAC/C,OAAO,KAAK,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,cAAc,CAAC;AA6B/D;;;GAGG;AACH,MAAM,MAAM,aAAa,GAAG;IAC1B,iDAAiD;IACjD,gBAAgB,CAAC,EAAE,CAAC,KAAK,EAAE,UAAU,KAAK,MAAM,CAAC;CAClD,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,UAAU,GACrB,GAAG,cAAc,EACjB,KAAK,GAAG,EACR,MAAK,aAAkB,KACtB,YAqHF,CAAC"}

package/dist/es/render/renderPrim.js

@@ -25,6 +25,7 @@ var renderPrim = (p, key, ctx = {}) => {
 			fill: p.fill,
 			fillOpacity: p.fillOpacity,
 			stroke: p.stroke,
+			strokeOpacity: p.strokeOpacity,
 			strokeWidth: p.strokeWidth,
 			strokeDasharray: p.strokeDasharray,
 			rx: p.cornerRadius,
@@ -42,32 +43,49 @@ var renderPrim = (p, key, ctx = {}) => {
 				fill: p.fill,
 				fillOpacity: p.fillOpacity,
 				stroke: p.stroke,
+				strokeOpacity: p.strokeOpacity,
 				strokeWidth: p.strokeWidth,
 				strokeDasharray: p.strokeDasharray,
 				opacity: p.opacity
 			}, key);
 		}
-		case "text": return /* @__PURE__ */ jsx("text", {
-			x: p.x,
-			y: p.y,
-			fontSize: p.fontSize,
-			fontFamily: p.fontFamily,
-			fontWeight: p.fontWeight,
-			fontStyle: p.fontStyle,
-			textAnchor: alignToAnchor(p.align),
-			dominantBaseline: baselineToDominant(p.baseline),
-			fill: p.fill,
-			opacity: p.opacity,
-			children: p.content
-		}, key);
+		case "text": {
+			const n = p.lines.length;
+			const firstDy = p.baseline === "middle" ? -(n - 1) / 2 * p.lineHeight : p.baseline === "bottom" ? -(n - 1) * p.lineHeight : 0;
+			return /* @__PURE__ */ jsx("text", {
+				x: p.x,
+				y: p.y,
+				fontSize: p.fontSize,
+				fontFamily: p.fontFamily,
+				fontWeight: p.fontWeight,
+				fontStyle: p.fontStyle,
+				textAnchor: alignToAnchor(p.align),
+				dominantBaseline: baselineToDominant(p.baseline),
+				fill: p.fill,
+				opacity: p.opacity,
+				children: p.lines.map((line, i) => /* @__PURE__ */ jsx("tspan", {
+					x: p.x,
+					dy: i === 0 ? firstDy : p.lineHeight,
+					fill: line.fill,
+					opacity: line.opacity,
+					fontSize: line.fontSize,
+					fontFamily: line.fontFamily,
+					fontWeight: line.fontWeight,
+					fontStyle: line.fontStyle,
+					children: line.text
+				}, i))
+			}, key);
+		}
 		case "path": {
 			const startId = p.arrowStart && ctx.arrowMarkerIdFor ? ctx.arrowMarkerIdFor(p.arrowStart) : void 0;
 			const endId = p.arrowEnd && ctx.arrowMarkerIdFor ? ctx.arrowMarkerIdFor(p.arrowEnd) : void 0;
 			return /* @__PURE__ */ jsx("path", {
 				d: p.d,
 				fill: p.fill,
+				fillOpacity: p.fillOpacity,
 				fillRule: p.fillRule,
 				stroke: p.stroke,
+				strokeOpacity: p.strokeOpacity,
 				strokeWidth: p.strokeWidth,
 				strokeDasharray: p.strokeDasharray,
 				strokeLinecap: p.strokeLinecap,

package/dist/es/sugar/Draw.d.ts

@@ -2,7 +2,13 @@ import { FC } from 'react';
 import { IRPath, WayDSL } from '@retikz/core';
 /** <Draw> 组件的 props */
 export type DrawProps = {
-    /** way 数组 DSL：节点 id / 坐标 / 极坐标 / 折角算子 `'-|'` `'|-'` / 闭合 `DrawWay.cycle` */
+    /**
+     * way 数组 DSL：节点 id / 笛卡尔 / 极坐标 / 相对偏移 `{ position, type: DrawWay.Relative | DrawWay.Accumulate }` /
+     * 折角算子 `'-|'` `'|-'`（或 `DrawWay.Hv` / `DrawWay.Vh`）/ 闭合 `DrawWay.Cycle` /
+     * 曲线算子 `{ curve | cubic | bend }`（infix）/
+     * 形状算子 `{ arc | circle | ellipse }`（infix，以"上一项"为圆心，不消耗下一项）/
+     * 边标注算子 `{ label }`（infix，修饰下一段）
+     */
     way: WayDSL;
     /** 描边色，省略时用 currentColor */
     stroke?: IRPath['stroke'];
@@ -10,6 +16,12 @@ export type DrawProps = {
     strokeWidth?: IRPath['strokeWidth'];
     /** SVG stroke-dasharray 模式（如 "4 2"） */
     strokeDasharray?: IRPath['strokeDasharray'];
+    /** 端点形状（SVG `stroke-linecap`） */
+    lineCap?: IRPath['lineCap'];
+    /** 拐点形状（SVG `stroke-linejoin`） */
+    lineJoin?: IRPath['lineJoin'];
+    /** 语义 stroke 档位（TikZ `ultra thin` … `ultra thick`）；显式 `strokeWidth` 始终优先 */
+    thickness?: IRPath['thickness'];
     /**
      * 路径级箭头方向。`'->'` = 终点；`'<-'` = 起点；`'<->'` = 两端；
      * 省略或 `'none'` = 无箭头。
@@ -19,10 +31,16 @@ export type DrawProps = {
      * 箭头形状。默认 `'normal'`。其他：`'open'` / `'stealth'` / `'diamond'` / `'circle'`。
      */
     arrowShape?: IRPath['arrowShape'];
-    /** 闭合区域填充色，省略 = 不填充。配合 way 末尾的 `DrawWay.cycle` 画填充形状 */
+    /** 闭合区域填充色，省略 = 不填充。配合 way 末尾的 `DrawWay.Cycle` 画填充形状 */
     fill?: IRPath['fill'];
     /** SVG fill-rule：`'nonzero'`（默认）/ `'evenodd'` */
     fillRule?: IRPath['fillRule'];
+    /** 整 path 透明度 0~1 */
+    opacity?: IRPath['opacity'];
+    /** 仅 fill 透明度 0~1 */
+    fillOpacity?: IRPath['fillOpacity'];
+    /** 仅 stroke 透明度 0~1（TikZ `draw opacity`） */
+    drawOpacity?: IRPath['drawOpacity'];
 };
 /**
  * Sugar 组件——展开为等价的 <Path><Step.../></Path> Kernel 子树。

package/dist/es/sugar/Draw.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Draw.d.ts","sourceRoot":"","sources":["../../../src/sugar/Draw.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAKnD,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB,4EAA4E;IAC5E,GAAG,EAAE,MAAM,CAAC;IACZ,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,kBAAkB;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC5C;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACxB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAClC,wDAAwD;IACxD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;CAC/B,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAsB9B,CAAC"}
+{"version":3,"file":"Draw.d.ts","sourceRoot":"","sources":["../../../src/sugar/Draw.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAKnD,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB;;;;;;OAMG;IACH,GAAG,EAAE,MAAM,CAAC;IACZ,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,kBAAkB;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC5C,iCAAiC;IACjC,OAAO,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAC5B,kCAAkC;IAClC,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACxB;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAClC,wDAAwD;IACxD,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,iDAAiD;IACjD,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,qBAAqB;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAC5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,4CAA4C;IAC5C,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;CACrC,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CA0G9B,CAAC"}

package/dist/es/sugar/Draw.js

@@ -12,15 +12,21 @@ import { jsx } from "react/jsx-runtime";
 * （useState / useMemo / useEffect 等会抛 "Invalid hook call"）。
 */
 var Draw = (props) => {
-	const { way, stroke, strokeWidth, strokeDasharray, arrow, arrowShape, fill, fillRule } = props;
+	const { way, stroke, strokeWidth, strokeDasharray, lineCap, lineJoin, thickness, arrow, arrowShape, fill, fillRule, opacity, fillOpacity, drawOpacity } = props;
 	return /* @__PURE__ */ jsx(Path, {
 		stroke,
 		strokeWidth,
 		strokeDasharray,
+		lineCap,
+		lineJoin,
+		thickness,
 		arrow,
 		arrowShape,
 		fill,
 		fillRule,
+		opacity,
+		fillOpacity,
+		drawOpacity,
 		children: parseWay(way).map((s, i) => {
 			if (s.kind === "cycle") return /* @__PURE__ */ jsx(Step, { kind: "cycle" }, i);
 			if (s.kind === "move") return /* @__PURE__ */ jsx(Step, {
@@ -30,11 +36,59 @@ var Draw = (props) => {
 			if (s.kind === "step") return /* @__PURE__ */ jsx(Step, {
 				kind: "step",
 				via: s.via,
-				to: s.to
+				to: s.to,
+				label: s.label
+			}, i);
+			if (s.kind === "curve") return /* @__PURE__ */ jsx(Step, {
+				kind: "curve",
+				to: s.to,
+				control: s.control,
+				label: s.label
+			}, i);
+			if (s.kind === "cubic") return /* @__PURE__ */ jsx(Step, {
+				kind: "cubic",
+				to: s.to,
+				control1: s.control1,
+				control2: s.control2,
+				label: s.label
+			}, i);
+			if (s.kind === "bend") {
+				if (s.bendAngle !== void 0) return /* @__PURE__ */ jsx(Step, {
+					kind: "bend",
+					to: s.to,
+					bendDirection: s.bendDirection,
+					bendAngle: s.bendAngle,
+					label: s.label
+				}, i);
+				return /* @__PURE__ */ jsx(Step, {
+					kind: "bend",
+					to: s.to,
+					bendDirection: s.bendDirection,
+					label: s.label
+				}, i);
+			}
+			if (s.kind === "arc") return /* @__PURE__ */ jsx(Step, {
+				kind: "arc",
+				startAngle: s.startAngle,
+				endAngle: s.endAngle,
+				radius: s.radius,
+				label: s.label
+			}, i);
+			if (s.kind === "circlePath") return /* @__PURE__ */ jsx(Step, {
+				kind: "circlePath",
+				radius: s.radius,
+				label: s.label
+			}, i);
+			if (s.kind === "ellipsePath") return /* @__PURE__ */ jsx(Step, {
+				kind: "ellipsePath",
+				radiusX: s.radiusX,
+				radiusY: s.radiusY,
+				label: s.label
 			}, i);
 			return /* @__PURE__ */ jsx(Step, {
 				kind: "line",
-				to: s.to
+				to: s.to,
+				label: s.label
 			}, i);
 		})
 	});

package/dist/es/sugar/EdgeLabel.d.ts

@@ -0,0 +1,20 @@
+import { FC } from 'react';
+import { IRStepLabel } from '@retikz/core';
+/** <EdgeLabel> 组件的 props（ADR-0004） */
+export type EdgeLabelProps = {
+    /** 段上位置（TikZ `midway` / `near start` / `near end`），缺省 'midway' */
+    position?: IRStepLabel['position'];
+    /** 相对段方向 / 视觉方位的偏移侧（'sloped' = 沿切线旋转），缺省 'above' */
+    side?: IRStepLabel['side'];
+    /** 标签文字内容；必须是字符串 */
+    children: string;
+};
+/**
+ * Sugar 组件——挂在 <Step> 内作为子节点声明边标注。等价于在 Step 上写
+ * `label={{ text, position, side }}` prop；二者并存时 prop 优先。
+ *
+ * <EdgeLabel> 自身不渲染，由 buildIR 在收集 Step 时识别 displayName 后
+ * 提取到 IR `step.label`。
+ */
+export declare const EdgeLabel: FC<EdgeLabelProps>;
+//# sourceMappingURL=EdgeLabel.d.ts.map

package/dist/es/sugar/EdgeLabel.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EdgeLabel.d.ts","sourceRoot":"","sources":["../../../src/sugar/EdgeLabel.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAGhD,sCAAsC;AACtC,MAAM,MAAM,cAAc,GAAG;IAC3B,kEAAkE;IAClE,QAAQ,CAAC,EAAE,WAAW,CAAC,UAAU,CAAC,CAAC;IACnC,oDAAoD;IACpD,IAAI,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC3B,oBAAoB;IACpB,QAAQ,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,SAAS,EAAE,EAAE,CAAC,cAAc,CAAc,CAAC"}

package/dist/es/sugar/EdgeLabel.js

@@ -0,0 +1,13 @@
+import { TIKZ_EDGE_LABEL } from "../kernel/_displayNames.js";
+//#region src/sugar/EdgeLabel.tsx
+/**
+* Sugar 组件——挂在 <Step> 内作为子节点声明边标注。等价于在 Step 上写
+* `label={{ text, position, side }}` prop；二者并存时 prop 优先。
+*
+* <EdgeLabel> 自身不渲染，由 buildIR 在收集 Step 时识别 displayName 后
+* 提取到 IR `step.label`。
+*/
+var EdgeLabel = () => null;
+EdgeLabel.displayName = TIKZ_EDGE_LABEL;
+//#endregion
+export { EdgeLabel };

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

@@ -1,2 +1,3 @@
 export * from './Draw';
+export * from './EdgeLabel';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/sugar/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/sugar/index.ts"],"names":[],"mappings":"AAAA,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC"}

package/dist/es/sugar/index.js

@@ -1 +1,2 @@
 import "./Draw.js";
+import "./EdgeLabel.js";

package/dist/lib/index.cjs

@@ -4,8 +4,10 @@ const require_Tikz = require("./kernel/Tikz.cjs");
 const require_Node = require("./kernel/Node.cjs");
 const require_Path = require("./kernel/Path.cjs");
 const require_Step = require("./kernel/Step.cjs");
+const require_Text = require("./kernel/Text.cjs");
 require("./kernel/index.cjs");
 const require_Draw = require("./sugar/Draw.cjs");
+const require_EdgeLabel = require("./sugar/EdgeLabel.cjs");
 require("./sugar/index.cjs");
 const require__unbuilder = require("./kernel/_unbuilder.cjs");
 let _retikz_core = require("@retikz/core");
@@ -16,9 +18,11 @@ Object.defineProperty(exports, "DrawWay", {
 		return _retikz_core.DrawWay;
 	}
 });
+exports.EdgeLabel = require_EdgeLabel.EdgeLabel;
 exports.Node = require_Node.Node;
 exports.Path = require_Path.Path;
 exports.Step = require_Step.Step;
+exports.Text = require_Text.Text;
 exports.Tikz = require_Tikz.Tikz;
 exports.convertIRToReactNode = require__unbuilder.convertIRToReactNode;
 exports.convertReactNodeToIR = require__builder.buildIR;

package/dist/lib/index.d.ts

@@ -6,12 +6,12 @@
  *
  * 渲染管道：buildIR → compileToScene → renderPrim → SVG
  */
-export { Tikz, Node, Path, Step } from './kernel';
-export type { TikzProps, NodeProps, PathProps, StepProps } from './kernel';
-export { Draw } from './sugar';
-export type { DrawProps } from './sugar';
+export { Tikz, Node, Path, Step, Text } from './kernel';
+export type { TikzProps, NodeProps, PathProps, StepProps, TextProps } from './kernel';
+export { Draw, EdgeLabel } from './sugar';
+export type { DrawProps, EdgeLabelProps } from './sugar';
 export { DrawWay } from '@retikz/core';
-export type { WayItem, WayDSL, WayCycle, WayVia } from '@retikz/core';
+export type { WayItem, WayDSL, WayCycle, WayVia, WayRelItem, WayLabel, WayLabelOp, } from '@retikz/core';
 export { buildIR as convertReactNodeToIR } from './kernel/_builder';
 export { convertIRToReactNode } from './kernel/_unbuilder';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AAClD,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAE3E,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,YAAY,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGzC,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAGtE,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,UAAU,CAAC;AACxD,YAAY,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAEtF,OAAO,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAC1C,YAAY,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,SAAS,CAAC;AAGzD,OAAO,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AACvC,YAAY,EACV,OAAO,EACP,MAAM,EACN,QAAQ,EACR,MAAM,EACN,UAAU,EACV,QAAQ,EACR,UAAU,GACX,MAAM,cAAc,CAAC;AAGtB,OAAO,EAAE,OAAO,IAAI,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAEpE,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC"}

package/dist/lib/kernel/Node.d.ts

@@ -1,5 +1,5 @@
 import { FC, ReactNode } from 'react';
-import { IRNode, IRPosition, PolarPosition } from '@retikz/core';
+import { IRFont, IRLineSpec, IRNode, IRPosition, NodeTextAlign, PolarPosition } from '@retikz/core';
 /** <Node> 组件的 props */
 export type NodeProps = {
     /** 节点 id；其他 Path/Draw 通过这个 id 引用本节点 */
@@ -10,22 +10,73 @@ export type NodeProps = {
     position: IRPosition | PolarPosition;
     /** 旋转角度（度数，与 TikZ 一致），绕节点中心；正值顺时针 */
     rotate?: number;
-    /** 文本内容；也支持 children 形式（仅字符串） */
+    /**
+     * 文本内容（也可以用 children 写）；与 `text` 二选一，`text` 优先。
+     *
+     * children 多行写法：
+     * - `<Node>{'Line 1\nLine 2'}</Node>`（字符串内嵌 `\n`）
+     * - ``<Node>{`Line 1\nLine 2`}</Node>``（模板字面量）
+     * - `<Node>{['Line 1', 'Line 2']}</Node>`（数组）
+     * - `<Node><Text fill="red">L1</Text>L2</Node>`（混 `<Text>` 带样式行）
+     */
     children?: ReactNode;
-    /** 显式 text，优先级高于 children */
-    text?: string;
-    /** 字号；不填用默认值 */
-    fontSize?: number;
-    /** 内边距：内容到 border 的距离 */
+    /**
+     * 显式 text，优先级高于 children：
+     * - `string` — 单行
+     * - `Array<string>` — 多行无样式覆盖
+     * - `Array<string | LineSpec>` — 多行，可对单行覆盖 fill / opacity / font
+     */
+    text?: string | Array<IRLineSpec>;
+    /** 多行文本对齐：left / center（默认）/ right；只影响多行块内各行的水平对齐 */
+    align?: NodeTextAlign;
+    /** 行高（user units）；不填走 `font.size × 1.2` 默认 */
+    lineHeight?: number;
+    /** 字体规格：family / size / weight / style 全部可选；不填走渲染端默认值 */
+    font?: IRFont;
+    /** 横向内边距（text → 左右 border）；不填走 `padding` 兜底，再走默认 */
+    innerXSep?: number;
+    /** 纵向内边距（text → 上下 border）；不填走 `padding` 兜底，再走默认 */
+    innerYSep?: number;
+    /** 外边距（border → path 附着点）；不影响 border 位置；不填走 `margin` 兜底 */
+    outerSep?: number;
+    /** 内边距对称别名——等价于同时设 `innerXSep` 和 `innerYSep`；轴特化字段优先 */
     padding?: number;
-    /** 外边距：border 到 path 附着点的距离；不影响 border 位置；必须 ≥ 0 */
+    /** 外边距对称别名——等价于 `outerSep`；轴特化字段优先 */
     margin?: number;
     /** 背景色 */
     fill?: IRNode['fill'];
+    /** 填充透明度 0~1 */
+    fillOpacity?: number;
     /** 描边色 */
     stroke?: IRNode['stroke'];
+    /** 描边透明度 0~1（TikZ `draw opacity`） */
+    drawOpacity?: number;
     /** 描边宽度 */
     strokeWidth?: number;
+    /** 描边虚线预设：等价于 dashArray="4 2"；与 `dotted` / `dashArray` 优先级：dashArray > dashed > dotted */
+    dashed?: boolean;
+    /** 描边点线预设：等价于 dashArray="1 2" */
+    dotted?: boolean;
+    /** 显式 SVG stroke-dasharray 值（如 "4 2"）；优先级最高 */
+    dashArray?: string;
+    /** 圆角半径（user units）；只对 `rectangle` shape 生效 */
+    roundedCorners?: number;
+    /** 最小 border 宽度（user units）；不足时撑开 bbox */
+    minimumWidth?: number;
+    /** 最小 border 高度（user units） */
+    minimumHeight?: number;
+    /** 对称最小尺寸别名——等价于同时设 `minimumWidth` 与 `minimumHeight`；轴特化字段优先 */
+    minimumSize?: number;
+    /** 均匀缩放因子；同时影响 bbox / 字号 / padding / margin / 路径附着点（与 TikZ scale 一致） */
+    scale?: number;
+    /** 横向缩放，优先于 `scale` */
+    xScale?: number;
+    /** 纵向缩放，优先于 `scale` */
+    yScale?: number;
+    /** 文字颜色（块级默认；行级 LineSpec.fill 可覆盖）；不填走 `currentColor` */
+    textColor?: string;
+    /** 整节点透明度 0~1（同时作用于 shape 与 text） */
+    opacity?: number;
 };
 /**
  * Node 是 DSL 标记组件——本身不渲染任何 React 元素。

package/dist/lib/kernel/Node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../../src/kernel/Node.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAGtE,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB,uCAAuC;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,qDAAqD;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACxB,oCAAoC;IACpC,QAAQ,EAAE,UAAU,GAAG,aAAa,CAAC;IACrC,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iCAAiC;IACjC,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,6BAA6B;IAC7B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,gBAAgB;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,yBAAyB;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,oDAAoD;IACpD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU;IACV,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,UAAU;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAAc,CAAC"}
+{"version":3,"file":"Node.d.ts","sourceRoot":"","sources":["../../../src/kernel/Node.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EACV,MAAM,EACN,UAAU,EACV,MAAM,EACN,UAAU,EACV,aAAa,EACb,aAAa,EACd,MAAM,cAAc,CAAC;AAGtB,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB,uCAAuC;IACvC,EAAE,CAAC,EAAE,MAAM,CAAC;IACZ,qDAAqD;IACrD,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACxB,oCAAoC;IACpC,QAAQ,EAAE,UAAU,GAAG,aAAa,CAAC;IACrC,qCAAqC;IACrC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB;;;;;OAKG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,KAAK,CAAC,UAAU,CAAC,CAAC;IAClC,qDAAqD;IACrD,KAAK,CAAC,EAAE,aAAa,CAAC;IACtB,8CAA8C;IAC9C,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,yDAAyD;IACzD,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,oDAAoD;IACpD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,2DAA2D;IAC3D,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,wDAAwD;IACxD,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,sCAAsC;IACtC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,UAAU;IACV,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,gBAAgB;IAChB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU;IACV,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,qCAAqC;IACrC,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW;IACX,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,0FAA0F;IAC1F,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,iCAAiC;IACjC,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,+CAA+C;IAC/C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,+CAA+C;IAC/C,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,0CAA0C;IAC1C,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,+BAA+B;IAC/B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gEAAgE;IAChE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,uBAAuB;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,uBAAuB;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,yDAAyD;IACzD,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,qCAAqC;IACrC,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAAc,CAAC"}

package/dist/lib/kernel/Path.d.ts

@@ -8,6 +8,12 @@ export type PathProps = {
     strokeWidth?: IRPath['strokeWidth'];
     /** SVG stroke-dasharray 模式（如 "4 2"） */
     strokeDasharray?: IRPath['strokeDasharray'];
+    /** 端点形状（SVG `stroke-linecap`）：`'butt'`（默认 / 直角）/ `'round'`（半圆）/ `'square'`（方头外扩半 stroke） */
+    lineCap?: IRPath['lineCap'];
+    /** 拐点形状（SVG `stroke-linejoin`）：`'miter'`（默认 / 尖角）/ `'round'`（圆角）/ `'bevel'`（切角） */
+    lineJoin?: IRPath['lineJoin'];
+    /** 语义 stroke 档位（TikZ `ultra thin` … `ultra thick`）；显式 `strokeWidth` 始终优先 */
+    thickness?: IRPath['thickness'];
     /**
      * 路径级箭头方向。`'->'` = 终点；`'<-'` = 起点；`'<->'` = 两端；
      * 省略或 `'none'` = 无箭头。
@@ -22,6 +28,12 @@ export type PathProps = {
     fill?: IRPath['fill'];
     /** SVG fill-rule：`'nonzero'`（默认）/ `'evenodd'`（环形 / 孔洞） */
     fillRule?: IRPath['fillRule'];
+    /** 整 path 透明度 0~1；同时作用于 stroke 与 fill */
+    opacity?: IRPath['opacity'];
+    /** 仅 fill 透明度 0~1 */
+    fillOpacity?: IRPath['fillOpacity'];
+    /** 仅 stroke 透明度 0~1（TikZ `draw opacity`） */
+    drawOpacity?: IRPath['drawOpacity'];
     /** 应当全部是 <Step /> */
     children: ReactNode;
 };

package/dist/lib/kernel/Path.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../../src/kernel/Path.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,kBAAkB;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC5C;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAClC,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,qBAAqB;IACrB,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAAc,CAAC"}
+{"version":3,"file":"Path.d.ts","sourceRoot":"","sources":["../../../src/kernel/Path.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB,4BAA4B;IAC5B,MAAM,CAAC,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC1B,kBAAkB;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,uCAAuC;IACvC,eAAe,CAAC,EAAE,MAAM,CAAC,iBAAiB,CAAC,CAAC;IAC5C,4FAA4F;IAC5F,OAAO,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAC5B,mFAAmF;IACnF,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,4EAA4E;IAC5E,SAAS,CAAC,EAAE,MAAM,CAAC,WAAW,CAAC,CAAC;IAChC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;IACxB;;;OAGG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;IAClC,0DAA0D;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;IACtB,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC;IAC9B,yCAAyC;IACzC,OAAO,CAAC,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;IAC5B,qBAAqB;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,4CAA4C;IAC5C,WAAW,CAAC,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC;IACpC,qBAAqB;IACrB,QAAQ,EAAE,SAAS,CAAC;CACrB,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAAc,CAAC"}