fluidcad 0.0.26 → 0.0.28

package/lib/dist/tests/features/peer-ops-history.test.js

@@ -0,0 +1,119 @@
+import { describe, it, expect } from "vitest";
+import { setupOC, render } from "../setup.js";
+import sketch from "../../core/sketch.js";
+import revolve from "../../core/revolve.js";
+import sweep from "../../core/sweep.js";
+import loft from "../../core/loft.js";
+import extrude from "../../core/extrude.js";
+import cylinder from "../../core/cylinder.js";
+import plane from "../../core/plane.js";
+import { move, rect, circle, vLine } from "../../core/2d/index.js";
+describe("Revolve — history tracking", () => {
+    setupOC();
+    it("records added faces/edges and finalShapes on a plain revolve into empty scene", () => {
+        sketch("xz", () => {
+            move([20, 0]);
+            rect(10, 30);
+        });
+        const r = revolve("z");
+        render();
+        expect(r.getAddedFaces().length).toBeGreaterThan(0);
+        expect(r.getAddedEdges().length).toBeGreaterThan(0);
+        expect(r.getModifiedFaces()).toEqual([]);
+        expect(r.getRemovedFaces()).toEqual([]);
+        expect(r.getFinalShapes().length).toBeGreaterThan(0);
+    });
+    it("pre-computes edge categories in state after revolve build", () => {
+        sketch("xz", () => {
+            move([20, 0]);
+            rect(10, 30);
+        });
+        const r = revolve("z", 90);
+        render();
+        expect(r.getState('start-edges')).toBeDefined();
+        expect(r.getState('end-edges')).toBeDefined();
+        expect(r.getState('side-edges')).toBeDefined();
+    });
+    it("attributes modifications to the scene object when revolve fuses with it", () => {
+        const c = cylinder(30, 40);
+        sketch("xz", () => {
+            move([20, 0]);
+            rect(8, 20);
+        });
+        const r = revolve("z");
+        render();
+        const modified = c.getModifiedFaces();
+        expect(modified.length).toBeGreaterThan(0);
+        for (const record of modified) {
+            expect(record.modifiedBy).toBe(r);
+        }
+        expect(r.getAddedFaces().length).toBeGreaterThan(0);
+    });
+});
+describe("Sweep — history tracking", () => {
+    setupOC();
+    it("records added faces/edges and finalShapes on a plain sweep into empty scene", () => {
+        const profile = sketch("xy", () => {
+            circle(10);
+        });
+        const path = sketch("xz", () => {
+            vLine(50);
+        });
+        const s = sweep(path, profile);
+        render();
+        expect(s.getAddedFaces().length).toBeGreaterThan(0);
+        expect(s.getAddedEdges().length).toBeGreaterThan(0);
+        expect(s.getFinalShapes().length).toBeGreaterThan(0);
+        expect(s.getState('side-edges')).toBeDefined();
+    });
+});
+describe("Loft — history tracking", () => {
+    setupOC();
+    it("records added faces/edges and finalShapes on a plain loft into empty scene", () => {
+        const s1 = sketch("xy", () => {
+            rect(20, 20);
+        });
+        const p = plane("xy", { offset: 50 });
+        const s2 = sketch(p, () => {
+            circle(10);
+        });
+        const l = loft(s1, s2);
+        render();
+        expect(l.getAddedFaces().length).toBeGreaterThan(0);
+        expect(l.getAddedEdges().length).toBeGreaterThan(0);
+        expect(l.getFinalShapes().length).toBeGreaterThan(0);
+        expect(l.getState('side-edges')).toBeDefined();
+    });
+});
+describe("ExtrudeToFace — history tracking", () => {
+    setupOC();
+    it("records added faces/edges and finalShapes into empty scene via 'last-face'", () => {
+        sketch("xy", () => {
+            rect(100, 50);
+        });
+        extrude(30);
+        sketch("xy", () => {
+            rect(20, 20);
+        });
+        const e = extrude("last-face");
+        render();
+        expect(e.getAddedFaces().length).toBeGreaterThan(0);
+        expect(e.getAddedEdges().length).toBeGreaterThan(0);
+        expect(e.getFinalShapes().length).toBeGreaterThan(0);
+        expect(e.getState('side-edges')).toBeDefined();
+    });
+});
+describe("ExtrudeTwoDistances — history tracking", () => {
+    setupOC();
+    it("records added faces/edges and finalShapes into empty scene", () => {
+        sketch("xy", () => {
+            rect(40, 30);
+        });
+        const e2 = extrude(20, 10);
+        render();
+        expect(e2.getAddedFaces().length).toBeGreaterThan(0);
+        expect(e2.getAddedEdges().length).toBeGreaterThan(0);
+        expect(e2.getFinalShapes().length).toBeGreaterThan(0);
+        expect(e2.getState('side-edges')).toBeDefined();
+    });
+});

package/lib/dist/tests/features/select.test.js

@@ -4,6 +4,7 @@ import sketch from "../../core/sketch.js";
 import extrude from "../../core/extrude.js";
 import select from "../../core/select.js";
 import cylinder from "../../core/cylinder.js";
+import fillet from "../../core/fillet.js";
 import { circle, move, rect } from "../../core/2d/index.js";
 import { face, edge } from "../../filters/index.js";
 describe("select", () => {
@@ -177,6 +178,55 @@ describe("select", () => {
                 expect(shapes).toHaveLength(2);
             });
         });
+        describe("torus / notTorus", () => {
+            // Filleting the top edge of a cylinder produces a canonical GeomAbs_Torus face.
+            // For cylinder(radius=30, height=50) with fillet(5): major=25, minor=5.
+            const makeFilletedCylinder = () => {
+                cylinder(30, 50);
+                select(edge().onPlane("xy", 50));
+                fillet(5);
+            };
+            it("should select the toroidal face from a filleted cylinder edge", () => {
+                makeFilletedCylinder();
+                const sel = select(face().torus());
+                render();
+                const shapes = sel.getShapes();
+                expect(shapes).toHaveLength(1);
+                expect(shapes[0].getType()).toBe("face");
+            });
+            it("should match a torus by both major and minor radius", () => {
+                makeFilletedCylinder();
+                const sel = select(face().torus(25, 5));
+                render();
+                expect(sel.getShapes()).toHaveLength(1);
+            });
+            it("should match a torus by major radius only", () => {
+                makeFilletedCylinder();
+                const sel = select(face().torus(25));
+                render();
+                expect(sel.getShapes()).toHaveLength(1);
+            });
+            it("should match a torus by minor radius only", () => {
+                makeFilletedCylinder();
+                const sel = select(face().torus(undefined, 5));
+                render();
+                expect(sel.getShapes()).toHaveLength(1);
+            });
+            it("should not match a torus with the wrong major radius", () => {
+                makeFilletedCylinder();
+                const sel = select(face().torus(999));
+                render();
+                expect(sel.getShapes()).toHaveLength(0);
+            });
+            it("should exclude toroidal faces via notTorus", () => {
+                makeFilletedCylinder();
+                const sel = select(face().notTorus());
+                render();
+                // Filleted cylinder has 4 faces (side cylinder, top/bottom circles, torus fillet).
+                // Excluding the torus leaves 3.
+                expect(sel.getShapes()).toHaveLength(3);
+            });
+        });
         describe("cone / notCone", () => {
             it("should select conical faces from a drafted extrusion", () => {
                 sketch("xy", () => {

package/lib/dist/tests/features/subtract.test.js

@@ -4,7 +4,10 @@ import sketch from "../../core/sketch.js";
 import extrude from "../../core/extrude.js";
 import subtract from "../../core/subtract.js";
 import cylinder from "../../core/cylinder.js";
-import { move, rect } from "../../core/2d/index.js";
+import sphere from "../../core/sphere.js";
+import axis from "../../core/axis.js";
+import revolve from "../../core/revolve.js";
+import { circle, move, rect } from "../../core/2d/index.js";
 import { countShapes } from "../utils.js";
 import { ShapeOps } from "../../oc/shape-ops.js";
 describe("subtract", () => {
@@ -99,5 +102,22 @@ describe("subtract", () => {
             const solid = shapes[0];
             expect(solid.getFaces()).toHaveLength(6);
         });
+        // Repro for issue #46: a torus revolved on the -yz plane produced an
+        // inside-out solid that caused subtract() to silently fail.
+        it("should subtract a revolved torus built on the -yz plane", () => {
+            const s = sphere(10);
+            const a = axis("y", { offsetZ: 20 });
+            sketch("-yz", () => {
+                circle([0, 1], 5);
+            });
+            const ringHole = revolve(a).new();
+            const result = subtract(s, ringHole);
+            render();
+            // Sphere (r=10) and torus (centered at z=20, tube r=5) don't intersect,
+            // so the subtract should leave the sphere intact.
+            const shapes = result.getShapes();
+            expect(shapes).toHaveLength(1);
+            expect(shapes[0].getType()).toBe("solid");
+        });
     });
 });

package/lib/dist/tests/setup.js

@@ -1,13 +1,14 @@
 import { beforeEach } from "vitest";
 import { getSceneManager, getCurrentScene } from "../scene-manager.js";
-import { renderScene } from "../rendering/render.js";
+import { SceneRenderer } from "../rendering/render.js";
+const renderer = new SceneRenderer();
 export function setupOC() {
     beforeEach(() => {
         getSceneManager().startScene();
     });
 }
 export function render() {
-    return renderScene(getCurrentScene());
+    return renderer.render(getCurrentScene());
 }
 export function addToScene(obj) {
     getCurrentScene().addSceneObject(obj);