@faicad/faijs 0.33.2 → 0.35.2

package/dist/sketch/canonical.d.ts

@@ -0,0 +1,239 @@
+/**
+ * canonical — the faijs canonical sketch model (§4 of the sketch library plan).
+ *
+ * One model, projected outward: the FreeCAD side (`fcstd-types.ts`) and the
+ * CadQuery side (`./project.ts`) are projections of this shape, not parallel
+ * implementations. Geometry declarations carry coordinates that ARE the solve
+ * initial guess; constraints pull them exact.
+ *
+ * Lengths are in mm. **Every angular quantity is in radians** — arc angles
+ * (`a0`/`a1`), `ellipse.angle` and the `angle` constraint's `value` alike; they
+ * are consumed by `Math.cos`/`Math.sin` and handed to planegcs unchanged (which
+ * works in radians). Measured, not assumed: an `angle` constraint of `Math.PI/2`
+ * solves to 90°, while `90` solves to 5.7°. Hosts that display degrees convert
+ * at their own boundary.
+ */
+/**
+ * A position on an element. `number` is the 0..1 parametric position (0 =
+ * start, 1 = end, 0.5 = arc/line midpoint). `'center'` is the circle/arc/ellipse
+ * centre — semantically distinct from `'mid'`.
+ */
+export type At = number | 'start' | 'end' | 'mid' | 'center';
+/** An element reference: `tag` (named) or `index` (array position); `at` omitted = whole element. */
+export type Ref = {
+    tag: string;
+    at?: At;
+} | {
+    index: number;
+    at?: At;
+};
+/**
+ * Canonical sketch geometry. Supports `line` + `circle` + `arc` + `ellipse` +
+ * `point` + `bspline` (ellipse/point reopened 2026-09-28, bspline 2026-09-29 —
+ * the solver chain already consumed all three; only the op-entry schema was
+ * narrower than the chain).
+ *
+ * `construction` (2026-09-30): reference geometry — symmetry axes, centrelines,
+ * helper lines the constraints may be tied to but that must NOT become part of
+ * the profile loop. It participates in the solve exactly like any other geom
+ * (its whole point is to anchor constraints) and is filtered out of contour
+ * extraction (`contour.ts`), which is what keeps a reference line's (often
+ * arbitrary) coordinates from invading the profile chain.
+ */
+export type SketchGeom = {
+    tag?: string;
+    construction?: boolean;
+    kind: 'line';
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+} | {
+    tag?: string;
+    construction?: boolean;
+    kind: 'circle';
+    cx: number;
+    cy: number;
+    r: number;
+} | {
+    tag?: string;
+    construction?: boolean;
+    kind: 'arc';
+    cx: number;
+    cy: number;
+    r: number;
+    a0: number;
+    a1: number;
+    ccw?: boolean;
+} | {
+    tag?: string;
+    construction?: boolean;
+    kind: 'point';
+    x: number;
+    y: number;
+} | {
+    tag?: string;
+    construction?: boolean;
+    kind: 'ellipse';
+    cx: number;
+    cy: number;
+    rx: number;
+    ry: number;
+    a0?: number;
+    a1?: number;
+    /** major-axis rotation, radians */
+    angle?: number;
+} | {
+    tag?: string;
+    construction?: boolean;
+    kind: 'bspline';
+    poles: {
+        x: number;
+        y: number;
+    }[];
+    knots: number[];
+    degree: number;
+    periodic?: boolean;
+};
+/** Canonical constraint kinds (string enums; integer enums only appear at projection boundaries). */
+export type SketchConstraint = {
+    kind: 'fixed';
+    of: Ref;
+} | {
+    kind: 'coincident';
+    a: Ref;
+    b: Ref;
+} | {
+    kind: 'horizontal';
+    of: Ref;
+} | {
+    kind: 'vertical';
+    of: Ref;
+} | {
+    kind: 'parallel';
+    a: Ref;
+    b: Ref;
+} | {
+    kind: 'perpendicular';
+    a: Ref;
+    b: Ref;
+} | {
+    kind: 'tangent';
+    a: Ref;
+    b: Ref;
+} | {
+    kind: 'distance';
+    a: Ref;
+    b: Ref;
+    value: number;
+} | {
+    kind: 'distanceX';
+    a: Ref;
+    b: Ref;
+    value: number;
+} | {
+    kind: 'distanceY';
+    a: Ref;
+    b: Ref;
+    value: number;
+} | {
+    kind: 'length';
+    of: Ref;
+    value: number;
+} | {
+    kind: 'angle';
+    a: Ref;
+    b: Ref;
+    value: number;
+} | {
+    kind: 'orientation';
+    of: Ref;
+    dir: [number, number];
+} | {
+    kind: 'radius';
+    of: Ref;
+    value: number;
+} | {
+    kind: 'diameter';
+    of: Ref;
+    value: number;
+} | {
+    kind: 'arcAngle';
+    of: Ref;
+    value: number;
+} | {
+    kind: 'equal';
+    a: Ref;
+    b: Ref;
+} | {
+    kind: 'pointOnObject';
+    p: Ref;
+    on: Ref;
+} | {
+    kind: 'symmetric';
+    p1: Ref;
+    p2: Ref;
+    about: Ref;
+};
+/** The `kind` string of a canonical constraint. */
+export type SketchConstraintKind = SketchConstraint['kind'];
+/**
+ * A canonical constraint involved in a conflict or redundancy, resolved to
+ * human-readable element identifiers (tags) so a host / error message can point
+ * at *where* the problem is (§3.2 of the 2026-09-27 over-constraint plan).
+ */
+export interface ConflictDetail {
+    /** canonical constraint kind, e.g. `'length'` / `'coincident'`. */
+    kind: SketchConstraintKind;
+    /** element identifiers the constraint references, as tags or `geom#<n>` fallbacks. */
+    refs: string[];
+    /** the constraint's value when it carries one (length / radius / angle / distance…). */
+    value?: number;
+}
+/** A canonical sketch: geometry declarations plus constraints. */
+export interface SketchInput {
+    geoms: SketchGeom[];
+    constraints?: SketchConstraint[];
+}
+/**
+ * Solve status (§5): under- and over-constraint are allowed, but never silent.
+ */
+export type SolveStatus = 
+/** all constraints satisfied, zero remaining DoF */
+'solved'
+/** free DoF remain; solved to a minimal-displacement solution */
+ | 'underconstrained'
+/** redundant constraints were dropped; solved */
+ | 'redundant'
+/** constraints conflict; best-effort least-squares solution returned */
+ | 'conflicting'
+/** solver failed numerically (not an under/over-constraint cause) */
+ | 'failed';
+/**
+ * Result of one canonical solve: solved geometry plus explicit diagnostics.
+ *
+ * `converged` is false only for `failed` — under/redundant/conflicting all
+ * produce geometry (allowed ≠ silent: the status and diagnostics carry the
+ * story).
+ */
+export interface SolveOutcome {
+    /** solved geometry, same order/index as input */
+    geoms: SketchGeom[];
+    /** true unless `status === 'failed'` */
+    converged: boolean;
+    /** explicit solve status (§5) */
+    status: SolveStatus;
+    /** remaining degrees of freedom when known (-1 = not reported) */
+    dof: number;
+    /** constraint indices the solver flagged (conflicting/redundant) */
+    problemConstraints: number[];
+    /** constraint indices dropped because they could not be projected/pushed */
+    droppedConstraints: number[];
+    /** per-problem-constraint residual magnitude when available */
+    residuals?: number[];
+    /** resolved conflict details (tags) when `status === 'conflicting'` (§3.2) */
+    conflictDetails?: ConflictDetail[];
+    /** human-readable detail for a non-solved status */
+    reason?: string;
+}
+//# sourceMappingURL=canonical.d.ts.map

package/dist/sketch/canonical.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonical.d.ts","sourceRoot":"","sources":["../../src/sketch/canonical.ts"],"names":[],"mappings":"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"}

package/dist/sketch/canonical.js

@@ -0,0 +1,17 @@
+/**
+ * canonical — the faijs canonical sketch model (§4 of the sketch library plan).
+ *
+ * One model, projected outward: the FreeCAD side (`fcstd-types.ts`) and the
+ * CadQuery side (`./project.ts`) are projections of this shape, not parallel
+ * implementations. Geometry declarations carry coordinates that ARE the solve
+ * initial guess; constraints pull them exact.
+ *
+ * Lengths are in mm. **Every angular quantity is in radians** — arc angles
+ * (`a0`/`a1`), `ellipse.angle` and the `angle` constraint's `value` alike; they
+ * are consumed by `Math.cos`/`Math.sin` and handed to planegcs unchanged (which
+ * works in radians). Measured, not assumed: an `angle` constraint of `Math.PI/2`
+ * solves to 90°, while `90` solves to 5.7°. Hosts that display degrees convert
+ * at their own boundary.
+ */
+export {};
+//# sourceMappingURL=canonical.js.map

package/dist/sketch/canonical.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"canonical.js","sourceRoot":"","sources":["../../src/sketch/canonical.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG","sourcesContent":["/**\n * canonical — the faijs canonical sketch model (§4 of the sketch library plan).\n *\n * One model, projected outward: the FreeCAD side (`fcstd-types.ts`) and the\n * CadQuery side (`./project.ts`) are projections of this shape, not parallel\n * implementations. Geometry declarations carry coordinates that ARE the solve\n * initial guess; constraints pull them exact.\n *\n * Lengths are in mm. **Every angular quantity is in radians** — arc angles\n * (`a0`/`a1`), `ellipse.angle` and the `angle` constraint's `value` alike; they\n * are consumed by `Math.cos`/`Math.sin` and handed to planegcs unchanged (which\n * works in radians). Measured, not assumed: an `angle` constraint of `Math.PI/2`\n * solves to 90°, while `90` solves to 5.7°. Hosts that display degrees convert\n * at their own boundary.\n */\n\n/**\n * A position on an element. `number` is the 0..1 parametric position (0 =\n * start, 1 = end, 0.5 = arc/line midpoint). `'center'` is the circle/arc/ellipse\n * centre — semantically distinct from `'mid'`.\n */\nexport type At = number | 'start' | 'end' | 'mid' | 'center'\n\n/** An element reference: `tag` (named) or `index` (array position); `at` omitted = whole element. */\nexport type Ref = { tag: string; at?: At } | { index: number; at?: At }\n\n/**\n * Canonical sketch geometry. Supports `line` + `circle` + `arc` + `ellipse` +\n * `point` + `bspline` (ellipse/point reopened 2026-09-28, bspline 2026-09-29 —\n * the solver chain already consumed all three; only the op-entry schema was\n * narrower than the chain).\n *\n * `construction` (2026-09-30): reference geometry — symmetry axes, centrelines,\n * helper lines the constraints may be tied to but that must NOT become part of\n * the profile loop. It participates in the solve exactly like any other geom\n * (its whole point is to anchor constraints) and is filtered out of contour\n * extraction (`contour.ts`), which is what keeps a reference line's (often\n * arbitrary) coordinates from invading the profile chain.\n */\nexport type SketchGeom =\n  | { tag?: string; construction?: boolean; kind: 'line'; x1: number; y1: number; x2: number; y2: number }\n  | { tag?: string; construction?: boolean; kind: 'circle'; cx: number; cy: number; r: number }\n  | { tag?: string; construction?: boolean; kind: 'arc'; cx: number; cy: number; r: number; a0: number; a1: number; ccw?: boolean }\n  | { tag?: string; construction?: boolean; kind: 'point'; x: number; y: number }\n  | {\n      tag?: string\n      construction?: boolean\n      kind: 'ellipse'\n      cx: number\n      cy: number\n      rx: number\n      ry: number\n      a0?: number\n      a1?: number\n      /** major-axis rotation, radians */\n      angle?: number\n    }\n  | {\n      tag?: string\n      construction?: boolean\n      kind: 'bspline'\n      poles: { x: number; y: number }[]\n      knots: number[]\n      degree: number\n      periodic?: boolean\n    }\n\n/** Canonical constraint kinds (string enums; integer enums only appear at projection boundaries). */\nexport type SketchConstraint =\n  | { kind: 'fixed'; of: Ref }\n  | { kind: 'coincident'; a: Ref; b: Ref }\n  | { kind: 'horizontal'; of: Ref }\n  | { kind: 'vertical'; of: Ref }\n  | { kind: 'parallel'; a: Ref; b: Ref }\n  | { kind: 'perpendicular'; a: Ref; b: Ref }\n  | { kind: 'tangent'; a: Ref; b: Ref }\n  | { kind: 'distance'; a: Ref; b: Ref; value: number }\n  | { kind: 'distanceX'; a: Ref; b: Ref; value: number }\n  | { kind: 'distanceY'; a: Ref; b: Ref; value: number }\n  | { kind: 'length'; of: Ref; value: number }\n  | { kind: 'angle'; a: Ref; b: Ref; value: number }\n  | { kind: 'orientation'; of: Ref; dir: [number, number] }\n  | { kind: 'radius'; of: Ref; value: number }\n  | { kind: 'diameter'; of: Ref; value: number }\n  | { kind: 'arcAngle'; of: Ref; value: number }\n  | { kind: 'equal'; a: Ref; b: Ref }\n  | { kind: 'pointOnObject'; p: Ref; on: Ref }\n  | { kind: 'symmetric'; p1: Ref; p2: Ref; about: Ref }\n\n/** The `kind` string of a canonical constraint. */\nexport type SketchConstraintKind = SketchConstraint['kind']\n\n/**\n * A canonical constraint involved in a conflict or redundancy, resolved to\n * human-readable element identifiers (tags) so a host / error message can point\n * at *where* the problem is (§3.2 of the 2026-09-27 over-constraint plan).\n */\nexport interface ConflictDetail {\n  /** canonical constraint kind, e.g. `'length'` / `'coincident'`. */\n  kind: SketchConstraintKind\n  /** element identifiers the constraint references, as tags or `geom#<n>` fallbacks. */\n  refs: string[]\n  /** the constraint's value when it carries one (length / radius / angle / distance…). */\n  value?: number\n}\n\n/** A canonical sketch: geometry declarations plus constraints. */\nexport interface SketchInput {\n  geoms: SketchGeom[]\n  constraints?: SketchConstraint[]\n}\n\n/**\n * Solve status (§5): under- and over-constraint are allowed, but never silent.\n */\nexport type SolveStatus =\n  /** all constraints satisfied, zero remaining DoF */\n  | 'solved'\n  /** free DoF remain; solved to a minimal-displacement solution */\n  | 'underconstrained'\n  /** redundant constraints were dropped; solved */\n  | 'redundant'\n  /** constraints conflict; best-effort least-squares solution returned */\n  | 'conflicting'\n  /** solver failed numerically (not an under/over-constraint cause) */\n  | 'failed'\n\n/**\n * Result of one canonical solve: solved geometry plus explicit diagnostics.\n *\n * `converged` is false only for `failed` — under/redundant/conflicting all\n * produce geometry (allowed ≠ silent: the status and diagnostics carry the\n * story).\n */\nexport interface SolveOutcome {\n  /** solved geometry, same order/index as input */\n  geoms: SketchGeom[]\n  /** true unless `status === 'failed'` */\n  converged: boolean\n  /** explicit solve status (§5) */\n  status: SolveStatus\n  /** remaining degrees of freedom when known (-1 = not reported) */\n  dof: number\n  /** constraint indices the solver flagged (conflicting/redundant) */\n  problemConstraints: number[]\n  /** constraint indices dropped because they could not be projected/pushed */\n  droppedConstraints: number[]\n  /** per-problem-constraint residual magnitude when available */\n  residuals?: number[]\n  /** resolved conflict details (tags) when `status === 'conflicting'` (§3.2) */\n  conflictDetails?: ConflictDetail[]\n  /** human-readable detail for a non-solved status */\n  reason?: string\n}"]}

package/dist/sketch/contour.d.ts

@@ -0,0 +1,43 @@
+/**
+ * M3.6 — contour extraction: solved sketch geometry → closed loops → 2D
+ * contour (R6: pure data, no OCCT dependency; the cad-face wiring that turns
+ * contours into Blueprint/extrude inputs happens in M4.6/M5).
+ *
+ * Extraction: collect endpoints of every non-construction geometry, chain
+ * segments sharing endpoints (tolerance-based), keep closed loops.
+ */
+import type { FcstdSketchGeom } from './fcstd-types.js';
+/** One segment of a 2D contour: either a straight line or a circular arc (planar, sketch-local coordinates). */
+export type ContourSeg = {
+    kind: 'line';
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+} | {
+    kind: 'arc';
+    cx: number;
+    cy: number;
+    radius: number;
+    startAngle: number;
+    endAngle: number;
+    ccw: boolean;
+    x1: number;
+    y1: number;
+    x2: number;
+    y2: number;
+};
+/** A chained run of segments; `closed` when the chain's ends meet (R6: pure data, no OCCT dependency). */
+export interface Contour {
+    /** chained segments in traversal order */
+    segments: ContourSeg[];
+    /** true when the chain's endpoints meet within JOIN_TOL */
+    closed: boolean;
+}
+/**
+ * Extract closed contours (chains of segments whose endpoints meet).
+ * @param geoms solved sketch geometry to chain (non-construction segments only)
+ * @returns closed loops plus self-closed circles (open chains are dropped)
+ */
+export declare function extractContours(geoms: FcstdSketchGeom[]): Contour[];
+//# sourceMappingURL=contour.d.ts.map

package/dist/sketch/contour.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contour.d.ts","sourceRoot":"","sources":["../../src/sketch/contour.ts"],"names":[],"mappings":"AAAA;;;;;;;GAOG;AACH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAGxD,gHAAgH;AAChH,MAAM,MAAM,UAAU,GAClB;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,GAChE;IACE,IAAI,EAAE,KAAK,CAAC;IACZ,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;IACjB,GAAG,EAAE,OAAO,CAAC;IACb,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;IACX,EAAE,EAAE,MAAM,CAAC;CACZ,CAAC;AAEN,0GAA0G;AAC1G,MAAM,WAAW,OAAO;IACtB,0CAA0C;IAC1C,QAAQ,EAAE,UAAU,EAAE,CAAC;IACvB,2DAA2D;IAC3D,MAAM,EAAE,OAAO,CAAC;CACjB;AA2DD;;;;GAIG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,eAAe,EAAE,GAAG,OAAO,EAAE,CA+HnE"}

package/dist/sketch/contour.js

@@ -0,0 +1,202 @@
+import { bsplineToSegments } from './bspline.js';
+const JOIN_TOL = 1e-7;
+function segEnds(g) {
+    switch (g.kind) {
+        case 'line':
+            return [
+                { kind: 'line', x1: g.x1, y1: g.y1, x2: g.x2, y2: g.y2 },
+                { x: g.x1, y: g.y1 },
+                { x: g.x2, y: g.y2 },
+            ];
+        case 'arc': {
+            // GOTCHA (2026-10-06, G6-2b / HC-SR04 Sketch001): the arc radius/angle
+            // fields ALSO differ across the projection boundary — FCStd form
+            // (`radius`/`startAngle`/`endAngle`, carries x1/y1/x2/y2) vs canonical
+            // form (`r`/`a0`/`a1`+`ccw`, NO endpoint fields). The original code read
+            // only the FCStd spelling, so codegen-emitted arcs produced
+            // `undefined` endpoints (NaN joins) and the sketch reported
+            // E_SKETCHC_NO_CONTOUR although the convert-time loop discriminator
+            // (sketch-loop-topology.ts, its own `g.r`/`g.a0` reads) had accepted
+            // it. Accept both spellings; compute endpoints from the center/radius/
+            // angles when the stored endpoint fields are absent.
+            const radius = g.radius ?? g.r;
+            const startAngle = g.startAngle ?? g.a0;
+            const endAngle = g.endAngle ?? g.a1;
+            if (radius === undefined || startAngle === undefined || endAngle === undefined)
+                return undefined;
+            const x1 = g.x1 ?? g.cx + radius * Math.cos(startAngle);
+            const y1 = g.y1 ?? g.cy + radius * Math.sin(startAngle);
+            const x2 = g.x2 ?? g.cx + radius * Math.cos(endAngle);
+            const y2 = g.y2 ?? g.cy + radius * Math.sin(endAngle);
+            return [
+                {
+                    kind: 'arc', cx: g.cx, cy: g.cy, radius,
+                    startAngle, endAngle, ccw: true,
+                    x1, y1, x2, y2,
+                },
+                { x: x1, y: y1 },
+                { x: x2, y: y2 },
+            ];
+        }
+        case 'bspline': {
+            // P4: flatten the spline into a sampled polyline. Only the FIRST
+            // sub-segment is returned here so the pool gets exactly one entry per
+            // geometry (no index duplication); extractContours splices the full
+            // polyline run in its place (see expandBSpline below).
+            const segs = bsplineToSegments({
+                poles: g.poles, knots: g.knots, degree: g.degree, periodic: g.periodic,
+            });
+            const first = segs[0];
+            const last = segs[segs.length - 1];
+            if (!first || !last)
+                return undefined;
+            return [{ kind: 'line', x1: first.x1, y1: first.y1, x2: last.x2, y2: last.y2 }, { x: first.x1, y: first.y1 }, { x: last.x2, y: last.y2 }];
+        }
+        default:
+            return undefined; // circles are closed on their own; points don't join
+    }
+}
+/**
+ * Extract closed contours (chains of segments whose endpoints meet).
+ * @param geoms solved sketch geometry to chain (non-construction segments only)
+ * @returns closed loops plus self-closed circles (open chains are dropped)
+ */
+export function extractContours(geoms) {
+    const pool = [];
+    for (const g of geoms) {
+        // GOTCHA (2026-09-26): this function's doc comment always promised
+        // "non-construction segments only" but nothing filtered them. FreeCAD
+        // leaves construction geometry unconstrained, so its coordinates are
+        // frequently leftover garbage — a reference line at `StartY = -16508`
+        // sitting next to real geometry at y ≈ 1165 (Double glazed window
+        // … .FCStd, Sketch095). Left in the pool it contributed two dangling
+        // endpoints, and because the DFS marks pool entries `used` as it walks,
+        // a construction branch could consume real segments before the actual
+        // profile was ever tried — the sketch then had zero loops even though it
+        // was solved.
+        if (g.construction)
+            continue;
+        const s = segEnds(g);
+        if (!s)
+            continue;
+        // P4: keep the full sampled polyline for splines — after chaining, the
+        // winning seg is expanded back into all sub-segments (no interior loss).
+        const spline = g.kind === 'bspline'
+            ? bsplineToSegments({ poles: g.poles, knots: g.knots, degree: g.degree, periodic: g.periodic })
+            : undefined;
+        pool.push({ seg: s[0], a: s[1], b: s[2], used: false, spline });
+    }
+    const near = (p, q) => Math.hypot(p.x - q.x, p.y - q.y) <= JOIN_TOL;
+    const contours = [];
+    for (const start of pool) {
+        if (start.used)
+            continue;
+        start.used = true;
+        const head = start.a;
+        // GOTCHA (slittingsaw corpus, 2026-09-20): junction points with free
+        // branches (three+ segments sharing an endpoint) defeat first-come
+        // chaining — a branch to a dead end consumed the segments and the real
+        // loop never closed. DFS with backtracking: try each candidate
+        // continuation; the FIRST chain that closes at the head wins; a dead
+        // branch returns its segments to the pool. Closure-stop (tap GOTCHA) and
+        // pool-restart are both subsumed by the DFS ordering.
+        const dfs = (tail, walk) => {
+            if (walk.length > 0 && near(tail, head))
+                return walk;
+            for (const cand of pool) {
+                if (cand.used)
+                    continue;
+                cand.used = true;
+                if (near(tail, cand.a)) {
+                    const r = dfs(cand.b, [...walk, cand.seg]);
+                    if (r)
+                        return r;
+                }
+                else if (near(tail, cand.b)) {
+                    const r = dfs(cand.a, [...walk, reverseSeg(cand.seg)]);
+                    if (r)
+                        return r;
+                }
+                cand.used = false; // dead branch — return the segment to the pool
+            }
+            return undefined;
+        };
+        const solved = dfs(start.b, [start.seg]);
+        if (solved && solved.length > 1) {
+            // P4: replace spline proxy segs with their full sampled polyline runs.
+            // The proxy seg for geometry index i sits in pool order; recover the
+            // spline runs by matching the seg reference against pool entries.
+            const expanded = [];
+            for (const seg of solved) {
+                const entry = pool.find((e) => e.seg === seg && e.spline);
+                if (entry?.spline) {
+                    for (const sub of entry.spline) {
+                        expanded.push({ kind: 'line', x1: sub.x1, y1: sub.y1, x2: sub.x2, y2: sub.y2 });
+                    }
+                }
+                else {
+                    expanded.push(seg);
+                }
+            }
+            contours.push({ segments: expanded, closed: true });
+        }
+    }
+    // circles are self-closed contours (construction circles excluded: they are
+    // reference geometry, not profile holes/outer rings)
+    // GOTCHA (2026-10-06, HC-SR04 Sketch008 / G6-1 NO_CONTOUR bucket): the
+    // radius field name differs on the two sides of the projection boundary —
+    // `radius` on the Fcstd canonical model (project.ts:170) vs `r` on the
+    // canonical constraint model (canonical.ts:42). Accept BOTH: a circle
+    // stored with the other spelling was silently dropped here (undefined > 0
+    // is false) and the sketch reported E_SKETCHC_NO_CONTOUR even though the
+    // loop topology discriminator (sketch-loop-topology.ts) accepted it via
+    // its own `g.r` check.
+    for (const g of geoms) {
+        const radius = g.kind === 'circle' ? (g.radius ?? g.r) : undefined;
+        if (g.kind === 'circle' && radius !== undefined && radius > 0 && !g.construction) {
+            contours.push({
+                segments: [{
+                        kind: 'arc', cx: g.cx, cy: g.cy, radius,
+                        startAngle: 0, endAngle: Math.PI * 2, ccw: true,
+                        x1: g.cx + radius, y1: g.cy, x2: g.cx + radius, y2: g.cy,
+                    }],
+                closed: true,
+            });
+        }
+    }
+    // A6 (2026-09-28 plan): full ellipses were silently DROPPED before — the
+    // segEnds default branch returned undefined and nothing else picked them
+    // up (the "ellipse loses segments" hard bug). FCStd stores no partial
+    // ellipse arcs in Geometry (the canonical FcstdSketchGeom ellipse has no
+    // start/end angles), so every ellipse is a closed whole — sampled here as
+    // a closed polyline run (64 chords, endpoints exact). Construction
+    // ellipses are reference geometry, excluded like construction circles.
+    for (const g of geoms) {
+        if (g.kind !== 'ellipse' || g.minorRadius <= 0 || g.majorRadius <= 0 || g.construction)
+            continue;
+        const segments = [];
+        const N = 64;
+        const ca = Math.cos(g.angleXU);
+        const sa = Math.sin(g.angleXU);
+        const pt = (t) => {
+            const px = g.majorRadius * Math.cos(t);
+            const py = g.minorRadius * Math.sin(t);
+            // rotate by the major-axis angle into sketch coordinates
+            return [g.cx + px * ca - py * sa, g.cy + px * sa + py * ca];
+        };
+        let prev = pt(0);
+        for (let i = 1; i <= N; i++) {
+            const cur = pt((i / N) * Math.PI * 2);
+            segments.push({ kind: 'line', x1: prev[0], y1: prev[1], x2: cur[0], y2: cur[1] });
+            prev = cur;
+        }
+        contours.push({ segments, closed: true });
+    }
+    return contours;
+}
+function reverseSeg(s) {
+    if (s.kind === 'line')
+        return { kind: 'line', x1: s.x2, y1: s.y2, x2: s.x1, y2: s.y1 };
+    return { ...s, startAngle: s.endAngle, endAngle: s.startAngle, ccw: !s.ccw, x1: s.x2, y1: s.y2, x2: s.x1, y2: s.y1 };
+}
+//# sourceMappingURL=contour.js.map

package/dist/sketch/contour.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"contour.js","sourceRoot":"","sources":["../../src/sketch/contour.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * M3.6 — contour extraction: solved sketch geometry → closed loops → 2D\n * contour (R6: pure data, no OCCT dependency; the cad-face wiring that turns\n * contours into Blueprint/extrude inputs happens in M4.6/M5).\n *\n * Extraction: collect endpoints of every non-construction geometry, chain\n * segments sharing endpoints (tolerance-based), keep closed loops.\n */\nimport type { FcstdSketchGeom } from './fcstd-types.js';\nimport { bsplineToSegments } from './bspline.js';\n\n/** One segment of a 2D contour: either a straight line or a circular arc (planar, sketch-local coordinates). */\nexport type ContourSeg =\n  | { kind: 'line'; x1: number; y1: number; x2: number; y2: number }\n  | {\n      kind: 'arc';\n      cx: number;\n      cy: number;\n      radius: number;\n      startAngle: number;\n      endAngle: number;\n      ccw: boolean;\n      x1: number;\n      y1: number;\n      x2: number;\n      y2: number;\n    };\n\n/** A chained run of segments; `closed` when the chain's ends meet (R6: pure data, no OCCT dependency). */\nexport interface Contour {\n  /** chained segments in traversal order */\n  segments: ContourSeg[];\n  /** true when the chain's endpoints meet within JOIN_TOL */\n  closed: boolean;\n}\n\nconst JOIN_TOL = 1e-7;\n\nfunction segEnds(g: FcstdSketchGeom): [ContourSeg, { x: number; y: number }, { x: number; y: number }] | undefined {\n  switch (g.kind) {\n    case 'line':\n      return [\n        { kind: 'line', x1: g.x1, y1: g.y1, x2: g.x2, y2: g.y2 },\n        { x: g.x1, y: g.y1 },\n        { x: g.x2, y: g.y2 },\n      ];\n    case 'arc': {\n      // GOTCHA (2026-10-06, G6-2b / HC-SR04 Sketch001): the arc radius/angle\n      // fields ALSO differ across the projection boundary — FCStd form\n      // (`radius`/`startAngle`/`endAngle`, carries x1/y1/x2/y2) vs canonical\n      // form (`r`/`a0`/`a1`+`ccw`, NO endpoint fields). The original code read\n      // only the FCStd spelling, so codegen-emitted arcs produced\n      // `undefined` endpoints (NaN joins) and the sketch reported\n      // E_SKETCHC_NO_CONTOUR although the convert-time loop discriminator\n      // (sketch-loop-topology.ts, its own `g.r`/`g.a0` reads) had accepted\n      // it. Accept both spellings; compute endpoints from the center/radius/\n      // angles when the stored endpoint fields are absent.\n      const radius = g.radius ?? (g as { r?: number }).r;\n      const startAngle = g.startAngle ?? (g as { a0?: number }).a0;\n      const endAngle = g.endAngle ?? (g as { a1?: number }).a1;\n      if (radius === undefined || startAngle === undefined || endAngle === undefined) return undefined;\n      const x1 = g.x1 ?? g.cx + radius * Math.cos(startAngle);\n      const y1 = g.y1 ?? g.cy + radius * Math.sin(startAngle);\n      const x2 = g.x2 ?? g.cx + radius * Math.cos(endAngle);\n      const y2 = g.y2 ?? g.cy + radius * Math.sin(endAngle);\n      return [\n        {\n          kind: 'arc', cx: g.cx, cy: g.cy, radius,\n          startAngle, endAngle, ccw: true,\n          x1, y1, x2, y2,\n        },\n        { x: x1, y: y1 },\n        { x: x2, y: y2 },\n      ];\n    }\n    case 'bspline': {\n      // P4: flatten the spline into a sampled polyline. Only the FIRST\n      // sub-segment is returned here so the pool gets exactly one entry per\n      // geometry (no index duplication); extractContours splices the full\n      // polyline run in its place (see expandBSpline below).\n      const segs = bsplineToSegments({\n        poles: g.poles, knots: g.knots, degree: g.degree, periodic: g.periodic,\n      });\n      const first = segs[0];\n      const last = segs[segs.length - 1];\n      if (!first || !last) return undefined;\n      return [{ kind: 'line', x1: first.x1, y1: first.y1, x2: last.x2, y2: last.y2 }, { x: first.x1, y: first.y1 }, { x: last.x2, y: last.y2 }];\n    }\n    default:\n      return undefined; // circles are closed on their own; points don't join\n  }\n}\n\n/**\n * Extract closed contours (chains of segments whose endpoints meet).\n * @param geoms solved sketch geometry to chain (non-construction segments only)\n * @returns closed loops plus self-closed circles (open chains are dropped)\n */\nexport function extractContours(geoms: FcstdSketchGeom[]): Contour[] {\n  const pool: { seg: ContourSeg; a: { x: number; y: number }; b: { x: number; y: number }; used: boolean; spline?: { x1: number; y1: number; x2: number; y2: number }[] }[] = [];\n  for (const g of geoms) {\n    // GOTCHA (2026-09-26): this function's doc comment always promised\n    // \"non-construction segments only\" but nothing filtered them. FreeCAD\n    // leaves construction geometry unconstrained, so its coordinates are\n    // frequently leftover garbage — a reference line at `StartY = -16508`\n    // sitting next to real geometry at y ≈ 1165 (Double glazed window\n    // … .FCStd, Sketch095). Left in the pool it contributed two dangling\n    // endpoints, and because the DFS marks pool entries `used` as it walks,\n    // a construction branch could consume real segments before the actual\n    // profile was ever tried — the sketch then had zero loops even though it\n    // was solved.\n    if (g.construction) continue;\n    const s = segEnds(g);\n    if (!s) continue;\n    // P4: keep the full sampled polyline for splines — after chaining, the\n    // winning seg is expanded back into all sub-segments (no interior loss).\n    const spline = g.kind === 'bspline'\n      ? bsplineToSegments({ poles: g.poles, knots: g.knots, degree: g.degree, periodic: g.periodic })\n      : undefined;\n    pool.push({ seg: s[0], a: s[1], b: s[2], used: false, spline });\n  }\n\n  const near = (p: { x: number; y: number }, q: { x: number; y: number }): boolean =>\n    Math.hypot(p.x - q.x, p.y - q.y) <= JOIN_TOL;\n\n  const contours: Contour[] = [];\n  for (const start of pool) {\n    if (start.used) continue;\n    start.used = true;\n    const head = start.a;\n    // GOTCHA (slittingsaw corpus, 2026-09-20): junction points with free\n    // branches (three+ segments sharing an endpoint) defeat first-come\n    // chaining — a branch to a dead end consumed the segments and the real\n    // loop never closed. DFS with backtracking: try each candidate\n    // continuation; the FIRST chain that closes at the head wins; a dead\n    // branch returns its segments to the pool. Closure-stop (tap GOTCHA) and\n    // pool-restart are both subsumed by the DFS ordering.\n    const dfs = (tail: { x: number; y: number }, walk: ContourSeg[]): ContourSeg[] | undefined => {\n      if (walk.length > 0 && near(tail, head)) return walk;\n      for (const cand of pool) {\n        if (cand.used) continue;\n        cand.used = true;\n        if (near(tail, cand.a)) {\n          const r = dfs(cand.b, [...walk, cand.seg]);\n          if (r) return r;\n        } else if (near(tail, cand.b)) {\n          const r = dfs(cand.a, [...walk, reverseSeg(cand.seg)]);\n          if (r) return r;\n        }\n        cand.used = false; // dead branch — return the segment to the pool\n      }\n      return undefined;\n    };\n    const solved = dfs(start.b, [start.seg]);\n    if (solved && solved.length > 1) {\n      // P4: replace spline proxy segs with their full sampled polyline runs.\n      // The proxy seg for geometry index i sits in pool order; recover the\n      // spline runs by matching the seg reference against pool entries.\n      const expanded: ContourSeg[] = [];\n      for (const seg of solved) {\n        const entry = pool.find((e) => e.seg === seg && e.spline);\n        if (entry?.spline) {\n          for (const sub of entry.spline) {\n            expanded.push({ kind: 'line', x1: sub.x1, y1: sub.y1, x2: sub.x2, y2: sub.y2 });\n          }\n        } else {\n          expanded.push(seg);\n        }\n      }\n      contours.push({ segments: expanded, closed: true });\n    }\n  }\n\n  // circles are self-closed contours (construction circles excluded: they are\n  // reference geometry, not profile holes/outer rings)\n  // GOTCHA (2026-10-06, HC-SR04 Sketch008 / G6-1 NO_CONTOUR bucket): the\n  // radius field name differs on the two sides of the projection boundary —\n  // `radius` on the Fcstd canonical model (project.ts:170) vs `r` on the\n  // canonical constraint model (canonical.ts:42). Accept BOTH: a circle\n  // stored with the other spelling was silently dropped here (undefined > 0\n  // is false) and the sketch reported E_SKETCHC_NO_CONTOUR even though the\n  // loop topology discriminator (sketch-loop-topology.ts) accepted it via\n  // its own `g.r` check.\n  for (const g of geoms) {\n    const radius = g.kind === 'circle' ? (g.radius ?? (g as { r?: number }).r) : undefined;\n    if (g.kind === 'circle' && radius !== undefined && radius > 0 && !g.construction) {\n      contours.push({\n        segments: [{\n          kind: 'arc', cx: g.cx, cy: g.cy, radius,\n          startAngle: 0, endAngle: Math.PI * 2, ccw: true,\n          x1: g.cx + radius, y1: g.cy, x2: g.cx + radius, y2: g.cy,\n        }],\n        closed: true,\n      });\n    }\n  }\n\n  // A6 (2026-09-28 plan): full ellipses were silently DROPPED before — the\n  // segEnds default branch returned undefined and nothing else picked them\n  // up (the \"ellipse loses segments\" hard bug). FCStd stores no partial\n  // ellipse arcs in Geometry (the canonical FcstdSketchGeom ellipse has no\n  // start/end angles), so every ellipse is a closed whole — sampled here as\n  // a closed polyline run (64 chords, endpoints exact). Construction\n  // ellipses are reference geometry, excluded like construction circles.\n  for (const g of geoms) {\n    if (g.kind !== 'ellipse' || g.minorRadius <= 0 || g.majorRadius <= 0 || g.construction) continue;\n    const segments: ContourSeg[] = [];\n    const N = 64;\n    const ca = Math.cos(g.angleXU);\n    const sa = Math.sin(g.angleXU);\n    const pt = (t: number): [number, number] => {\n      const px = g.majorRadius * Math.cos(t);\n      const py = g.minorRadius * Math.sin(t);\n      // rotate by the major-axis angle into sketch coordinates\n      return [g.cx + px * ca - py * sa, g.cy + px * sa + py * ca];\n    };\n    let prev = pt(0);\n    for (let i = 1; i <= N; i++) {\n      const cur = pt((i / N) * Math.PI * 2);\n      segments.push({ kind: 'line', x1: prev[0], y1: prev[1], x2: cur[0], y2: cur[1] });\n      prev = cur;\n    }\n    contours.push({ segments, closed: true });\n  }\n  return contours;\n}\n\nfunction reverseSeg(s: ContourSeg): ContourSeg {\n  if (s.kind === 'line') return { kind: 'line', x1: s.x2, y1: s.y2, x2: s.x1, y2: s.y1 };\n  return { ...s, startAngle: s.endAngle, endAngle: s.startAngle, ccw: !s.ccw, x1: s.x2, y1: s.y2, x2: s.x1, y2: s.y1 };\n}\n"]}

package/dist/sketch/dim-spec.d.ts

@@ -0,0 +1,32 @@
+/**
+ * dim-spec — recursive {@link DimSpec} for `cad.sketch` unit-aware codegen.
+ *
+ * Every numeric field is explicitly declared:
+ * - Length fields → `dim: 'length'`
+ * - Angle fields → `dim: 'angle'`
+ * - Pure numbers (counts, degrees, booleans) → `kind: 'plain'`
+ * - String/boolean/ref fields → omitted (not numeric, `object` spec only
+ *   descends into listed fields)
+ *
+ * Design doc §3.1 (user裁定 2026-10-10): `'plain'` is a legal, explicit
+ * declaration — not an exemption. Every numeric parameter must be declared.
+ */
+import type { DimSpec } from '../units.js';
+/**
+ * DimSpec for the `shapes[]` array of `cad.sketch`.
+ * @returns a `tagged`-by-`kind` array spec; length fields → `dim:'length'`,
+ *          angle fields → `dim:'angle'`, pure numbers → `plain`.
+ */
+export declare function shapesDimSpec(): DimSpec;
+/**
+ * DimSpec for the `constraints[]` array of `cad.sketch`.
+ * @returns a `tagged`-by-`kind` array spec; length-valued constraints → `dim:'length'`,
+ *          angle-valued constraints → `dim:'angle'`, pure numbers → `plain`.
+ */
+export declare function constraintsDimSpec(): DimSpec;
+/**
+ * DimSpec for the top-level options object of `cad.sketch({ shapes, geoms, constraints, plane, ... })`.
+ * @returns an `object` spec covering `shapes`/`geoms`/`constraints`/`plane` fields.
+ */
+export declare function sketchDimSpec(): DimSpec;
+//# sourceMappingURL=dim-spec.d.ts.map

package/dist/sketch/dim-spec.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dim-spec.d.ts","sourceRoot":"","sources":["../../src/sketch/dim-spec.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;GAYG;AACH,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAA;AA+FvC;;;;GAIG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAEvC;AAED;;;;GAIG;AACH,wBAAgB,kBAAkB,IAAI,OAAO,CAE5C;AAED;;;GAGG;AACH,wBAAgB,aAAa,IAAI,OAAO,CAUvC"}