brepjs 8.2.0 → 8.4.0

package/dist/brepjs.cjs

@@ -1,29 +1,30 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const occtBoundary = require("./occtBoundary-BFAaUtA7.cjs");
-const errors = require("./errors-DK1VAdP4.cjs");
-const shapeTypes = require("./shapeTypes-UqVCIO_T.cjs");
+const occtBoundary = require("./occtBoundary-CocN2VKx.cjs");
+const errors = require("./errors-D13q2HCk.cjs");
+const shapeTypes = require("./shapeTypes-BxVxLdiD.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const Blueprint = require("./Blueprint-CTAwjJMN.cjs");
-const curveFns = require("./curveFns-ByeCqutv.cjs");
-const loft$2 = require("./loft-PMRx9iMG.cjs");
-const operations = require("./operations-CdGb6IBU.cjs");
-const boolean2D = require("./boolean2D-B5axNhjN.cjs");
+const Blueprint = require("./Blueprint-zgFe_5Qj.cjs");
+const curveFns = require("./curveFns-VMxgfkqw.cjs");
+const loft$2 = require("./loft-B-UCPW9P.cjs");
+const operations = require("./operations-BQeW_DSM.cjs");
+const boolean2D = require("./boolean2D-CfEbRMPF.cjs");
 const _2d = require("./2d.cjs");
-const helpers = require("./helpers-Dje6wrKi.cjs");
+const helpers = require("./helpers-C0q_FVxq.cjs");
 const io = require("./io.cjs");
-const drawFns = require("./drawFns-CiNxPu6J.cjs");
-const vectors = require("./vectors-t1XG4LpL.cjs");
-const topology = require("./topology-D8Au8q4i.cjs");
-const faceFns = require("./faceFns-D1Sqnlu6.cjs");
-const meshFns = require("./meshFns-CFVxKBlE.cjs");
-const booleanFns = require("./booleanFns-Yc3EBxdm.cjs");
-const measurement = require("./measurement-B06hNs89.cjs");
-const curveBuilders = require("./curveBuilders-Du03_Yyf.cjs");
-const cast = require("./cast-C107o5ow.cjs");
+const drawFns = require("./drawFns-CKaHgGSK.cjs");
+const vectors = require("./vectors-DVmHF4zt.cjs");
+const shapeFns = require("./shapeFns-B0zSdO9c.cjs");
+const topology = require("./topology-CycEc6Oe.cjs");
+const faceFns = require("./faceFns-es3GENII.cjs");
+const meshFns = require("./meshFns-DDC_2U81.cjs");
+const booleanFns = require("./booleanFns-5dDG0jpA.cjs");
+const measurement = require("./measurement-CYmT-C77.cjs");
+const curveBuilders = require("./curveBuilders-BkEJ-RVn.cjs");
+const cast = require("./cast-CPNOTNFm.cjs");
 const query = require("./query.cjs");
 const result = require("./result.cjs");
-const cornerFinder = require("./cornerFinder-DuStF5jK.cjs");
+const cornerFinder = require("./cornerFinder-BQ-_VJx0.cjs");
 const worker = require("./worker.cjs");
 const errorFactories = {
   OCCT_OPERATION: (code, message, cause) => ({ kind: "OCCT_OPERATION", code, message, cause }),
@@ -97,9 +98,9 @@ function withNearestPostFilter(baseFinder, nearestPoint) {
     const candidates = baseFinder.findAll(shape2);
     if (candidates.length === 0) return [];
     let bestIdx = 0;
-    let bestDist = vecOps.vecDistance(curveFns.vertexPosition(candidates[0]), nearestPoint);
+    let bestDist = vecOps.vecDistance(shapeFns.vertexPosition(candidates[0]), nearestPoint);
     for (let i = 1; i < candidates.length; i++) {
-      const d = vecOps.vecDistance(curveFns.vertexPosition(candidates[i]), nearestPoint);
+      const d = vecOps.vecDistance(shapeFns.vertexPosition(candidates[i]), nearestPoint);
       if (d < bestDist) {
         bestDist = d;
         bestIdx = i;
@@ -129,13 +130,13 @@ function buildVertexFinder(filters) {
     buildVertexFinder,
     (_base, withFilter) => ({
       nearestTo: (point) => withNearestPostFilter(buildVertexFinder(filters), point),
-      atPosition: (point, tolerance = 1e-4) => withFilter((vertex2) => vecOps.vecDistance(curveFns.vertexPosition(vertex2), point) < tolerance),
+      atPosition: (point, tolerance = 1e-4) => withFilter((vertex2) => vecOps.vecDistance(shapeFns.vertexPosition(vertex2), point) < tolerance),
       withinBox: (min, max) => withFilter((vertex2) => {
-        const pos = curveFns.vertexPosition(vertex2);
+        const pos = shapeFns.vertexPosition(vertex2);
         return pos[0] >= min[0] - 1e-6 && pos[0] <= max[0] + 1e-6 && pos[1] >= min[1] - 1e-6 && pos[1] <= max[1] + 1e-6 && pos[2] >= min[2] - 1e-6 && pos[2] <= max[2] + 1e-6;
       }),
       atDistance: (distance, point = [0, 0, 0], tolerance = 1e-4) => withFilter((vertex2) => {
-        const pos = curveFns.vertexPosition(vertex2);
+        const pos = shapeFns.vertexPosition(vertex2);
         return Math.abs(vecOps.vecDistance(pos, point) - distance) < tolerance;
       })
     })
@@ -144,6 +145,170 @@ function buildVertexFinder(filters) {
 function vertexFinder() {
   return buildVertexFinder([]);
 }
+function validateNotNull$1(shape2, label) {
+  if (shape2.wrapped.IsNull()) {
+    return errors.err(errors.validationError(errors.BrepErrorCode.NULL_SHAPE_INPUT, `${label} is a null shape`));
+  }
+  return errors.ok(void 0);
+}
+function hull(shapes, options = {}) {
+  if (shapes.length === 0) {
+    return errors.err(
+      errors.validationError(
+        errors.BrepErrorCode.HULL_EMPTY_INPUT,
+        "hull: at least one shape is required",
+        void 0,
+        void 0,
+        "Provide one or more shapes to compute a convex hull"
+      )
+    );
+  }
+  for (const [i, shape2] of shapes.entries()) {
+    const check = validateNotNull$1(shape2, `hull: shapes[${i}]`);
+    if (errors.isErr(check)) return check;
+  }
+  const tolerance = options.tolerance ?? 0.1;
+  try {
+    const kernel = occtBoundary.getKernel();
+    const ocShapes = shapes.map((s) => s.wrapped);
+    const resultOc = kernel.hull(ocShapes, tolerance);
+    const cast2 = shapeTypes.castShape(resultOc);
+    if (!shapeTypes.isSolid(cast2)) {
+      return errors.err(
+        errors.occtError(errors.BrepErrorCode.HULL_NOT_3D, "Hull result is not a solid; input may be degenerate")
+      );
+    }
+    return errors.ok(cast2);
+  } catch (e) {
+    const raw = e instanceof Error ? e.message : String(e);
+    if (raw.includes("coplanar") || raw.includes("fewer than") || raw.includes("degenerate")) {
+      return errors.err(errors.occtError(errors.BrepErrorCode.HULL_DEGENERATE, `Hull degenerate: ${raw}`, e));
+    }
+    return errors.err(errors.occtError(errors.BrepErrorCode.HULL_FAILED, `Hull operation failed: ${raw}`, e));
+  }
+}
+function detectSphere(shape2) {
+  const oc = occtBoundary.getKernel().oc;
+  const faces = shapeFns.getFaces(shape2);
+  if (faces.length !== 1) return null;
+  const face2 = faces[0];
+  const r = shapeTypes.gcWithScope();
+  const adaptor = r(new oc.BRepAdaptor_Surface_2(face2.wrapped, true));
+  const surfType = adaptor.GetType();
+  if (surfType !== oc.GeomAbs_SurfaceType.GeomAbs_Sphere) return null;
+  const ocSphere = adaptor.Sphere();
+  const radius = ocSphere.Radius();
+  ocSphere.delete();
+  return radius;
+}
+function minkowskiSphere(shape2, radius, tolerance) {
+  const oc = occtBoundary.getKernel().oc;
+  const r = shapeTypes.gcWithScope();
+  try {
+    const offsetMaker = r(new oc.BRepOffsetAPI_MakeOffsetShape());
+    const progress = r(new oc.Message_ProgressRange_1());
+    offsetMaker.PerformByJoin(
+      shape2.wrapped,
+      radius,
+      tolerance,
+      oc.BRepOffset_Mode.BRepOffset_Skin,
+      false,
+      false,
+      oc.GeomAbs_JoinType.GeomAbs_Arc,
+      false,
+      progress
+    );
+    const resultShape = offsetMaker.Shape();
+    const wrapped = shapeTypes.castShape(resultShape);
+    if (!shapeTypes.isShape3D(wrapped)) {
+      wrapped[Symbol.dispose]();
+      return errors.err(
+        errors.typeCastError(
+          errors.BrepErrorCode.MINKOWSKI_NOT_3D,
+          "Minkowski sphere offset did not produce a 3D shape"
+        )
+      );
+    }
+    return errors.ok(wrapped);
+  } catch (e) {
+    const raw = e instanceof Error ? e.message : String(e);
+    return errors.err(
+      errors.occtError(errors.BrepErrorCode.MINKOWSKI_FAILED, `Minkowski sphere offset failed: ${raw}`, e, {
+        operation: "minkowski",
+        fastPath: "sphere"
+      })
+    );
+  }
+}
+function minkowskiGeneral(shape2, tool, _tolerance) {
+  const oc = occtBoundary.getKernel().oc;
+  try {
+    const shapeVerts = shapeFns.getVertices(shape2);
+    const toolVerts = shapeFns.getVertices(tool);
+    if (shapeVerts.length === 0 || toolVerts.length === 0) {
+      return errors.err(
+        errors.occtError(
+          errors.BrepErrorCode.MINKOWSKI_FAILED,
+          "Minkowski sum: one or both shapes have no vertices",
+          void 0,
+          {
+            operation: "minkowski"
+          }
+        )
+      );
+    }
+    const sumPoints = [];
+    for (const sv of shapeVerts) {
+      const r1 = shapeTypes.gcWithScope();
+      const pa = r1(oc.BRep_Tool.Pnt(sv.wrapped));
+      const ax = pa.X(), ay = pa.Y(), az = pa.Z();
+      for (const tv of toolVerts) {
+        const r2 = shapeTypes.gcWithScope();
+        const pb = r2(oc.BRep_Tool.Pnt(tv.wrapped));
+        const bx = pb.X(), by = pb.Y(), bz = pb.Z();
+        sumPoints.push({ x: ax + bx, y: ay + by, z: az + bz });
+      }
+    }
+    const kernel = occtBoundary.getKernel();
+    const hullShape = kernel.hullFromPoints(sumPoints, _tolerance);
+    const wrapped = shapeTypes.castShape(hullShape);
+    if (!shapeTypes.isShape3D(wrapped)) {
+      wrapped[Symbol.dispose]();
+      return errors.err(
+        errors.typeCastError(errors.BrepErrorCode.MINKOWSKI_NOT_3D, "Minkowski hull did not produce a 3D shape")
+      );
+    }
+    return errors.ok(wrapped);
+  } catch (e) {
+    const raw = e instanceof Error ? e.message : String(e);
+    return errors.err(
+      errors.occtError(errors.BrepErrorCode.MINKOWSKI_FAILED, `Minkowski general path failed: ${raw}`, e, {
+        operation: "minkowski"
+      })
+    );
+  }
+}
+function minkowski(shape2, tool, options = {}) {
+  const { tolerance = 1e-6 } = options;
+  if (shape2.wrapped.IsNull()) {
+    return errors.err(errors.validationError(errors.BrepErrorCode.NULL_SHAPE_INPUT, "minkowski: shape is a null shape"));
+  }
+  if (tool.wrapped.IsNull()) {
+    return errors.err(
+      errors.validationError(errors.BrepErrorCode.MINKOWSKI_NULL_TOOL, "minkowski: tool is a null shape")
+    );
+  }
+  if (!shapeTypes.isShape3D(shape2) || !shapeTypes.isShape3D(tool)) {
+    return errors.err(
+      errors.validationError(errors.BrepErrorCode.MINKOWSKI_NOT_3D, "minkowski: both shape and tool must be 3D")
+    );
+  }
+  const sphereRadius = detectSphere(tool);
+  if (sphereRadius !== null) {
+    return minkowskiSphere(shape2, sphereRadius, tolerance);
+  }
+  return minkowskiGeneral(shape2, tool, tolerance);
+}
 function checkInterference(shape1, shape2, tolerance = 1e-6) {
   if (shape1.wrapped.IsNull()) {
     return errors.err(
@@ -197,7 +362,7 @@ function box(width, depth, height, options) {
   const solid2 = shapeTypes.createSolid(maker.Solid());
   const center = options?.at ?? (options?.centered ? [0, 0, 0] : void 0);
   if (center) {
-    return curveFns.translate(solid2, [center[0] - width / 2, center[1] - depth / 2, center[2] - height / 2]);
+    return shapeFns.translate(solid2, [center[0] - width / 2, center[1] - depth / 2, center[2] - height / 2]);
   }
   return solid2;
 }
@@ -211,14 +376,14 @@ function cylinder(radius, height, options) {
       -axis[1] * height * 0.5,
       -axis[2] * height * 0.5
     ];
-    solid2 = curveFns.translate(solid2, halfShift);
+    solid2 = shapeFns.translate(solid2, halfShift);
   }
   return solid2;
 }
 function sphere(radius, options) {
   let solid2 = loft$2.makeSphere(radius);
   if (options?.at) {
-    solid2 = curveFns.translate(solid2, options.at);
+    solid2 = shapeFns.translate(solid2, options.at);
   }
   return solid2;
 }
@@ -232,7 +397,7 @@ function cone(bottomRadius, topRadius, height, options) {
       -axis[1] * height * 0.5,
       -axis[2] * height * 0.5
     ];
-    solid2 = curveFns.translate(solid2, halfShift);
+    solid2 = shapeFns.translate(solid2, halfShift);
   }
   return solid2;
 }
@@ -242,7 +407,7 @@ function torus(majorRadius, minorRadius, options) {
 function ellipsoid(rx, ry, rz, options) {
   let solid2 = loft$2.makeEllipsoid(rx, ry, rz);
   if (options?.at) {
-    solid2 = curveFns.translate(solid2, options.at);
+    solid2 = shapeFns.translate(solid2, options.at);
   }
   return solid2;
 }
@@ -333,11 +498,21 @@ function validateNotNull(shape2, label) {
 function thicken$1(shape2, thickness) {
   const check = validateNotNull(shape2, "thicken: shape");
   if (errors.isErr(check)) return check;
-  return kernelCall(
-    () => occtBoundary.getKernel().thicken(shape2.wrapped, thickness),
-    "THICKEN_FAILED",
-    "Thicken operation failed"
-  );
+  try {
+    const oc = occtBoundary.getKernel().oc;
+    const r = shapeTypes.gcWithScope();
+    const builder = r(new oc.BRepOffsetAPI_MakeThickSolid());
+    builder.MakeThickSolidBySimple(shape2.wrapped, thickness);
+    const progress = r(new oc.Message_ProgressRange_1());
+    builder.Build(progress);
+    const resultOc = builder.Shape();
+    const cast2 = shapeTypes.castShape(resultOc);
+    shapeFns.propagateOrigins(builder, [shape2], cast2);
+    return errors.ok(cast2);
+  } catch (e) {
+    const raw = e instanceof Error ? e.message : String(e);
+    return errors.err(errors.occtError("THICKEN_FAILED", `Thicken operation failed: ${raw}`, e));
+  }
 }
 function fillet$1(shape2, edges, radius) {
   const check = validateNotNull(shape2, "fillet: shape");
@@ -364,7 +539,7 @@ function fillet$1(shape2, edges, radius) {
       )
     );
   }
-  const selectedEdges = edges ?? curveFns.getEdges(shape2);
+  const selectedEdges = edges ?? shapeFns.getEdges(shape2);
   if (selectedEdges.length === 0) {
     return errors.err(
       errors.validationError(
@@ -377,23 +552,26 @@ function fillet$1(shape2, edges, radius) {
     );
   }
   try {
-    const kernel = occtBoundary.getKernel();
-    const kernelRadius = typeof radius === "function" ? (
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any -- kernel expects OcShape callback
-      ((ocEdge) => {
-        const edgeWrapped = shapeTypes.castShape(ocEdge);
-        return radius(edgeWrapped) ?? 0;
-      })
-    ) : radius;
-    const result2 = kernel.fillet(
-      shape2.wrapped,
-      selectedEdges.map((e) => e.wrapped),
-      kernelRadius
+    const oc = occtBoundary.getKernel().oc;
+    const r = shapeTypes.gcWithScope();
+    const builder = r(
+      new oc.BRepFilletAPI_MakeFillet(shape2.wrapped, oc.ChFi3d_FilletShape.ChFi3d_Rational)
     );
-    const cast2 = shapeTypes.castShape(result2);
+    for (const edge of selectedEdges) {
+      const rad = typeof radius === "function" ? radius(edge) ?? 0 : radius;
+      if (typeof rad === "number") {
+        if (rad > 0) builder.Add_2(rad, edge.wrapped);
+      } else {
+        const [r1, r2] = rad;
+        if (r1 > 0 && r2 > 0) builder.Add_3(r1, r2, edge.wrapped);
+      }
+    }
+    const resultOc = builder.Shape();
+    const cast2 = shapeTypes.castShape(resultOc);
     if (!shapeTypes.isShape3D(cast2)) {
       return errors.err(errors.occtError("FILLET_RESULT_NOT_3D", "Fillet result is not a 3D shape"));
     }
+    shapeFns.propagateOrigins(builder, [shape2], cast2);
     return errors.ok(cast2);
   } catch (e) {
     const raw = e instanceof Error ? e.message : String(e);
@@ -431,28 +609,63 @@ function chamfer$1(shape2, edges, distance) {
       )
     );
   }
-  const selectedEdges = edges ?? curveFns.getEdges(shape2);
+  const selectedEdges = edges ?? shapeFns.getEdges(shape2);
   if (selectedEdges.length === 0) {
     return errors.err(errors.validationError("NO_EDGES", "No edges found for chamfer"));
   }
   try {
-    const kernel = occtBoundary.getKernel();
-    const kernelDistance = typeof distance === "function" ? (
-      // eslint-disable-next-line @typescript-eslint/no-explicit-any -- kernel expects OcShape callback
-      ((ocEdge) => {
-        const edgeWrapped = shapeTypes.castShape(ocEdge);
-        return distance(edgeWrapped) ?? 0;
-      })
-    ) : distance;
-    const result2 = kernel.chamfer(
-      shape2.wrapped,
-      selectedEdges.map((e) => e.wrapped),
-      kernelDistance
-    );
-    const cast2 = shapeTypes.castShape(result2);
+    let getEdgeFaceMap = function() {
+      if (edgeFaceMap) return edgeFaceMap;
+      edgeFaceMap = /* @__PURE__ */ new Map();
+      const faceExp = new oc.TopExp_Explorer_2(
+        shape2.wrapped,
+        oc.TopAbs_ShapeEnum.TopAbs_FACE,
+        oc.TopAbs_ShapeEnum.TopAbs_SHAPE
+      );
+      while (faceExp.More()) {
+        const face2 = oc.TopoDS.Face_1(faceExp.Current());
+        const edgeExp = new oc.TopExp_Explorer_2(
+          face2,
+          oc.TopAbs_ShapeEnum.TopAbs_EDGE,
+          oc.TopAbs_ShapeEnum.TopAbs_SHAPE
+        );
+        while (edgeExp.More()) {
+          const hash = edgeExp.Current().HashCode(2147483647);
+          if (!edgeFaceMap.has(hash)) {
+            edgeFaceMap.set(hash, face2);
+          }
+          edgeExp.Next();
+        }
+        edgeExp.delete();
+        faceExp.Next();
+      }
+      faceExp.delete();
+      return edgeFaceMap;
+    };
+    const oc = occtBoundary.getKernel().oc;
+    const r = shapeTypes.gcWithScope();
+    const builder = r(new oc.BRepFilletAPI_MakeChamfer(shape2.wrapped));
+    let edgeFaceMap = null;
+    for (const edge of selectedEdges) {
+      const d = typeof distance === "function" ? distance(edge) ?? 0 : distance;
+      if (typeof d === "number") {
+        if (d > 0) builder.Add_2(d, edge.wrapped);
+      } else {
+        const [d1, d2] = d;
+        if (d1 > 0 && d2 > 0) {
+          const face2 = getEdgeFaceMap().get(edge.wrapped.HashCode(2147483647));
+          if (face2) {
+            builder.Add_3(d1, d2, oc.TopoDS.Edge_1(edge.wrapped), face2);
+          }
+        }
+      }
+    }
+    const resultOc = builder.Shape();
+    const cast2 = shapeTypes.castShape(resultOc);
     if (!shapeTypes.isShape3D(cast2)) {
       return errors.err(errors.occtError("CHAMFER_RESULT_NOT_3D", "Chamfer result is not a 3D shape"));
     }
+    shapeFns.propagateOrigins(builder, [shape2], cast2);
     return errors.ok(cast2);
   } catch (e) {
     const raw = e instanceof Error ? e.message : String(e);
@@ -475,16 +688,32 @@ function shell$1(shape2, faces, thickness, tolerance = 1e-3) {
     return errors.err(errors.validationError("NO_FACES", "At least one face must be specified for shell"));
   }
   try {
-    const result2 = occtBoundary.getKernel().shell(
+    const oc = occtBoundary.getKernel().oc;
+    const r = shapeTypes.gcWithScope();
+    const facesToRemove = r(new oc.TopTools_ListOfShape_1());
+    for (const face2 of faces) {
+      facesToRemove.Append_1(face2.wrapped);
+    }
+    const progress = r(new oc.Message_ProgressRange_1());
+    const builder = r(new oc.BRepOffsetAPI_MakeThickSolid());
+    builder.MakeThickSolidByJoin(
       shape2.wrapped,
-      faces.map((f) => f.wrapped),
-      thickness,
-      tolerance
+      facesToRemove,
+      -thickness,
+      tolerance,
+      oc.BRepOffset_Mode.BRepOffset_Skin,
+      false,
+      false,
+      oc.GeomAbs_JoinType.GeomAbs_Arc,
+      false,
+      progress
     );
-    const cast2 = shapeTypes.castShape(result2);
+    const resultOc = builder.Shape();
+    const cast2 = shapeTypes.castShape(resultOc);
     if (!shapeTypes.isShape3D(cast2)) {
       return errors.err(errors.occtError("SHELL_RESULT_NOT_3D", "Shell result is not a 3D shape"));
     }
+    shapeFns.propagateOrigins(builder, [shape2], cast2);
     return errors.ok(cast2);
   } catch (e) {
     const raw = e instanceof Error ? e.message : String(e);
@@ -503,34 +732,56 @@ function offset$1(shape2, distance, tolerance = 1e-6) {
   if (distance === 0) {
     return errors.err(errors.validationError("ZERO_OFFSET", "Offset distance cannot be zero"));
   }
-  return kernelCall(
-    () => occtBoundary.getKernel().offset(shape2.wrapped, distance, tolerance),
-    "OFFSET_FAILED",
-    "Offset operation failed"
-  );
+  try {
+    const oc = occtBoundary.getKernel().oc;
+    const r = shapeTypes.gcWithScope();
+    const progress = r(new oc.Message_ProgressRange_1());
+    const builder = r(new oc.BRepOffsetAPI_MakeOffsetShape());
+    builder.PerformByJoin(
+      shape2.wrapped,
+      distance,
+      tolerance,
+      oc.BRepOffset_Mode.BRepOffset_Skin,
+      false,
+      false,
+      oc.GeomAbs_JoinType.GeomAbs_Arc,
+      false,
+      progress
+    );
+    const resultOc = builder.Shape();
+    const cast2 = shapeTypes.castShape(resultOc);
+    if (!shapeTypes.isShape3D(cast2)) {
+      return errors.err(errors.occtError("OFFSET_RESULT_NOT_3D", "Offset result is not a 3D shape"));
+    }
+    shapeFns.propagateOrigins(builder, [shape2], cast2);
+    return errors.ok(cast2);
+  } catch (e) {
+    const raw = e instanceof Error ? e.message : String(e);
+    return errors.err(errors.occtError("OFFSET_FAILED", `Offset operation failed: ${raw}`, e));
+  }
 }
 function translate(shape2, v) {
-  return curveFns.translate(resolve(shape2), v);
+  return shapeFns.translate(resolve(shape2), v);
 }
 function rotate(shape2, angle, options) {
   const pivotPoint = options?.at;
-  return curveFns.rotate(resolve(shape2), angle, pivotPoint, options?.axis);
+  return shapeFns.rotate(resolve(shape2), angle, pivotPoint, options?.axis);
 }
 function mirror(shape2, options) {
   const planeOrigin = options?.at;
-  return curveFns.mirror(resolve(shape2), options?.normal ?? [1, 0, 0], planeOrigin);
+  return shapeFns.mirror(resolve(shape2), options?.normal ?? [1, 0, 0], planeOrigin);
 }
 function scale(shape2, factor, options) {
-  return curveFns.scale(resolve(shape2), factor, options?.center);
+  return shapeFns.scale(resolve(shape2), factor, options?.center);
 }
 function clone(shape2) {
-  return curveFns.clone(resolve(shape2));
+  return shapeFns.clone(resolve(shape2));
 }
 function applyMatrix(shape2, matrix) {
-  return curveFns.applyMatrix(resolve(shape2), matrix);
+  return shapeFns.applyMatrix(resolve(shape2), matrix);
 }
 function transformCopy(shape2, composed) {
-  return curveFns.transformCopy(resolve(shape2), composed);
+  return shapeFns.transformCopy(resolve(shape2), composed);
 }
 function fuse(a, b, options) {
   return booleanFns.fuse(resolve(a), resolve(b), options);
@@ -613,7 +864,7 @@ function chamfer(shape2, edgesOrDistance, maybeDistance) {
   }
   const normalized = normalizeChamferDistance(distance);
   if (normalized.mode === "distAngle") {
-    const selectedEdges = edges ?? curveFns.getEdges(s);
+    const selectedEdges = edges ?? shapeFns.getEdges(s);
     return topology.chamferDistAngle(
       s,
       [...selectedEdges],
@@ -638,7 +889,7 @@ function heal(shape2) {
   return topology.heal(resolve(shape2));
 }
 function simplify(shape2) {
-  return curveFns.simplify(resolve(shape2));
+  return shapeFns.simplify(resolve(shape2));
 }
 function mesh(shape2, options) {
   return meshFns.mesh(resolve(shape2), options);
@@ -647,10 +898,10 @@ function meshEdges(shape2, options) {
   return meshFns.meshEdges(resolve(shape2), options);
 }
 function describe(shape2) {
-  return curveFns.describe(resolve(shape2));
+  return shapeFns.describe(resolve(shape2));
 }
 function toBREP(shape2) {
-  return curveFns.toBREP(resolve(shape2));
+  return shapeFns.toBREP(resolve(shape2));
 }
 function fromBREP(data) {
   return cast.fromBREP(data);
@@ -659,7 +910,7 @@ function isValid(shape2) {
   return topology.isValid(resolve(shape2));
 }
 function isEmpty(shape2) {
-  return curveFns.isEmpty(resolve(shape2));
+  return shapeFns.isEmpty(resolve(shape2));
 }
 function loft$1(wires, { ruled = true, startPoint, endPoint } = {}, returnShell = false) {
   if (wires.length === 0 && !startPoint && !endPoint) {
@@ -712,7 +963,7 @@ function loft(wires, options) {
 }
 function resolveTargetFace(shape2, faceSpec) {
   if (faceSpec === void 0) {
-    const faces = curveFns.getFaces(shape2);
+    const faces = shapeFns.getFaces(shape2);
     if (faces.length === 0) {
       throw new Error("compoundOps: shape has no faces");
     }
@@ -758,7 +1009,7 @@ function drill(shape2, options) {
   const pos = at.length === 2 ? [at[0], at[1], 0] : [at[0], at[1], at[2]];
   let depth = options.depth;
   if (depth === void 0) {
-    const b = curveFns.getBounds(s);
+    const b = shapeFns.getBounds(s);
     const dx = b.xMax - b.xMin;
     const dy = b.yMax - b.yMin;
     const dz = b.zMax - b.zMin;
@@ -766,7 +1017,7 @@ function drill(shape2, options) {
   }
   const cyl = loft$2.makeCylinder(radius, depth, pos, dir);
   const startOffset = options.depth === void 0 ? vecOps.vecScale(dir, -depth / 2) : [0, 0, 0];
-  const tool = startOffset[0] !== 0 || startOffset[1] !== 0 || startOffset[2] !== 0 ? curveFns.translate(cyl, startOffset) : cyl;
+  const tool = startOffset[0] !== 0 || startOffset[1] !== 0 || startOffset[2] !== 0 ? shapeFns.translate(cyl, startOffset) : cyl;
   return booleanFns.cut(s, tool);
 }
 function pocket(shape2, options) {
@@ -805,7 +1056,7 @@ function mirrorJoin(shape2, options) {
   const s = resolve(shape2);
   const normal = options?.normal ?? [1, 0, 0];
   const planeOrigin = options?.at;
-  const mirrored = curveFns.mirror(s, normal, planeOrigin);
+  const mirrored = shapeFns.mirror(s, normal, planeOrigin);
   return booleanFns.fuse(s, mirrored);
 }
 function rectangularPattern(shape2, options) {
@@ -832,7 +1083,7 @@ function rectangularPattern(shape2, options) {
         xNorm[1] * xSpacing * xi + yNorm[1] * ySpacing * yi,
         xNorm[2] * xSpacing * xi + yNorm[2] * ySpacing * yi
       ];
-      copies.push(curveFns.translate(s, offset2));
+      copies.push(shapeFns.translate(s, offset2));
     }
   }
   return booleanFns.fuseAll(copies);
@@ -879,7 +1130,7 @@ function createWrappedBase(val) {
     rotateX: (a) => wrapAny(rotate(val, a, { axis: [1, 0, 0] })),
     rotateY: (a) => wrapAny(rotate(val, a, { axis: [0, 1, 0] })),
     rotateZ: (a) => wrapAny(rotate(val, a, { axis: [0, 0, 1] })),
-    bounds: () => curveFns.getBounds(val),
+    bounds: () => shapeFns.getBounds(val),
     describe: () => describe(val),
     clone: () => wrapAny(clone(val)),
     // Meshing & Rendering
@@ -940,10 +1191,10 @@ function createWrapped3D(val) {
     volumeProps: () => measurement.measureVolumeProps(val),
     surfaceProps: () => measurement.measureSurfaceProps(val),
     // Queries
-    edges: () => curveFns.getEdges(val),
-    faces: () => curveFns.getFaces(val),
-    wires: () => curveFns.getWires(val),
-    vertices: () => curveFns.getVertices(val),
+    edges: () => shapeFns.getEdges(val),
+    faces: () => shapeFns.getFaces(val),
+    wires: () => shapeFns.getWires(val),
+    vertices: () => shapeFns.getVertices(val),
     // Patterns
     linearPattern: (dir, count, spacing) => wrap3D(unwrapOrThrow(operations.linearPattern(val, dir, count, spacing))),
     circularPattern: (axis, count, angle) => wrap3D(unwrapOrThrow(operations.circularPattern(val, axis, count, angle)))
@@ -1093,7 +1344,6 @@ exports.Curve2D = Blueprint.Curve2D;
 exports.axis2d = Blueprint.axis2d;
 exports.makePlane = Blueprint.makePlane;
 exports.approximateCurve = curveFns.approximateCurve;
-exports.composeTransforms = curveFns.composeTransforms;
 exports.curveEndPoint = curveFns.curveEndPoint;
 exports.curveIsClosed = curveFns.curveIsClosed;
 exports.curveIsPeriodic = curveFns.curveIsPeriodic;
@@ -1104,23 +1354,10 @@ exports.curveStartPoint = curveFns.curveStartPoint;
 exports.curveTangentAt = curveFns.curveTangentAt;
 exports.findCurveType = curveFns.findCurveType;
 exports.flipOrientation = curveFns.flipOrientation;
-exports.getBounds = curveFns.getBounds;
 exports.getCurveType = curveFns.getCurveType;
-exports.getEdges = curveFns.getEdges;
-exports.getFaces = curveFns.getFaces;
-exports.getHashCode = curveFns.getHashCode;
 exports.getOrientation = curveFns.getOrientation;
-exports.getVertices = curveFns.getVertices;
-exports.getWires = curveFns.getWires;
 exports.interpolateCurve = curveFns.interpolateCurve;
-exports.isEqualShape = curveFns.isEqualShape;
-exports.isSameShape = curveFns.isSameShape;
-exports.iterEdges = curveFns.iterEdges;
-exports.iterFaces = curveFns.iterFaces;
-exports.iterVertices = curveFns.iterVertices;
-exports.iterWires = curveFns.iterWires;
 exports.offsetWire2D = curveFns.offsetWire2D;
-exports.vertexPosition = curveFns.vertexPosition;
 exports.basicFaceExtrusion = loft$2.basicFaceExtrusion;
 exports.genericSweep = loft$2.genericSweep;
 exports.revolution = loft$2.revolution;
@@ -1266,6 +1503,22 @@ exports.createPlane = vectors.createPlane;
 exports.pivotPlane = vectors.pivotPlane;
 exports.resolvePlane = vectors.resolvePlane;
 exports.translatePlane = vectors.translatePlane;
+exports.composeTransforms = shapeFns.composeTransforms;
+exports.getBounds = shapeFns.getBounds;
+exports.getEdges = shapeFns.getEdges;
+exports.getFaceOrigins = shapeFns.getFaceOrigins;
+exports.getFaces = shapeFns.getFaces;
+exports.getHashCode = shapeFns.getHashCode;
+exports.getVertices = shapeFns.getVertices;
+exports.getWires = shapeFns.getWires;
+exports.isEqualShape = shapeFns.isEqualShape;
+exports.isSameShape = shapeFns.isSameShape;
+exports.iterEdges = shapeFns.iterEdges;
+exports.iterFaces = shapeFns.iterFaces;
+exports.iterVertices = shapeFns.iterVertices;
+exports.iterWires = shapeFns.iterWires;
+exports.setShapeOrigin = shapeFns.setShapeOrigin;
+exports.vertexPosition = shapeFns.vertexPosition;
 exports.adjacentFaces = topology.adjacentFaces;
 exports.autoHeal = topology.autoHeal;
 exports.chamferDistAngleShape = topology.chamferDistAngle;
@@ -1366,6 +1619,7 @@ exports.fromBREP = fromBREP;
 exports.fuse = fuse;
 exports.heal = heal;
 exports.helix = helix;
+exports.hull = hull;
 exports.intersect = intersect;
 exports.isChamferRadius = isChamferRadius;
 exports.isEmpty = isEmpty;
@@ -1378,6 +1632,7 @@ exports.line = line;
 exports.loft = loft;
 exports.mesh = mesh;
 exports.meshEdges = meshEdges;
+exports.minkowski = minkowski;
 exports.mirror = mirror;
 exports.mirrorJoin = mirrorJoin;
 exports.offset = offset;