@retikz/core 0.3.0-alpha.2 → 0.3.0-alpha.4

package/dist/es/compile/path/anchor.js

@@ -8,10 +8,10 @@ import { resolveAnchor, resolveEdgePoint } from "../anchor-cache.js";
 var isNodeTarget = (t) => typeof t === "object" && !Array.isArray(t) && "id" in t;
 /** target 是否 between 比例点（`{ between, t }`）；独有 `between` 字段 */
 var isBetween = (t) => typeof t === "object" && !Array.isArray(t) && "between" in t;
-/** 解析 NodeTarget 的 anchor（非 undefined）到世界坐标：命名 / 角度走 resolveAnchor，`{ side, t }` 走 resolveEdgePoint */
-var resolveAnchorRef = (node, anchor) => {
-	if (typeof anchor === "number") return resolveAnchor(node, String(anchor));
-	if (typeof anchor === "string") return resolveAnchor(node, anchor);
+/** 解析 NodeTarget 的 anchor（非 undefined）到世界坐标：命名 / 角度走 resolveAnchor（可选连接面），`{ side, t }` 恒走视觉形状（不传 boundary） */
+var resolveAnchorRef = (node, anchor, boundary) => {
+	if (typeof anchor === "number") return resolveAnchor(node, String(anchor), boundary);
+	if (typeof anchor === "string") return resolveAnchor(node, anchor, boundary);
 	return resolveEdgePoint(node, anchor.side, anchor.t);
 };
 /** anchor/边点解析后叠加世界系 offset（不随节点 rotate 旋转） */
@@ -27,7 +27,7 @@ var refPointOfTarget = (target, nameStack, scopeChain = []) => {
 	if (isNodeTarget(target)) {
 		const node = nameStack.lookup(target.id);
 		if (!node) return null;
-		return addOffset(target.anchor === void 0 ? [node.rect.x, node.rect.y] : resolveAnchorRef(node, target.anchor), target.offset);
+		return addOffset(target.anchor === void 0 ? [node.rect.x, node.rect.y] : resolveAnchorRef(node, target.anchor, target.boundary ?? node.boundary), target.offset);
 	}
 	if (isBetween(target)) {
 		const a = refPointOfTarget(target.between[0], nameStack, scopeChain);
@@ -54,7 +54,8 @@ var clipForTarget = (target, toward, nameStack, scopeChain = []) => {
 	if (isNodeTarget(target)) {
 		const node = nameStack.lookup(target.id);
 		if (!node) return null;
-		return addOffset(target.anchor === void 0 ? boundaryPointOf(node, toward) : resolveAnchorRef(node, target.anchor), target.offset);
+		const boundary = target.boundary ?? node.boundary;
+		return addOffset(target.anchor === void 0 ? boundaryPointOf(node, toward, boundary) : resolveAnchorRef(node, target.anchor, boundary), target.offset);
 	}
 	if (isBetween(target)) return refPointOfTarget(target, nameStack, scopeChain);
 	if (typeof target === "object" && !Array.isArray(target) && ("relative" in target || "relativeAccumulate" in target)) return null;

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAY9C,OAAO,KAAK,EACV,MAAM,EAEN,UAAU,EAGX,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAIV,cAAc,EACd,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AAKtE,OAAO,EAAE,KAAK,eAAe,EAA2D,MAAM,UAAU,CAAC;AA8FzG,mCAAmC;AACnC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iCAAiC;IACjC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,IAAI,CAAC;IACX,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACtC,wEAAwE;IACxE,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;CACnE,CAAC;AA0EF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,WAAW,SAAS,EACpB,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAC5B,cAAa,YAA+B,EAC5C,WAAU,gBAAqB,KAC9B;IAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CAAE,GAAG,IAwuBrE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/compile/path/index.ts"],"names":[],"mappings":"AAQA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,UAAU,CAAC;AAY9C,OAAO,KAAK,EACV,MAAM,EAEN,UAAU,EAGX,MAAM,UAAU,CAAC;AAElB,OAAO,KAAK,EAIV,cAAc,EACd,SAAS,EACV,MAAM,iBAAiB,CAAC;AAEzB,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sBAAsB,CAAC;AACpE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,KAAK,YAAY,EAAoB,MAAM,iBAAiB,CAAC;AAKtE,OAAO,EAAE,KAAK,eAAe,EAA2D,MAAM,UAAU,CAAC;AA8FzG,mCAAmC;AACnC,MAAM,MAAM,gBAAgB,GAAG;IAC7B,iCAAiC;IACjC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE;QACjB,IAAI,EAAE,MAAM,CAAC;QACb,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd,KAAK,IAAI,CAAC;IACX,yDAAyD;IACzD,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB;;;;OAIG;IACH,UAAU,CAAC,EAAE,aAAa,CAAC,SAAS,CAAC,CAAC;IACtC,wEAAwE;IACxE,WAAW,CAAC,EAAE,aAAa,CAAC;IAC5B;;;;OAIG;IACH,eAAe,CAAC,EAAE,eAAe,CAAC;IAClC;;;;;OAKG;IACH,uBAAuB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,uBAAuB,CAAC,CAAC;CACnE,CAAC;AA0EF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,MAAM,MAAM,EACZ,WAAW,SAAS,EACpB,OAAO,CAAC,CAAC,EAAE,MAAM,KAAK,MAAM,EAC5B,cAAa,YAA+B,EAC5C,WAAU,gBAAqB,KAC9B;IAAE,UAAU,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IAAC,MAAM,EAAE,KAAK,CAAC,UAAU,CAAC,CAAA;CAAE,GAAG,IAkvBrE,CAAC"}

package/dist/es/compile/path/index.js

@@ -1,8 +1,8 @@
-import { rectOutline } from "../../geometry/rect.js";
 import { JsonObjectSchema } from "../../ir/json.js";
+import { rectOutline } from "../../geometry/rect.js";
+import { arcBoundingPoints, arcEndPoint, ellipseArcBoundingPoints, ellipseArcPoint } from "../../geometry/arc.js";
 import { BUILTIN_ARROWS } from "../../arrows/index.js";
 import { applyTransformChain } from "../scope.js";
-import { arcBoundingPoints, arcEndPoint, ellipseArcBoundingPoints, ellipseArcPoint } from "../../geometry/arc.js";
 import { bendControlPoints, outInControlPoints } from "../../geometry/bend.js";
 import { arcSegmentSample, circleSegmentSample, cubicSegmentSample, ellipseArcSegmentSample, ellipseSegmentSample, foldSegmentSample, lineSegmentSample, quadSegmentSample } from "../../geometry/segment.js";
 import { fallbackMeasurer } from "../text-metrics.js";
@@ -434,7 +434,7 @@ var emitPathPrimitive = (path, nameStack, round, measureText = fallbackMeasurer,
 				return null;
 			}
 			let rectStart = null;
-			for (const op of rectOutline(fromPt, toPt, step.roundedCorners)) if (op.kind === "move") {
+			for (const op of rectOutline(fromPt, toPt, step.cornerRadius)) if (op.kind === "move") {
 				emitMove(op.to);
 				rectStart = op.to;
 			} else if (op.kind === "line") emitLine(op.to);
@@ -646,6 +646,8 @@ var emitPathPrimitive = (path, nameStack, round, measureText = fallbackMeasurer,
 				transforms,
 				children: bodyPrims
 			};
+			if (path.id !== void 0) group.id = path.id;
+			if (path.meta !== void 0) group.meta = path.meta;
 			const transformedPoints = points.map((p) => applyTransformChain(p, transforms));
 			if (!transformedPoints.every(isFinitePoint)) throw new Error("Path rotate / scale produced a non-finite coordinate (scale too large); use a smaller scale.");
 			return {
@@ -654,6 +656,8 @@ var emitPathPrimitive = (path, nameStack, round, measureText = fallbackMeasurer,
 			};
 		}
 	}
+	if (path.id !== void 0) primitive.id = path.id;
+	if (path.meta !== void 0) primitive.meta = path.meta;
 	return {
 		primitives: bodyPrims,
 		points

package/dist/es/compile/path/relative.js

@@ -1,5 +1,5 @@
-import { inverseTransformChain } from "../scope.js";
 import { arcEndPoint } from "../../geometry/arc.js";
+import { inverseTransformChain } from "../scope.js";
 import { refPointOfTarget } from "./anchor.js";
 //#region src/compile/path/relative.ts
 /**

package/dist/es/compile/scope.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../../src/compile/scope.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,UAAU,EACV,WAAW,EAEZ,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGzC;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,YAAY,aAAa,CAAC,WAAW,CAAC,EACtC,WAAW,SAAS,EACpB,eAAe,MAAM,KACpB,KAAK,CAAC,SAAS,CAAC,GAAG,IAiDrB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAyBF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAgCF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAuBF,CAAC;AAEF,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,aAAa,CAAC,UAAU,CAAC,KACjC,gBAAgB,GAAG,IA2BrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,IAAI,MAAM,EACV,MAAM,gBAAgB,GAAG,IAAI,EAC7B,gBAAgB,UAAU,KACzB,UAgBF,CAAC"}
+{"version":3,"file":"scope.d.ts","sourceRoot":"","sources":["../../../src/compile/scope.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAGV,UAAU,EACV,WAAW,EAEZ,MAAM,OAAO,CAAC;AACf,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAC9C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAC;AAGzC;;;;;GAKG;AACH,eAAO,MAAM,oBAAoB,GAC/B,YAAY,aAAa,CAAC,WAAW,CAAC,EACtC,WAAW,SAAS,EACpB,eAAe,MAAM,KACpB,KAAK,CAAC,SAAS,CAAC,GAAG,IAiDrB,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,mBAAmB,GAC9B,OAAO,UAAU,EACjB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAyBF,CAAC;AAEF;;;;;;;;GAQG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAgCF,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,qBAAqB,GAChC,QAAQ,UAAU,EAClB,OAAO,aAAa,CAAC,SAAS,CAAC,KAC9B,UAuBF,CAAC;AAEF,8EAA8E;AAC9E,MAAM,MAAM,gBAAgB,GAAG;IAC7B,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,wBAAwB;IACxB,CAAC,EAAE,MAAM,CAAC;IACV,qCAAqC;IACrC,KAAK,EAAE,MAAM,CAAC;IACd,qCAAqC;IACrC,MAAM,EAAE,MAAM,CAAC;CAChB,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,uBAAuB,GAClC,SAAS,aAAa,CAAC,UAAU,CAAC,KACjC,gBAAgB,GAAG,IA2BrB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,qBAAqB,GAChC,IAAI,MAAM,EACV,MAAM,gBAAgB,GAAG,IAAI,EAC7B,gBAAgB,UAAU,KACzB,UAiBF,CAAC"}

package/dist/es/compile/scope.js

@@ -251,7 +251,8 @@ var registerScopeAsLayout = (id, bbox, fallbackOrigin) => {
 		textHeight: box.height,
 		align: "middle",
 		lineHeight: 0,
-		fontSize: 0
+		fontSize: 0,
+		shapes: BUILTIN_SHAPES
 	};
 };
 //#endregion

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

@@ -6,6 +6,20 @@ export declare const arcEndPoint: (center: Position, radius: number, angleDeg: n
  * @description 弧投影到 x/y 轴的极值只可能在弧端点或圆周轴向四点出现。endAngle < startAngle 时按 min..max 扫描；跨 360°（270→450）按数值区间正确处理；不去重——端角恰在 90°·k 上时调用方处理
  */
 export declare const arcBoundingPoints: (center: Position, radius: number, startAngleDeg: number, endAngleDeg: number) => Array<Position>;
+/**
+ * 角度 a（度）是否落在弧的角度区间 [startAngle, endAngle] 内（含端点，带容差）
+ * @description 与 ir/path arc 同约定：弧从 startAngle 扫到 endAngle，counterClockwise=false（缺省）
+ *   时角度递增（屏幕顺时针）、true 时角度递减（逆时针）。统一把扫描量化为「从 start 出发、沿扫描方向
+ *   累积的非负 sweep ∈ [0, |span|]」判定，跨 360°、负角、巨型角都正确（不死循环）。
+ */
+export declare const arcAngleInRange: (startAngleDeg: number, endAngleDeg: number, angleDeg: number, toleranceDeg?: number) => boolean;
+/**
+ * 射线（origin + 单位方向 dir）∩ 圆弧（center, radius, [startAngle, endAngle]）
+ * @description 泛化 sector 的内联 rayCircle：先解 |origin + s·dir|² = radius² 得至多两个参数 s，
+ *   再用 arcAngleInRange 过滤掉不在弧角度区间内的交点。返回沿射线的正向参数 s（命中点 = origin + s·dir），
+ *   按 s 升序、仅含 s > tolerance 的正向交点；不在区间内的根被剔除。dir 必须为单位向量。
+ */
+export declare const rayArc: (origin: Position, dir: Position, center: Position, radius: number, startAngleDeg: number, endAngleDeg: number, tolerance?: number) => Array<number>;
 /**
  * 椭圆弧参数点：中心 + 半轴 rx/ry + 参数角（度）→ 椭圆周上点
  * @description 与 arcEndPoint 同角度约定（SVG y-down）；endpoint = [cx + rx·cosθ, cy + ry·sinθ]。

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

@@ -1 +1 @@
-{"version":3,"file":"arc.d.ts","sourceRoot":"","sources":["../../../src/geometry/arc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAWxC,iDAAiD;AACjD,eAAO,MAAM,WAAW,GACtB,QAAQ,QAAQ,EAChB,QAAQ,MAAM,EACd,UAAU,MAAM,KACf,QAMF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,QAAQ,EAChB,QAAQ,MAAM,EACd,eAAe,MAAM,EACrB,aAAa,MAAM,KAClB,KAAK,CAAC,QAAQ,CAiBhB,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,QAAQ,EAChB,SAAS,MAAM,EACf,SAAS,MAAM,EACf,UAAU,MAAM,KACf,QAMF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,QAAQ,QAAQ,EAChB,SAAS,MAAM,EACf,SAAS,MAAM,EACf,eAAe,MAAM,EACrB,aAAa,MAAM,KAClB,KAAK,CAAC,QAAQ,CAehB,CAAC"}
+{"version":3,"file":"arc.d.ts","sourceRoot":"","sources":["../../../src/geometry/arc.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AA8BxC,iDAAiD;AACjD,eAAO,MAAM,WAAW,GACtB,QAAQ,QAAQ,EAChB,QAAQ,MAAM,EACd,UAAU,MAAM,KACf,QAMF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,iBAAiB,GAC5B,QAAQ,QAAQ,EAChB,QAAQ,MAAM,EACd,eAAe,MAAM,EACrB,aAAa,MAAM,KAClB,KAAK,CAAC,QAAQ,CAchB,CAAC;AAQF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,eAAe,MAAM,EACrB,aAAa,MAAM,EACnB,UAAU,MAAM,EAChB,qBAAmB,KAClB,OASF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,MAAM,GACjB,QAAQ,QAAQ,EAChB,KAAK,QAAQ,EACb,QAAQ,QAAQ,EAChB,QAAQ,MAAM,EACd,eAAe,MAAM,EACrB,aAAa,MAAM,EACnB,kBAAgB,KACf,KAAK,CAAC,MAAM,CAuBd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,eAAe,GAC1B,QAAQ,QAAQ,EAChB,SAAS,MAAM,EACf,SAAS,MAAM,EACf,UAAU,MAAM,KACf,QAMF,CAAC;AAEF;;;GAGG;AACH,eAAO,MAAM,wBAAwB,GACnC,QAAQ,QAAQ,EAChB,SAAS,MAAM,EACf,SAAS,MAAM,EACf,eAAe,MAAM,EACrB,aAAa,MAAM,KAClB,KAAK,CAAC,QAAQ,CAYhB,CAAC"}

package/dist/es/geometry/arc.js

@@ -1,5 +1,22 @@
 //#region src/geometry/arc.ts
 var DEG_TO_RAD = Math.PI / 180;
+/**
+* 在 [lo, hi] 内枚举所有 90°·k 方向角（弧轴向极值候选）
+* @description 一圈最多 4 个轴向，合法弧 sweep ≤ 360° → 至多 5 个 90°·k；正常区间直接 for 扫。
+*   但 lo/hi 为巨型角度（如 1e308）时 k=ceil(lo/90) 落在浮点无整数分辨率区，`k++` 满足 k+1===k →
+*   for 循环永不前进而挂死（DoS）。此时端点投影已覆盖全部 x/y 极值（巨角下弧实际是退化点 / 单端），
+*   轴向点无新增信息 → 直接跳过枚举。守卫：仅当 kEnd−kStart 是 finite 且 ≤ 安全上界（远大于
+*   任何合法弧的轴向点数）时才枚举，否则返回空（端点已足够定界）。
+*/
+var axisAngles = (lo, hi) => {
+	const kStart = Math.ceil(lo / 90);
+	const kEnd = Math.floor(hi / 90);
+	const span = kEnd - kStart;
+	if (!Number.isFinite(span) || span < 0 || span > 1e6) return [];
+	const angles = [];
+	for (let k = kStart; k <= kEnd; k++) angles.push(k * 90);
+	return angles;
+};
 /** 圆心、半径、角度（度，与 polar.toPosition 同约定）→ 圆周上对应点 */
 var arcEndPoint = (center, radius, angleDeg) => {
 	const rad = angleDeg * DEG_TO_RAD;
@@ -13,15 +30,57 @@ var arcBoundingPoints = (center, radius, startAngleDeg, endAngleDeg) => {
 	const points = [arcEndPoint(center, radius, startAngleDeg), arcEndPoint(center, radius, endAngleDeg)];
 	const lo = Math.min(startAngleDeg, endAngleDeg);
 	const hi = Math.max(startAngleDeg, endAngleDeg);
-	const kStart = Math.ceil(lo / 90);
-	const kEnd = Math.floor(hi / 90);
-	for (let k = kStart; k <= kEnd; k++) {
-		const angle = k * 90;
+	for (const angle of axisAngles(lo, hi)) {
 		if (angle === startAngleDeg || angle === endAngleDeg) continue;
 		points.push(arcEndPoint(center, radius, angle));
 	}
 	return points;
 };
+/** 角度（度）→ 规范化到 [0, 360) */
+var normalizeDeg = (deg) => {
+	const m = deg % 360;
+	return m < 0 ? m + 360 : m;
+};
+/**
+* 角度 a（度）是否落在弧的角度区间 [startAngle, endAngle] 内（含端点，带容差）
+* @description 与 ir/path arc 同约定：弧从 startAngle 扫到 endAngle，counterClockwise=false（缺省）
+*   时角度递增（屏幕顺时针）、true 时角度递减（逆时针）。统一把扫描量化为「从 start 出发、沿扫描方向
+*   累积的非负 sweep ∈ [0, |span|]」判定，跨 360°、负角、巨型角都正确（不死循环）。
+*/
+var arcAngleInRange = (startAngleDeg, endAngleDeg, angleDeg, toleranceDeg = 1e-7) => {
+	const span = endAngleDeg - startAngleDeg;
+	const total = Math.abs(span);
+	if (total >= 360 - toleranceDeg) return true;
+	const swept = normalizeDeg(span < 0 ? startAngleDeg - angleDeg : angleDeg - startAngleDeg);
+	return swept <= total + toleranceDeg || swept >= 360 - toleranceDeg;
+};
+/**
+* 射线（origin + 单位方向 dir）∩ 圆弧（center, radius, [startAngle, endAngle]）
+* @description 泛化 sector 的内联 rayCircle：先解 |origin + s·dir|² = radius² 得至多两个参数 s，
+*   再用 arcAngleInRange 过滤掉不在弧角度区间内的交点。返回沿射线的正向参数 s（命中点 = origin + s·dir），
+*   按 s 升序、仅含 s > tolerance 的正向交点；不在区间内的根被剔除。dir 必须为单位向量。
+*/
+var rayArc = (origin, dir, center, radius, startAngleDeg, endAngleDeg, tolerance = 1e-9) => {
+	const ox = origin[0] - center[0];
+	const oy = origin[1] - center[1];
+	const ux = dir[0];
+	const uy = dir[1];
+	const b = 2 * (ox * ux + oy * uy);
+	const c = ox * ox + oy * oy - radius * radius;
+	const disc = b * b - 4 * c;
+	if (disc < 0) return [];
+	const sq = Math.sqrt(disc);
+	const roots = [(-b - sq) / 2, (-b + sq) / 2];
+	const hits = [];
+	for (const s of roots) {
+		if (s <= tolerance) continue;
+		const px = ox + s * ux;
+		const py = oy + s * uy;
+		if (arcAngleInRange(startAngleDeg, endAngleDeg, Math.atan2(py, px) * (180 / Math.PI))) hits.push(s);
+	}
+	hits.sort((a, z) => a - z);
+	return hits;
+};
 /**
 * 椭圆弧参数点：中心 + 半轴 rx/ry + 参数角（度）→ 椭圆周上点
 * @description 与 arcEndPoint 同角度约定（SVG y-down）；endpoint = [cx + rx·cosθ, cy + ry·sinθ]。
@@ -39,14 +98,11 @@ var ellipseArcBoundingPoints = (center, radiusX, radiusY, startAngleDeg, endAngl
 	const points = [ellipseArcPoint(center, radiusX, radiusY, startAngleDeg), ellipseArcPoint(center, radiusX, radiusY, endAngleDeg)];
 	const lo = Math.min(startAngleDeg, endAngleDeg);
 	const hi = Math.max(startAngleDeg, endAngleDeg);
-	const kStart = Math.ceil(lo / 90);
-	const kEnd = Math.floor(hi / 90);
-	for (let k = kStart; k <= kEnd; k++) {
-		const angle = k * 90;
+	for (const angle of axisAngles(lo, hi)) {
 		if (angle === startAngleDeg || angle === endAngleDeg) continue;
 		points.push(ellipseArcPoint(center, radiusX, radiusY, angle));
 	}
 	return points;
 };
 //#endregion
-export { arcBoundingPoints, arcEndPoint, ellipseArcBoundingPoints, ellipseArcPoint };
+export { arcAngleInRange, arcBoundingPoints, arcEndPoint, ellipseArcBoundingPoints, ellipseArcPoint, rayArc };

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

@@ -7,4 +7,5 @@ export * from './polar';
 export * from './bend';
 export * from './arc';
 export * from './segment';
+export * from './roundedContour';
 //# 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,UAAU,CAAC;AACzB,cAAc,WAAW,CAAC;AAC1B,cAAc,WAAW,CAAC;AAC1B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,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;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,OAAO,CAAC;AACtB,cAAc,WAAW,CAAC;AAC1B,cAAc,kBAAkB,CAAC"}

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

@@ -54,8 +54,8 @@ export type RectOutlineOp = {
 /**
  * 矩形 outline：两对角 → 顺时针 path 算子序列
  * @description from/to 任意顺序，归一化 (x0,y0)=min、(x1,y1)=max。直角 = 4 line + close（起点左上 (x0,y0)）；
- *   圆角 = 4 line + 4 quarter-arc + close（起点 (x0+r, y0)）。roundedCorners clamp 到 min(w,h)/2。
+ *   圆角 = 4 line + 4 quarter-arc + close（起点 (x0+r, y0)）。cornerRadius clamp 到 min(w,h)/2。
  *   角度约定同 geometry/arc（y-down：0=+x, 90=+y/下, 180=-x, 270=-y/上）。
  */
-export declare const rectOutline: (from: Position, to: Position, roundedCorners?: number) => Array<RectOutlineOp>;
+export declare const rectOutline: (from: Position, to: Position, cornerRadius?: number) => Array<RectOutlineOp>;
 //# sourceMappingURL=rect.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"rect.d.ts","sourceRoot":"","sources":["../../../src/geometry/rect.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,IAAI,EAAa,MAAM,SAAS,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,gCAAgC;AAChC,MAAM,MAAM,IAAI,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,YAAY;;;;;;;;;;CAUf,CAAC;AAEX,+BAA+B;AAC/B,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAE1E,eAAO,MAAM,IAAI;IACf,WAAW;gBACC,IAAI,KAAG,QAAQ;IAC3B,uBAAuB;kBACT,IAAI,KAAK,QAAQ,KAAG,OAAO;IAMzC,sCAAsC;gBAC1B,IAAI,QAAQ,UAAU,KAAG,QAAQ;IAuC7C,qDAAqD;uBAClC,IAAI,UAAU,QAAQ,KAAG,QAAQ;IAUpD,gEAAgE;mBACjD,IAAI,QAAQ,IAAI,KAAK,MAAM,KAAG,QAAQ;CAItD,CAAC;AAEF,4FAA4F;AAC5F,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACvF;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtB;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,QAAQ,EACd,IAAI,QAAQ,EACZ,iBAAiB,MAAM,KACtB,KAAK,CAAC,aAAa,CAgCrB,CAAC"}
+{"version":3,"file":"rect.d.ts","sourceRoot":"","sources":["../../../src/geometry/rect.ts"],"names":[],"mappings":"AACA,OAAO,EAAa,KAAK,IAAI,EAAa,MAAM,SAAS,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAExC,gCAAgC;AAChC,MAAM,MAAM,IAAI,GAAG;IACjB,CAAC,EAAE,MAAM,CAAC;IACV,CAAC,EAAE,MAAM,CAAC;IACV,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,cAAc;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,qEAAqE;AACrE,eAAO,MAAM,YAAY;;;;;;;;;;CAUf,CAAC;AAEX,+BAA+B;AAC/B,MAAM,MAAM,UAAU,GAAG,CAAC,OAAO,YAAY,CAAC,CAAC,MAAM,OAAO,YAAY,CAAC,CAAC;AAE1E,eAAO,MAAM,IAAI;IACf,WAAW;gBACC,IAAI,KAAG,QAAQ;IAC3B,uBAAuB;kBACT,IAAI,KAAK,QAAQ,KAAG,OAAO;IAMzC,sCAAsC;gBAC1B,IAAI,QAAQ,UAAU,KAAG,QAAQ;IAuC7C,qDAAqD;uBAClC,IAAI,UAAU,QAAQ,KAAG,QAAQ;IAUpD,gEAAgE;mBACjD,IAAI,QAAQ,IAAI,KAAK,MAAM,KAAG,QAAQ;CAItD,CAAC;AAEF,4FAA4F;AAC5F,MAAM,MAAM,aAAa,GACrB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,KAAK,CAAC;IAAC,MAAM,EAAE,QAAQ,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAA;CAAE,GACvF;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AAEtB;;;;;GAKG;AACH,eAAO,MAAM,WAAW,GACtB,MAAM,QAAQ,EACd,IAAI,QAAQ,EACZ,eAAe,MAAM,KACpB,KAAK,CAAC,aAAa,CAgCrB,CAAC"}

package/dist/es/geometry/rect.js

@@ -82,15 +82,15 @@ var rect = {
 /**
 * 矩形 outline：两对角 → 顺时针 path 算子序列
 * @description from/to 任意顺序，归一化 (x0,y0)=min、(x1,y1)=max。直角 = 4 line + close（起点左上 (x0,y0)）；
-*   圆角 = 4 line + 4 quarter-arc + close（起点 (x0+r, y0)）。roundedCorners clamp 到 min(w,h)/2。
+*   圆角 = 4 line + 4 quarter-arc + close（起点 (x0+r, y0)）。cornerRadius clamp 到 min(w,h)/2。
 *   角度约定同 geometry/arc（y-down：0=+x, 90=+y/下, 180=-x, 270=-y/上）。
 */
-var rectOutline = (from, to, roundedCorners) => {
+var rectOutline = (from, to, cornerRadius) => {
 	const x0 = Math.min(from[0], to[0]);
 	const x1 = Math.max(from[0], to[0]);
 	const y0 = Math.min(from[1], to[1]);
 	const y1 = Math.max(from[1], to[1]);
-	const r = roundedCorners === void 0 ? 0 : Math.min(roundedCorners, (x1 - x0) / 2, (y1 - y0) / 2);
+	const r = cornerRadius === void 0 ? 0 : Math.min(cornerRadius, (x1 - x0) / 2, (y1 - y0) / 2);
 	if (r <= 0) return [
 		{
 			kind: "move",

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

@@ -0,0 +1,88 @@
+import { Position } from './point';
+/** 直线段：从 from 到 to 的有向线段 */
+export type LineSegment = {
+    /** 鉴别字面量 */
+    kind: 'line';
+    /** 起点 [x, y] */
+    from: Position;
+    /** 终点 [x, y] */
+    to: Position;
+};
+/** 圆弧段：圆心 + 半径 + 起末角（度）+ 扫描方向，与 ir/path arc 同参数化 */
+export type ArcSegment = {
+    /** 鉴别字面量 */
+    kind: 'arc';
+    /** 圆心 [x, y] */
+    center: Position;
+    /** 半径（user units） */
+    radius: number;
+    /** 起始角度（度，0=+x、90=+y 视觉下） */
+    startAngle: number;
+    /** 终止角度（度） */
+    endAngle: number;
+    /** 是否逆时针扫描；缺省 / false = CW（角度递增 / 屏幕顺时针） */
+    counterClockwise?: boolean;
+};
+/** 轮廓段：组成闭合轮廓的最小单元（直线或圆弧） */
+export type ContourSegment = LineSegment | ArcSegment;
+/** fillet 后用于 emit 的路径命令（与 primitive/path PathCommand 的 move/line/arc/close 子集对齐） */
+export type ContourCommand = {
+    kind: 'move';
+    to: Position;
+} | {
+    kind: 'line';
+    to: Position;
+} | {
+    kind: 'arc';
+    center: Position;
+    radius: number;
+    startAngle: number;
+    endAngle: number;
+    counterClockwise?: boolean;
+} | {
+    kind: 'close';
+};
+/**
+ * 一个接缝处 fillet 的解算结果
+ * @description tangentInPoint = 前段被裁短到此点（前段新终点）；tangentOutPoint = 后段从此点起（后段新起点）；
+ *   filletArc 描述连接两切点的圆弧。clampedToZero=true 表示该角夹紧后 r→0，不倒角（保持尖角）。
+ */
+type FilletSolution = {
+    /** 前段切点（前段新终点） */
+    tangentInPoint: Position;
+    /** 后段切点（后段新起点） */
+    tangentOutPoint: Position;
+    /** fillet 圆心 */
+    center: Position;
+    /** fillet 半径 */
+    radius: number;
+    /** fillet 弧起始角（度，从 center 看 tangentInPoint） */
+    startAngle: number;
+    /** fillet 弧终止角（度，从 center 看 tangentOutPoint） */
+    endAngle: number;
+    /** fillet 弧是否逆时针 */
+    counterClockwise: boolean;
+    /** 夹紧后 r→0，本角不倒（emit 走原尖角） */
+    clampedToZero: boolean;
+};
+/**
+ * 对闭合轮廓的每个接缝做 fillet，返回 fillet 解算列表（与接缝一一对应，下标 i = 段 i 终点接段 (i+1)%n 起点）
+ * @description cornerRadius 省略 / ≤0 → 返回空数组（调用方据此 passthrough 原段序列）。arc-arc 接缝抛错。
+ */
+export declare const filletContour: (segments: Array<ContourSegment>, cornerRadius?: number) => Array<FilletSolution>;
+/**
+ * 把闭合轮廓 + cornerRadius emit 成路径命令（move + 缩短 line + 裁剪原 arc + fillet arc + close）
+ * @description cornerRadius 省略 / ≤0 → 直接 emit 原始尖角轮廓（passthrough）。否则每段从「上一接缝的
+ *   fillet 出点」走到「本接缝的 fillet 入点」（line 缩短 / arc 裁剪角度），接缝处插 fillet 弧。
+ *   夹紧到 0 的角不插弧、按原尖角连接。
+ */
+export declare const contourCommands: (segments: Array<ContourSegment>, cornerRadius?: number) => Array<ContourCommand>;
+/**
+ * 从 rayOrigin 朝 toward 射线 ∩ fillet 后轮廓全部段，返回最近正向交点
+ * @description rayOrigin 显式传（不假设中心）；toward 是射线指向的目标点（方向 = toward − rayOrigin）。
+ *   遍历 fillet 后的有效段（缩短 line / 裁剪 arc / fillet arc），对每段求 ray∩段、取最小正参数命中点。
+ *   cornerRadius 省略 / ≤0 → 走原尖角轮廓。无命中返回 undefined（调用方兜底）。
+ */
+export declare const boundaryFromContour: (segments: Array<ContourSegment>, cornerRadius: number | undefined, rayOrigin: Position, toward: Position) => Position | undefined;
+export {};
+//# sourceMappingURL=roundedContour.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"roundedContour.d.ts","sourceRoot":"","sources":["../../../src/geometry/roundedContour.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,SAAS,CAAC;AAkBxC,4BAA4B;AAC5B,MAAM,MAAM,WAAW,GAAG;IACxB,YAAY;IACZ,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB;IAChB,IAAI,EAAE,QAAQ,CAAC;IACf,gBAAgB;IAChB,EAAE,EAAE,QAAQ,CAAC;CACd,CAAC;AAEF,oDAAoD;AACpD,MAAM,MAAM,UAAU,GAAG;IACvB,YAAY;IACZ,IAAI,EAAE,KAAK,CAAC;IACZ,gBAAgB;IAChB,MAAM,EAAE,QAAQ,CAAC;IACjB,qBAAqB;IACrB,MAAM,EAAE,MAAM,CAAC;IACf,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc;IACd,QAAQ,EAAE,MAAM,CAAC;IACjB,4CAA4C;IAC5C,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,CAAC;AAEF,6BAA6B;AAC7B,MAAM,MAAM,cAAc,GAAG,WAAW,GAAG,UAAU,CAAC;AAEtD,qFAAqF;AACrF,MAAM,MAAM,cAAc,GACtB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,QAAQ,CAAA;CAAE,GAC9B;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,MAAM,EAAE,QAAQ,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,gBAAgB,CAAC,EAAE,OAAO,CAAC;CAC5B,GACD;IAAE,IAAI,EAAE,OAAO,CAAA;CAAE,CAAC;AA6CtB;;;;GAIG;AACH,KAAK,cAAc,GAAG;IACpB,kBAAkB;IAClB,cAAc,EAAE,QAAQ,CAAC;IACzB,kBAAkB;IAClB,eAAe,EAAE,QAAQ,CAAC;IAC1B,gBAAgB;IAChB,MAAM,EAAE,QAAQ,CAAC;IACjB,gBAAgB;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,+CAA+C;IAC/C,UAAU,EAAE,MAAM,CAAC;IACnB,gDAAgD;IAChD,QAAQ,EAAE,MAAM,CAAC;IACjB,oBAAoB;IACpB,gBAAgB,EAAE,OAAO,CAAC;IAC1B,8BAA8B;IAC9B,aAAa,EAAE,OAAO,CAAC;CACxB,CAAC;AAgTF;;;GAGG;AACH,eAAO,MAAM,aAAa,GACxB,UAAU,KAAK,CAAC,cAAc,CAAC,EAC/B,eAAe,MAAM,KACpB,KAAK,CAAC,cAAc,CAUtB,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,eAAe,GAC1B,UAAU,KAAK,CAAC,cAAc,CAAC,EAC/B,eAAe,MAAM,KACpB,KAAK,CAAC,cAAc,CAuCtB,CAAC;AAwCF;;;;;GAKG;AACH,eAAO,MAAM,mBAAmB,GAC9B,UAAU,KAAK,CAAC,cAAc,CAAC,EAC/B,cAAc,MAAM,GAAG,SAAS,EAChC,WAAW,QAAQ,EACnB,QAAQ,QAAQ,KACf,QAAQ,GAAG,SA2Eb,CAAC"}