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

package/dist/lib/render/renderPrim.cjs

@@ -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__ */ (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 "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,

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,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/lib/sugar/Draw.cjs

@@ -12,15 +12,21 @@ let react_jsx_runtime = require("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__ */ (0, react_jsx_runtime.jsx)(require_Path.Path, {
 		stroke,
 		strokeWidth,
 		strokeDasharray,
+		lineCap,
+		lineJoin,
+		thickness,
 		arrow,
 		arrowShape,
 		fill,
 		fillRule,
+		opacity,
+		fillOpacity,
+		drawOpacity,
 		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, {
@@ -30,11 +36,59 @@ var Draw = (props) => {
 			if (s.kind === "step") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
 				kind: "step",
 				via: s.via,
-				to: s.to
+				to: s.to,
+				label: s.label
+			}, i);
+			if (s.kind === "curve") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+				kind: "curve",
+				to: s.to,
+				control: s.control,
+				label: s.label
+			}, i);
+			if (s.kind === "cubic") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.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__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+					kind: "bend",
+					to: s.to,
+					bendDirection: s.bendDirection,
+					bendAngle: s.bendAngle,
+					label: s.label
+				}, i);
+				return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+					kind: "bend",
+					to: s.to,
+					bendDirection: s.bendDirection,
+					label: s.label
+				}, i);
+			}
+			if (s.kind === "arc") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+				kind: "arc",
+				startAngle: s.startAngle,
+				endAngle: s.endAngle,
+				radius: s.radius,
+				label: s.label
+			}, i);
+			if (s.kind === "circlePath") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+				kind: "circlePath",
+				radius: s.radius,
+				label: s.label
+			}, i);
+			if (s.kind === "ellipsePath") return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
+				kind: "ellipsePath",
+				radiusX: s.radiusX,
+				radiusY: s.radiusY,
+				label: s.label
 			}, i);
 			return /* @__PURE__ */ (0, react_jsx_runtime.jsx)(require_Step.Step, {
 				kind: "line",
-				to: s.to
+				to: s.to,
+				label: s.label
 			}, i);
 		})
 	});

package/dist/lib/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/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,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/lib/sugar/EdgeLabel.cjs

@@ -0,0 +1,13 @@
+const require__displayNames = require("../kernel/_displayNames.cjs");
+//#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 = require__displayNames.TIKZ_EDGE_LABEL;
+//#endregion
+exports.EdgeLabel = EdgeLabel;

package/dist/lib/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/lib/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/lib/sugar/index.cjs

@@ -1 +1,2 @@
 require("./Draw.cjs");
+require("./EdgeLabel.cjs");

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

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

package/dist/lib/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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@retikz/react",
-  "version": "0.1.0-alpha.1",
+  "version": "0.1.0-alpha.3",
   "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.1"
+    "@retikz/core": "0.1.0-alpha.3"
   },
   "devDependencies": {
     "@types/node": "^25.6.0",