@constructorfleet/sketchforge-engine 1.24.1 → 1.26.0

package/dist/serverCadMeasure.js

@@ -29,9 +29,10 @@
  */
 import { circularEdgeRadius, faceRadius, planarFaceAngle, } from "./cadMeasurements.js";
 import { withCadKernel } from "./serverCadKernel.js";
-import { edgeSolidForShape, orientedSolidForShape, ServerCadError } from "./serverCadOperations.js";
+import { edgeSolidForShape, orientedSolidForShape, ServerCadError, treatmentBakesRotation } from "./serverCadOperations.js";
 import { faceOutwardNormal } from "./serverCadShell.js";
 import { placedSolidForShape } from "./serverShapeBooleans.js";
+import { shapePlacementMatrix } from "./serverShapeGroups.js";
 function edgeMeasurement(cad, handle, index) {
     let geometryType = "unknown";
     try {
@@ -124,7 +125,37 @@ function resolveTarget(cad, target, label) {
     // listings use, and which is right for them -- hands back the solid in its own
     // frame with the rotation applied and the translation not. Two parts 60mm
     // apart both measured from the origin through that, so this read zero.
-    const solid = placedSolidForShape(cad, target.shape);
+    // Edges have their own canonical solid: for an untreated plain revolve it
+    // is rebuilt from the retained profile, exactly like GET /edges and edge
+    // treatments. The stored mesh has many more edges and cannot resolve those
+    // listed indexes. Faces continue to use their existing placed solid.
+    let solid;
+    if (target.entity === "edge") {
+        solid = edgeSolidForShape(cad, target.shape);
+        // The edge listing and treatment solid is in the shape frame: its mirror
+        // is already applied, while a treatment may bake a parametric shape's
+        // rotation into the geometry. Put that same solid where it sits without
+        // applying either transform twice. Untreated revolves are the exception:
+        // their exact edge solid is rebuilt from the profile before rotation.
+        const rotationAlreadyApplied = treatmentBakesRotation(target.shape)
+            && target.shape.sketchOperation !== "revolve";
+        const placementShape = {
+            ...target.shape,
+            mirrorX: undefined,
+            mirrorY: undefined,
+            mirrorZ: undefined,
+            ...(rotationAlreadyApplied ? { rotation: 0, rotationX: 0, rotationZ: 0 } : {}),
+        };
+        const elements = shapePlacementMatrix(placementShape).elements;
+        solid = cad.transform(solid, [
+            elements[0], elements[4], elements[8], elements[12],
+            elements[1], elements[5], elements[9], elements[13],
+            elements[2], elements[6], elements[10], elements[14],
+        ]);
+    }
+    else {
+        solid = placedSolidForShape(cad, target.shape);
+    }
     if (target.entity === "shape") {
         return { handle: solid, face: null };
     }

package/dist/serverCadMeasure.js.map

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

package/dist/serverCadOperations.d.ts

@@ -16,6 +16,7 @@
  */
 import type { EvolutionData, OcctKernel, ShapeHandle } from "occt-wasm";
 import type { SketchProfile, WorkplaneShape } from "./domain/sketchforge.js";
+import { type SketchFaceDraftRequest } from "./sketchFaceDraftKernel.js";
 export type ServerCadEdge = {
     index: number;
     length: number;
@@ -46,43 +47,7 @@ export declare class ServerCadError extends Error {
     readonly status: number;
     constructor(message: string, status?: number);
 }
-declare const DRAFT_PULL_AXES: {
-    readonly x: {
-        readonly x: 1;
-        readonly y: 0;
-        readonly z: 0;
-    };
-    readonly y: {
-        readonly x: 0;
-        readonly y: 1;
-        readonly z: 0;
-    };
-    readonly z: {
-        readonly x: 0;
-        readonly y: 0;
-        readonly z: 1;
-    };
-    readonly "-x": {
-        readonly x: -1;
-        readonly y: 0;
-        readonly z: 0;
-    };
-    readonly "-y": {
-        readonly x: 0;
-        readonly y: -1;
-        readonly z: 0;
-    };
-    readonly "-z": {
-        readonly x: 0;
-        readonly y: 0;
-        readonly z: -1;
-    };
-};
-export type SketchFaceDraftRequest = {
-    sourceFaceId: string;
-    angle: number;
-    pullDirection: keyof typeof DRAFT_PULL_AXES;
-};
+export type { SketchFaceDraftRequest } from "./sketchFaceDraftKernel.js";
 /**
  * Whether the kernel considers a shape sound.
  *
@@ -131,8 +96,12 @@ export declare function localSolidForShape(cad: OcctKernel, shape: WorkplaneShap
  * straightened. `treatmentBakesRotation` is the other half of that bargain and
  * reads the same predicate.
  *
- * For stored geometry this is the local solid unchanged: the rotation stays on
- * the shape, which is where it already was.
+ * For stored geometry this is the local solid with only its mirror applied:
+ * the rotation stays on the shape, which is where it already was.
+ *
+ * Mirrored either way, because the result is stored with the shape's mirror
+ * flags cleared. Building it unmirrored handed back the unmirrored shape and
+ * reported success (#413).
  */
 export declare function orientedSolidForShape(cad: OcctKernel, shape: WorkplaneShape): ShapeHandle;
 /** The edges of a shape, in the order a treatment request refers to them by index. */
@@ -175,6 +144,7 @@ export declare function allEdgeTreatmentEdgeCount(shape: WorkplaneShape, _kind:
  * the treatment. For an untreated revolve that is the exact solid rebuilt from
  * its profile (#347); a revolve with no exact solid is refused rather than
  * listed or treated by its facets. Everything else is the oriented solid.
+ * Both carry the shape's mirror, which the treated result no longer does.
  */
 export declare function edgeSolidForShape(cad: OcctKernel, shape: WorkplaneShape): ShapeHandle;
 /** Build the analytical full-turn BREP for chamfering a retained plain revolve. */
@@ -189,9 +159,11 @@ export declare function exactPlainSketchRevolveResult(shape: WorkplaneShape): Pr
 /**
  * Apply a prism draft along the shape's vertical extrusion axis.
  *
- * This is intentionally a baked operation: the project does not yet retain
- * the source extrusion as a parametric feature. The exact BREP and viewport
- * mesh are persisted together, as with shell and edge treatments.
+ * The geometry only: the caller records the retained angle and source frame
+ * (`retainedPrismDraftFields`) that a sketch edit replays it from. The B-rep
+ * is built about the centre of the profile's bounds
+ * (`draftPrismProfileOffset`), and the exact BREP and viewport mesh are
+ * persisted together, as with shell and edge treatments.
  */
 export declare function applyDraftPrism(shape: WorkplaneShape, request: {
     angle: number;
@@ -213,5 +185,4 @@ export declare function meshedCadResult(cad: OcctKernel, result: ShapeHandle, so
  * the viewport expects -- so the shape keeps its place on the workplane.
  */
 export declare function shapeWithCadResult(shape: WorkplaneShape, result: ServerCadResult): WorkplaneShape;
-export {};
 //# sourceMappingURL=serverCadOperations.d.ts.map

package/dist/serverCadOperations.d.ts.map

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

package/dist/serverCadOperations.js

@@ -16,11 +16,13 @@
  */
 import { faceIdsFromEvolution } from "./faceLineage.js";
 import { withCadKernel } from "./serverCadKernel.js";
-import { exactSolidForShape, shapeIsTurned, unrotatedSolidForShape, UnbuildableShapeError, EXACT_SOLID_KINDS, } from "./cadSolids.js";
+import { exactSolidForShape, mirroredInShapeFrame, shapeIsTurned, unrotatedSolidForShape, UnbuildableShapeError, EXACT_SOLID_KINDS, } from "./cadSolids.js";
 import { canonicalizeShape } from "./workplaneShapes.js";
 import { createLocalId } from "./localIds.js";
 import { cadSketchRegions } from "./sketchCadProfile.js";
 import { normalizeSketchRevolveSettings, sketchProfileToRevolvePolygons } from "./sketchRevolve.js";
+import { triangleFaceGroups } from "./cadFaceMesh.js";
+import { draftSketchFace, draftPrismProfileOffset, faceIdsForCadResult } from "./sketchFaceDraftKernel.js";
 export class ServerCadError extends Error {
     status;
     constructor(message, status = 422) {
@@ -32,10 +34,6 @@ export class ServerCadError extends Error {
 const MESH_DEFLECTION = 0.1;
 const MIN_CAD_DIMENSION = 0.01;
 const FACE_HASH_UPPER_BOUND = 2_147_483_647;
-const DRAFT_PULL_AXES = {
-    x: { x: 1, y: 0, z: 0 }, y: { x: 0, y: 1, z: 0 }, z: { x: 0, y: 0, z: 1 },
-    "-x": { x: -1, y: 0, z: 0 }, "-y": { x: 0, y: -1, z: 0 }, "-z": { x: 0, y: 0, z: -1 },
-};
 function meshPositionsOf(shape) {
     const positions = shape.importedMesh?.positions;
     return positions && positions.length >= 9 ? positions : null;
@@ -184,12 +182,16 @@ export function localSolidForShape(cad, shape) {
  * straightened. `treatmentBakesRotation` is the other half of that bargain and
  * reads the same predicate.
  *
- * For stored geometry this is the local solid unchanged: the rotation stays on
- * the shape, which is where it already was.
+ * For stored geometry this is the local solid with only its mirror applied:
+ * the rotation stays on the shape, which is where it already was.
+ *
+ * Mirrored either way, because the result is stored with the shape's mirror
+ * flags cleared. Building it unmirrored handed back the unmirrored shape and
+ * reported success (#413).
  */
 export function orientedSolidForShape(cad, shape) {
     if (!rotationIsRebuilt(shape))
-        return localSolidForShape(cad, shape);
+        return mirroredStoredSolid(cad, localSolidForShape(cad, shape), shape);
     try {
         return exactSolidForShape(cad, shape);
     }
@@ -199,6 +201,25 @@ export function orientedSolidForShape(cad, shape) {
         throw error;
     }
 }
+/**
+ * A solid stored on the shape -- its BREP, its mesh, or a revolve rebuilt from
+ * its profile -- with the shape's mirror flags applied about its own centre.
+ *
+ * The bounds centre rather than the origin, because stored geometry is not
+ * always in the builders' frame (an earlier treatment's BREP keeps whatever
+ * frame it was made in); the viewport mirrors the normalized mesh about its
+ * centre, and a plane through any other point would only move the result.
+ */
+function mirroredStoredSolid(cad, solid, shape) {
+    if (!shape.mirrorX && !shape.mirrorY && !shape.mirrorZ)
+        return solid;
+    const bounds = cad.getBoundingBox(solid, false);
+    return mirroredInShapeFrame(cad, solid, shape, {
+        x: (bounds.xmin + bounds.xmax) / 2,
+        y: (bounds.ymin + bounds.ymax) / 2,
+        z: (bounds.zmin + bounds.zmax) / 2,
+    });
+}
 /** How many faces of the solid meet along this edge. A seam reports one. */
 function adjacentFaceCount(cad, solid, handle) {
     try {
@@ -272,12 +293,7 @@ export function applyBakedMirror(shape, axis, pivot) {
             throw error;
         }
         const centerY = shape.height / 2;
-        if (shape.mirrorX)
-            solid = cad.mirror(solid, { x: 0, y: 0, z: 0 }, { x: 1, y: 0, z: 0 });
-        if (shape.mirrorY)
-            solid = cad.mirror(solid, { x: 0, y: centerY, z: 0 }, { x: 0, y: 1, z: 0 });
-        if (shape.mirrorZ)
-            solid = cad.mirror(solid, { x: 0, y: 0, z: 0 }, { x: 0, y: 0, z: 1 });
+        solid = mirroredInShapeFrame(cad, solid, shape, { x: 0, y: centerY, z: 0 });
         const center = { x: 0, y: centerY, z: 0 };
         const angle = (degrees) => degrees * Math.PI / 180;
         if (shape.rotationZ)
@@ -482,12 +498,14 @@ function exactRevolveSolidForShape(cad, shape) {
  * the treatment. For an untreated revolve that is the exact solid rebuilt from
  * its profile (#347); a revolve with no exact solid is refused rather than
  * listed or treated by its facets. Everything else is the oriented solid.
+ * Both carry the shape's mirror, which the treated result no longer does.
  */
 export function edgeSolidForShape(cad, shape) {
     const refusal = revolveWithoutExactEdges(shape);
     if (refusal)
         throw new ServerCadError(refusal);
-    return exactRevolveSolidForShape(cad, shape) ?? orientedSolidForShape(cad, shape);
+    const revolve = exactRevolveSolidForShape(cad, shape);
+    return revolve ? mirroredStoredSolid(cad, revolve, shape) : orientedSolidForShape(cad, shape);
 }
 /** Build the analytical full-turn BREP for chamfering a retained plain revolve. */
 export function isPlainFullTurnSketchRevolve(shape) {
@@ -589,9 +607,11 @@ export function exactPlainSketchRevolveResult(shape) {
 /**
  * Apply a prism draft along the shape's vertical extrusion axis.
  *
- * This is intentionally a baked operation: the project does not yet retain
- * the source extrusion as a parametric feature. The exact BREP and viewport
- * mesh are persisted together, as with shell and edge treatments.
+ * The geometry only: the caller records the retained angle and source frame
+ * (`retainedPrismDraftFields`) that a sketch edit replays it from. The B-rep
+ * is built about the centre of the profile's bounds
+ * (`draftPrismProfileOffset`), and the exact BREP and viewport mesh are
+ * persisted together, as with shell and edge treatments.
  */
 export function applyDraftPrism(shape, request) {
     if (!Number.isFinite(request.angle) || request.angle === 0 || Math.abs(request.angle) >= 45) {
@@ -609,12 +629,7 @@ export function applyDraftPrism(shape, request) {
         return Promise.reject(new ServerCadError("Draft prism currently requires one closed polygonal sketch profile made from straight segments.", 400));
     }
     return withCadKernel((cad) => {
-        const minX = Math.min(...points.map(({ x }) => x));
-        const maxX = Math.max(...points.map(({ x }) => x));
-        const minZ = Math.min(...points.map(({ z }) => z));
-        const maxZ = Math.max(...points.map(({ z }) => z));
-        const centerX = (minX + maxX) / 2;
-        const centerZ = (minZ + maxZ) / 2;
+        const { x: centerX, z: centerZ } = draftPrismProfileOffset(shape.sketchProfile);
         const edges = points.map((point, index) => {
             const next = points[(index + 1) % points.length];
             return cad.makeLineEdge({ x: point.x - centerX, y: 0, z: point.z - centerZ }, { x: next.x - centerX, y: 0, z: next.z - centerZ });
@@ -663,75 +678,15 @@ export function applySketchFaceDraft(shape, request) {
         const face = faces[selected[0]];
         if (!face)
             throw new ServerCadError("The selected source face is no longer available.");
-        const direction = DRAFT_PULL_AXES[request.pullDirection];
-        const angle = request.angle * Math.PI / 180;
-        let drafted;
-        try {
-            drafted = cad.draft(solid, face, angle, direction);
-        }
-        catch {
-            const rotation = canonicalDraftRotation(request.pullDirection);
-            try {
-                if (!rotation)
-                    throw new Error("No canonical rotation for the selected pull axis.");
-                const rotatedSolid = cad.rotate(solid, rotation.axis, rotation.angle);
-                const oldNormal = faceNormal(cad, face);
-                if (!oldNormal)
-                    throw new Error("The selected face has no usable normal.");
-                const targetNormal = rotateVector(oldNormal, rotation.axis.direction, rotation.angle);
-                const targetCenter = rotateVector(cad.getSurfaceCenterOfMass(face), rotation.axis.direction, rotation.angle);
-                const bounds = cad.getBoundingBox(solid, false);
-                const scale = Math.max(1, Math.hypot(bounds.xmax - bounds.xmin, bounds.ymax - bounds.ymin, bounds.zmax - bounds.zmin));
-                const matches = cad.getSubShapes(rotatedSolid, "face").filter((candidate) => {
-                    const normal = faceNormal(cad, candidate);
-                    const center = cad.getSurfaceCenterOfMass(candidate);
-                    return normal && Math.hypot(normal.x - targetNormal.x, normal.y - targetNormal.y, normal.z - targetNormal.z) <= 1e-7
-                        && Math.hypot(center.x - targetCenter.x, center.y - targetCenter.y, center.z - targetCenter.z) <= scale * 1e-8;
-                });
-                if (matches.length !== 1)
-                    throw new Error("Could not uniquely identify the selected face after rotating the solid.");
-                const canonicalDraft = cad.draft(rotatedSolid, matches[0], angle, { x: 0, y: 0, z: 1 });
-                drafted = cad.rotate(canonicalDraft, rotation.axis, -rotation.angle);
-            }
-            catch {
-                throw new ServerCadError("The selected source face cannot be drafted along that local pull axis and angle.");
-            }
-        }
+        const drafted = draftSketchFace(cad, solid, face, request);
+        if (!drafted)
+            throw new ServerCadError("The selected source face cannot be drafted along that local pull axis and angle.");
         if (!cadResultIsValid(cad, drafted) || !cad.isSolid(drafted)) {
             throw new ServerCadError("The face draft did not produce a valid solid.");
         }
         return meshedCadResult(cad, exactRevolve ? scaleRevolveResult(cad, drafted, shape) : drafted, shape);
     });
 }
-function canonicalDraftRotation(direction) {
-    switch (direction) {
-        case "x": return { axis: { point: { x: 0, y: 0, z: 0 }, direction: { x: 0, y: 1, z: 0 } }, angle: -Math.PI / 2 };
-        case "-x": return { axis: { point: { x: 0, y: 0, z: 0 }, direction: { x: 0, y: 1, z: 0 } }, angle: Math.PI / 2 };
-        case "y": return { axis: { point: { x: 0, y: 0, z: 0 }, direction: { x: 1, y: 0, z: 0 } }, angle: Math.PI / 2 };
-        case "-y": return { axis: { point: { x: 0, y: 0, z: 0 }, direction: { x: 1, y: 0, z: 0 } }, angle: -Math.PI / 2 };
-        case "z": return null;
-        case "-z": return { axis: { point: { x: 0, y: 0, z: 0 }, direction: { x: 0, y: 1, z: 0 } }, angle: Math.PI };
-    }
-}
-function rotateVector(vector, axis, angle) {
-    const cosine = Math.cos(angle), sine = Math.sin(angle);
-    const dot = axis.x * vector.x + axis.y * vector.y + axis.z * vector.z;
-    const cross = { x: axis.y * vector.z - axis.z * vector.y, y: axis.z * vector.x - axis.x * vector.z, z: axis.x * vector.y - axis.y * vector.x };
-    return {
-        x: vector.x * cosine + cross.x * sine + axis.x * dot * (1 - cosine),
-        y: vector.y * cosine + cross.y * sine + axis.y * dot * (1 - cosine),
-        z: vector.z * cosine + cross.z * sine + axis.z * dot * (1 - cosine),
-    };
-}
-function faceNormal(cad, face) {
-    try {
-        const bounds = cad.uvBounds(face);
-        return cad.surfaceNormal(face, (bounds.uMin + bounds.uMax) / 2, (bounds.vMin + bounds.vMax) / 2);
-    }
-    catch {
-        return null;
-    }
-}
 /** The exact geometry and a mesh of it, which is what a shape stores after any CAD operation. */
 export function meshedCadResult(cad, result, sourceShape, lineage, sourceSolid) {
     const mesh = cad.meshShape(result, { linearDeflection: MESH_DEFLECTION });
@@ -746,12 +701,7 @@ export function meshedCadResult(cad, result, sourceShape, lineage, sourceSolid)
     }
     const faces = cad.getSubShapes(result, "face");
     const faceIndexByHash = new Map(faces.map((face, index) => [cad.hashCode(face, 2_147_483_647), index]));
-    const faceGroups = [];
-    for (let group = 0; group + 2 < (mesh.faceGroups?.length ?? 0); group += 3) {
-        const index = faceIndexByHash.get(mesh.faceGroups[group + 2]);
-        if (index !== undefined)
-            faceGroups.push(mesh.faceGroups[group], mesh.faceGroups[group + 1], index);
-    }
+    const faceGroups = triangleFaceGroups(mesh.faceGroups, faceIndexByHash);
     const faceIds = sourceShape
         ? lineage
             ? faceIdsFromEvolution(sourceShape.id, sourceShape.faceIds, lineage.sourceFaceHashes, faces.map((face) => cad.hashCode(face, FACE_HASH_UPPER_BOUND)), lineage.evolution)
@@ -766,56 +716,8 @@ export function meshedCadResult(cad, result, sourceShape, lineage, sourceSolid)
         ...(faceGroups.length ? { faceGroups } : {}),
     };
 }
-/**
- * Keep an ID only when an exact face BREP or a unique planar support surface
- * occurs on each side. OCCT face ordering and hash codes are kernel details,
- * so an unmatched or ambiguous face receives a new application ID.
- */
 function faceIdsForResult(cad, source, resultFaces, sourceSolid = orientedSolidForShape(cad, source)) {
-    const sourceFaces = cad.getSubShapes(sourceSolid, "face");
-    const fingerprint = (face) => {
-        const brep = cad.toBREP(face);
-        try {
-            if (cad.surfaceType(face) !== "plane")
-                return `brep:${brep}`;
-            const bounds = cad.uvBounds(face);
-            const normal = cad.surfaceNormal(face, (bounds.uMin + bounds.uMax) / 2, (bounds.vMin + bounds.vMax) / 2);
-            const center = cad.getSurfaceCenterOfMass(face);
-            const round = (value) => Math.round(value * 1e6) / 1e6;
-            const n = [round(normal.x), round(normal.y), round(normal.z)];
-            const offset = round(center.x * normal.x + center.y * normal.y + center.z * normal.z);
-            return `plane:${n.join(",")}:${offset}`;
-        }
-        catch {
-            return `brep:${brep}`;
-        }
-    };
-    const sourceByBrep = new Map();
-    sourceFaces.forEach((face, index) => {
-        const key = fingerprint(face);
-        sourceByBrep.set(key, [...(sourceByBrep.get(key) ?? []), index]);
-    });
-    const resultCounts = new Map();
-    const resultBreps = resultFaces.map((face) => {
-        const key = fingerprint(face);
-        resultCounts.set(key, (resultCounts.get(key) ?? 0) + 1);
-        return key;
-    });
-    const used = new Set();
-    return resultBreps.map((brep, index) => {
-        const matches = sourceByBrep.get(brep) ?? [];
-        const sourceIndex = matches.length === 1 && resultCounts.get(brep) === 1 ? matches[0] : undefined;
-        const inherited = sourceIndex === undefined
-            ? undefined
-            : source.faceIds?.[sourceIndex] ?? `face_${encodeURIComponent(source.id)}_${sourceIndex}`;
-        if (inherited && !used.has(inherited)) {
-            used.add(inherited);
-            return inherited;
-        }
-        const fresh = createLocalId(`${source.id}-face-${index}`);
-        used.add(fresh);
-        return fresh.startsWith("face_") ? fresh : `face_${fresh}`;
-    });
+    return faceIdsForCadResult(cad, source, resultFaces, sourceSolid);
 }
 function freshFaceIds(cad, solid, shapeId) {
     return cad.getSubShapes(solid, "face").map((_, index) => `face_${createLocalId(`${shapeId}-face-${index}`)}`);