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

package/dist/es/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/es/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/es/render/arrowMarkers.js

@@ -0,0 +1,81 @@
+import { jsx } from "react/jsx-runtime";
+//#region src/render/arrowMarkers.tsx
+var MARKERS = {
+	normal: {
+		refX: 10,
+		children: /* @__PURE__ */ jsx("path", {
+			d: "M 0 0 L 10 5 L 0 10 Z",
+			fill: "context-stroke"
+		})
+	},
+	open: {
+		refX: 1,
+		children: /* @__PURE__ */ 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__ */ jsx("path", {
+			d: "M 0 0 L 10 5 L 0 10 L 3 5 Z",
+			fill: "context-stroke"
+		})
+	},
+	diamond: {
+		refX: 10,
+		children: /* @__PURE__ */ jsx("path", {
+			d: "M 0 5 L 5 0 L 10 5 L 5 10 Z",
+			fill: "context-stroke"
+		})
+	},
+	openDiamond: {
+		refX: 1,
+		children: /* @__PURE__ */ 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__ */ jsx("circle", {
+			cx: 5,
+			cy: 5,
+			r: 5,
+			fill: "context-stroke"
+		})
+	},
+	openCircle: {
+		refX: 0,
+		children: /* @__PURE__ */ 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__ */ 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
+export { ArrowMarker };

package/dist/es/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/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,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/es/render/renderPrim.js

@@ -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__ */ 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__ */ 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__ */ 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__ */ 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__ */ 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,
+				strokeLinejoin: p.strokeLinejoin,
+				markerStart: startId ? `url(#${startId})` : void 0,
+				markerEnd: endId ? `url(#${endId})` : void 0,
+				opacity: p.opacity
+			}, key);
+		}
 		case "group": return /* @__PURE__ */ 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/es/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/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,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/dist/es/sugar/Draw.js

@@ -12,18 +12,31 @@ import { jsx } from "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__ */ jsx(Path, {
 		stroke,
 		strokeWidth,
 		strokeDasharray,
-		children: parseWay(way).map((s, i) => s.kind === "move" ? /* @__PURE__ */ jsx(Step, {
-			kind: "move",
-			to: s.to
-		}, i) : /* @__PURE__ */ jsx(Step, {
-			kind: "line",
-			to: s.to
-		}, i))
+		arrow,
+		arrowShape,
+		fill,
+		fillRule,
+		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, {
+				kind: "move",
+				to: s.to
+			}, i);
+			if (s.kind === "step") return /* @__PURE__ */ jsx(Step, {
+				kind: "step",
+				via: s.via,
+				to: s.to
+			}, i);
+			return /* @__PURE__ */ jsx(Step, {
+				kind: "line",
+				to: s.to
+			}, i);
+		})
 	});
 };
 //#endregion

package/dist/lib/index.cjs

@@ -4,14 +4,23 @@ 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");
 require("./sugar/index.cjs");
 const require__unbuilder = require("./kernel/_unbuilder.cjs");
+let _retikz_core = require("@retikz/core");
 exports.Draw = require_Draw.Draw;
+Object.defineProperty(exports, "DrawWay", {
+	enumerable: true,
+	get: function() {
+		return _retikz_core.DrawWay;
+	}
+});
 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,10 +6,12 @@
  *
  * 渲染管道：buildIR → compileToScene → renderPrim → SVG
  */
-export { Tikz, Node, Path, Step } from './kernel';
-export type { TikzProps, NodeProps, PathProps, StepProps } from './kernel';
+export { Tikz, Node, Path, Step, Text } from './kernel';
+export type { TikzProps, NodeProps, PathProps, StepProps, TextProps } from './kernel';
 export { Draw } from './sugar';
 export type { DrawProps } from './sugar';
+export { DrawWay } from '@retikz/core';
+export type { WayItem, WayDSL, WayCycle, WayVia } 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,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,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"}

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

@@ -1,29 +1,82 @@
 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 引用本节点 */
     id?: string;
+    /** 节点形状：rectangle（默认）/ circle / ellipse / diamond */
+    shape?: IRNode['shape'];
     /** 节点中心位置；笛卡尔 [x, y] 或极坐标（编译时解析） */
     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,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,20 @@ export type PathProps = {
     strokeWidth?: IRPath['strokeWidth'];
     /** SVG stroke-dasharray 模式（如 "4 2"） */
     strokeDasharray?: IRPath['strokeDasharray'];
+    /**
+     * 路径级箭头方向。`'->'` = 终点；`'<-'` = 起点；`'<->'` = 两端；
+     * 省略或 `'none'` = 无箭头。
+     */
+    arrow?: IRPath['arrow'];
+    /**
+     * 箭头形状。默认 `'normal'`（实心三角）。其他：`'open'` 空心三角、
+     * `'stealth'` 倒钩、`'diamond'` 菱形、`'circle'` 圆点。
+     */
+    arrowShape?: IRPath['arrowShape'];
+    /** 闭合区域填充色，CSS 颜色字符串；省略 = 不填充（仅描边）。配合 cycle step 画填充形状 */
+    fill?: IRPath['fill'];
+    /** SVG fill-rule：`'nonzero'`（默认）/ `'evenodd'`（环形 / 孔洞） */
+    fillRule?: IRPath['fillRule'];
     /** 应当全部是 <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,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;;;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"}

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

@@ -2,7 +2,8 @@ import { FC } from 'react';
 import { IRTarget } from '@retikz/core';
 /**
  * <Step> 组件的 props。
- * v0.1.0-alpha 仅支持 'move' 与 'line'，kind 默认 'line'。
+ * v0.1.0-alpha.1 支持四种 kind：'move' / 'line' / 'step'（折角）/ 'cycle'（闭合）。
+ * kind 默认 'line'。
  */
 export type StepProps = {
     /** 移动游标但不绘制（类似 SVG path "M"） */
@@ -14,6 +15,16 @@ export type StepProps = {
     kind?: 'line';
     /** 直线终点 */
     to: IRTarget;
+} | {
+    /** 折角段：从游标经一个直角拐点到目标点（TikZ `-|` / `|-`） */
+    kind: 'step';
+    /** 折角走向：`-|` 先水平后垂直；`|-` 先垂直后水平 */
+    via: '-|' | '|-';
+    /** 折角终点 */
+    to: IRTarget;
+} | {
+    /** 闭合：把当前子路径回到最近一个 move 起点（TikZ `cycle` / SVG `Z`） */
+    kind: 'cycle';
 };
 /**
  * Step 是 DSL 标记组件——本身不渲染。

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

@@ -1 +1 @@
-{"version":3,"file":"Step.d.ts","sourceRoot":"","sources":["../../../src/kernel/Step.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG7C;;;GAGG;AACH,MAAM,MAAM,SAAS,GACjB;IACE,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY;IACZ,EAAE,EAAE,QAAQ,CAAC;CACd,GACD;IACE,wBAAwB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW;IACX,EAAE,EAAE,QAAQ,CAAC;CACd,CAAC;AAEN;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAAc,CAAC"}
+{"version":3,"file":"Step.d.ts","sourceRoot":"","sources":["../../../src/kernel/Step.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,cAAc,CAAC;AAG7C;;;;GAIG;AACH,MAAM,MAAM,SAAS,GACjB;IACE,gCAAgC;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,YAAY;IACZ,EAAE,EAAE,QAAQ,CAAC;CACd,GACD;IACE,wBAAwB;IACxB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,WAAW;IACX,EAAE,EAAE,QAAQ,CAAC;CACd,GACD;IACE,2CAA2C;IAC3C,IAAI,EAAE,MAAM,CAAC;IACb,mCAAmC;IACnC,GAAG,EAAE,IAAI,GAAG,IAAI,CAAC;IACjB,WAAW;IACX,EAAE,EAAE,QAAQ,CAAC;CACd,GACD;IACE,sDAAsD;IACtD,IAAI,EAAE,OAAO,CAAC;CACf,CAAC;AAEN;;;GAGG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAAc,CAAC"}

package/dist/lib/kernel/Text.cjs

@@ -0,0 +1,22 @@
+const require__displayNames = require("./_displayNames.cjs");
+//#region src/kernel/Text.tsx
+/**
+* Text 是 Node 内的"行级"标记组件——本身不渲染，
+* 由 buildIR 在扫描 Node children 时识别为 LineSpec。
+*
+* 和字符串 children 平等参与——String 按 `'\n'` 拆纯样式行；
+* `<Text>` 一次贡献一行带样式行；保持 JSX 顺序。
+*
+* 用法：
+* ```tsx
+* <Node>
+*   <Text fill="red" font={{ weight: 'bold' }}>Heading</Text>
+*   body line 1
+*   body line 2
+* </Node>
+* ```
+*/
+var Text = () => null;
+Text.displayName = require__displayNames.TIKZ_TEXT;
+//#endregion
+exports.Text = Text;

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

@@ -0,0 +1,31 @@
+import { FC } from 'react';
+import { IRFont } from '@retikz/core';
+/** <Text> 组件的 props——Node 多行文本里给某一行带覆盖样式 */
+export type TextProps = {
+    /** 行内容（必须是字符串） */
+    children: string;
+    /** 行级覆盖颜色；不填走 Node 块级默认 */
+    fill?: string;
+    /** 行级透明度 0~1；不填走 Node 块级默认 */
+    opacity?: number;
+    /** 行级字体覆盖；missing 字段继承 Node 的 `font` 块级值 */
+    font?: IRFont;
+};
+/**
+ * Text 是 Node 内的"行级"标记组件——本身不渲染，
+ * 由 buildIR 在扫描 Node children 时识别为 LineSpec。
+ *
+ * 和字符串 children 平等参与——String 按 `'\n'` 拆纯样式行；
+ * `<Text>` 一次贡献一行带样式行；保持 JSX 顺序。
+ *
+ * 用法：
+ * ```tsx
+ * <Node>
+ *   <Text fill="red" font={{ weight: 'bold' }}>Heading</Text>
+ *   body line 1
+ *   body line 2
+ * </Node>
+ * ```
+ */
+export declare const Text: FC<TextProps>;
+//# sourceMappingURL=Text.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Text.d.ts","sourceRoot":"","sources":["../../../src/kernel/Text.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAG3C,4CAA4C;AAC5C,MAAM,MAAM,SAAS,GAAG;IACtB,kBAAkB;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,2BAA2B;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,8BAA8B;IAC9B,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,IAAI,EAAE,EAAE,CAAC,SAAS,CAAc,CAAC"}

package/dist/lib/kernel/Tikz.cjs

@@ -1,4 +1,5 @@
 const require__builder = require("./_builder.cjs");
+const require_arrowMarkers = require("../render/arrowMarkers.cjs");
 const require_browser_measurer = require("../render/browser-measurer.cjs");
 const require_renderPrim = require("../render/renderPrim.cjs");
 const require_viewBox = require("../render/viewBox.cjs");
@@ -6,22 +7,41 @@ let react = require("react");
 let _retikz_core = require("@retikz/core");
 let react_jsx_runtime = require("react/jsx-runtime");
 //#region src/kernel/Tikz.tsx
+/** 递归收集 scene 里所有 PathPrim 用到的 arrow 形状——按需注入 marker defs */
+var collectArrowShapes = (prims) => {
+	const shapes = /* @__PURE__ */ new Set();
+	for (const p of prims) if (p.type === "path") {
+		if (p.arrowStart) shapes.add(p.arrowStart);
+		if (p.arrowEnd) shapes.add(p.arrowEnd);
+	} else if (p.type === "group") for (const s of collectArrowShapes(p.children)) shapes.add(s);
+	return shapes;
+};
 /**
 * <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 同步。
 */
 var Tikz = ({ ir: irFromProp, children, width, height, className, style }) => {
 	const ir = (0, react.useMemo)(() => irFromProp ?? require__builder.buildIR(children), [irFromProp, children]);
 	const scene = (0, react.useMemo)(() => (0, _retikz_core.compileToScene)(ir, { measureText: require_browser_measurer.browserMeasurer }), [ir]);
-	return /* @__PURE__ */ (0, react_jsx_runtime.jsx)("svg", {
+	const arrowMarkerPrefix = `retikz-arrow-${(0, react.useId)().replace(/[^a-zA-Z0-9]/g, "")}`;
+	const usedShapes = collectArrowShapes(scene.primitives);
+	const arrowMarkerIdFor = (shape) => `${arrowMarkerPrefix}-${shape}`;
+	return /* @__PURE__ */ (0, react_jsx_runtime.jsxs)("svg", {
 		viewBox: require_viewBox.formatViewBox(scene.viewBox),
 		width,
 		height,
 		className,
 		style,
-		children: scene.primitives.map((p, i) => require_renderPrim.renderPrim(p, i))
+		children: [usedShapes.size > 0 && /* @__PURE__ */ (0, react_jsx_runtime.jsx)("defs", { children: Array.from(usedShapes).map((shape) => /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_arrowMarkers.ArrowMarker, {
+			id: arrowMarkerIdFor(shape),
+			shape
+		}, shape)) }), scene.primitives.map((p, i) => require_renderPrim.renderPrim(p, i, { arrowMarkerIdFor }))]
 	});
 };
 //#endregion