@retikz/core 0.2.0-alpha.6 → 0.2.0-alpha.8

package/dist/lib/ir/path/arrow.d.ts

@@ -15,6 +15,18 @@ export declare const ARROW_SHAPES: {
 };
 /** 箭头形状字面量类型 */
 export type ArrowShape = ValueOf<typeof ARROW_SHAPES>;
+/**
+ * 内置 7 箭头名联合
+ * @description `BUILTIN_ARROWS` 的 Record key（保穷尽性约束，不随 `ArrowShapeName` 开放而退化为 `string`）；
+ *   等价于历史 `ArrowShape`，独立命名对齐 `node.ts` 的 `BuiltinShapeName` 范式
+ */
+export type BuiltinArrowName = ValueOf<typeof ARROW_SHAPES>;
+/**
+ * 箭头形状名：开放字符串
+ * @description 内置 `BuiltinArrowName`，或经 `CompileOptions.arrows` 注册的扩展箭头名；
+ *   `& {}` 让 IDE 仍对内置 7 名自动补全，同时接受任意非空字符串（对齐 `node.ts` 的 `NodeShape`）
+ */
+export type ArrowShapeName = BuiltinArrowName | (string & {});
 /** 箭头默认形状 */
 export declare const DEFAULT_ARROW_SHAPE: "stealth";
 /**
@@ -31,15 +43,7 @@ export declare const ARROW_MARKER_HOLLOW_DEFAULT_LINE_WIDTH = 1.5;
  * @description 顶层 8 字段全 optional；fill 在空心 shape 上 silent no-op（schema 不拒绝、compile/render 丢字段）；start/end 子对象用相同字段集（无 start/end 递归）
  */
 export declare const ArrowEndDetailSchema: z.ZodObject<{
-    shape: z.ZodOptional<z.ZodNativeEnum<{
-        readonly normal: "normal";
-        readonly open: "open";
-        readonly stealth: "stealth";
-        readonly diamond: "diamond";
-        readonly openDiamond: "openDiamond";
-        readonly circle: "circle";
-        readonly openCircle: "openCircle";
-    }>>;
+    shape: z.ZodOptional<z.ZodString>;
     scale: z.ZodOptional<z.ZodNumber>;
     length: z.ZodOptional<z.ZodNumber>;
     width: z.ZodOptional<z.ZodNumber>;
@@ -50,36 +54,28 @@ export declare const ArrowEndDetailSchema: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     length?: number | undefined;
     fill?: string | undefined;
+    color?: string | undefined;
     opacity?: number | undefined;
-    shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+    shape?: string | undefined;
+    lineWidth?: number | undefined;
     scale?: number | undefined;
     width?: number | undefined;
-    color?: string | undefined;
-    lineWidth?: number | undefined;
 }, {
     length?: number | undefined;
     fill?: string | undefined;
+    color?: string | undefined;
     opacity?: number | undefined;
-    shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+    shape?: string | undefined;
+    lineWidth?: number | undefined;
     scale?: number | undefined;
     width?: number | undefined;
-    color?: string | undefined;
-    lineWidth?: number | undefined;
 }>;
 /**
  * Path 级箭头详细配置 schema
  * @description 顶层视觉字段（与 `ArrowEndDetailSchema` 同字段集）作为起末共享默认；`start` / `end` 子对象逐字段 merge 顶层（缺省字段继承，已填字段 override）
  */
 export declare const ArrowDetailSchema: z.ZodObject<{
-    shape: z.ZodOptional<z.ZodNativeEnum<{
-        readonly normal: "normal";
-        readonly open: "open";
-        readonly stealth: "stealth";
-        readonly diamond: "diamond";
-        readonly openDiamond: "openDiamond";
-        readonly circle: "circle";
-        readonly openCircle: "openCircle";
-    }>>;
+    shape: z.ZodOptional<z.ZodString>;
     scale: z.ZodOptional<z.ZodNumber>;
     length: z.ZodOptional<z.ZodNumber>;
     width: z.ZodOptional<z.ZodNumber>;
@@ -89,15 +85,7 @@ export declare const ArrowDetailSchema: z.ZodObject<{
     lineWidth: z.ZodOptional<z.ZodNumber>;
 } & {
     start: z.ZodOptional<z.ZodObject<{
-        shape: z.ZodOptional<z.ZodNativeEnum<{
-            readonly normal: "normal";
-            readonly open: "open";
-            readonly stealth: "stealth";
-            readonly diamond: "diamond";
-            readonly openDiamond: "openDiamond";
-            readonly circle: "circle";
-            readonly openCircle: "openCircle";
-        }>>;
+        shape: z.ZodOptional<z.ZodString>;
         scale: z.ZodOptional<z.ZodNumber>;
         length: z.ZodOptional<z.ZodNumber>;
         width: z.ZodOptional<z.ZodNumber>;
@@ -108,32 +96,24 @@ export declare const ArrowDetailSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     }, {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     }>>;
     end: z.ZodOptional<z.ZodObject<{
-        shape: z.ZodOptional<z.ZodNativeEnum<{
-            readonly normal: "normal";
-            readonly open: "open";
-            readonly stealth: "stealth";
-            readonly diamond: "diamond";
-            readonly openDiamond: "openDiamond";
-            readonly circle: "circle";
-            readonly openCircle: "openCircle";
-        }>>;
+        shape: z.ZodOptional<z.ZodString>;
         scale: z.ZodOptional<z.ZodNumber>;
         length: z.ZodOptional<z.ZodNumber>;
         width: z.ZodOptional<z.ZodNumber>;
@@ -144,79 +124,79 @@ export declare const ArrowDetailSchema: z.ZodObject<{
     }, "strip", z.ZodTypeAny, {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     }, {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     length?: number | undefined;
     fill?: string | undefined;
+    color?: string | undefined;
     opacity?: number | undefined;
-    shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+    shape?: string | undefined;
+    lineWidth?: number | undefined;
     scale?: number | undefined;
     width?: number | undefined;
-    color?: string | undefined;
-    lineWidth?: number | undefined;
     start?: {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     } | undefined;
     end?: {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     } | undefined;
 }, {
     length?: number | undefined;
     fill?: string | undefined;
+    color?: string | undefined;
     opacity?: number | undefined;
-    shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+    shape?: string | undefined;
+    lineWidth?: number | undefined;
     scale?: number | undefined;
     width?: number | undefined;
-    color?: string | undefined;
-    lineWidth?: number | undefined;
     start?: {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     } | undefined;
     end?: {
         length?: number | undefined;
         fill?: string | undefined;
+        color?: string | undefined;
         opacity?: number | undefined;
-        shape?: "normal" | "open" | "stealth" | "diamond" | "openDiamond" | "circle" | "openCircle" | undefined;
+        shape?: string | undefined;
+        lineWidth?: number | undefined;
         scale?: number | undefined;
         width?: number | undefined;
-        color?: string | undefined;
-        lineWidth?: number | undefined;
     } | undefined;
 }>;
 /** 端点级箭头视觉规格 */

package/dist/lib/ir/path/arrow.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"arrow.d.ts","sourceRoot":"","sources":["../../../../src/ir/path/arrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;CAQf,CAAC;AAEX,gBAAgB;AAChB,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,YAAY,CAAC,CAAC;AAEtD,aAAa;AACb,eAAO,MAAM,mBAAmB,WAAuB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,iBAA6D,CAAC;AAE9F,wCAAwC;AACxC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,0CAA0C;AAC1C,eAAO,MAAM,sCAAsC,MAAM,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2D9B,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAS7B,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACpE,mBAAmB;AACnB,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}
+{"version":3,"file":"arrow.d.ts","sourceRoot":"","sources":["../../../../src/ir/path/arrow.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAC;AACxB,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C;;;GAGG;AACH,eAAO,MAAM,YAAY;;;;;;;;CAQf,CAAC;AAEX,gBAAgB;AAChB,MAAM,MAAM,UAAU,GAAG,OAAO,CAAC,OAAO,YAAY,CAAC,CAAC;AAEtD;;;;GAIG;AACH,MAAM,MAAM,gBAAgB,GAAG,OAAO,CAAC,OAAO,YAAY,CAAC,CAAC;AAE5D;;;;GAIG;AACH,MAAM,MAAM,cAAc,GAAG,gBAAgB,GAAG,CAAC,MAAM,GAAG,EAAE,CAAC,CAAC;AAE9D,aAAa;AACb,eAAO,MAAM,mBAAmB,WAAuB,CAAC;AAExD;;;GAGG;AACH,eAAO,MAAM,mBAAmB,iBAA6D,CAAC;AAE9F,wCAAwC;AACxC,eAAO,MAAM,yBAAyB,IAAI,CAAC;AAE3C,0CAA0C;AAC1C,eAAO,MAAM,sCAAsC,MAAM,CAAC;AAE1D;;;GAGG;AACH,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;;;;;;;;;;;;;;;EAgE9B,CAAC;AAEJ;;;GAGG;AACH,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAS7B,CAAC;AAEF,gBAAgB;AAChB,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,oBAAoB,CAAC,CAAC;AACpE,mBAAmB;AACnB,MAAM,MAAM,aAAa,GAAG,CAAC,CAAC,KAAK,CAAC,OAAO,iBAAiB,CAAC,CAAC"}

package/dist/lib/ir/path/path.cjs

@@ -1,7 +1,22 @@
+const require_paint = require("../paint.cjs");
 const require_arrow = require("./arrow.cjs");
 const require_step = require("./step.cjs");
 let zod = require("zod");
 //#region src/ir/path/path.ts
+/**
+* 路径整条缩放 schema：等比 number 或非等比 {x,y}
+* @description 与 Node scale 字段对齐；number = 等比，{x,y} = 各轴独立。全部要求有限正数。
+*/
+var PathScaleSchema = zod.z.union([zod.z.number().finite().positive(), zod.z.object({
+	x: zod.z.number().finite().positive().describe("Scale factor on the x axis (finite, positive)."),
+	y: zod.z.number().finite().positive().describe("Scale factor on the y axis (finite, positive).")
+}).describe("Anisotropic scale with independent x / y factors.")]).describe("Whole-path scale: a single finite positive number for uniform scaling, or an { x, y } object for anisotropic scaling. Applied around the path bounding-box center together with rotate.");
+/**
+* 路径中段标记 schema（首批仅箭头）
+* @description `kind:'arrow'` 判别符 + 复用 ArrowEndDetail 视觉子集（shape / scale / length / width / color / fill / opacity / lineWidth）；
+*   方向由该处路径切线决定，shape 是已注册箭头名（不是 `->` 方向记号）。后续可扩展更多 mark kind。
+*/
+var ArrowMarkSchema = require_arrow.ArrowEndDetailSchema.extend({ kind: zod.z.literal("arrow").describe("Discriminator marking this mark as an arrow tip. Only `arrow` is supported in the first batch; other kinds are rejected by schema.") }).describe("Arrow mark placed along the path: an arrow tip whose direction follows the path tangent at the mark position. Reuses the per-end arrow visual subset (shape / scale / length / width / color / fill / opacity / lineWidth); `shape` is a registered arrow name, NOT a `->` direction token.");
 var PathSchema = zod.z.object({
 	type: zod.z.literal("path").describe("Discriminator marking this child as a path"),
 	color: zod.z.string().optional().describe("Master color (TikZ `color=`). When set, the stroke, arrow tips, and step labels default to it unless individually overridden. Following the master color (not the stroke) is how a colored line shares its color with its labels and arrows — `stroke=` alone only paints the line."),
@@ -15,7 +30,7 @@ var PathSchema = zod.z.object({
 		"<->"
 	]).optional().describe("Path-level arrow direction. omitted/`none` = no arrows; `->` = arrow at end; `<-` = at start; `<->` = both."),
 	arrowDetail: require_arrow.ArrowDetailSchema.optional().describe("Detailed arrow visual config (shape / scale / length / width / color / fill / opacity / lineWidth) with optional `start` / `end` per-end overrides. Omitted = built-in defaults (shape `stealth`, all visuals inherit from path stroke / opacity)."),
-	fill: zod.z.string().optional().describe("Fill color of the closed region; any CSS color. Omitted = no fill (stroke only). Pairs with `cycle` step for filled shapes."),
+	fill: zod.z.union([zod.z.string(), require_paint.PaintSpecSchema]).optional().describe("Fill of the closed region: any CSS color string, or a PaintSpec (linear / radial gradient, pattern, or image). Omitted = no fill (stroke only). Pairs with `cycle` step for filled shapes."),
 	fillRule: zod.z.enum(["nonzero", "evenodd"]).optional().describe("How self-intersecting / nested sub-paths are filled. `nonzero` (default) winds-by-direction; `evenodd` toggles fill on each crossing — useful for ring / donut shapes."),
 	lineCap: zod.z.enum([
 		"butt",
@@ -40,6 +55,12 @@ var PathSchema = zod.z.object({
 	fillOpacity: zod.z.number().min(0).max(1).optional().describe("Fill opacity 0..1; affects only the closed-region fill."),
 	drawOpacity: zod.z.number().min(0).max(1).optional().describe("Stroke opacity 0..1 (TikZ `draw opacity`); affects only the path stroke."),
 	zIndex: zod.z.number().int().finite().optional().describe("Explicit stacking order among sibling IR children. Higher draws on top. Omitted = 0 = source order. Sorting is stable: same zIndex keeps source order. Scoped per group (a path inside a scope only restacks within that scope)."),
+	rotate: zod.z.number().finite().optional().describe("Rotate the whole path by this many degrees about its bounding-box center (positive = visually clockwise under screen y-down). Equivalent to wrapping the path in a Scope with a rotate transform centered on the path. Endpoints are resolved in the current scope first; the rotation wraps the resulting geometry."),
+	scale: PathScaleSchema.optional().describe("Scale the whole path about its bounding-box center: a finite positive number (uniform) or { x, y } (anisotropic). Applied together with rotate around the same center."),
+	marks: zod.z.array(zod.z.object({
+		pos: zod.z.number().min(0).max(1).describe("Normalized position along the path in [0, 1] (0 = start, 1 = end). Values outside [0, 1] are rejected by schema. The geometric meaning of the parameter matches step labels: arc length for line/step, Bezier parameter for curve/cubic/bend."),
+		mark: ArrowMarkSchema.describe("The mark to place at this position; currently an arrow tip oriented by the path tangent.")
+	})).optional().describe("Marks placed along the path at normalized positions; each is rendered at its position with its direction taken from the path tangent there. First batch supports arrow marks only."),
 	children: zod.z.array(require_step.StepSchema).min(2).describe("Sequence of step actions defining the path; the first should usually be a `move`")
 }).describe("A drawn path composed of a sequence of step actions (move / line / ...)");
 //#endregion