@faicad/faijs 0.18.3 → 0.22.2

package/dist/geometry2d/point.js

@@ -0,0 +1,57 @@
+/**
+ * geometry2d — small 2D point / vector helpers shared by the sketcher pens and
+ * the draw package. Pure TS, zero dependency.
+ *
+ * Ported from brepjs `2d/lib`-style utilities (Apache-2.0).
+ *
+ * @module
+ */
+/**
+ * Euclidean distance between two 2D points.
+ * @param a - first point.
+ * @param b - second point.
+ * @returns the distance.
+ */
+export function distance2d(a, b) {
+    return Math.hypot(b[0] - a[0], b[1] - a[1]);
+}
+/**
+ * True when two 2D points coincide within `eps`.
+ * @param a - first point.
+ * @param b - second point.
+ * @param eps - coincidence tolerance (default 1e-9).
+ * @returns whether `a` and `b` are the same point.
+ */
+export function samePoint(a, b, eps = 1e-9) {
+    return distance2d(a, b) <= eps;
+}
+/**
+ * Convert polar `[r, theta]` (radians) to Cartesian `[x, y]`.
+ * @param r - radial distance.
+ * @param theta - angle in radians.
+ * @returns the Cartesian point.
+ */
+export function polarToCartesian(r, theta) {
+    return [r * Math.cos(theta), r * Math.sin(theta)];
+}
+/**
+ * Normalize a 2D vector to unit length.
+ * @param v - the input vector.
+ * @returns the unit vector (the zero vector normalizes to `[1,0]`).
+ */
+export function normalize2d(v) {
+    const len = Math.hypot(v[0], v[1]);
+    if (len < 1e-12)
+        return [1, 0];
+    return [v[0] / len, v[1] / len];
+}
+/**
+ * Absolute polar angle of `b` relative to `a`.
+ * @param a - the reference point.
+ * @param b - the target point.
+ * @returns the angle in radians, in `[0, 2π)`.
+ */
+export function polarAngle2d(a, b) {
+    return Math.atan2(b[1] - a[1], b[0] - a[0]);
+}
+//# sourceMappingURL=point.js.map

package/dist/geometry2d/point.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"point.js","sourceRoot":"","sources":["../../src/geometry2d/point.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AAEH;;;;;GAKG;AACH,MAAM,UAAU,UAAU,CAAC,CAA4B,EAAE,CAA4B;IACnF,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7C,CAAC;AAED;;;;;;GAMG;AACH,MAAM,UAAU,SAAS,CAAC,CAA4B,EAAE,CAA4B,EAAE,GAAG,GAAG,IAAI;IAC9F,OAAO,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,GAAG,CAAA;AAChC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,gBAAgB,CAAC,CAAS,EAAE,KAAa;IACvD,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAA;AACnD,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,WAAW,CAAC,CAA4B;IACtD,MAAM,GAAG,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAClC,IAAI,GAAG,GAAG,KAAK;QAAE,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;IAC9B,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,CAAC,CAAA;AACjC,CAAC;AAED;;;;;GAKG;AACH,MAAM,UAAU,YAAY,CAAC,CAA4B,EAAE,CAA4B;IACrF,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAC7C,CAAC","sourcesContent":["/**\n * geometry2d — small 2D point / vector helpers shared by the sketcher pens and\n * the draw package. Pure TS, zero dependency.\n *\n * Ported from brepjs `2d/lib`-style utilities (Apache-2.0).\n *\n * @module\n */\n\n/**\n * Euclidean distance between two 2D points.\n * @param a - first point.\n * @param b - second point.\n * @returns the distance.\n */\nexport function distance2d(a: readonly [number, number], b: readonly [number, number]): number {\n  return Math.hypot(b[0] - a[0], b[1] - a[1])\n}\n\n/**\n * True when two 2D points coincide within `eps`.\n * @param a - first point.\n * @param b - second point.\n * @param eps - coincidence tolerance (default 1e-9).\n * @returns whether `a` and `b` are the same point.\n */\nexport function samePoint(a: readonly [number, number], b: readonly [number, number], eps = 1e-9): boolean {\n  return distance2d(a, b) <= eps\n}\n\n/**\n * Convert polar `[r, theta]` (radians) to Cartesian `[x, y]`.\n * @param r - radial distance.\n * @param theta - angle in radians.\n * @returns the Cartesian point.\n */\nexport function polarToCartesian(r: number, theta: number): [number, number] {\n  return [r * Math.cos(theta), r * Math.sin(theta)]\n}\n\n/**\n * Normalize a 2D vector to unit length.\n * @param v - the input vector.\n * @returns the unit vector (the zero vector normalizes to `[1,0]`).\n */\nexport function normalize2d(v: readonly [number, number]): [number, number] {\n  const len = Math.hypot(v[0], v[1])\n  if (len < 1e-12) return [1, 0]\n  return [v[0] / len, v[1] / len]\n}\n\n/**\n * Absolute polar angle of `b` relative to `a`.\n * @param a - the reference point.\n * @param b - the target point.\n * @returns the angle in radians, in `[0, 2π)`.\n */\nexport function polarAngle2d(a: readonly [number, number], b: readonly [number, number]): number {\n  return Math.atan2(b[1] - a[1], b[0] - a[0])\n}"]}

package/dist/geometry2d/svg-ellipse.d.ts

@@ -0,0 +1,74 @@
+/**
+ * geometry2d — SVG-style elliptical arc construction (SVG endpoint form).
+ *
+ * Ported from brepjs `2d/blueprints/ellipseUtils.ts` (Apache-2.0). Adapts the
+ * SVG F.6.5/F.6.6 endpoint→center conversion onto the pure `Curve2dObj` base:
+ * the resulting elliptical arc is a `TrimmedCurve2d` over an `Ellipse2d`, whose
+ * parameter is the sweep angle in radians (CCW positive).
+ *
+ * @module
+ */
+import { type Curve2dObj } from './curve2d.js';
+/** A `[x, y]` 2D point. */
+type Pt = [number, number];
+/**
+ * Normalize ellipse radii so the major axis is horizontal, adjusting rotation.
+ * @param horizontalRadius - the radius along the SVG x-axis.
+ * @param verticalRadius - the radius along the SVG y-axis.
+ * @param rotation - rotation in degrees.
+ * @returns the normalized radius set.
+ */
+export declare function normalizeEllipseRadii(horizontalRadius: number, verticalRadius: number, rotation: number): {
+    majorRadius: number;
+    minorRadius: number;
+    rotationAngle: number;
+};
+/**
+ * Convert SVG elliptical-arc endpoint parameters to the centerly parametrization
+ * (SVG F6.5.1–F6.5.6).
+ * @param x1 - start x.
+ * @param y1 - start y.
+ * @param x2 - end x.
+ * @param y2 - end y.
+ * @param rx - x radius.
+ * @param ry - y radius.
+ * @param phi - rotation angle (radians).
+ * @param fA - large-arc flag.
+ * @param fS - sweep flag.
+ * @returns the center, radii and angular parametrization.
+ */
+export declare function convertSvgEllipseParams(x1: number, y1: number, x2: number, y2: number, rx: number, ry: number, phi: number, fA: boolean, fS: boolean): {
+    cx: number;
+    cy: number;
+    startAngle: number;
+    endAngle: number;
+    clockwise: boolean;
+    rx: number;
+    ry: number;
+};
+/**
+ * Build an elliptical arc `Curve2dObj` from SVG endpoint parameters.
+ * @param startUV - the start point.
+ * @param endUV - the end point.
+ * @param majorRadius - the major radius.
+ * @param minorRadius - the minor radius.
+ * @param rotationAngleDeg - rotation in degrees.
+ * @param longAxis - SVG large-arc flag.
+ * @param sweep - SVG sweep flag.
+ * @returns a trimmed elliptical arc.
+ */
+export declare function makeEllipseArcFromSvgParams(startUV: Pt, endUV: Pt, majorRadius: number, minorRadius: number, rotationAngleDeg: number, longAxis: boolean, sweep: boolean): Curve2dObj;
+/**
+ * Build an elliptical arc as a trimmed ellipse over an angle range.
+ * @param rx - x radius.
+ * @param ry - y radius.
+ * @param startAngle - start angle (radians, ellipse-param space).
+ * @param endAngle - end angle (radians).
+ * @param center - the ellipse center.
+ * @param xDir - the in-plane X axis of the ellipse.
+ * @param clockwise - sweep direction.
+ * @returns a trimmed elliptical arc.
+ */
+export declare function makeEllipseArcFromCenter(rx: number, ry: number, startAngle: number, endAngle: number, center: Pt, xDir: Pt, clockwise: boolean): Curve2dObj;
+export {};
+//# sourceMappingURL=svg-ellipse.d.ts.map

package/dist/geometry2d/svg-ellipse.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"svg-ellipse.d.ts","sourceRoot":"","sources":["../../src/geometry2d/svg-ellipse.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AAEH,OAAO,EAAiB,KAAK,UAAU,EAAE,MAAM,WAAW,CAAA;AAM1D,2BAA2B;AAC3B,KAAK,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;AA0C1B;;;;;;GAMG;AACH,wBAAgB,qBAAqB,CACnC,gBAAgB,EAAE,MAAM,EACxB,cAAc,EAAE,MAAM,EACtB,QAAQ,EAAE,MAAM,GACf;IAAE,WAAW,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,MAAM,CAAC;IAAC,aAAa,EAAE,MAAM,CAAA;CAAE,CAKrE;AAED;;;;;;;;;;;;;GAaG;AACH,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,GAAG,EAAE,MAAM,EACX,EAAE,EAAE,OAAO,EACX,EAAE,EAAE,OAAO,GACV;IAAE,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,UAAU,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,OAAO,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAiC9G;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,2BAA2B,CACzC,OAAO,EAAE,EAAE,EACX,KAAK,EAAE,EAAE,EACT,WAAW,EAAE,MAAM,EACnB,WAAW,EAAE,MAAM,EACnB,gBAAgB,EAAE,MAAM,EACxB,QAAQ,EAAE,OAAO,EACjB,KAAK,EAAE,OAAO,GACb,UAAU,CASZ;AAED;;;;;;;;;;GAUG;AACH,wBAAgB,wBAAwB,CACtC,EAAE,EAAE,MAAM,EACV,EAAE,EAAE,MAAM,EACV,UAAU,EAAE,MAAM,EAClB,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,EAAE,EACV,IAAI,EAAE,EAAE,EACR,SAAS,EAAE,OAAO,GACjB,UAAU,CAOZ"}

package/dist/geometry2d/svg-ellipse.js

@@ -0,0 +1,163 @@
+/**
+ * geometry2d — SVG-style elliptical arc construction (SVG endpoint form).
+ *
+ * Ported from brepjs `2d/blueprints/ellipseUtils.ts` (Apache-2.0). Adapts the
+ * SVG F.6.5/F.6.6 endpoint→center conversion onto the pure `Curve2dObj` base:
+ * the resulting elliptical arc is a `TrimmedCurve2d` over an `Ellipse2d`, whose
+ * parameter is the sweep angle in radians (CCW positive).
+ *
+ * @module
+ */
+import { makeEllipse2d } from './curve2d.js';
+import { normalize2d } from './point.js';
+const DEG2RAD = Math.PI / 180;
+const TWO_PI = Math.PI * 2;
+function bug(caller, message) {
+    throw new Error(`[geometry2d/svg-ellipse] ${caller}: ${message}`);
+}
+/** Rotate a 2D point by `rad` radians. */
+function rotate2d([x, y], rad) {
+    return [x * Math.cos(rad) - y * Math.sin(rad), x * Math.sin(rad) + y * Math.cos(rad)];
+}
+/** Signed angle from `[ux,uy]` to `[vx,vy]` in `[−π, π]`. */
+function radianAngle(ux, uy, vx, vy) {
+    const dot = ux * vx + uy * vy;
+    const mod = Math.sqrt((ux * ux + uy * uy) * (vx * vx + vy * vy));
+    if (mod < 1e-12)
+        bug('radianAngle', 'Cannot compute angle between zero-length vectors');
+    let rad = Math.acos(Math.max(-1, Math.min(1, dot / mod)));
+    if (ux * vy - uy * vx < 0)
+        rad = -rad;
+    return rad;
+}
+/**
+ * Compute arc start/end angles from the unit-circle parameterization (SVG F6.5.5).
+ * @param xcr1 - first unit-circle x.
+ * @param ycr1 - first unit-circle y.
+ * @param xcr2 - second unit-circle x.
+ * @param ycr2 - second unit-circle y.
+ * @param fS - sweep flag.
+ * @returns the `{ startAngle, endAngle }` pair (radians).
+ */
+function computeArcAngles(xcr1, ycr1, xcr2, ycr2, fS) {
+    const startAngle = radianAngle(1, 0, xcr1, ycr1);
+    let deltaAngle = radianAngle(xcr1, ycr1, -xcr2, -ycr2);
+    while (deltaAngle > TWO_PI)
+        deltaAngle -= TWO_PI;
+    while (deltaAngle < 0)
+        deltaAngle += TWO_PI;
+    if (!fS)
+        deltaAngle -= TWO_PI;
+    let endAngle = startAngle + deltaAngle;
+    while (endAngle > TWO_PI)
+        endAngle -= TWO_PI;
+    while (endAngle < 0)
+        endAngle += TWO_PI;
+    return { startAngle, endAngle };
+}
+/**
+ * Normalize ellipse radii so the major axis is horizontal, adjusting rotation.
+ * @param horizontalRadius - the radius along the SVG x-axis.
+ * @param verticalRadius - the radius along the SVG y-axis.
+ * @param rotation - rotation in degrees.
+ * @returns the normalized radius set.
+ */
+export function normalizeEllipseRadii(horizontalRadius, verticalRadius, rotation) {
+    if (horizontalRadius < verticalRadius) {
+        return { majorRadius: verticalRadius, minorRadius: horizontalRadius, rotationAngle: rotation + 90 };
+    }
+    return { majorRadius: horizontalRadius, minorRadius: verticalRadius, rotationAngle: rotation };
+}
+/**
+ * Convert SVG elliptical-arc endpoint parameters to the centerly parametrization
+ * (SVG F6.5.1–F6.5.6).
+ * @param x1 - start x.
+ * @param y1 - start y.
+ * @param x2 - end x.
+ * @param y2 - end y.
+ * @param rx - x radius.
+ * @param ry - y radius.
+ * @param phi - rotation angle (radians).
+ * @param fA - large-arc flag.
+ * @param fS - sweep flag.
+ * @returns the center, radii and angular parametrization.
+ */
+export function convertSvgEllipseParams(x1, y1, x2, y2, rx, ry, phi, fA, fS) {
+    if (rx < 0)
+        rx = -rx;
+    if (ry < 0)
+        ry = -ry;
+    if (rx < 1e-10 || ry < 1e-10)
+        bug('convertSvgEllipseParams', 'rx and ry cannot be 0');
+    const s_phi = Math.sin(phi);
+    const c_phi = Math.cos(phi);
+    const hd_x = (x1 - x2) / 2;
+    const hd_y = (y1 - y2) / 2;
+    const hs_x = (x1 + x2) / 2;
+    const hs_y = (y1 + y2) / 2;
+    // F6.5.1: transform to (x', y')
+    const x1_ = c_phi * hd_x + s_phi * hd_y;
+    const y1_ = c_phi * hd_y - s_phi * hd_x;
+    // F.6.6: correct out-of-range radii
+    const lambda = (x1_ * x1_) / (rx * rx) + (y1_ * y1_) / (ry * ry);
+    if (lambda > 1) {
+        rx = rx * Math.sqrt(lambda);
+        ry = ry * Math.sqrt(lambda);
+    }
+    const rxry = rx * ry;
+    const rxy1_ = rx * y1_;
+    const ryx1_ = ry * x1_;
+    const sum_of_sq = rxy1_ * rxy1_ + ryx1_ * ryx1_;
+    if (!sum_of_sq)
+        bug('convertSvgEllipseParams', 'Start point cannot be the same as end point');
+    let coe = Math.sqrt(Math.abs((rxry * rxry - sum_of_sq) / sum_of_sq));
+    if (fA === fS)
+        coe = -coe;
+    const cx_ = (coe * rxy1_) / ry;
+    const cy_ = (-coe * ryx1_) / rx;
+    // F6.5.3: back-transform to absolute center
+    const cx = c_phi * cx_ - s_phi * cy_ + hs_x;
+    const cy = s_phi * cx_ + c_phi * cy_ + hs_y;
+    const { startAngle, endAngle } = computeArcAngles((x1_ - cx_) / rx, (y1_ - cy_) / ry, (x1_ + cx_) / rx, (y1_ + cy_) / ry, fS);
+    return { cx, cy, startAngle, endAngle, clockwise: fS, rx, ry };
+}
+/**
+ * Build an elliptical arc `Curve2dObj` from SVG endpoint parameters.
+ * @param startUV - the start point.
+ * @param endUV - the end point.
+ * @param majorRadius - the major radius.
+ * @param minorRadius - the minor radius.
+ * @param rotationAngleDeg - rotation in degrees.
+ * @param longAxis - SVG large-arc flag.
+ * @param sweep - SVG sweep flag.
+ * @returns a trimmed elliptical arc.
+ */
+export function makeEllipseArcFromSvgParams(startUV, endUV, majorRadius, minorRadius, rotationAngleDeg, longAxis, sweep) {
+    const radRotation = rotationAngleDeg * DEG2RAD;
+    const xDir = normalize2d(rotate2d([1, 0], radRotation));
+    const phi = Math.atan2(xDir[1], xDir[0]);
+    const { majorRadius: maAxis, minorRadius: miAxis } = normalizeEllipseRadii(majorRadius, minorRadius, rotationAngleDeg);
+    const { cx, cy, startAngle, endAngle, clockwise, rx, ry } = convertSvgEllipseParams(startUV[0], startUV[1], endUV[0], endUV[1], maAxis, miAxis, phi, longAxis, sweep);
+    return makeEllipseArcFromCenter(rx, ry, startAngle, endAngle, [cx, cy], xDir, clockwise);
+}
+/**
+ * Build an elliptical arc as a trimmed ellipse over an angle range.
+ * @param rx - x radius.
+ * @param ry - y radius.
+ * @param startAngle - start angle (radians, ellipse-param space).
+ * @param endAngle - end angle (radians).
+ * @param center - the ellipse center.
+ * @param xDir - the in-plane X axis of the ellipse.
+ * @param clockwise - sweep direction.
+ * @returns a trimmed elliptical arc.
+ */
+export function makeEllipseArcFromCenter(rx, ry, startAngle, endAngle, center, xDir, clockwise) {
+    const sense = !clockwise;
+    const aStart = sense ? startAngle : -startAngle;
+    let aEnd = sense ? endAngle : -endAngle;
+    if (aEnd < aStart - 1e-9)
+        aEnd += TWO_PI;
+    const ellipse = makeEllipse2d(center[0], center[1], rx, ry, xDir[0], xDir[1], sense);
+    return { kind2d: 'trimmed', basis: ellipse, tStart: aStart, tEnd: aEnd };
+}
+//# sourceMappingURL=svg-ellipse.js.map

package/dist/geometry2d/svg-ellipse.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"svg-ellipse.js","sourceRoot":"","sources":["../../src/geometry2d/svg-ellipse.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * geometry2d — SVG-style elliptical arc construction (SVG endpoint form).\n *\n * Ported from brepjs `2d/blueprints/ellipseUtils.ts` (Apache-2.0). Adapts the\n * SVG F.6.5/F.6.6 endpoint→center conversion onto the pure `Curve2dObj` base:\n * the resulting elliptical arc is a `TrimmedCurve2d` over an `Ellipse2d`, whose\n * parameter is the sweep angle in radians (CCW positive).\n *\n * @module\n */\n\nimport { makeEllipse2d, type Curve2dObj } from './curve2d'\nimport { normalize2d } from './point'\n\nconst DEG2RAD = Math.PI / 180\nconst TWO_PI = Math.PI * 2\n\n/** A `[x, y]` 2D point. */\ntype Pt = [number, number]\n\nfunction bug(caller: string, message: string): never {\n  throw new Error(`[geometry2d/svg-ellipse] ${caller}: ${message}`)\n}\n\n/** Rotate a 2D point by `rad` radians. */\nfunction rotate2d([x, y]: Pt, rad: number): Pt {\n  return [x * Math.cos(rad) - y * Math.sin(rad), x * Math.sin(rad) + y * Math.cos(rad)]\n}\n\n/** Signed angle from `[ux,uy]` to `[vx,vy]` in `[−π, π]`. */\nfunction radianAngle(ux: number, uy: number, vx: number, vy: number): number {\n  const dot = ux * vx + uy * vy\n  const mod = Math.sqrt((ux * ux + uy * uy) * (vx * vx + vy * vy))\n  if (mod < 1e-12) bug('radianAngle', 'Cannot compute angle between zero-length vectors')\n  let rad = Math.acos(Math.max(-1, Math.min(1, dot / mod)))\n  if (ux * vy - uy * vx < 0) rad = -rad\n  return rad\n}\n\n/**\n * Compute arc start/end angles from the unit-circle parameterization (SVG F6.5.5).\n * @param xcr1 - first unit-circle x.\n * @param ycr1 - first unit-circle y.\n * @param xcr2 - second unit-circle x.\n * @param ycr2 - second unit-circle y.\n * @param fS - sweep flag.\n * @returns the `{ startAngle, endAngle }` pair (radians).\n */\nfunction computeArcAngles(xcr1: number, ycr1: number, xcr2: number, ycr2: number, fS: boolean): { startAngle: number; endAngle: number } {\n  const startAngle = radianAngle(1, 0, xcr1, ycr1)\n  let deltaAngle = radianAngle(xcr1, ycr1, -xcr2, -ycr2)\n  while (deltaAngle > TWO_PI) deltaAngle -= TWO_PI\n  while (deltaAngle < 0) deltaAngle += TWO_PI\n  if (!fS) deltaAngle -= TWO_PI\n  let endAngle = startAngle + deltaAngle\n  while (endAngle > TWO_PI) endAngle -= TWO_PI\n  while (endAngle < 0) endAngle += TWO_PI\n  return { startAngle, endAngle }\n}\n\n/**\n * Normalize ellipse radii so the major axis is horizontal, adjusting rotation.\n * @param horizontalRadius - the radius along the SVG x-axis.\n * @param verticalRadius - the radius along the SVG y-axis.\n * @param rotation - rotation in degrees.\n * @returns the normalized radius set.\n */\nexport function normalizeEllipseRadii(\n  horizontalRadius: number,\n  verticalRadius: number,\n  rotation: number,\n): { majorRadius: number; minorRadius: number; rotationAngle: number } {\n  if (horizontalRadius < verticalRadius) {\n    return { majorRadius: verticalRadius, minorRadius: horizontalRadius, rotationAngle: rotation + 90 }\n  }\n  return { majorRadius: horizontalRadius, minorRadius: verticalRadius, rotationAngle: rotation }\n}\n\n/**\n * Convert SVG elliptical-arc endpoint parameters to the centerly parametrization\n * (SVG F6.5.1–F6.5.6).\n * @param x1 - start x.\n * @param y1 - start y.\n * @param x2 - end x.\n * @param y2 - end y.\n * @param rx - x radius.\n * @param ry - y radius.\n * @param phi - rotation angle (radians).\n * @param fA - large-arc flag.\n * @param fS - sweep flag.\n * @returns the center, radii and angular parametrization.\n */\nexport function convertSvgEllipseParams(\n  x1: number,\n  y1: number,\n  x2: number,\n  y2: number,\n  rx: number,\n  ry: number,\n  phi: number,\n  fA: boolean,\n  fS: boolean,\n): { cx: number; cy: number; startAngle: number; endAngle: number; clockwise: boolean; rx: number; ry: number } {\n  if (rx < 0) rx = -rx\n  if (ry < 0) ry = -ry\n  if (rx < 1e-10 || ry < 1e-10) bug('convertSvgEllipseParams', 'rx and ry cannot be 0')\n  const s_phi = Math.sin(phi)\n  const c_phi = Math.cos(phi)\n  const hd_x = (x1 - x2) / 2\n  const hd_y = (y1 - y2) / 2\n  const hs_x = (x1 + x2) / 2\n  const hs_y = (y1 + y2) / 2\n  // F6.5.1: transform to (x', y')\n  const x1_ = c_phi * hd_x + s_phi * hd_y\n  const y1_ = c_phi * hd_y - s_phi * hd_x\n  // F.6.6: correct out-of-range radii\n  const lambda = (x1_ * x1_) / (rx * rx) + (y1_ * y1_) / (ry * ry)\n  if (lambda > 1) {\n    rx = rx * Math.sqrt(lambda)\n    ry = ry * Math.sqrt(lambda)\n  }\n  const rxry = rx * ry\n  const rxy1_ = rx * y1_\n  const ryx1_ = ry * x1_\n  const sum_of_sq = rxy1_ * rxy1_ + ryx1_ * ryx1_\n  if (!sum_of_sq) bug('convertSvgEllipseParams', 'Start point cannot be the same as end point')\n  let coe = Math.sqrt(Math.abs((rxry * rxry - sum_of_sq) / sum_of_sq))\n  if (fA === fS) coe = -coe\n  const cx_ = (coe * rxy1_) / ry\n  const cy_ = (-coe * ryx1_) / rx\n  // F6.5.3: back-transform to absolute center\n  const cx = c_phi * cx_ - s_phi * cy_ + hs_x\n  const cy = s_phi * cx_ + c_phi * cy_ + hs_y\n  const { startAngle, endAngle } = computeArcAngles((x1_ - cx_) / rx, (y1_ - cy_) / ry, (x1_ + cx_) / rx, (y1_ + cy_) / ry, fS)\n  return { cx, cy, startAngle, endAngle, clockwise: fS, rx, ry }\n}\n\n/**\n * Build an elliptical arc `Curve2dObj` from SVG endpoint parameters.\n * @param startUV - the start point.\n * @param endUV - the end point.\n * @param majorRadius - the major radius.\n * @param minorRadius - the minor radius.\n * @param rotationAngleDeg - rotation in degrees.\n * @param longAxis - SVG large-arc flag.\n * @param sweep - SVG sweep flag.\n * @returns a trimmed elliptical arc.\n */\nexport function makeEllipseArcFromSvgParams(\n  startUV: Pt,\n  endUV: Pt,\n  majorRadius: number,\n  minorRadius: number,\n  rotationAngleDeg: number,\n  longAxis: boolean,\n  sweep: boolean,\n): Curve2dObj {\n  const radRotation = rotationAngleDeg * DEG2RAD\n  const xDir = normalize2d(rotate2d([1, 0], radRotation))\n  const phi = Math.atan2(xDir[1], xDir[0])\n  const { majorRadius: maAxis, minorRadius: miAxis } = normalizeEllipseRadii(majorRadius, minorRadius, rotationAngleDeg)\n  const { cx, cy, startAngle, endAngle, clockwise, rx, ry } = convertSvgEllipseParams(\n    startUV[0], startUV[1], endUV[0], endUV[1], maAxis, miAxis, phi, longAxis, sweep,\n  )\n  return makeEllipseArcFromCenter(rx, ry, startAngle, endAngle, [cx, cy], xDir, clockwise)\n}\n\n/**\n * Build an elliptical arc as a trimmed ellipse over an angle range.\n * @param rx - x radius.\n * @param ry - y radius.\n * @param startAngle - start angle (radians, ellipse-param space).\n * @param endAngle - end angle (radians).\n * @param center - the ellipse center.\n * @param xDir - the in-plane X axis of the ellipse.\n * @param clockwise - sweep direction.\n * @returns a trimmed elliptical arc.\n */\nexport function makeEllipseArcFromCenter(\n  rx: number,\n  ry: number,\n  startAngle: number,\n  endAngle: number,\n  center: Pt,\n  xDir: Pt,\n  clockwise: boolean,\n): Curve2dObj {\n  const sense = !clockwise\n  const aStart = sense ? startAngle : -startAngle\n  let aEnd = sense ? endAngle : -endAngle\n  if (aEnd < aStart - 1e-9) aEnd += TWO_PI\n  const ellipse = makeEllipse2d(center[0], center[1], rx, ry, xDir[0], xDir[1], sense)\n  return { kind2d: 'trimmed', basis: ellipse, tStart: aStart, tEnd: aEnd }\n}"]}

package/dist/lang/code-to-args.d.ts

@@ -19,6 +19,8 @@
  * 不得把折叠值写回源码（会丢失原表达式）。
  */
 import type { HostArg } from './host-arg.js';
+import { type OpDimMap } from './metadata-extractor.js';
+import type { DimName, UnitName } from '../units.js';
 /**
  * `codeToArgs` 的返回契约：位置实参槽 + 尾随选项对象（HostArg 形态，纯数据无 IR）。
  */
@@ -26,6 +28,16 @@ export interface CodeToArgsResult {
     positional: HostArg[];
     args: Record<string, HostArg>;
 }
+/**
+ * codeToArgs 选项。`opDims` 为 P4/P6 (unit-system D8) 透传：callee → 量纲声明，
+ * 供单行回填路径的 dimension pass 消费（P6 落地前声明面透传即可，不影响解析结果）。
+ */
+export interface CodeToArgsOptions {
+    /** 该脚本顶层 import 的绑定名（F2）。 */
+    namespaces?: string[];
+    /** callee → 量纲声明（unit-system D8，P6 消费）。 */
+    opDims?: OpDimMap;
+}
 /**
  * 解析单条语句行，提取其位置实参槽与选项对象（序列化形态，无 IR 变体语义）。
  *
@@ -52,7 +64,21 @@ export interface CodeToArgsResult {
  *  serialized JSON form).
  * @throws ParseError — 行文本不是合法语句时抛出（含行号）
  */
-export declare function codeToArgs(codeLine: string, opts?: {
-    namespaces?: string[];
-}): CodeToArgsResult;
+export declare function codeToArgs(codeLine: string, opts?: CodeToArgsOptions): CodeToArgsResult;
+/**
+ * Parse a unit literal text expression (`n * UNIT`) into its base-unit value.
+ *
+ * P7/D10.3: This is the reverse of `formatUnitLiteral`. Given text like
+ * `10 * INCH`, returns `{ base: 254, dim: 'length', unitName: 'inch' }`.
+ * Non-unit-literal expressions return `null` (host decides whether to
+ * downgrade to read-only).
+ *
+ * @param text - the expression text (e.g. `10 * INCH` or `0.5 * DEGREE`).
+ * @returns the parsed unit literal info, or `null` if not a unit literal.
+ */
+export declare function parseUnitLiteral(text: string): {
+    base: number;
+    dim: DimName;
+    unitName: UnitName;
+} | null;
 //# sourceMappingURL=code-to-args.d.ts.map

package/dist/lang/code-to-args.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"code-to-args.d.ts","sourceRoot":"","sources":["../../src/lang/code-to-args.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAqDzC;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,OAAO,EAAE,CAAA;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9B;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE;IAAE,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;CAAE,GAAG,gBAAgB,CA0B/F"}
+{"version":3,"file":"code-to-args.d.ts","sourceRoot":"","sources":["../../src/lang/code-to-args.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AACzC,OAAO,EAAmB,KAAK,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAGrE,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAA;AAsDjD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,UAAU,EAAE,OAAO,EAAE,CAAA;IACrB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAC9B;AAED;;;GAGG;AACH,MAAM,WAAW,iBAAiB;IAChC,6BAA6B;IAC7B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB,2CAA2C;IAC3C,MAAM,CAAC,EAAE,QAAQ,CAAA;CAClB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,wBAAgB,UAAU,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,gBAAgB,CA+BvF;AAeD;;;;;;;;;;GAUG;AACH,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,GAAG,EAAE,OAAO,CAAC;IAAC,QAAQ,EAAE,QAAQ,CAAA;CAAE,GAAG,IAAI,CAWxG"}

package/dist/lang/code-to-args.js

@@ -20,6 +20,7 @@
  */
 import { extractMetadata } from './metadata-extractor.js';
 import { isHostRef } from './host-arg.js';
+import { SCRIPT_UNIT_NAMES, UNIT_SCALE, UNIT_DIM, SCRIPT_UNIT_TO_NAME } from '../units.js';
 /**
  * 单行提取的前置声明规则（确定性静态规则，非 try/catch 兜底）：
  * parser 的作用域检查（inputs / 重赋值 LHS / 成员方法 receiver / args 中的
@@ -42,7 +43,10 @@ function extractIdentifiers(line, namespaces) {
     const ids = new Set();
     for (const m of withoutStrings.matchAll(IDENT_RE)) {
         const id = m[0];
-        if (NON_DECL.has(id) || declared.has(id) || namespaces?.has(id))
+        // P7/D10.4: unit constants (MM, INCH, DEGREE, …) must NOT be pre-declared
+        // as sentinel parameters (`let INCH = 0`), because that would shadow the
+        // real global value and cause `10 * INCH` to fold to 0.
+        if (NON_DECL.has(id) || declared.has(id) || namespaces?.has(id) || SCRIPT_UNIT_NAMES.has(id))
             continue;
         ids.add(id);
     }
@@ -104,7 +108,12 @@ export function codeToArgs(codeLine, opts) {
     // 单行提取语义：前置哨兵参数（let id = 0）在 extractMetadata 中按参数行处理；
     // 末条 op 行摘要 = 目标行。裸本机函数 callee（makeArray 等）放行（looseLocalCalls，
     // 与现状 codeToArgs 的 MetadataExtractor looseLocalCalls 同语义；ABI 校验延后到完整脚本上下文）。
-    const meta = extractMetadata(code, { namespaces: opts?.namespaces ?? [], looseLocalCalls: true });
+    // opDims 透传给 dimension pass（P6 消费，P4 仅透传声明面）。
+    const meta = extractMetadata(code, {
+        namespaces: opts?.namespaces ?? [],
+        looseLocalCalls: true,
+        ...(opts?.opDims ? { opDims: opts.opDims } : {}),
+    });
     const last = meta.lines[meta.lines.length - 1];
     if (!last)
         return { positional: [], args: {} };
@@ -121,4 +130,34 @@ export function codeToArgs(codeLine, opts) {
     }
     return { positional, args: { ...last.args } };
 }
+// ── P7/D10: unit literal parsing ────────────────────────────────────────────
+/**
+ * Reverse mapping: script-side constant name (UPPERCASE) → internal UnitName.
+ */
+const CONST_TO_UNIT = Object.freeze(Object.fromEntries(Object.keys(SCRIPT_UNIT_TO_NAME).map((k) => [k, SCRIPT_UNIT_TO_NAME[k]])));
+/**
+ * Parse a unit literal text expression (`n * UNIT`) into its base-unit value.
+ *
+ * P7/D10.3: This is the reverse of `formatUnitLiteral`. Given text like
+ * `10 * INCH`, returns `{ base: 254, dim: 'length', unitName: 'inch' }`.
+ * Non-unit-literal expressions return `null` (host decides whether to
+ * downgrade to read-only).
+ *
+ * @param text - the expression text (e.g. `10 * INCH` or `0.5 * DEGREE`).
+ * @returns the parsed unit literal info, or `null` if not a unit literal.
+ */
+export function parseUnitLiteral(text) {
+    const match = /^\s*(-?\d+(?:\.\d+)?(?:[eE][+-]?\d+)?)\s*\*\s*([A-Z]+)\s*$/.exec(text);
+    if (!match)
+        return null;
+    const n = Number(match[1]);
+    const constName = match[2];
+    const unitName = CONST_TO_UNIT[constName];
+    if (!unitName)
+        return null;
+    const dim = UNIT_DIM[unitName];
+    // toBase: n * UNIT_SCALE[unitName]
+    const base = n * UNIT_SCALE[unitName];
+    return { base, dim, unitName };
+}
 //# sourceMappingURL=code-to-args.js.map

package/dist/lang/code-to-args.js.map

@@ -1 +1 @@
-{"version":3,"file":"code-to-args.js","sourceRoot":"","sources":["../../src/lang/code-to-args.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAGH,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AAEtC;;;;;;;;;GASG;AACH,MAAM,QAAQ,GAAG,mBAAmB,CAAA;AACpC,MAAM,SAAS,GAAG,sCAAsC,CAAA;AACxD,MAAM,QAAQ,GAAG,IAAI,GAAG,CAAC;IACvB,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,WAAW;IAC3D,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,KAAK,EAAE,UAAU;CACtD,CAAC,CAAA;AAEF,SAAS,kBAAkB,CAAC,IAAY,EAAE,UAAwB;IAChE,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,CAAA;IACpD,MAAM,QAAQ,GAAG,cAAc,CAAC,cAAc,CAAC,CAAA;IAC/C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAA;IAC7B,KAAK,MAAM,CAAC,IAAI,cAAc,CAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QAClD,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACf,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC,IAAI,UAAU,EAAE,GAAG,CAAC,EAAE,CAAC;YAAE,SAAQ;QACzE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACb,CAAC;IACD,OAAO,CAAC,GAAG,GAAG,CAAC,CAAA;AACjB,CAAC;AAED;;;;GAIG;AACH,SAAS,cAAc,CAAC,IAAY;IAClC,MAAM,GAAG,GAAG,IAAI,GAAG,EAAU,CAAA;IAC7B,IAAI,CAAC,GAAG,4CAA4C,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC/D,IAAI,CAAC;QAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACpB,CAAC,GAAG,6BAA6B,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC5C,IAAI,CAAC,EAAE,CAAC;QACN,KAAK,MAAM,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACnC,MAAM,KAAK,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAA;YACjD,MAAM,EAAE,GAAG,qBAAqB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAA;YAC5C,IAAI,EAAE;gBAAE,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAA;QACxB,CAAC;IACH,CAAC;IACD,OAAO,GAAG,CAAA;AACZ,CAAC;AAUD;;;;;;;;;;;;;;;;;;;;;;;;;GAyBG;AACH,MAAM,UAAU,UAAU,CAAC,QAAgB,EAAE,IAAgC;IAC3E,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,IAAI,EAAE,UAAU,IAAI,EAAE,CAAC,CAAA;IAClD,MAAM,KAAK,GAAG,kBAAkB,CAAC,QAAQ,EAAE,UAAU,CAAC;SACnD,GAAG,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,CAAC;SAC5B,IAAI,CAAC,IAAI,CAAC,CAAA;IACb,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,KAAK,KAAK,QAAQ,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAA;IACvD,sDAAsD;IACtD,+DAA+D;IAC/D,4EAA4E;IAC5E,MAAM,IAAI,GAAG,eAAe,CAAC,IAAI,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,UAAU,IAAI,EAAE,EAAE,eAAe,EAAE,IAAI,EAAE,CAAC,CAAA;IACjG,MAAM,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IAC9C,IAAI,CAAC,IAAI;QAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,CAAA;IAC9C,2DAA2D;IAC3D,yCAAyC;IACzC,MAAM,UAAU,GAAG,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,CAAA;IACvC,MAAM,OAAO,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC,CAAA;IACjD,IACE,OAAO,KAAK,IAAI;QAChB,OAAO,OAAO,KAAK,QAAQ;QAC3B,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC;QACvB,CAAC,SAAS,CAAC,OAAkB,CAAC,EAC9B,CAAC;QACD,UAAU,CAAC,GAAG,EAAE,CAAA;QAChB,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,GAAI,OAAmC,EAAE,EAAE,CAAA;IAC1E,CAAC;IACD,OAAO,EAAE,UAAU,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,IAAI,EAAE,EAAE,CAAA;AAC/C,CAAC","sourcesContent":["/**\n * code-to-args — 单语句行 args 提取（编辑回填配套）\n *\n * See docs/syntax-design.md §3 (statement model ↔ StatementSummary mapping) and §6.4 (check).\n *\n * 宿主编辑回填（FeatureEditor.backfill / editStatement）需要从代码行\n * 反提参数对象。此能力由 faijs 标配提供（与 parse 语义一致），\n * 宿主不得用 acorn 自行解析（B3 修正）。\n *\n * 无 IR 双通道方案（2026-09-06）后实现换 MetadataExtractor 行级提取：\n * 单行文本经哨兵参数前置声明（与 MetadataExtractor looseLocalCalls 同构）\n * 交给 extractMetadata，取末条 op 行摘要的 positional/args。函数名、签名与\n * 返回契约（CodeToArgsResult）不变；HostArg 引用形态保真（A-5）。\n *\n * F1（表达式折叠）：args 含计算表达式（binary/template/conditional/spread）时，\n * 与 parser 折叠语义一致地**求值后返回字面值**，不抛错。\n * 单行提取缺失参数真实值 → 前置声明用哨兵字面量 `let <id> = 0`（参数形态），\n * 使表达式可静态折叠；宿主用 StatementSummary.hasComputedArgs 判定只读降级，\n * 不得把折叠值写回源码（会丢失原表达式）。\n */\n\nimport type { HostArg } from './host-arg'\nimport { extractMetadata } from './metadata-extractor'\nimport { isHostRef } from './host-arg'\n\n/**\n * 单行提取的前置声明规则（确定性静态规则，非 try/catch 兜底）：\n * parser 的作用域检查（inputs / 重赋值 LHS / 成员方法 receiver / args 中的\n * 裸标识符参数引用）要求变量已声明，而单行提取天然缺失声明上下文。\n * 规则：提取行内全部标识符（剥掉字符串字面量后），为每个非 `cad`/关键字\n * 标识符前置一行 `let <id> = 0`（哨兵参数）。parser 对该形态只做语法\n * 检查、不查符号表；多余声明对 varToId 仅是\"可查到\"，不影响目标行的\n * args 解析结果。F1 起用哨兵参数（而非 `cad.assembly({})` 语句）——\n * 参数值已知 → 表达式可静态折叠，满足\"参数为表达式时返回折叠字面值\"。\n */\nconst IDENT_RE = /[A-Za-z_$][\\w$]*/g\nconst STRING_RE = /'(?:[^'\\\\]|\\\\.)*'|\"(?:[^\"\\\\]|\\\\.)*\"/g\nconst NON_DECL = new Set([\n  'cad', 'const', 'let', 'true', 'false', 'null', 'undefined',\n  'await', 'return', 'new', 'typeof', 'var', 'function',\n])\n\nfunction extractIdentifiers(line: string, namespaces?: Set<string>): string[] {\n  const withoutStrings = line.replace(STRING_RE, \"''\")\n  const declared = declaredByLine(withoutStrings)\n  const ids = new Set<string>()\n  for (const m of withoutStrings.matchAll(IDENT_RE)) {\n    const id = m[0]\n    if (NON_DECL.has(id) || declared.has(id) || namespaces?.has(id)) continue\n    ids.add(id)\n  }\n  return [...ids]\n}\n\n/**\n * 行内自身声明的标识符（前置声明必须跳过，否则 acorn 重声明报错）：\n * - `const/let x = ...` 的 x\n * - `const { k1: v1, k2 } = ...` 的绑定名 v1/k2（键名 k1 不是声明，仍需前置声明——无害）\n */\nfunction declaredByLine(line: string): Set<string> {\n  const ids = new Set<string>()\n  let m = /^\\s*(?:const|let)\\s+([A-Za-z_$][\\w$]*)\\s*=/.exec(line)\n  if (m) ids.add(m[1])\n  m = /^\\s*const\\s*\\{([^}]*)\\}\\s*=/.exec(line)\n  if (m) {\n    for (const prop of m[1].split(',')) {\n      const bound = (prop.split(':')[1] ?? prop).trim()\n      const id = /^([A-Za-z_$][\\w$]*)/.exec(bound)\n      if (id) ids.add(id[1])\n    }\n  }\n  return ids\n}\n\n/**\n * `codeToArgs` 的返回契约：位置实参槽 + 尾随选项对象（HostArg 形态，纯数据无 IR）。\n */\nexport interface CodeToArgsResult {\n  positional: HostArg[]\n  args: Record<string, HostArg>\n}\n\n/**\n * 解析单条语句行，提取其位置实参槽与选项对象（序列化形态，无 IR 变体语义）。\n *\n * true-JS-subset §4.6.3 新契约：返回 `{ positional, args }`——\n * - `positional`: HostArg[]，按调用顺序的位置实参（字面量原样；var-ref/\n *   param-ref/call-ref/expr-ref 以 `{kind,...}` 标记对象呈现，宿主据此降级为\n *   只读编辑）；宿主不接触内部类型（纯数据面）。\n * - `args`: 尾随选项对象（键值 HostArg 形态；无选项对象时为 `{}`）。\n * 旧契约（只返回对象槽）在位置形态下会静默丢弃非对象实参——本契约显式保留全部信息。\n *\n * 支持的行形态（与 parser 接受的语句一致）：\n * - `const part0 = cad.box(10, 20, 30)`\n * - `part0 = cad.fai_drill(part0, { diameter: 5 })`（裸重赋值）\n * - `const { front: a, back: b } = cad.fai_split(part0, { normal: [0,0,1] })`（解构）\n * - `asm0.add_constraint({ ... })`（成员方法调用）\n * - 位置实参为字面量/变量引用/表达式（`cad.box(10, 20, 30)`、`cad.hem(p0.solid, {...})`）\n * - args 中的裸标识符参数引用（`cad.box(10, 20, height)`）\n * - args 中的计算表达式（`cad.box(10, 20, base + 20)`）→ 折叠为字面值返回\n *\n * @param codeLine 单条语句源码行\n * @param opts.namespaces 该脚本顶层 import 的绑定名（F2：`mech.makeHeadstock(...)`\n *   中 `mech` 不得被前置声明为变量）。L0 不感知注册表，由宿主从脚本 imports 提供。\n * @returns the extracted positional slot and trailing options object (both in\n *  serialized JSON form).\n * @throws ParseError — 行文本不是合法语句时抛出（含行号）\n */\nexport function codeToArgs(codeLine: string, opts?: { namespaces?: string[] }): CodeToArgsResult {\n  const namespaces = new Set(opts?.namespaces ?? [])\n  const decls = extractIdentifiers(codeLine, namespaces)\n    .map((id) => `let ${id} = 0`)\n    .join('\\n')\n  const code = decls ? `${decls}\\n${codeLine}` : codeLine\n  // 单行提取语义：前置哨兵参数（let id = 0）在 extractMetadata 中按参数行处理；\n  // 末条 op 行摘要 = 目标行。裸本机函数 callee（makeArray 等）放行（looseLocalCalls，\n  // 与现状 codeToArgs 的 MetadataExtractor looseLocalCalls 同语义；ABI 校验延后到完整脚本上下文）。\n  const meta = extractMetadata(code, { namespaces: opts?.namespaces ?? [], looseLocalCalls: true })\n  const last = meta.lines[meta.lines.length - 1]\n  if (!last) return { positional: [], args: {} }\n  // 尾随纯对象（选项槽）从 positional 切出到 args（与现状 splitTrailingOptions\n  // 同构：末位纯数据对象是选项槽；引用形态/字面量留在 positional）。\n  const positional = [...last.positional]\n  const lastArg = positional[positional.length - 1]\n  if (\n    lastArg !== null &&\n    typeof lastArg === 'object' &&\n    !Array.isArray(lastArg) &&\n    !isHostRef(lastArg as HostArg)\n  ) {\n    positional.pop()\n    return { positional, args: { ...(lastArg as Record<string, HostArg>) } }\n  }\n  return { positional, args: { ...last.args } }\n}\n"]}
+{"version":3,"file":"code-to-args.js","sourceRoot":"","sources":["../../src/lang/code-to-args.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * code-to-args — 单语句行 args 提取（编辑回填配套）\n *\n * See docs/syntax-design.md §3 (statement model ↔ StatementSummary mapping) and §6.4 (check).\n *\n * 宿主编辑回填（FeatureEditor.backfill / editStatement）需要从代码行\n * 反提参数对象。此能力由 faijs 标配提供（与 parse 语义一致），\n * 宿主不得用 acorn 自行解析（B3 修正）。\n *\n * 无 IR 双通道方案（2026-09-06）后实现换 MetadataExtractor 行级提取：\n * 单行文本经哨兵参数前置声明（与 MetadataExtractor looseLocalCalls 同构）\n * 交给 extractMetadata，取末条 op 行摘要的 positional/args。函数名、签名与\n * 返回契约（CodeToArgsResult）不变；HostArg 引用形态保真（A-5）。\n *\n * F1（表达式折叠）：args 含计算表达式（binary/template/conditional/spread）时，\n * 与 parser 折叠语义一致地**求值后返回字面值**，不抛错。\n * 单行提取缺失参数真实值 → 前置声明用哨兵字面量 `let <id> = 0`（参数形态），\n * 使表达式可静态折叠；宿主用 StatementSummary.hasComputedArgs 判定只读降级，\n * 不得把折叠值写回源码（会丢失原表达式）。\n */\n\nimport type { HostArg } from './host-arg'\nimport { extractMetadata, type OpDimMap } from './metadata-extractor'\nimport { isHostRef } from './host-arg'\nimport { SCRIPT_UNIT_NAMES, UNIT_SCALE, UNIT_DIM, SCRIPT_UNIT_TO_NAME } from '../units'\nimport type { DimName, UnitName } from '../units'\n\n/**\n * 单行提取的前置声明规则（确定性静态规则，非 try/catch 兜底）：\n * parser 的作用域检查（inputs / 重赋值 LHS / 成员方法 receiver / args 中的\n * 裸标识符参数引用）要求变量已声明，而单行提取天然缺失声明上下文。\n * 规则：提取行内全部标识符（剥掉字符串字面量后），为每个非 `cad`/关键字\n * 标识符前置一行 `let <id> = 0`（哨兵参数）。parser 对该形态只做语法\n * 检查、不查符号表；多余声明对 varToId 仅是\"可查到\"，不影响目标行的\n * args 解析结果。F1 起用哨兵参数（而非 `cad.assembly({})` 语句）——\n * 参数值已知 → 表达式可静态折叠，满足\"参数为表达式时返回折叠字面值\"。\n */\nconst IDENT_RE = /[A-Za-z_$][\\w$]*/g\nconst STRING_RE = /'(?:[^'\\\\]|\\\\.)*'|\"(?:[^\"\\\\]|\\\\.)*\"/g\nconst NON_DECL = new Set([\n  'cad', 'const', 'let', 'true', 'false', 'null', 'undefined',\n  'await', 'return', 'new', 'typeof', 'var', 'function',\n])\n\nfunction extractIdentifiers(line: string, namespaces?: Set<string>): string[] {\n  const withoutStrings = line.replace(STRING_RE, \"''\")\n  const declared = declaredByLine(withoutStrings)\n  const ids = new Set<string>()\n  for (const m of withoutStrings.matchAll(IDENT_RE)) {\n    const id = m[0]\n    // P7/D10.4: unit constants (MM, INCH, DEGREE, …) must NOT be pre-declared\n    // as sentinel parameters (`let INCH = 0`), because that would shadow the\n    // real global value and cause `10 * INCH` to fold to 0.\n    if (NON_DECL.has(id) || declared.has(id) || namespaces?.has(id) || SCRIPT_UNIT_NAMES.has(id)) continue\n    ids.add(id)\n  }\n  return [...ids]\n}\n\n/**\n * 行内自身声明的标识符（前置声明必须跳过，否则 acorn 重声明报错）：\n * - `const/let x = ...` 的 x\n * - `const { k1: v1, k2 } = ...` 的绑定名 v1/k2（键名 k1 不是声明，仍需前置声明——无害）\n */\nfunction declaredByLine(line: string): Set<string> {\n  const ids = new Set<string>()\n  let m = /^\\s*(?:const|let)\\s+([A-Za-z_$][\\w$]*)\\s*=/.exec(line)\n  if (m) ids.add(m[1])\n  m = /^\\s*const\\s*\\{([^}]*)\\}\\s*=/.exec(line)\n  if (m) {\n    for (const prop of m[1].split(',')) {\n      const bound = (prop.split(':')[1] ?? prop).trim()\n      const id = /^([A-Za-z_$][\\w$]*)/.exec(bound)\n      if (id) ids.add(id[1])\n    }\n  }\n  return ids\n}\n\n/**\n * `codeToArgs` 的返回契约：位置实参槽 + 尾随选项对象（HostArg 形态，纯数据无 IR）。\n */\nexport interface CodeToArgsResult {\n  positional: HostArg[]\n  args: Record<string, HostArg>\n}\n\n/**\n * codeToArgs 选项。`opDims` 为 P4/P6 (unit-system D8) 透传：callee → 量纲声明，\n * 供单行回填路径的 dimension pass 消费（P6 落地前声明面透传即可，不影响解析结果）。\n */\nexport interface CodeToArgsOptions {\n  /** 该脚本顶层 import 的绑定名（F2）。 */\n  namespaces?: string[]\n  /** callee → 量纲声明（unit-system D8，P6 消费）。 */\n  opDims?: OpDimMap\n}\n\n/**\n * 解析单条语句行，提取其位置实参槽与选项对象（序列化形态，无 IR 变体语义）。\n *\n * true-JS-subset §4.6.3 新契约：返回 `{ positional, args }`——\n * - `positional`: HostArg[]，按调用顺序的位置实参（字面量原样；var-ref/\n *   param-ref/call-ref/expr-ref 以 `{kind,...}` 标记对象呈现，宿主据此降级为\n *   只读编辑）；宿主不接触内部类型（纯数据面）。\n * - `args`: 尾随选项对象（键值 HostArg 形态；无选项对象时为 `{}`）。\n * 旧契约（只返回对象槽）在位置形态下会静默丢弃非对象实参——本契约显式保留全部信息。\n *\n * 支持的行形态（与 parser 接受的语句一致）：\n * - `const part0 = cad.box(10, 20, 30)`\n * - `part0 = cad.fai_drill(part0, { diameter: 5 })`（裸重赋值）\n * - `const { front: a, back: b } = cad.fai_split(part0, { normal: [0,0,1] })`（解构）\n * - `asm0.add_constraint({ ... })`（成员方法调用）\n * - 位置实参为字面量/变量引用/表达式（`cad.box(10, 20, 30)`、`cad.hem(p0.solid, {...})`）\n * - args 中的裸标识符参数引用（`cad.box(10, 20, height)`）\n * - args 中的计算表达式（`cad.box(10, 20, base + 20)`）→ 折叠为字面值返回\n *\n * @param codeLine 单条语句源码行\n * @param opts.namespaces 该脚本顶层 import 的绑定名（F2：`mech.makeHeadstock(...)`\n *   中 `mech` 不得被前置声明为变量）。L0 不感知注册表，由宿主从脚本 imports 提供。\n * @returns the extracted positional slot and trailing options object (both in\n *  serialized JSON form).\n * @throws ParseError — 行文本不是合法语句时抛出（含行号）\n */\nexport function codeToArgs(codeLine: string, opts?: CodeToArgsOptions): CodeToArgsResult {\n  const namespaces = new Set(opts?.namespaces ?? [])\n  const decls = extractIdentifiers(codeLine, namespaces)\n    .map((id) => `let ${id} = 0`)\n    .join('\\n')\n  const code = decls ? `${decls}\\n${codeLine}` : codeLine\n  // 单行提取语义：前置哨兵参数（let id = 0）在 extractMetadata 中按参数行处理；\n  // 末条 op 行摘要 = 目标行。裸本机函数 callee（makeArray 等）放行（looseLocalCalls，\n  // 与现状 codeToArgs 的 MetadataExtractor looseLocalCalls 同语义；ABI 校验延后到完整脚本上下文）。\n  // opDims 透传给 dimension pass（P6 消费，P4 仅透传声明面）。\n  const meta = extractMetadata(code, {\n    namespaces: opts?.namespaces ?? [],\n    looseLocalCalls: true,\n    ...(opts?.opDims ? { opDims: opts.opDims } : {}),\n  })\n  const last = meta.lines[meta.lines.length - 1]\n  if (!last) return { positional: [], args: {} }\n  // 尾随纯对象（选项槽）从 positional 切出到 args（与现状 splitTrailingOptions\n  // 同构：末位纯数据对象是选项槽；引用形态/字面量留在 positional）。\n  const positional = [...last.positional]\n  const lastArg = positional[positional.length - 1]\n  if (\n    lastArg !== null &&\n    typeof lastArg === 'object' &&\n    !Array.isArray(lastArg) &&\n    !isHostRef(lastArg as HostArg)\n  ) {\n    positional.pop()\n    return { positional, args: { ...(lastArg as Record<string, HostArg>) } }\n  }\n  return { positional, args: { ...last.args } }\n}\n\n// ── P7/D10: unit literal parsing ────────────────────────────────────────────\n\n/**\n * Reverse mapping: script-side constant name (UPPERCASE) → internal UnitName.\n */\nconst CONST_TO_UNIT: Readonly<Record<string, UnitName>> = Object.freeze(\n  Object.fromEntries(\n    (Object.keys(SCRIPT_UNIT_TO_NAME) as string[]).map(\n      (k) => [k, SCRIPT_UNIT_TO_NAME[k]] as [string, UnitName],\n    ),\n  ),\n)\n\n/**\n * Parse a unit literal text expression (`n * UNIT`) into its base-unit value.\n *\n * P7/D10.3: This is the reverse of `formatUnitLiteral`. Given text like\n * `10 * INCH`, returns `{ base: 254, dim: 'length', unitName: 'inch' }`.\n * Non-unit-literal expressions return `null` (host decides whether to\n * downgrade to read-only).\n *\n * @param text - the expression text (e.g. `10 * INCH` or `0.5 * DEGREE`).\n * @returns the parsed unit literal info, or `null` if not a unit literal.\n */\nexport function parseUnitLiteral(text: string): { base: number; dim: DimName; unitName: UnitName } | null {\n  const match = /^\\s*(-?\\d+(?:\\.\\d+)?(?:[eE][+-]?\\d+)?)\\s*\\*\\s*([A-Z]+)\\s*$/.exec(text)\n  if (!match) return null\n  const n = Number(match[1])\n  const constName = match[2]\n  const unitName = CONST_TO_UNIT[constName]\n  if (!unitName) return null\n  const dim = UNIT_DIM[unitName]\n  // toBase: n * UNIT_SCALE[unitName]\n  const base = n * UNIT_SCALE[unitName]\n  return { base, dim, unitName }\n}\n"]}

package/dist/lang/codegen.d.ts

@@ -20,6 +20,7 @@
  * - 对象字面量 → `{key:value}`（冒号，合法 JS）
  */
 import type { HostArg } from './host-arg.js';
+import type { DimName, UnitName, UnitContext } from '../units.js';
 /**
  * Format a number as text: integers emit as-is; decimals retain at most 6
  * significant fractional digits with trailing zeros stripped.
@@ -27,6 +28,43 @@ import type { HostArg } from './host-arg.js';
  * @returns the formatted text representation.
  */
 export declare function fmtNum(n: number): string;
+/**
+ * Format a unit literal number using JS shortest-round-trip representation.
+ *
+ * P7/D10.3 rule 5: unit literal numbers MUST use `String(n)` (e.g.
+ * `0.39370078740157477`), NEVER `fmtNum` (which truncates to 6 decimal
+ * places and would silently zero out `1e-7`).
+ * @param n - the number to format.
+ * @returns the shortest JS round-trip text representation.
+ */
+export declare function fmtUnitNum(n: number): string;
+/**
+ * Format a base-unit value as a unit literal expression (`n * UNIT`).
+ *
+ * P7/D10.3: `base` is the base-unit (mm/degree) value; `dim` determines which
+ * system display unit to use; `unitName` is the target display unit.
+ * The number is formatted with `fmtUnitNum` (not `fmtNum`).
+ * @param base - the base-unit numeric value.
+ * @param dim - the dimension of the value.
+ * @param unitName - the display unit to express the value in.
+ * @returns text like `10 * INCH` or `0.39370078740157477 * INCH`.
+ */
+export declare function formatUnitLiteral(base: number, dim: DimName, unitName: UnitName): string;
+/**
+ * P7/D10.3: Options for unit-aware serialization of `formatCodeLine`.
+ *
+ * When provided, dimensioned parameters are emitted as unit literals
+ * (`n * UNIT`). When absent, output is byte-identical to the pre-P7 behavior.
+ */
+export interface UnitSerializeOptions {
+    /** System display unit; defaults to base (mm / degree). */
+    units?: UnitContext;
+    /** Parameter dimension declarations (host provides from op paramDims + slotMap). */
+    dims?: {
+        positional?: (DimName | null)[];
+        byKey?: Record<string, DimName>;
+    };
+}
 /**
  * Pure-data input for printing one faijs source line, decoupled from IR types.
  *
@@ -65,8 +103,14 @@ export interface FormatCodeLineInput {
  * 从纯数据（非 IR 类型）打印一行 faijs 源代码。
  *
  * 宿主 buildCode / 编辑重排行（editStatement → replaceCodeAt）统一走此入口。
+ *
+ * P7/D10: when `opts` is provided, dimensioned parameters are serialized as
+ * unit literals (`n * UNIT`). When `opts` is absent, output is byte-identical
+ * to the pre-P7 behavior (zero-impact regression guarantee).
+ *
  * @param input - the pure-data line description.
+ * @param opts - optional unit serialization options (P7/D10).
  * @returns the printed single-line code text.
  */
-export declare function formatCodeLine(input: FormatCodeLineInput): string;
+export declare function formatCodeLine(input: FormatCodeLineInput, opts?: UnitSerializeOptions): string;
 //# sourceMappingURL=codegen.d.ts.map

package/dist/lang/codegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/lang/codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAKzC;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAKxC;AAmDD;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;;OAKG;IACH,UAAU,EAAE,OAAO,EAAE,CAAA;IACrB,YAAY;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAOD;;;;;;GAMG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,MAAM,CAoDjE"}
+{"version":3,"file":"codegen.d.ts","sourceRoot":"","sources":["../../src/lang/codegen.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,YAAY,CAAA;AAEzC,OAAO,KAAK,EAAE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,UAAU,CAAA;AAK9D;;;;;GAKG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAKxC;AA2BD;;;;;;;;GAQG;AACH,wBAAgB,UAAU,CAAC,CAAC,EAAE,MAAM,GAAG,MAAM,CAE5C;AAcD;;;;;;;;;;GAUG;AACH,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,EAAE,OAAO,EAAE,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAIxF;AAED;;;;;GAKG;AACH,MAAM,WAAW,oBAAoB;IACnC,2DAA2D;IAC3D,KAAK,CAAC,EAAE,WAAW,CAAA;IACnB,oFAAoF;IACpF,IAAI,CAAC,EAAE;QAAE,UAAU,CAAC,EAAE,CAAC,OAAO,GAAG,IAAI,CAAC,EAAE,CAAC;QAAC,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;KAAE,CAAA;CAC5E;AA0BD;;;;;GAKG;AACH,MAAM,WAAW,mBAAmB;IAClC,MAAM,EAAE,MAAM,CAAA;IACd,mBAAmB;IACnB,QAAQ,CAAC,EAAE,MAAM,CAAA;IACjB;;;;;OAKG;IACH,UAAU,EAAE,OAAO,EAAE,CAAA;IACrB,YAAY;IACZ,OAAO,EAAE,MAAM,EAAE,CAAA;IACjB,0BAA0B;IAC1B,UAAU,CAAC,EAAE,MAAM,EAAE,CAAA;IACrB;;;OAGG;IACH,IAAI,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAC9B,kEAAkE;IAClE,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;OAGG;IACH,cAAc,CAAC,EAAE,OAAO,CAAA;CACzB;AAyFD;;;;;;;;;;;;GAYG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,EAAE,IAAI,CAAC,EAAE,oBAAoB,GAAG,MAAM,CA4D9F"}