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

package/dist/es/geometry/ellipse.js

@@ -0,0 +1,86 @@
+//#region src/geometry/ellipse.ts
+var SQRT_HALF = Math.SQRT1_2;
+var localToWorld = (e, local) => {
+	const angle = e.rotate ?? 0;
+	if (angle === 0) return [e.x + local[0], e.y + local[1]];
+	const cos = Math.cos(angle);
+	const sin = Math.sin(angle);
+	return [e.x + local[0] * cos - local[1] * sin, e.y + local[0] * sin + local[1] * cos];
+};
+var worldToLocal = (e, world) => {
+	const tx = world[0] - e.x;
+	const ty = world[1] - e.y;
+	const angle = e.rotate ?? 0;
+	if (angle === 0) return [tx, ty];
+	const cos = Math.cos(angle);
+	const sin = Math.sin(angle);
+	return [tx * cos + ty * sin, -tx * sin + ty * cos];
+};
+/** 椭圆相关基础工具 */
+var ellipse = {
+	/** 中心 */
+	center: (e) => [e.x, e.y],
+	/** 判断点是否在椭圆内（含边界，考虑旋转） */
+	contains: (e, p) => {
+		const [lx, ly] = worldToLocal(e, p);
+		return lx * lx / (e.rx * e.rx) + ly * ly / (e.ry * e.ry) <= 1;
+	},
+	/**
+	* 9 个标准 anchor 的世界坐标。
+	* 对角 anchor（NE/NW/SE/SW）取参数曲线 t=π/4 处的点：
+	* (rx·cos(π/4), ry·sin(π/4)) = (rx/√2, ry/√2)。
+	* 这与 TikZ 椭圆对角 anchor 的"参数等分"约定一致。
+	*/
+	anchor: (e, name) => {
+		let lx = 0;
+		let ly = 0;
+		switch (name) {
+			case "center": break;
+			case "north":
+				ly = -e.ry;
+				break;
+			case "south":
+				ly = e.ry;
+				break;
+			case "east":
+				lx = e.rx;
+				break;
+			case "west":
+				lx = -e.rx;
+				break;
+			case "north-east":
+				lx = e.rx * SQRT_HALF;
+				ly = -e.ry * SQRT_HALF;
+				break;
+			case "north-west":
+				lx = -e.rx * SQRT_HALF;
+				ly = -e.ry * SQRT_HALF;
+				break;
+			case "south-east":
+				lx = e.rx * SQRT_HALF;
+				ly = e.ry * SQRT_HALF;
+				break;
+			case "south-west":
+				lx = -e.rx * SQRT_HALF;
+				ly = e.ry * SQRT_HALF;
+				break;
+		}
+		return localToWorld(e, [lx, ly]);
+	},
+	/**
+	* 从中心向 toward 方向画射线，求与椭圆的交点。
+	* 椭圆方程：(x/rx)² + (y/ry)² = 1。
+	* 沿方向 (lx, ly) 缩放 t 倍命中：t² × ((lx/rx)² + (ly/ry)²) = 1
+	* → t = 1 / √((lx/rx)² + (ly/ry)²)。
+	*/
+	boundaryPoint: (e, toward) => {
+		const [lx, ly] = worldToLocal(e, toward);
+		if (lx === 0 && ly === 0) return [e.x, e.y];
+		const a = lx / e.rx;
+		const b = ly / e.ry;
+		const t = 1 / Math.sqrt(a * a + b * b);
+		return localToWorld(e, [lx * t, ly * t]);
+	}
+};
+//#endregion
+export { ellipse };

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

@@ -1,4 +1,7 @@
 export * from './point';
 export * from './rect';
+export * from './circle';
+export * from './ellipse';
+export * from './diamond';
 export * from './polar';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/geometry/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,SAAS,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/geometry/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC"}

package/dist/es/index.d.ts

@@ -6,13 +6,15 @@
  *
  * 本包零 React、零 DOM 依赖。
  */
-export { PositionSchema, PolarPositionSchema, TargetSchema, MoveStepSchema, LineStepSchema, StepSchema, NodeSchema, PathSchema, ChildSchema, SceneSchema, CURRENT_IR_VERSION, } from './ir';
-export type { IRPosition, IRTarget, IRMoveStep, IRLineStep, IRStep, IRNode, IRPath, IRChild, IR, } from './ir';
-export type { ScenePrimitive, RectPrim, TextPrim, PathPrim, GroupPrim, ViewBox, Scene, } from './primitive';
+export { PositionSchema, PolarPositionSchema, TargetSchema, MoveStepSchema, LineStepSchema, FoldStepSchema, CycleStepSchema, StepSchema, NodeSchema, FontSchema, NodeTextSchema, LineSpecSchema, PathSchema, ChildSchema, SceneSchema, CURRENT_IR_VERSION, } from './ir';
+export type { IRPosition, IRTarget, IRMoveStep, IRLineStep, IRFoldStep, IRCycleStep, IRStep, IRNode, IRFont, IRLineSpec, IRPath, IRChild, IR, ArrowShape, NodeShape, NodeTextAlign, } from './ir';
+export { ARROW_SHAPES, NODE_SHAPES, NODE_TEXT_ALIGNS } from './ir';
+export type { ScenePrimitive, RectPrim, EllipsePrim, TextPrim, TextLine, PathPrim, GroupPrim, ViewBox, Scene, } from './primitive';
 export type { FontSpec, TextMetrics, TextMeasurer, CompileOptions, } from './compile';
 export { fallbackMeasurer, compileToScene } from './compile';
-export type { WayItem, WayDSL } from './parsers';
-export { parseWay } from './parsers';
-export type { Position, Rect, RectAnchor, PolarPosition } from './geometry';
-export { point, rect, RECT_ANCHORS, polar } from './geometry';
+export type { WayItem, WayDSL, WayCycle, WayVia } from './parsers';
+export { parseWay, DrawWay } from './parsers';
+export type { Position, Rect, RectAnchor, Circle, CircleAnchor, Ellipse, EllipseAnchor, Diamond, DiamondAnchor, PolarPosition, } from './geometry';
+export { point, rect, circle, ellipse, diamond, RECT_ANCHORS, polar } from './geometry';
+export type { ValueOf } from './types';
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,UAAU,EACV,UAAU,EACV,UAAU,EACV,WAAW,EACX,WAAW,EACX,kBAAkB,GACnB,MAAM,MAAM,CAAC;AACd,YAAY,EACV,UAAU,EACV,QAAQ,EACR,UAAU,EACV,UAAU,EACV,MAAM,EACN,MAAM,EACN,MAAM,EACN,OAAO,EACP,EAAE,GACH,MAAM,MAAM,CAAC;AAGd,YAAY,EACV,cAAc,EACd,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,OAAO,EACP,KAAK,GACN,MAAM,aAAa,CAAC;AAGrB,YAAY,EACV,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG7D,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACjD,OAAO,EAAE,QAAQ,EAAE,MAAM,WAAW,CAAC;AAIrC,YAAY,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAGH,OAAO,EACL,cAAc,EACd,mBAAmB,EACnB,YAAY,EACZ,cAAc,EACd,cAAc,EACd,cAAc,EACd,eAAe,EACf,UAAU,EACV,UAAU,EACV,UAAU,EACV,cAAc,EACd,cAAc,EACd,UAAU,EACV,WAAW,EACX,WAAW,EACX,kBAAkB,GACnB,MAAM,MAAM,CAAC;AACd,YAAY,EACV,UAAU,EACV,QAAQ,EACR,UAAU,EACV,UAAU,EACV,UAAU,EACV,WAAW,EACX,MAAM,EACN,MAAM,EACN,MAAM,EACN,UAAU,EACV,MAAM,EACN,OAAO,EACP,EAAE,EACF,UAAU,EACV,SAAS,EACT,aAAa,GACd,MAAM,MAAM,CAAC;AACd,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,MAAM,CAAC;AAGnE,YAAY,EACV,cAAc,EACd,QAAQ,EACR,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,OAAO,EACP,KAAK,GACN,MAAM,aAAa,CAAC;AAGrB,YAAY,EACV,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,cAAc,GACf,MAAM,WAAW,CAAC;AACnB,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAG7D,YAAY,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,WAAW,CAAC;AACnE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAI9C,YAAY,EACV,QAAQ,EACR,IAAI,EACJ,UAAU,EACV,MAAM,EACN,YAAY,EACZ,OAAO,EACP,aAAa,EACb,OAAO,EACP,aAAa,EACb,aAAa,GACd,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AAGxF,YAAY,EAAE,OAAO,EAAE,MAAM,SAAS,CAAC"}

package/dist/es/index.js

@@ -1,14 +1,18 @@
 import { PositionSchema } from "./ir/position/position.js";
 import { PolarPositionSchema } from "./ir/position/polar-position.js";
+import { ARROW_SHAPES } from "./ir/path/arrow.js";
 import { TargetSchema } from "./ir/path/target.js";
-import { LineStepSchema, MoveStepSchema, StepSchema } from "./ir/path/step.js";
+import { CycleStepSchema, FoldStepSchema, LineStepSchema, MoveStepSchema, StepSchema } from "./ir/path/step.js";
 import { PathSchema } from "./ir/path/path.js";
-import { NodeSchema } from "./ir/node.js";
+import { FontSchema, LineSpecSchema, NODE_SHAPES, NODE_TEXT_ALIGNS, NodeSchema, NodeTextSchema } from "./ir/node.js";
 import { CURRENT_IR_VERSION, ChildSchema, SceneSchema } from "./ir/scene.js";
 import { RECT_ANCHORS, rect } from "./geometry/rect.js";
+import { circle } from "./geometry/circle.js";
+import { diamond } from "./geometry/diamond.js";
+import { ellipse } from "./geometry/ellipse.js";
 import { fallbackMeasurer } from "./compile/text-metrics.js";
 import { compileToScene } from "./compile/compile.js";
-import { parseWay } from "./parsers/parseWay.js";
+import { DrawWay, parseWay } from "./parsers/parseWay.js";
 import { polar } from "./geometry/polar.js";
 import { point } from "./geometry/point.js";
-export { CURRENT_IR_VERSION, ChildSchema, LineStepSchema, MoveStepSchema, NodeSchema, PathSchema, PolarPositionSchema, PositionSchema, RECT_ANCHORS, SceneSchema, StepSchema, TargetSchema, compileToScene, fallbackMeasurer, parseWay, point, polar, rect };
+export { ARROW_SHAPES, CURRENT_IR_VERSION, ChildSchema, CycleStepSchema, DrawWay, FoldStepSchema, FontSchema, LineSpecSchema, LineStepSchema, MoveStepSchema, NODE_SHAPES, NODE_TEXT_ALIGNS, NodeSchema, NodeTextSchema, PathSchema, PolarPositionSchema, PositionSchema, RECT_ANCHORS, SceneSchema, StepSchema, TargetSchema, circle, compileToScene, diamond, ellipse, fallbackMeasurer, parseWay, point, polar, rect };

package/dist/es/ir/node.d.ts

@@ -1,41 +1,353 @@
 import { z } from 'zod';
+import { ValueOf } from '../types';
+/**
+ * 节点形状常量。值是 IR 中 `shape` 字段的字面字符串；
+ * 用 const + ValueOf 派生（不用 TS enum）。
+ *
+ * - `rectangle`：矩形（默认；UML 类、流程图常规节点）
+ * - `circle`：圆形（流程图起止、状态机）
+ * - `ellipse`：椭圆（状态机、集合图）
+ * - `diamond`：菱形（流程图判定）
+ *
+ * 每个 shape 的几何语义：node 的视觉边界包住"text 矩形 + padding"——
+ * - rectangle: 视觉 rect = text rect
+ * - circle:    外接圆，r = √(innerHalfW² + innerHalfH²)
+ * - ellipse:   外接椭圆，rx = innerHalfW×√2、ry = innerHalfH×√2
+ * - diamond:   外接菱形，halfA = 2×innerHalfW、halfB = 2×innerHalfH
+ */
+export declare const NODE_SHAPES: {
+    readonly rectangle: "rectangle";
+    readonly circle: "circle";
+    readonly ellipse: "ellipse";
+    readonly diamond: "diamond";
+};
+/** 节点形状字面量类型，由 `NODE_SHAPES` 派生 */
+export type NodeShape = ValueOf<typeof NODE_SHAPES>;
+/**
+ * 节点字体规格——family / size / weight / style 全部可选；
+ * 单字段透传到 SVG `<text>` 的 `font-*` 属性 / `font-size`。
+ *
+ * 取代 alpha.1 的标量 `fontSize` 字段（已删）。
+ */
+export declare const FontSchema: z.ZodObject<{
+    family: z.ZodOptional<z.ZodString>;
+    size: z.ZodOptional<z.ZodNumber>;
+    weight: z.ZodOptional<z.ZodUnion<[z.ZodEnum<["normal", "bold"]>, z.ZodNumber]>>;
+    style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
+}, "strip", z.ZodTypeAny, {
+    family?: string | undefined;
+    size?: number | undefined;
+    weight?: number | "normal" | "bold" | undefined;
+    style?: "normal" | "italic" | "oblique" | undefined;
+}, {
+    family?: string | undefined;
+    size?: number | undefined;
+    weight?: number | "normal" | "bold" | undefined;
+    style?: "normal" | "italic" | "oblique" | undefined;
+}>;
+/** 节点字体规格（IR 层）——所有字段可选，编译期解析默认值 */
+export type IRFont = z.infer<typeof FontSchema>;
+/**
+ * 单行文本规格——纯字符串走块级默认样式；对象形式可对该行覆盖 fill / opacity / font。
+ *
+ * 行级覆盖只生效于本行的 `<tspan>`：
+ * - `fill`：仅这一行颜色
+ * - `opacity`：仅这一行 0~1 透明度
+ * - `font`：family / size / weight / style 任意子集；未填字段继承块级 font
+ *
+ * 块级 `align` / `lineHeight` 不可被行覆盖（多行块整体属性）。
+ */
+export declare const LineSpecSchema: z.ZodUnion<[z.ZodString, z.ZodObject<{
+    text: z.ZodString;
+    fill: z.ZodOptional<z.ZodString>;
+    opacity: z.ZodOptional<z.ZodNumber>;
+    font: z.ZodOptional<z.ZodObject<{
+        family: z.ZodOptional<z.ZodString>;
+        size: z.ZodOptional<z.ZodNumber>;
+        weight: z.ZodOptional<z.ZodUnion<[z.ZodEnum<["normal", "bold"]>, z.ZodNumber]>>;
+        style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
+    }, "strip", z.ZodTypeAny, {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    }, {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    text: string;
+    fill?: string | undefined;
+    opacity?: number | undefined;
+    font?: {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    } | undefined;
+}, {
+    text: string;
+    fill?: string | undefined;
+    opacity?: number | undefined;
+    font?: {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    } | undefined;
+}>]>;
+/** 行规格 IR 类型（string 或对象） */
+export type IRLineSpec = z.infer<typeof LineSpecSchema>;
+/**
+ * 节点文本——单行字符串或非空多行数组（每元素一个 LineSpec）：
+ * - `'Hello'` 等价于 `[{ text: 'Hello' }]`，按一行渲染
+ * - `['Line 1', 'Line 2']` 两行无样式覆盖
+ * - `[{ text: 'Heading', fill: 'red', font: { weight: 'bold' } }, 'body']` 混排
+ *
+ * 选 `Array<LineSpec>` 而非 `'\n'` 字符串：JSON 友好（无 escape）；行级覆盖天然落字段。
+ */
+export declare const NodeTextSchema: z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+    text: z.ZodString;
+    fill: z.ZodOptional<z.ZodString>;
+    opacity: z.ZodOptional<z.ZodNumber>;
+    font: z.ZodOptional<z.ZodObject<{
+        family: z.ZodOptional<z.ZodString>;
+        size: z.ZodOptional<z.ZodNumber>;
+        weight: z.ZodOptional<z.ZodUnion<[z.ZodEnum<["normal", "bold"]>, z.ZodNumber]>>;
+        style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
+    }, "strip", z.ZodTypeAny, {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    }, {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    }>>;
+}, "strip", z.ZodTypeAny, {
+    text: string;
+    fill?: string | undefined;
+    opacity?: number | undefined;
+    font?: {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    } | undefined;
+}, {
+    text: string;
+    fill?: string | undefined;
+    opacity?: number | undefined;
+    font?: {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    } | undefined;
+}>]>, "many">]>;
+/** 节点文本对齐（多行内文本对齐）——TikZ `align=` 同义词 */
+export declare const NODE_TEXT_ALIGNS: {
+    readonly left: "left";
+    readonly center: "center";
+    readonly right: "right";
+};
+/** 多行文本对齐字面量类型 */
+export type NodeTextAlign = ValueOf<typeof NODE_TEXT_ALIGNS>;
 export declare const NodeSchema: z.ZodObject<{
     type: z.ZodLiteral<"node">;
     id: z.ZodOptional<z.ZodString>;
+    shape: z.ZodOptional<z.ZodNativeEnum<{
+        readonly rectangle: "rectangle";
+        readonly circle: "circle";
+        readonly ellipse: "ellipse";
+        readonly diamond: "diamond";
+    }>>;
     position: z.ZodUnion<[z.ZodTuple<[z.ZodNumber, z.ZodNumber], null>, z.ZodType<import('./position').PolarPosition, z.ZodTypeDef, import('./position').PolarPosition>]>;
     rotate: z.ZodOptional<z.ZodNumber>;
-    text: z.ZodOptional<z.ZodString>;
+    text: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodUnion<[z.ZodString, z.ZodObject<{
+        text: z.ZodString;
+        fill: z.ZodOptional<z.ZodString>;
+        opacity: z.ZodOptional<z.ZodNumber>;
+        font: z.ZodOptional<z.ZodObject<{
+            family: z.ZodOptional<z.ZodString>;
+            size: z.ZodOptional<z.ZodNumber>;
+            weight: z.ZodOptional<z.ZodUnion<[z.ZodEnum<["normal", "bold"]>, z.ZodNumber]>>;
+            style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
+        }, "strip", z.ZodTypeAny, {
+            family?: string | undefined;
+            size?: number | undefined;
+            weight?: number | "normal" | "bold" | undefined;
+            style?: "normal" | "italic" | "oblique" | undefined;
+        }, {
+            family?: string | undefined;
+            size?: number | undefined;
+            weight?: number | "normal" | "bold" | undefined;
+            style?: "normal" | "italic" | "oblique" | undefined;
+        }>>;
+    }, "strip", z.ZodTypeAny, {
+        text: string;
+        fill?: string | undefined;
+        opacity?: number | undefined;
+        font?: {
+            family?: string | undefined;
+            size?: number | undefined;
+            weight?: number | "normal" | "bold" | undefined;
+            style?: "normal" | "italic" | "oblique" | undefined;
+        } | undefined;
+    }, {
+        text: string;
+        fill?: string | undefined;
+        opacity?: number | undefined;
+        font?: {
+            family?: string | undefined;
+            size?: number | undefined;
+            weight?: number | "normal" | "bold" | undefined;
+            style?: "normal" | "italic" | "oblique" | undefined;
+        } | undefined;
+    }>]>, "many">]>>;
+    align: z.ZodOptional<z.ZodNativeEnum<{
+        readonly left: "left";
+        readonly center: "center";
+        readonly right: "right";
+    }>>;
+    lineHeight: z.ZodOptional<z.ZodNumber>;
     fill: z.ZodOptional<z.ZodString>;
+    fillOpacity: z.ZodOptional<z.ZodNumber>;
     stroke: z.ZodOptional<z.ZodString>;
+    drawOpacity: z.ZodOptional<z.ZodNumber>;
     strokeWidth: z.ZodOptional<z.ZodNumber>;
+    dashed: z.ZodOptional<z.ZodBoolean>;
+    dotted: z.ZodOptional<z.ZodBoolean>;
+    dashArray: z.ZodOptional<z.ZodString>;
+    roundedCorners: z.ZodOptional<z.ZodNumber>;
+    minimumWidth: z.ZodOptional<z.ZodNumber>;
+    minimumHeight: z.ZodOptional<z.ZodNumber>;
+    minimumSize: z.ZodOptional<z.ZodNumber>;
+    scale: z.ZodOptional<z.ZodNumber>;
+    xScale: z.ZodOptional<z.ZodNumber>;
+    yScale: z.ZodOptional<z.ZodNumber>;
+    textColor: z.ZodOptional<z.ZodString>;
+    opacity: z.ZodOptional<z.ZodNumber>;
+    innerXSep: z.ZodOptional<z.ZodNumber>;
+    innerYSep: z.ZodOptional<z.ZodNumber>;
+    outerSep: z.ZodOptional<z.ZodNumber>;
     padding: z.ZodOptional<z.ZodNumber>;
     margin: z.ZodOptional<z.ZodNumber>;
-    fontSize: z.ZodOptional<z.ZodNumber>;
+    font: z.ZodOptional<z.ZodObject<{
+        family: z.ZodOptional<z.ZodString>;
+        size: z.ZodOptional<z.ZodNumber>;
+        weight: z.ZodOptional<z.ZodUnion<[z.ZodEnum<["normal", "bold"]>, z.ZodNumber]>>;
+        style: z.ZodOptional<z.ZodEnum<["normal", "italic", "oblique"]>>;
+    }, "strip", z.ZodTypeAny, {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    }, {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    }>>;
 }, "strip", z.ZodTypeAny, {
     type: "node";
     position: [number, number] | import('./position').PolarPosition;
     fill?: string | undefined;
+    shape?: "diamond" | "circle" | "rectangle" | "ellipse" | undefined;
     stroke?: string | undefined;
     strokeWidth?: number | undefined;
+    text?: string | (string | {
+        text: string;
+        fill?: string | undefined;
+        opacity?: number | undefined;
+        font?: {
+            family?: string | undefined;
+            size?: number | undefined;
+            weight?: number | "normal" | "bold" | undefined;
+            style?: "normal" | "italic" | "oblique" | undefined;
+        } | undefined;
+    })[] | undefined;
+    opacity?: number | undefined;
+    font?: {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    } | undefined;
     id?: string | undefined;
     rotate?: number | undefined;
-    text?: string | undefined;
+    align?: "left" | "center" | "right" | undefined;
+    lineHeight?: number | undefined;
+    fillOpacity?: number | undefined;
+    drawOpacity?: number | undefined;
+    dashed?: boolean | undefined;
+    dotted?: boolean | undefined;
+    dashArray?: string | undefined;
+    roundedCorners?: number | undefined;
+    minimumWidth?: number | undefined;
+    minimumHeight?: number | undefined;
+    minimumSize?: number | undefined;
+    scale?: number | undefined;
+    xScale?: number | undefined;
+    yScale?: number | undefined;
+    textColor?: string | undefined;
+    innerXSep?: number | undefined;
+    innerYSep?: number | undefined;
+    outerSep?: number | undefined;
     padding?: number | undefined;
     margin?: number | undefined;
-    fontSize?: number | undefined;
 }, {
     type: "node";
     position: [number, number] | import('./position').PolarPosition;
     fill?: string | undefined;
+    shape?: "diamond" | "circle" | "rectangle" | "ellipse" | undefined;
     stroke?: string | undefined;
     strokeWidth?: number | undefined;
+    text?: string | (string | {
+        text: string;
+        fill?: string | undefined;
+        opacity?: number | undefined;
+        font?: {
+            family?: string | undefined;
+            size?: number | undefined;
+            weight?: number | "normal" | "bold" | undefined;
+            style?: "normal" | "italic" | "oblique" | undefined;
+        } | undefined;
+    })[] | undefined;
+    opacity?: number | undefined;
+    font?: {
+        family?: string | undefined;
+        size?: number | undefined;
+        weight?: number | "normal" | "bold" | undefined;
+        style?: "normal" | "italic" | "oblique" | undefined;
+    } | undefined;
     id?: string | undefined;
     rotate?: number | undefined;
-    text?: string | undefined;
+    align?: "left" | "center" | "right" | undefined;
+    lineHeight?: number | undefined;
+    fillOpacity?: number | undefined;
+    drawOpacity?: number | undefined;
+    dashed?: boolean | undefined;
+    dotted?: boolean | undefined;
+    dashArray?: string | undefined;
+    roundedCorners?: number | undefined;
+    minimumWidth?: number | undefined;
+    minimumHeight?: number | undefined;
+    minimumSize?: number | undefined;
+    scale?: number | undefined;
+    xScale?: number | undefined;
+    yScale?: number | undefined;
+    textColor?: string | undefined;
+    innerXSep?: number | undefined;
+    innerYSep?: number | undefined;
+    outerSep?: number | undefined;
     padding?: number | undefined;
     margin?: number | undefined;
-    fontSize?: number | undefined;
 }>;
-/** 节点：矩形 + 可选文本标签，是最基础的有定位图元 */
+/** 节点：可定位的形状容器（矩形 / 圆 / 椭圆 / 菱形）+ 可选文本标签 */
 export type IRNode = z.infer<typeof NodeSchema>;
 //# sourceMappingURL=node.d.ts.map

package/dist/es/ir/node.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/ir/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AAGxB,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAiEpB,CAAC;AAEJ,gCAAgC;AAChC,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC"}
+{"version":3,"file":"node.d.ts","sourceRoot":"","sources":["../../../src/ir/node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AAGxC;;;;;;;;;;;;;;GAcG;AACH,eAAO,MAAM,WAAW;;;;;CAKd,CAAC;AAEX,mCAAmC;AACnC,MAAM,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,WAAW,CAAC,CAAC;AAEpD;;;;;GAKG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;EAwBpB,CAAC;AAEJ,oCAAoC;AACpC,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC;AAEhD;;;;;;;;;GASG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAsBxB,CAAC;AAEJ,4BAA4B;AAC5B,MAAM,MAAM,UAAU,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,cAAc,CAAC,CAAC;AAExD;;;;;;;GAOG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;eAIxB,CAAC;AAEJ,yCAAyC;AACzC,eAAO,MAAM,gBAAgB;;;;CAInB,CAAC;AAEX,kBAAkB;AAClB,MAAM,MAAM,aAAa,GAAG,OAAO,CAAC,OAAO,gBAAgB,CAAC,CAAC;AAE7D,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAyKpB,CAAC;AAEJ,4CAA4C;AAC5C,MAAM,MAAM,MAAM,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,UAAU,CAAC,CAAC"}

package/dist/es/ir/node.js

@@ -2,18 +2,106 @@ import { PositionSchema } from "./position/position.js";
 import { PolarPositionSchema } from "./position/polar-position.js";
 import { z } from "zod";
 //#region src/ir/node.ts
+/**
+* 节点形状常量。值是 IR 中 `shape` 字段的字面字符串；
+* 用 const + ValueOf 派生（不用 TS enum）。
+*
+* - `rectangle`：矩形（默认；UML 类、流程图常规节点）
+* - `circle`：圆形（流程图起止、状态机）
+* - `ellipse`：椭圆（状态机、集合图）
+* - `diamond`：菱形（流程图判定）
+*
+* 每个 shape 的几何语义：node 的视觉边界包住"text 矩形 + padding"——
+* - rectangle: 视觉 rect = text rect
+* - circle:    外接圆，r = √(innerHalfW² + innerHalfH²)
+* - ellipse:   外接椭圆，rx = innerHalfW×√2、ry = innerHalfH×√2
+* - diamond:   外接菱形，halfA = 2×innerHalfW、halfB = 2×innerHalfH
+*/
+var NODE_SHAPES = {
+	rectangle: "rectangle",
+	circle: "circle",
+	ellipse: "ellipse",
+	diamond: "diamond"
+};
+/**
+* 节点字体规格——family / size / weight / style 全部可选；
+* 单字段透传到 SVG `<text>` 的 `font-*` 属性 / `font-size`。
+*
+* 取代 alpha.1 的标量 `fontSize` 字段（已删）。
+*/
+var FontSchema = z.object({
+	family: z.string().optional().describe("CSS font-family string, e.g. \"serif\", \"monospace\", \"Inter, sans-serif\""),
+	size: z.number().positive().optional().describe("Font size in user units; falls back to the renderer default when omitted"),
+	weight: z.union([z.enum(["normal", "bold"]), z.number()]).optional().describe("CSS font-weight: keyword `normal` / `bold` or numeric 100..900"),
+	style: z.enum([
+		"normal",
+		"italic",
+		"oblique"
+	]).optional().describe("CSS font-style")
+}).describe("Font properties for the node text label; all fields optional, nested object form (replaces the alpha.1 `fontSize` scalar).");
+/**
+* 单行文本规格——纯字符串走块级默认样式；对象形式可对该行覆盖 fill / opacity / font。
+*
+* 行级覆盖只生效于本行的 `<tspan>`：
+* - `fill`：仅这一行颜色
+* - `opacity`：仅这一行 0~1 透明度
+* - `font`：family / size / weight / style 任意子集；未填字段继承块级 font
+*
+* 块级 `align` / `lineHeight` 不可被行覆盖（多行块整体属性）。
+*/
+var LineSpecSchema = z.union([z.string(), z.object({
+	text: z.string().describe("Line content"),
+	fill: z.string().optional().describe("Per-line text color; overrides block default"),
+	opacity: z.number().min(0).max(1).optional().describe("Per-line opacity 0..1"),
+	font: FontSchema.optional().describe("Per-line font overrides; missing fields inherit from block-level `font`")
+})]).describe("Single line of text: bare string for default styling, or an object with per-line `fill` / `opacity` / `font` overrides.");
+/**
+* 节点文本——单行字符串或非空多行数组（每元素一个 LineSpec）：
+* - `'Hello'` 等价于 `[{ text: 'Hello' }]`，按一行渲染
+* - `['Line 1', 'Line 2']` 两行无样式覆盖
+* - `[{ text: 'Heading', fill: 'red', font: { weight: 'bold' } }, 'body']` 混排
+*
+* 选 `Array<LineSpec>` 而非 `'\n'` 字符串：JSON 友好（无 escape）；行级覆盖天然落字段。
+*/
+var NodeTextSchema = z.union([z.string(), z.array(LineSpecSchema).min(1)]).describe("Text label rendered inside the node: a single string for one line, or a non-empty array of line specs (string for default, object for per-line overrides).");
+/** 节点文本对齐（多行内文本对齐）——TikZ `align=` 同义词 */
+var NODE_TEXT_ALIGNS = {
+	left: "left",
+	center: "center",
+	right: "right"
+};
 var NodeSchema = z.object({
 	type: z.literal("node").describe("Discriminator marking this child as a node"),
 	id: z.string().min(1).optional().describe("Optional unique id; required if any path needs to reference this node by string"),
+	shape: z.nativeEnum(NODE_SHAPES).optional().describe("Node visual shape; defaults to `rectangle`. The boundary fully contains text + padding (circumscribed for circle / ellipse / diamond)."),
 	position: z.union([PositionSchema, PolarPositionSchema]).describe("Center point of the node content box; Cartesian [x, y] or polar (resolved at compile time)"),
 	rotate: z.number().optional().describe("Rotation in degrees around the node center; positive = clockwise (matches TikZ rotate=...)"),
-	text: z.string().optional().describe("Text label rendered inside the node; omit for an empty node"),
-	fill: z.string().optional().describe("Background color of the node rectangle; any CSS color (e.g. \"lightblue\", \"#fafafa\", \"rgba(...)\")"),
-	stroke: z.string().optional().describe("Border color of the node rectangle; any CSS color. Defaults to currentColor when omitted"),
+	text: NodeTextSchema.optional(),
+	align: z.nativeEnum(NODE_TEXT_ALIGNS).optional().describe("Multi-line text alignment within the text block; `left` / `center` / `right`. Defaults to `center` (matches TikZ)."),
+	lineHeight: z.number().positive().optional().describe("Line height in user units; falls back to `font.size × 1.2` when omitted."),
+	fill: z.string().optional().describe("Background color of the node shape; any CSS color (e.g. \"lightblue\", \"#fafafa\", \"rgba(...)\")"),
+	fillOpacity: z.number().min(0).max(1).optional().describe("Fill opacity 0..1; affects only the shape fill, leaves stroke / text alone."),
+	stroke: z.string().optional().describe("Border color of the node shape; any CSS color. Defaults to currentColor when omitted"),
+	drawOpacity: z.number().min(0).max(1).optional().describe("Stroke opacity 0..1 (TikZ `draw opacity`); affects only the border."),
 	strokeWidth: z.number().optional().describe("Border width in user units; defaults to 1 when omitted"),
-	padding: z.number().optional().describe("Inner padding in user units between the text content and the node border"),
-	margin: z.number().nonnegative().optional().describe("Outer margin in user units: distance between the visual border and where paths attach. Lines stop this far from the border. Defaults to 0."),
-	fontSize: z.number().optional().describe("Text font size in user units; defaults to a fixed size for now (TikZ font sizes will be supported later)")
-}).describe("Rectangle node with optional text label; the basic positional drawing primitive");
+	dashed: z.boolean().optional().describe("Border style preset: dashed line (TikZ `dashed`); compiled to a default dash pattern. `dashArray` takes precedence."),
+	dotted: z.boolean().optional().describe("Border style preset: dotted line (TikZ `dotted`); compiled to a default dot pattern. `dashArray` and `dashed` take precedence."),
+	dashArray: z.string().optional().describe("Explicit SVG stroke-dasharray value (e.g. \"4 2\"); overrides `dashed` / `dotted`."),
+	roundedCorners: z.number().nonnegative().optional().describe("Corner radius in user units; only effective on `rectangle` shape (rx / ry on `<rect>`)."),
+	minimumWidth: z.number().nonnegative().optional().describe("Minimum visual border width in user units; floors the bounding box width."),
+	minimumHeight: z.number().nonnegative().optional().describe("Minimum visual border height in user units; floors the bounding box height."),
+	minimumSize: z.number().nonnegative().optional().describe("Symmetric alias for `minimumWidth` + `minimumHeight`; axis-specific fields take precedence."),
+	scale: z.number().positive().optional().describe("Uniform scale factor; multiplies all node dimensions (border, padding, text, fontSize) at layout time. Affects path attachment positions."),
+	xScale: z.number().positive().optional().describe("Horizontal scale factor; overrides `scale` for the X axis."),
+	yScale: z.number().positive().optional().describe("Vertical scale factor; overrides `scale` for the Y axis."),
+	textColor: z.string().optional().describe("Text label color; any CSS color. Defaults to `currentColor`."),
+	opacity: z.number().min(0).max(1).optional().describe("Whole-node opacity 0..1; applies uniformly to shape and text."),
+	innerXSep: z.number().nonnegative().optional().describe("Inner horizontal padding from text to border in user units. Falls back to `padding` then default."),
+	innerYSep: z.number().nonnegative().optional().describe("Inner vertical padding from text to border in user units. Falls back to `padding` then default."),
+	outerSep: z.number().nonnegative().optional().describe("Outer margin from border to path attachment point in user units; does NOT change the visible border. Falls back to `margin`."),
+	padding: z.number().nonnegative().optional().describe("Symmetric inner padding (alias for `innerXSep` + `innerYSep`); axis-specific fields take precedence."),
+	margin: z.number().nonnegative().optional().describe("Symmetric outer margin (alias for `outerSep`); axis-specific field takes precedence."),
+	font: FontSchema.optional().describe("Font spec for the inner text label (family / size / weight / style); all fields optional, all fall back to renderer defaults.")
+}).describe("Node primitive: a positioned, optionally textual shape (rectangle / circle / ellipse / diamond)");
 //#endregion
-export { NodeSchema };
+export { FontSchema, LineSpecSchema, NODE_SHAPES, NODE_TEXT_ALIGNS, NodeSchema, NodeTextSchema };