@retikz/react 0.1.0-alpha.0 → 0.1.0-alpha.2

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

@@ -19,7 +19,11 @@ export type TikzProps = {
  * <Tikz> 顶层容器。
  * 1. 从 children 构造 IR（或直接接受外部 IR）
  * 2. 调 compileToScene 得 Scene
- * 3. 把 Scene primitives 渲染为 SVG 元素
+ * 3. 把 Scene primitives 渲染为 SVG 元素；按需注入 `<defs>` 与每种 arrow 形状的 `<marker>`
+ *
+ * 箭头 marker 用 `useId()` 派生稳定前缀（多个 Tikz 实例共存不冲突）；
+ * 每种用到的 shape 一个 marker 定义，id 形如 `${prefix}-${shape}`，
+ * marker 内 path 借 `context-stroke` / `context-fill` 让颜色随 path 同步。
  */
 export declare const Tikz: FC<TikzProps>;
 //# sourceMappingURL=Tikz.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Tikz.d.ts","sourceRoot":"","sources":["../../../src/kernel/Tikz.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,EAAE,EAAE,KAAK,SAAS,EAAW,MAAM,OAAO,CAAC;AAC7E,OAAO,EAAE,KAAK,EAAE,EAAkB,MAAM,cAAc,CAAC;AAMvD,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB,mDAAmD;IACnD,EAAE,CAAC,EAAE,EAAE,CAAC;IACR,gCAAgC;IAChC,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,0BAA0B;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sBAAsB;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAS9B,CAAC"}
+{"version":3,"file":"Tikz.d.ts","sourceRoot":"","sources":["../../../src/kernel/Tikz.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,EAAE,EAAE,KAAK,SAAS,EAAkB,MAAM,OAAO,CAAC;AACpF,OAAO,EAAmB,KAAK,EAAE,EAAuC,MAAM,cAAc,CAAC;AAO7F,uBAAuB;AACvB,MAAM,MAAM,SAAS,GAAG;IACtB,mDAAmD;IACnD,EAAE,CAAC,EAAE,EAAE,CAAC;IACR,gCAAgC;IAChC,QAAQ,CAAC,EAAE,SAAS,CAAC;IACrB,0BAA0B;IAC1B,KAAK,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACxB,0BAA0B;IAC1B,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IACzB,4BAA4B;IAC5B,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sBAAsB;IACtB,KAAK,CAAC,EAAE,aAAa,CAAC;CACvB,CAAC;AAgBF;;;;;;;;;GASG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAuB9B,CAAC"}

package/dist/lib/kernel/_builder.cjs

@@ -8,26 +8,106 @@ var getDisplayName = (el) => {
 	if (typeof t === "string") return t;
 	return t.displayName;
 };
-/** 把 <Node> props 翻成 IRChild；text 优先取 props.text，其次取字符串 children */
-var buildNode = (props) => {
-	const text = typeof props.text === "string" ? props.text : typeof props.children === "string" ? props.children : void 0;
+/**
+* 把 <Text> 元素的 props + children 串解析为 IRLineSpec 对象形式。
+* children 必须是 string；非字符串 children 静默跳过此 <Text> 元素。
+*/
+var textElementToLineSpec = (el) => {
+	const props = el.props;
+	if (typeof props.children !== "string") return void 0;
+	if (props.fill === void 0 && props.opacity === void 0 && props.font === void 0) return props.children;
 	return {
-		type: "node",
-		id: props.id,
-		position: props.position,
-		rotate: props.rotate,
-		text,
+		text: props.children,
 		fill: props.fill,
-		stroke: props.stroke,
-		strokeWidth: props.strokeWidth,
-		padding: props.padding,
-		margin: props.margin,
-		fontSize: props.fontSize
+		opacity: props.opacity,
+		font: props.font
+	};
+};
+/**
+* 递归收集 Node children 中的行：
+* - 字符串按 `'\n'` 拆行（每段 → 字符串 LineSpec）
+* - 数组（JSX 多 child 自动展平）逐项递归
+* - <Text> 元素 → 对象 LineSpec（带覆盖样式）
+* - 其它类型（其它 React 元素 / null / 数字等）忽略——附带让 `<br/>` 当软分段
+*
+* 顺序保留——按 JSX 写的顺序行就是 IR 行顺序。
+*/
+var collectChildLines = (children) => {
+	const out = [];
+	const visit = (node) => {
+		if (typeof node === "string") {
+			for (const part of node.split("\n")) out.push(part);
+			return;
+		}
+		if (Array.isArray(node)) {
+			for (const c of node) visit(c);
+			return;
+		}
+		if ((0, react.isValidElement)(node) && getDisplayName(node) === "@retikz/Text") {
+			const spec = textElementToLineSpec(node);
+			if (spec !== void 0) out.push(spec);
+		}
 	};
+	visit(children);
+	return out;
 };
 /**
+* Node 文本读取顺序：
+* 1. `props.text`（string / string[] / LineSpec[]）— 显式优先，直接透传到 IR
+* 2. `props.children` — 字符串按 `'\n'` 拆行；`<Text>` 元素带样式贡献一行；保持 JSX 顺序
+*
+* 用 children 写多行的几种姿势：
+* - 字符串带换行：`<Node>{'Line 1\nLine 2'}</Node>`
+* - 模板字面量：``<Node>{`Line 1\nLine 2`}</Node>``
+* - 数组：`<Node>{['Line 1', 'Line 2']}</Node>`
+* - <Text>（带样式）：`<Node><Text fill="red">Heading</Text>body</Node>`
+*/
+var readNodeText = (props) => {
+	if (typeof props.text === "string") return props.text;
+	if (Array.isArray(props.text)) return props.text;
+	const lines = collectChildLines(props.children);
+	if (lines.length === 0) return void 0;
+	if (lines.length === 1 && typeof lines[0] === "string") return lines[0];
+	return lines;
+};
+/** 把 <Node> props 翻成 IRChild；text 优先取 props.text，其次取字符串 children */
+var buildNode = (props) => ({
+	type: "node",
+	id: props.id,
+	shape: props.shape,
+	position: props.position,
+	rotate: props.rotate,
+	text: readNodeText(props),
+	align: props.align,
+	lineHeight: props.lineHeight,
+	fill: props.fill,
+	fillOpacity: props.fillOpacity,
+	stroke: props.stroke,
+	drawOpacity: props.drawOpacity,
+	strokeWidth: props.strokeWidth,
+	dashed: props.dashed,
+	dotted: props.dotted,
+	dashArray: props.dashArray,
+	roundedCorners: props.roundedCorners,
+	minimumWidth: props.minimumWidth,
+	minimumHeight: props.minimumHeight,
+	minimumSize: props.minimumSize,
+	scale: props.scale,
+	xScale: props.xScale,
+	yScale: props.yScale,
+	textColor: props.textColor,
+	opacity: props.opacity,
+	innerXSep: props.innerXSep,
+	innerYSep: props.innerYSep,
+	outerSep: props.outerSep,
+	padding: props.padding,
+	margin: props.margin,
+	font: props.font
+});
+/**
 * 扫描 <Path> children 收集 <Step> 序列。
-* 至少 2 段；首段不是 move 时强制改为 move（与 SVG path 的 "M …" 语义对齐）。
+* 至少 2 段；首段不是 move 时强制改为 move（与 SVG path 的 "M …" 语义对齐）；
+* cycle 没有 to 字段，若用户把 cycle 放在首段，coerce 时降级到 move (0,0)。
 */
 var readPathChildren = (children) => {
 	const out = [];
@@ -36,6 +116,22 @@ var readPathChildren = (children) => {
 		if (getDisplayName(child) !== "@retikz/Step") return;
 		const props = child.props;
 		const kind = props.kind ?? "line";
+		if (kind === "cycle") {
+			out.push({
+				type: "step",
+				kind: "cycle"
+			});
+			return;
+		}
+		if (kind === "step") {
+			out.push({
+				type: "step",
+				kind: "step",
+				via: props.via,
+				to: props.to
+			});
+			return;
+		}
 		out.push({
 			type: "step",
 			kind,
@@ -43,11 +139,18 @@ var readPathChildren = (children) => {
 		});
 	});
 	if (out.length < 2) throw new Error("<Path> requires at least 2 <Step> children");
-	if (out[0].kind !== "move") out[0] = {
-		type: "step",
-		kind: "move",
-		to: out[0].to
-	};
+	if (out[0].kind !== "move") {
+		const first = out[0];
+		out[0] = first.kind === "cycle" ? {
+			type: "step",
+			kind: "move",
+			to: [0, 0]
+		} : {
+			type: "step",
+			kind: "move",
+			to: first.to
+		};
+	}
 	return out;
 };
 /** 把 <Path> props 翻成 IRChild；step 序列由 readPathChildren 收集 */
@@ -56,6 +159,10 @@ var buildPath = (props) => ({
 	stroke: props.stroke,
 	strokeWidth: props.strokeWidth,
 	strokeDasharray: props.strokeDasharray,
+	arrow: props.arrow,
+	arrowShape: props.arrowShape,
+	fill: props.fill,
+	fillRule: props.fillRule,
 	children: readPathChildren(props.children)
 });
 /**

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

@@ -1 +1 @@
-{"version":3,"file":"_builder.d.ts","sourceRoot":"","sources":["../../../src/kernel/_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,SAAS,EAAkB,MAAM,OAAO,CAAC;AACpF,OAAO,KAAK,EAAE,EAAE,EAA2B,MAAM,cAAc,CAAC;AAoGhE;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,UAAU,SAAS,KAAG,EAI5C,CAAC"}
+{"version":3,"file":"_builder.d.ts","sourceRoot":"","sources":["../../../src/kernel/_builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAA+B,KAAK,SAAS,EAAkB,MAAM,OAAO,CAAC;AACpF,OAAO,KAAK,EAAE,EAAE,EAA+C,MAAM,cAAc,CAAC;AA6NpF;;;GAGG;AACH,eAAO,MAAM,OAAO,GAAI,UAAU,SAAS,KAAG,EAI5C,CAAC"}

package/dist/lib/kernel/_displayNames.cjs

@@ -5,7 +5,10 @@ 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";
 //#endregion
 exports.TIKZ_NODE = TIKZ_NODE;
 exports.TIKZ_PATH = TIKZ_PATH;
 exports.TIKZ_STEP = TIKZ_STEP;
+exports.TIKZ_TEXT = TIKZ_TEXT;

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

@@ -4,4 +4,6 @@ export declare const TIKZ_NODE = "@retikz/Node";
 export declare const TIKZ_PATH = "@retikz/Path";
 /** <Step> 组件的 displayName */
 export declare const TIKZ_STEP = "@retikz/Step";
+/** <Text> 组件的 displayName（Node 内多行文本带样式） */
+export declare const TIKZ_TEXT = "@retikz/Text";
 //# sourceMappingURL=_displayNames.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"_displayNames.d.ts","sourceRoot":"","sources":["../../../src/kernel/_displayNames.ts"],"names":[],"mappings":"AAKA,6BAA6B;AAC7B,eAAO,MAAM,SAAS,iBAAiB,CAAC;AAExC,6BAA6B;AAC7B,eAAO,MAAM,SAAS,iBAAiB,CAAC;AAExC,6BAA6B;AAC7B,eAAO,MAAM,SAAS,iBAAiB,CAAC"}
+{"version":3,"file":"_displayNames.d.ts","sourceRoot":"","sources":["../../../src/kernel/_displayNames.ts"],"names":[],"mappings":"AAKA,6BAA6B;AAC7B,eAAO,MAAM,SAAS,iBAAiB,CAAC;AAExC,6BAA6B;AAC7B,eAAO,MAAM,SAAS,iBAAiB,CAAC;AAExC,6BAA6B;AAC7B,eAAO,MAAM,SAAS,iBAAiB,CAAC;AAExC,4CAA4C;AAC5C,eAAO,MAAM,SAAS,iBAAiB,CAAC"}

package/dist/lib/kernel/_unbuilder.cjs

@@ -7,22 +7,54 @@ let react = require("react");
 var nodePropsFromIR = (n) => {
 	const props = { position: n.position };
 	if (n.id !== void 0) props.id = n.id;
+	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 */
-var stepToElement = (step, key) => (0, react.createElement)(require_Step.Step, {
-	key,
-	kind: step.kind,
-	to: step.to
-});
+var stepToElement = (step, key) => {
+	if (step.kind === "cycle") return (0, react.createElement)(require_Step.Step, {
+		key,
+		kind: "cycle"
+	});
+	if (step.kind === "step") return (0, react.createElement)(require_Step.Step, {
+		key,
+		kind: "step",
+		via: step.via,
+		to: step.to
+	});
+	return (0, react.createElement)(require_Step.Step, {
+		key,
+		kind: step.kind,
+		to: step.to
+	});
+};
 /** discriminated union 兜底：编译期保证不漏 case，运行时给出明确错误 */
 var assertNever = (x) => {
 	throw new Error(`convertIRToReactNode: unknown IR child type: ${JSON.stringify(x)}`);
@@ -39,6 +71,10 @@ var childToElement = (child, key) => {
 			stroke: child.stroke,
 			strokeWidth: child.strokeWidth,
 			strokeDasharray: child.strokeDasharray,
+			arrow: child.arrow,
+			arrowShape: child.arrowShape,
+			fill: child.fill,
+			fillRule: child.fillRule,
 			children: child.children.map((s, j) => stepToElement(s, j))
 		});
 		default: return assertNever(child);

package/dist/lib/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;AA+ChE;;;;;;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;AA8EhE;;;;;;GAMG;AACH,eAAO,MAAM,oBAAoB,GAAI,IAAI,EAAE,KAAG,SACW,CAAC"}

package/dist/lib/kernel/index.cjs

@@ -2,3 +2,4 @@ require("./Tikz.cjs");
 require("./Node.cjs");
 require("./Path.cjs");
 require("./Step.cjs");
+require("./Text.cjs");

package/dist/lib/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/lib/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/lib/render/arrowMarkers.cjs

@@ -0,0 +1,81 @@
+let react_jsx_runtime = require("react/jsx-runtime");
+//#region src/render/arrowMarkers.tsx
+var MARKERS = {
+	normal: {
+		refX: 10,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
+			d: "M 0 0 L 10 5 L 0 10 Z",
+			fill: "context-stroke"
+		})
+	},
+	open: {
+		refX: 1,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
+			d: "M 1 1 L 9 5 L 1 9 Z",
+			fill: "none",
+			stroke: "context-stroke",
+			strokeWidth: 1.5
+		})
+	},
+	stealth: {
+		refX: 10,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
+			d: "M 0 0 L 10 5 L 0 10 L 3 5 Z",
+			fill: "context-stroke"
+		})
+	},
+	diamond: {
+		refX: 10,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
+			d: "M 0 5 L 5 0 L 10 5 L 5 10 Z",
+			fill: "context-stroke"
+		})
+	},
+	openDiamond: {
+		refX: 1,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
+			d: "M 1 5 L 5 1 L 9 5 L 5 9 Z",
+			fill: "none",
+			stroke: "context-stroke",
+			strokeWidth: 1.5,
+			strokeLinejoin: "round"
+		})
+	},
+	circle: {
+		refX: 10,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("circle", {
+			cx: 5,
+			cy: 5,
+			r: 5,
+			fill: "context-stroke"
+		})
+	},
+	openCircle: {
+		refX: 0,
+		children: /* @__PURE__ */ (0, react_jsx_runtime.jsx)("circle", {
+			cx: 5,
+			cy: 5,
+			r: 4.25,
+			fill: "none",
+			stroke: "context-stroke",
+			strokeWidth: 1.5
+		})
+	}
+};
+/** 单个 `<marker>` 元素，由 `<defs>` 包起来 */
+var ArrowMarker = ({ id, shape }) => {
+	const spec = MARKERS[shape];
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("marker", {
+		id,
+		viewBox: "0 0 10 10",
+		refX: spec.refX,
+		refY: 5,
+		markerWidth: 6,
+		markerHeight: 6,
+		orient: "auto-start-reverse",
+		markerUnits: "strokeWidth",
+		children: spec.children
+	});
+};
+//#endregion
+exports.ArrowMarker = ArrowMarker;

package/dist/lib/render/arrowMarkers.d.ts

@@ -0,0 +1,11 @@
+import { FC } from 'react';
+import { ArrowShape } from '@retikz/core';
+export type ArrowMarkerProps = {
+    /** marker 元素 id，用于 path markerStart / markerEnd 引用 */
+    id: string;
+    /** 形状名 */
+    shape: ArrowShape;
+};
+/** 单个 `<marker>` 元素，由 `<defs>` 包起来 */
+export declare const ArrowMarker: FC<ArrowMarkerProps>;
+//# sourceMappingURL=arrowMarkers.d.ts.map

package/dist/lib/render/arrowMarkers.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"arrowMarkers.d.ts","sourceRoot":"","sources":["../../../src/render/arrowMarkers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAgB,MAAM,OAAO,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAqF/C,MAAM,MAAM,gBAAgB,GAAG;IAC7B,sDAAsD;IACtD,EAAE,EAAE,MAAM,CAAC;IACX,UAAU;IACV,KAAK,EAAE,UAAU,CAAC;CACnB,CAAC;AAEF,sCAAsC;AACtC,eAAO,MAAM,WAAW,EAAE,EAAE,CAAC,gBAAgB,CAgB5C,CAAC"}

package/dist/lib/render/renderPrim.cjs

@@ -13,9 +13,9 @@ var baselineToDominant = (b) => {
 };
 /**
 * Scene primitive → SVG React 元素。
-* 不读 IR，只读 Scene；约束在 100 行以内（超过说明 Scene 抽象不够下沉，回 core 补）。
+* 不读 IR，只读 Scene。
 */
-var renderPrim = (p, key) => {
+var renderPrim = (p, key, ctx = {}) => {
 	switch (p.type) {
 		case "rect": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("rect", {
 			x: p.x,
@@ -25,38 +25,79 @@ var renderPrim = (p, key) => {
 			fill: p.fill,
 			fillOpacity: p.fillOpacity,
 			stroke: p.stroke,
+			strokeOpacity: p.strokeOpacity,
 			strokeWidth: p.strokeWidth,
 			strokeDasharray: p.strokeDasharray,
 			rx: p.cornerRadius,
 			ry: p.cornerRadius,
 			opacity: p.opacity
 		}, key);
-		case "text": return /* @__PURE__ */ (0, react_jsx_runtime.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 "path": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("path", {
-			d: p.d,
-			fill: p.fill,
-			stroke: p.stroke,
-			strokeWidth: p.strokeWidth,
-			strokeDasharray: p.strokeDasharray,
-			strokeLinecap: p.strokeLinecap,
-			strokeLinejoin: p.strokeLinejoin,
-			opacity: p.opacity
-		}, key);
+		case "ellipse": {
+			const transform = p.rotate ? `rotate(${p.rotate} ${p.cx} ${p.cy})` : void 0;
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("ellipse", {
+				cx: p.cx,
+				cy: p.cy,
+				rx: p.rx,
+				ry: p.ry,
+				transform,
+				fill: p.fill,
+				fillOpacity: p.fillOpacity,
+				stroke: p.stroke,
+				strokeOpacity: p.strokeOpacity,
+				strokeWidth: p.strokeWidth,
+				strokeDasharray: p.strokeDasharray,
+				opacity: p.opacity
+			}, 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__ */ (0, react_jsx_runtime.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__ */ (0, react_jsx_runtime.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__ */ (0, react_jsx_runtime.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,
+				strokeLinejoin: p.strokeLinejoin,
+				markerStart: startId ? `url(#${startId})` : void 0,
+				markerEnd: endId ? `url(#${endId})` : void 0,
+				opacity: p.opacity
+			}, key);
+		}
 		case "group": return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("g", {
 			transform: p.transform,
-			children: p.children.map((c, i) => renderPrim(c, i))
+			children: p.children.map((c, i) => renderPrim(c, i, ctx))
 		}, key);
 	}
 };

package/dist/lib/render/renderPrim.d.ts

@@ -1,8 +1,16 @@
 import { Key, ReactElement } from 'react';
-import { ScenePrimitive } from '@retikz/core';
+import { ArrowShape, ScenePrimitive } from '@retikz/core';
+/**
+ * 渲染上下文——Tikz 容器侧把 marker id 等"全 SVG 共享"的资源向下传给 renderPrim。
+ * 资源若不存在就传 undefined，对应路径 prim 不会引用 marker。
+ */
+export type RenderContext = {
+    /** 按 arrow 形状查 SVG `<defs><marker id>` id 的回调 */
+    arrowMarkerIdFor?: (shape: ArrowShape) => string;
+};
 /**
  * Scene primitive → SVG React 元素。
- * 不读 IR，只读 Scene；约束在 100 行以内（超过说明 Scene 抽象不够下沉，回 core 补）。
+ * 不读 IR，只读 Scene。
  */
-export declare const renderPrim: (p: ScenePrimitive, key: Key) => ReactElement;
+export declare const renderPrim: (p: ScenePrimitive, key: Key, ctx?: RenderContext) => ReactElement;
 //# sourceMappingURL=renderPrim.d.ts.map

package/dist/lib/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,cAAc,EAAE,MAAM,cAAc,CAAC;AA6BnD;;;GAGG;AACH,eAAO,MAAM,UAAU,GAAI,GAAG,cAAc,EAAE,KAAK,GAAG,KAAG,YA2DxD,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/lib/sugar/Draw.cjs

@@ -12,18 +12,31 @@ let react_jsx_runtime = require("react/jsx-runtime");
 * （useState / useMemo / useEffect 等会抛 "Invalid hook call"）。
 */
 var Draw = (props) => {
-	const { way, stroke, strokeWidth, strokeDasharray } = props;
+	const { way, stroke, strokeWidth, strokeDasharray, arrow, arrowShape, fill, fillRule } = props;
 	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Path.Path, {
 		stroke,
 		strokeWidth,
 		strokeDasharray,
-		children: (0, _retikz_core.parseWay)(way).map((s, i) => s.kind === "move" ? /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
-			kind: "move",
-			to: s.to
-		}, i) : /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
-			kind: "line",
-			to: s.to
-		}, i))
+		arrow,
+		arrowShape,
+		fill,
+		fillRule,
+		children: (0, _retikz_core.parseWay)(way).map((s, i) => {
+			if (s.kind === "cycle") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, { kind: "cycle" }, i);
+			if (s.kind === "move") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+				kind: "move",
+				to: s.to
+			}, i);
+			if (s.kind === "step") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+				kind: "step",
+				via: s.via,
+				to: s.to
+			}, i);
+			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+				kind: "line",
+				to: s.to
+			}, i);
+		})
 	});
 };
 //#endregion

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

@@ -2,7 +2,7 @@ import { FC } from 'react';
 import { IRPath, WayDSL } from '@retikz/core';
 /** <Draw> 组件的 props */
 export type DrawProps = {
-    /** way 数组 DSL：节点 id 字符串、坐标 [x, y]、极坐标对象 */
+    /** way 数组 DSL：节点 id / 坐标 / 极坐标 / 折角算子 `'-|'` `'|-'` / 闭合 `DrawWay.cycle` */
     way: WayDSL;
     /** 描边色，省略时用 currentColor */
     stroke?: IRPath['stroke'];
@@ -10,6 +10,19 @@ export type DrawProps = {
     strokeWidth?: IRPath['strokeWidth'];
     /** SVG stroke-dasharray 模式（如 "4 2"） */
     strokeDasharray?: IRPath['strokeDasharray'];
+    /**
+     * 路径级箭头方向。`'->'` = 终点；`'<-'` = 起点；`'<->'` = 两端；
+     * 省略或 `'none'` = 无箭头。
+     */
+    arrow?: IRPath['arrow'];
+    /**
+     * 箭头形状。默认 `'normal'`。其他：`'open'` / `'stealth'` / `'diamond'` / `'circle'`。
+     */
+    arrowShape?: IRPath['arrowShape'];
+    /** 闭合区域填充色，省略 = 不填充。配合 way 末尾的 `DrawWay.cycle` 画填充形状 */
+    fill?: IRPath['fill'];
+    /** SVG fill-rule：`'nonzero'`（默认）/ `'evenodd'` */
+    fillRule?: IRPath['fillRule'];
 };
 /**
  * Sugar 组件——展开为等价的 <Path><Step.../></Path> Kernel 子树。

package/dist/lib/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,2CAA2C;IAC3C,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;CAC7C,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAW9B,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,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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retikz/react",
-  "version": "0.1.0-alpha.0",
+  "version": "0.1.0-alpha.2",
   "description": "React adapter for retikz: Kernel/Sugar JSX components and SVG renderer.",
   "type": "module",
   "main": "dist/lib/index.cjs",
@@ -24,7 +24,7 @@
     "react-dom": ">=18"
   },
   "dependencies": {
-    "@retikz/core": "0.1.0-alpha.0"
+    "@retikz/core": "0.1.0-alpha.2"
   },
   "devDependencies": {
     "@types/node": "^25.6.0",