brepjs 8.0.1 → 8.0.3

package/dist/{drawFns-CUyx50gi.cjs → drawFns-C-MCkYj6.cjs}

@@ -1,20 +1,20 @@
 "use strict";
 const errors = require("./errors-DK1VAdP4.cjs");
-const shapeHelpers = require("./shapeHelpers-B2SXz1p4.cjs");
-const vectors = require("./vectors-ChWEZPwy.cjs");
-const occtBoundary = require("./occtBoundary-du8_ex-p.cjs");
+const vectors = require("./vectors-aQBZK0Sb.cjs");
+const occtBoundary = require("./occtBoundary-DHtzU4tz.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const boolean2D = require("./boolean2D-BdZATaHs.cjs");
-const faceFns = require("./faceFns-BwK7FP7N.cjs");
-const curveFns = require("./curveFns-BilyYL_s.cjs");
-const shapeTypes = require("./shapeTypes-DKhwEnUM.cjs");
-const cast = require("./cast-DkB0GKmQ.cjs");
-const Blueprint = require("./Blueprint-CVctc41Z.cjs");
+const boolean2D = require("./boolean2D-BrjHZfWn.cjs");
+const faceFns = require("./faceFns-DcSCjDG0.cjs");
+const curveFns = require("./curveFns-BoG_iA07.cjs");
+const curveBuilders = require("./curveBuilders-BjtdNw1B.cjs");
+const shapeTypes = require("./shapeTypes-b_lhwQB7.cjs");
+const cast = require("./cast-CqDc8oFW.cjs");
+const Blueprint = require("./Blueprint-FxmMji4s.cjs");
 const result = require("./result.cjs");
-const query = require("./query-hMSmOWJP.cjs");
-const shapeFns = require("./shapeFns-BvOndshS.cjs");
-const loft = require("./loft-BzWFokmC.cjs");
+const helpers = require("./helpers--iZxPeJg.cjs");
+const loft = require("./loft-8asn63t4.cjs");
 const opentype = require("opentype.js");
+const cornerFinder = require("./cornerFinder-BKsCkrXd.cjs");
 const stitchCurves = (curves, precision = 1e-7) => {
   const startPoints = new boolean2D.Flatbush(curves.length);
   curves.forEach((c) => {
@@ -97,7 +97,7 @@ class Sketcher {
   /** Draw a straight line to an absolute 2D point on the sketch plane. */
   lineTo([x, y]) {
     const endPoint = vectors.planeToWorld(this.plane, [x, y]);
-    this.pendingEdges.push(shapeHelpers.makeLine(this.pointer, endPoint));
+    this.pendingEdges.push(curveBuilders.makeLine(this.pointer, endPoint));
     this._updatePointer(endPoint);
     return this;
   }
@@ -127,13 +127,13 @@ class Sketcher {
   /** Draw a line in polar coordinates (distance and angle in degrees) from the current point. */
   polarLine(distance, angle) {
     const angleInRads = angle * vecOps.DEG2RAD;
-    const [x, y] = query.polarToCartesian(distance, angleInRads);
+    const [x, y] = helpers.polarToCartesian(distance, angleInRads);
     return this.line(x, y);
   }
   /** Draw a line to a point given in polar coordinates [r, theta] from the origin. */
   polarLineTo([r, theta]) {
     const angleInRads = theta * vecOps.DEG2RAD;
-    const point = query.polarToCartesian(r, angleInRads);
+    const point = helpers.polarToCartesian(r, angleInRads);
     return this.lineTo(point);
   }
   /** Draw a line tangent to the previous edge, extending by the given distance. */
@@ -144,7 +144,7 @@ class Sketcher {
     const tangent = curveFns.curveTangentAt(previousEdge, 1);
     const scaledTangent = vecOps.vecScale(vecOps.vecNormalize(tangent), distance);
     const endPoint = vecOps.vecAdd(scaledTangent, this.pointer);
-    this.pendingEdges.push(shapeHelpers.makeLine(this.pointer, endPoint));
+    this.pendingEdges.push(curveBuilders.makeLine(this.pointer, endPoint));
     this._updatePointer(endPoint);
     return this;
   }
@@ -152,7 +152,7 @@ class Sketcher {
   threePointsArcTo(end, innerPoint) {
     const gpoint1 = vectors.planeToWorld(this.plane, innerPoint);
     const gpoint2 = vectors.planeToWorld(this.plane, end);
-    this.pendingEdges.push(shapeHelpers.makeThreePointArc(this.pointer, gpoint1, gpoint2));
+    this.pendingEdges.push(curveBuilders.makeThreePointArc(this.pointer, gpoint1, gpoint2));
     this._updatePointer(gpoint2);
     return this;
   }
@@ -169,7 +169,7 @@ class Sketcher {
       result.bug("Sketcher.tangentArcTo", "You need a previous edge to create a tangent arc");
     const prevEnd = curveFns.curveEndPoint(previousEdge);
     const prevTangent = curveFns.curveTangentAt(previousEdge, 1);
-    this.pendingEdges.push(shapeHelpers.makeTangentArc(prevEnd, prevTangent, endPoint));
+    this.pendingEdges.push(curveBuilders.makeTangentArc(prevEnd, prevTangent, endPoint));
     this._updatePointer(endPoint);
     return this;
   }
@@ -189,7 +189,7 @@ class Sketcher {
     const sagDirection = vecOps.vecNormalize(crossResult);
     const sagVector = vecOps.vecScale(sagDirection, sagitta);
     const sagPoint = vecOps.vecAdd(midPoint, sagVector);
-    this.pendingEdges.push(shapeHelpers.makeThreePointArc(this.pointer, sagPoint, endPoint));
+    this.pendingEdges.push(curveBuilders.makeThreePointArc(this.pointer, sagPoint, endPoint));
     this._updatePointer(endPoint);
     return this;
   }
@@ -210,7 +210,7 @@ class Sketcher {
   bulgeArcTo(end, bulge) {
     if (!bulge) return this.lineTo(end);
     const [px, py] = vectors.planeToLocal(this.plane, this.pointer);
-    const halfChord = query.distance2d([px, py], end) / 2;
+    const halfChord = helpers.distance2d([px, py], end) / 2;
     const bulgeAsSagitta = -bulge * halfChord;
     return this.sagittaArcTo(end, bulgeAsSagitta);
   }
@@ -229,7 +229,6 @@ class Sketcher {
   }
   /** Draw an elliptical arc to an absolute end point (SVG-style parameters). */
   ellipseTo(end, horizontalRadius, verticalRadius, rotation = 0, longAxis = false, sweep = false) {
-    const [, gc] = shapeTypes.localGC();
     const [startX, startY] = vectors.planeToLocal(this.plane, this.pointer);
     let rotationAngle = rotation;
     let majorRadius = horizontalRadius;
@@ -250,7 +249,7 @@ class Sketcher {
     );
     const xDir = vecOps.vecRotate(this.plane.xDir, this.plane.zDir, rotationAngle * vecOps.DEG2RAD);
     const arc = errors.unwrap(
-      shapeHelpers.makeEllipseArc(
+      curveBuilders.makeEllipseArc(
         rx,
         ry,
         clockwise ? startAngle : endAngle,
@@ -265,7 +264,6 @@ class Sketcher {
     }
     this.pendingEdges.push(arc);
     this._updatePointer(vectors.planeToWorld(this.plane, end));
-    gc();
     return this;
   }
   /** Draw an elliptical arc to a relative end point (SVG-style parameters). */
@@ -284,8 +282,8 @@ class Sketcher {
   halfEllipseTo(end, verticalRadius, sweep = false) {
     const [px, py] = vectors.planeToLocal(this.plane, this.pointer);
     const start = [px, py];
-    const angle = query.polarAngle2d(end, start);
-    const distance = query.distance2d(end, start);
+    const angle = helpers.polarAngle2d(end, start);
+    const distance = helpers.distance2d(end, start);
     return this.ellipseTo(end, distance / 2, verticalRadius, angle * vecOps.RAD2DEG, false, sweep);
   }
   /** Draw a half-ellipse arc to a relative end point with a given minor radius. */
@@ -303,7 +301,7 @@ class Sketcher {
     }
     const inWorldPoints = cp.map((p) => vectors.planeToWorld(this.plane, p));
     const endPoint = vectors.planeToWorld(this.plane, end);
-    this.pendingEdges.push(errors.unwrap(shapeHelpers.makeBezierCurve([this.pointer, ...inWorldPoints, endPoint])));
+    this.pendingEdges.push(errors.unwrap(curveBuilders.makeBezierCurve([this.pointer, ...inWorldPoints, endPoint])));
     this._updatePointer(endPoint);
     return this;
   }
@@ -352,7 +350,7 @@ class Sketcher {
       const endPoleDistance = vecOps.vecScale(vecOps.vecNormalize(endPoleDirection), endFactor * defaultDistance);
       const endControl = vecOps.vecSub(endPoint, endPoleDistance);
       this.pendingEdges.push(
-        errors.unwrap(shapeHelpers.makeBezierCurve([this.pointer, startControl, endControl, endPoint]))
+        errors.unwrap(curveBuilders.makeBezierCurve([this.pointer, startControl, endControl, endPoint]))
       );
       this._updatePointer(endPoint);
       return this;
@@ -373,12 +371,12 @@ class Sketcher {
     const mirroredRaw = Blueprint.mirror(clonedWrapped, normal, this.pointer);
     const mirroredWrapped = errors.unwrap(cast.downcast(mirroredRaw));
     const mirroredWire = shapeTypes.createWire(mirroredWrapped);
-    const combinedWire = errors.unwrap(shapeHelpers.assembleWire([wire, mirroredWire]));
+    const combinedWire = errors.unwrap(curveBuilders.assembleWire([wire, mirroredWire]));
     return combinedWire;
   }
   buildWire() {
     if (!this.pendingEdges.length) result.bug("Sketcher.buildWire", "No lines to convert into a wire");
-    let wire = errors.unwrap(shapeHelpers.assembleWire(this.pendingEdges));
+    let wire = errors.unwrap(curveBuilders.assembleWire(this.pendingEdges));
     if (this._mirrorWire) {
       wire = this._mirrorWireOnStartEnd(wire);
     }
@@ -416,7 +414,7 @@ const guessFaceFromWires = (wires) => {
     new oc.BRepOffsetAPI_MakeFilling(3, 15, 2, false, 1e-5, 1e-4, 0.01, 0.1, 8, 9)
   );
   wires.forEach((wire, wireIndex) => {
-    shapeFns.getEdges(wire).forEach((edge) => {
+    curveFns.getEdges(wire).forEach((edge) => {
       faceBuilder.Add_1(edge.wrapped, oc.GeomAbs_Shape.GeomAbs_C0, wireIndex === 0);
     });
   });
@@ -440,7 +438,7 @@ const fixWire = (wire, baseFace) => {
 const faceFromWires = (wires) => {
   let baseFace;
   let holeWires;
-  const faceResult = shapeHelpers.makeFace(wires[0]);
+  const faceResult = Blueprint.makeFace(wires[0]);
   if (errors.isOk(faceResult)) {
     baseFace = faceResult.value;
     holeWires = wires.slice(1);
@@ -448,7 +446,7 @@ const faceFromWires = (wires) => {
     baseFace = guessFaceFromWires(wires);
     holeWires = wires.slice(1).map((w) => fixWire(w, baseFace));
   }
-  return shapeHelpers.addHolesInFace(baseFace, holeWires);
+  return Blueprint.addHolesInFace(baseFace, holeWires);
 };
 const solidFromShellGenerator = (sketches, shellGenerator) => {
   const shells = [];
@@ -462,7 +460,7 @@ const solidFromShellGenerator = (sketches, shellGenerator) => {
   });
   const startFace = faceFromWires(startWires);
   const endFace = faceFromWires(endWires);
-  const solid = errors.unwrap(shapeHelpers.makeSolid([startFace, ...shells, endFace]));
+  const solid = errors.unwrap(loft.makeSolid([startFace, ...shells, endFace]));
   return solid;
 };
 class CompoundSketch {
@@ -490,12 +488,12 @@ class CompoundSketch {
   /** Return all wires (outer + holes) combined into a compound shape. */
   get wires() {
     const wires = this.sketches.map((s) => s.wire);
-    return shapeHelpers.makeCompound(wires);
+    return loft.makeCompound(wires);
   }
   /** Build a face from the outer boundary with inner wires subtracted as holes. */
   face() {
     const baseFace = this.outerSketch.face();
-    const newFace = shapeHelpers.addHolesInFace(
+    const newFace = Blueprint.addHolesInFace(
       baseFace,
       this.innerSketches.map((s) => s.wire)
     );
@@ -574,7 +572,7 @@ class CompoundSketch {
     const baseFaceRaw = this.face();
     const baseFace = shapeTypes.createFace(errors.unwrap(cast.downcast(baseFaceRaw.wrapped)));
     shells.push(baseFace, otherCompound.face());
-    return errors.unwrap(shapeHelpers.makeSolid(shells));
+    return errors.unwrap(loft.makeSolid(shells));
   }
 }
 class Sketches {
@@ -585,12 +583,12 @@ class Sketches {
   /** Return all wires combined into a single compound shape. */
   wires() {
     const wires = this.sketches.map((s) => s instanceof boolean2D.Sketch ? s.wire : s.wires);
-    return shapeHelpers.makeCompound(wires);
+    return loft.makeCompound(wires);
   }
   /** Return all sketch faces combined into a single compound shape. */
   faces() {
     const faces = this.sketches.map((s) => s.face());
-    return shapeHelpers.makeCompound(faces);
+    return loft.makeCompound(faces);
   }
   /** Extrudes the sketch to a certain distance (along the default direction
    * and origin of the sketch).
@@ -604,19 +602,19 @@ class Sketches {
    */
   extrude(extrusionDistance, extrusionConfig = {}) {
     const extruded = this.sketches.map((s) => s.extrude(extrusionDistance, extrusionConfig));
-    return shapeHelpers.makeCompound(extruded);
+    return loft.makeCompound(extruded);
   }
   /**
    * Revolves the drawing on an axis (defined by its direction and an origin
    * (defaults to the sketch origin)
    */
   revolve(revolutionAxis, config) {
-    return shapeHelpers.makeCompound(this.sketches.map((s) => s.revolve(revolutionAxis, config)));
+    return loft.makeCompound(this.sketches.map((s) => s.revolve(revolutionAxis, config)));
   }
 }
 const sketchCircle = (radius, planeConfig = {}) => {
   const plane = planeConfig.plane && typeof planeConfig.plane !== "string" ? { ...planeConfig.plane } : vectors.resolvePlane(planeConfig.plane ?? "XY", planeConfig.origin);
-  const wire = errors.unwrap(shapeHelpers.assembleWire([shapeHelpers.makeCircle(radius, plane.origin, plane.zDir)]));
+  const wire = errors.unwrap(curveBuilders.assembleWire([curveBuilders.makeCircle(radius, plane.origin, plane.zDir)]));
   const sketch = new boolean2D.Sketch(wire, {
     defaultOrigin: [...plane.origin],
     defaultDirection: [...plane.zDir]
@@ -634,7 +632,7 @@ const sketchEllipse = (xRadius = 1, yRadius = 2, planeConfig = {}) => {
     minR = xRadius;
   }
   const wire = errors.unwrap(
-    shapeHelpers.assembleWire([errors.unwrap(shapeHelpers.makeEllipse(majR, minR, plane.origin, plane.zDir, xDir))])
+    curveBuilders.assembleWire([errors.unwrap(curveBuilders.makeEllipse(majR, minR, plane.origin, plane.zDir, xDir))])
   );
   const sketch = new boolean2D.Sketch(wire, {
     defaultOrigin: [...plane.origin],
@@ -696,7 +694,7 @@ const sketchParametricFunction = (func, planeConfig = {}, { pointsCount = 400, s
     return vectors.planeToWorld(plane, point);
   });
   const wire = errors.unwrap(
-    shapeHelpers.assembleWire([r(errors.unwrap(shapeHelpers.makeBSplineApproximation(points, approximationConfig)))])
+    curveBuilders.assembleWire([r(errors.unwrap(curveBuilders.makeBSplineApproximation(points, approximationConfig)))])
   );
   const sketch = new boolean2D.Sketch(wire, {
     defaultOrigin: [...plane.origin],
@@ -709,13 +707,13 @@ const sketchHelix = (pitch, height, radius, center = [0, 0, 0], dir = [0, 0, 1],
   const centerVec3 = occtBoundary.toVec3(center);
   const dirVec3 = occtBoundary.toVec3(dir);
   return new boolean2D.Sketch(
-    errors.unwrap(shapeHelpers.assembleWire([shapeHelpers.makeHelix(pitch, height, radius, centerVec3, dirVec3, lefthand)]))
+    errors.unwrap(curveBuilders.assembleWire([curveBuilders.makeHelix(pitch, height, radius, centerVec3, dirVec3, lefthand)]))
   );
 };
 const makeBaseBox = (xLength, yLength, zLength) => {
   return new Sketcher().movePointerTo([-xLength / 2, yLength / 2]).hLine(xLength).vLine(-yLength).hLine(-xLength).close().extrude(zLength);
 };
-const samePoint = (x, y) => query.samePoint(x, y, query.PRECISION_OFFSET * 10);
+const samePoint = (x, y) => helpers.samePoint(x, y, helpers.PRECISION_OFFSET * 10);
 const getIntersectionPoint = (line1Start, line1End, line2Start, line2End) => {
   const dx1 = line1Start[0] - line1End[0];
   const dy1 = line1Start[1] - line1End[1];
@@ -744,8 +742,8 @@ function joinBevel(appendCurve, previousLastPoint, firstPoint, previousCurve, _c
   appendCurve(bevelJoiner);
 }
 function joinMiter(appendCurve, previousLastPoint, firstPoint, previousCurve, curve) {
-  const previousOtherPoint = previousCurve.offset instanceof Blueprint.Curve2D ? query.subtract2d(previousLastPoint, previousCurve.offset.tangentAt(1)) : previousCurve.offset.firstPoint;
-  const nextOtherPoint = curve.offset instanceof Blueprint.Curve2D ? query.add2d(firstPoint, curve.offset.tangentAt(0)) : curve.offset.lastPoint;
+  const previousOtherPoint = previousCurve.offset instanceof Blueprint.Curve2D ? helpers.subtract2d(previousLastPoint, previousCurve.offset.tangentAt(1)) : previousCurve.offset.firstPoint;
+  const nextOtherPoint = curve.offset instanceof Blueprint.Curve2D ? helpers.add2d(firstPoint, curve.offset.tangentAt(0)) : curve.offset.lastPoint;
   const offsetIntersectionPoint = getIntersectionPoint(
     previousOtherPoint,
     previousLastPoint,
@@ -810,7 +808,7 @@ function rawOffsets(blueprint, offset2, offsetConfig = {}) {
     let intersections = [];
     if (previousCurve.offset instanceof Blueprint.Curve2D && curve.offset instanceof Blueprint.Curve2D) {
       const { intersections: pointIntersections, commonSegmentsPoints } = errors.unwrap(
-        boolean2D.intersectCurves(previousCurve.offset, curve.offset, query.PRECISION_OFFSET / 100)
+        boolean2D.intersectCurves(previousCurve.offset, curve.offset, helpers.PRECISION_OFFSET / 100)
       );
       intersections = [...pointIntersections, ...commonSegmentsPoints];
     }
@@ -818,10 +816,10 @@ function rawOffsets(blueprint, offset2, offsetConfig = {}) {
       let intersection = intersections[0];
       if (intersections.length > 1) {
         const originalEndpoint = previousCurve.original.lastPoint;
-        let minDist = query.squareDistance2d(intersection, originalEndpoint);
+        let minDist = helpers.squareDistance2d(intersection, originalEndpoint);
         for (let i = 1; i < intersections.length; i++) {
           const point = intersections[i];
-          const d = query.squareDistance2d(point, originalEndpoint);
+          const d = helpers.squareDistance2d(point, originalEndpoint);
           if (d < minDist) {
             minDist = d;
             intersection = point;
@@ -830,9 +828,9 @@ function rawOffsets(blueprint, offset2, offsetConfig = {}) {
       }
       const splitPreviousCurve = previousCurve.offset.splitAt(
         [intersection],
-        query.PRECISION_OFFSET
+        helpers.PRECISION_OFFSET
       )[0];
-      const splitCurve = curve.offset.splitAt([intersection], query.PRECISION_OFFSET).at(-1);
+      const splitCurve = curve.offset.splitAt([intersection], helpers.PRECISION_OFFSET).at(-1);
       if (!splitCurve) result.bug("offset.rawOffsets", "Split produced no trailing curve segment");
       appendCurve({
         offset: splitPreviousCurve,
@@ -873,7 +871,7 @@ function offsetBlueprint(blueprint, offset2, offsetConfig = {}) {
       testedPairs.add(pairKey);
       const secondCurve = offsettedArray[secondIndex];
       const { intersections: rawIntersections, commonSegmentsPoints } = errors.unwrap(
-        boolean2D.intersectCurves(firstCurve, secondCurve, query.PRECISION_OFFSET)
+        boolean2D.intersectCurves(firstCurve, secondCurve, helpers.PRECISION_OFFSET)
       );
       const intersections = [...rawIntersections, ...commonSegmentsPoints].filter(
         (intersection) => {
@@ -895,12 +893,12 @@ function offsetBlueprint(blueprint, offset2, offsetConfig = {}) {
   const splitCurves = offsettedArray.flatMap((curve, index) => {
     if (!allIntersections.has(index)) return curve;
     const intersections = allIntersections.get(index) || [];
-    const splitCurves2 = curve.splitAt(intersections, query.PRECISION_OFFSET * 100);
+    const splitCurves2 = curve.splitAt(intersections, helpers.PRECISION_OFFSET * 100);
     return splitCurves2;
   });
   const prunedCurves = splitCurves.filter((curve) => {
     const closeCurve = blueprint.curves.find(
-      (c) => c.distanceFrom(curve) < Math.abs(offset2) - query.PRECISION_OFFSET
+      (c) => c.distanceFrom(curve) < Math.abs(offset2) - helpers.PRECISION_OFFSET
     );
     return !closeCurve;
   });
@@ -971,7 +969,7 @@ function modifyCorners(makeCorner, blueprint, radius, finder) {
     result.bug("customCorners.modifyCorners", "Unexpected empty curve list during corner modification");
   if (
     // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
-    query.samePoint(curves[0].firstPoint, lastCurve.lastPoint) && curves.length > 1
+    helpers.samePoint(curves[0].firstPoint, lastCurve.lastPoint) && curves.length > 1
   ) {
     const firstCurve = curves.pop();
     const secondCurve = curves.shift();
@@ -1121,7 +1119,7 @@ function isProjectionPlane(plane) {
 }
 const getEdgesFromOc = (shape) => {
   if (shape.IsNull()) return [];
-  return shapeFns.getEdges(shapeTypes.castShape(shape));
+  return curveFns.getEdges(shapeTypes.castShape(shape));
 };
 function makeProjectedEdges(shape, camera, withHiddenLines = true) {
   const oc = occtBoundary.getKernel().oc;
@@ -1302,7 +1300,7 @@ class Drawing {
    * @category Drawing Modifications
    */
   fillet(radius, filter) {
-    const finder = filter && filter(query.cornerFinder());
+    const finder = filter && filter(cornerFinder.cornerFinder());
     return new Drawing(fillet2D(this.innerShape, radius, finder));
   }
   /**
@@ -1312,7 +1310,7 @@ class Drawing {
    * @category Drawing Modifications
    */
   chamfer(radius, filter) {
-    const finder = filter && filter(query.cornerFinder());
+    const finder = filter && filter(cornerFinder.cornerFinder());
     return new Drawing(chamfer2D(this.innerShape, radius, finder));
   }
   sketchOnPlane(inputPlane, origin) {
@@ -1459,7 +1457,7 @@ const drawPointsInterpolation = (points, approximationConfig = {}, options = {})
   const curves = [errors.unwrap(Blueprint.make2dInerpolatedBSplineCurve(points, approximationConfig))];
   const firstPoint = points[0];
   const lastPoint = points[points.length - 1];
-  if (options.closeShape && firstPoint && lastPoint && !query.samePoint(firstPoint, lastPoint)) {
+  if (options.closeShape && firstPoint && lastPoint && !helpers.samePoint(firstPoint, lastPoint)) {
     curves.push(Blueprint.make2dSegmentCurve(lastPoint, firstPoint));
   }
   return new Drawing(new Blueprint.Blueprint(curves));
@@ -1474,7 +1472,7 @@ const drawParametricFunction = (func, { pointsCount = 400, start = 0, stop = 1,
 const edgesToDrawing = (edges) => {
   const [r, gc] = shapeTypes.localGC();
   const planeSketch = drawRectangle(1e3, 1e3).sketchOnPlane();
-  const planeFace = r(errors.unwrap(shapeHelpers.makeFace(planeSketch.wire)));
+  const planeFace = r(errors.unwrap(Blueprint.makeFace(planeSketch.wire)));
   const curves = edges.map((e) => Blueprint.edgeToCurve(e, planeFace));
   gc();
   const stitchedCurves = stitchCurves(curves).map((s) => new Blueprint.Blueprint(s));
@@ -1499,7 +1497,7 @@ function drawFaceOutline(face) {
   const [r, gc] = shapeTypes.localGC();
   const clonedFace = r(shapeTypes.createFace(errors.unwrap(cast.downcast(face.wrapped))));
   const faceOuterWire = r(faceFns.outerWire(clonedFace));
-  const curves = shapeFns.getEdges(faceOuterWire).map((e) => Blueprint.edgeToCurve(e, face));
+  const curves = curveFns.getEdges(faceOuterWire).map((e) => Blueprint.edgeToCurve(e, face));
   gc();
   const stitchedCurves = stitchCurves(curves).map((s) => new Blueprint.Blueprint(s));
   if (stitchedCurves.length === 0) return new Drawing();

package/dist/{drawFns-921SkhDL.js → drawFns-DJV-nOox.js}

@@ -1,19 +1,19 @@
 import { u as unwrap, g as isOk, e as err, x as validationError, l as ok } from "./errors-wGhcJMpB.js";
-import { m as makeLine, x as makeThreePointArc, v as makeTangentArc, l as makeEllipseArc, e as makeBezierCurve, a as assembleWire, h as makeCompound, d as addHolesInFace, s as makeSolid, o as makeFace, g as makeCircle, k as makeEllipse, b as makeHelix, f as makeBSplineApproximation } from "./shapeHelpers-BcoZf2N9.js";
-import { r as resolvePlane, b as planeToWorld, d as planeToLocal } from "./vectors-CBuaMeZv.js";
-import { g as getKernel, a as toVec3, c as makeOcAx2 } from "./occtBoundary-CwegMzqc.js";
+import { r as resolvePlane, b as planeToWorld, d as planeToLocal } from "./vectors-DWLjb9-P.js";
+import { g as getKernel, a as toVec3, m as makeOcAx2 } from "./occtBoundary-DYsksDtE.js";
 import { n as vecScale, j as vecNormalize, v as vecAdd, o as vecSub, b as vecCross, m as vecRotate, R as RAD2DEG, g as vecLength, e as vecEquals, D as DEG2RAD } from "./vecOps-ZDdZWbwT.js";
-import { h as Flatbush, j as convertSvgEllipseParams, k as defaultsSplineOptions, S as Sketch, r as roundedRectangleBlueprint, b as Blueprints, C as CompoundBlueprint, c as cut2D, l as intersectCurves, f as fuse2D, m as make2dOffset, n as filletCurves, q as chamferCurves, o as organiseBlueprints, a as BlueprintSketcher, i as intersect2D, B as BaseSketcher2d, p as polysidesBlueprint } from "./boolean2D-hOw5Qay5.js";
-import { f as faceCenter, n as normalAt, o as outerWire } from "./faceFns-DHu-2JpA.js";
-import { a as curveTangentAt, d as curveEndPoint, l as getCurveType, o as offsetWire2D } from "./curveFns-CdVE4da7.js";
-import { s as createWire, o as localGC, q as createFace, e as isFace, n as gcWithScope, c as castShape } from "./shapeTypes-BlSElW8z.js";
-import { d as downcast, c as cast } from "./cast-DQaUibmm.js";
-import { n as mirror, B as Blueprint, C as Curve2D, c as make2dSegmentCurve, g as make2dArcFromCenter, o as approximateAsSvgCompatibleCurve, a as BoundingBox2d, p as edgeToCurve, q as make2dInerpolatedBSplineCurve, e as make2dCircle, s as make2dEllipse, t as deserializeCurve2D } from "./Blueprint-D3JfGJTz.js";
+import { h as Flatbush, j as convertSvgEllipseParams, k as defaultsSplineOptions, S as Sketch, r as roundedRectangleBlueprint, b as Blueprints, C as CompoundBlueprint, c as cut2D, l as intersectCurves, f as fuse2D, m as make2dOffset, n as filletCurves, q as chamferCurves, o as organiseBlueprints, a as BlueprintSketcher, i as intersect2D, B as BaseSketcher2d, p as polysidesBlueprint } from "./boolean2D-BnZKKBWU.js";
+import { f as faceCenter, n as normalAt, o as outerWire } from "./faceFns-CyokaCDr.js";
+import { l as curveTangentAt, o as curveEndPoint, C as getCurveType, a as getEdges, K as offsetWire2D } from "./curveFns-Cg99XKe2.js";
+import { m as makeLine, i as makeThreePointArc, h as makeTangentArc, g as makeEllipseArc, c as makeBezierCurve, a as assembleWire, e as makeCircle, f as makeEllipse, b as makeHelix, d as makeBSplineApproximation } from "./curveBuilders-U26XDfxg.js";
+import { n as createWire, t as localGC, u as createFace, e as isFace, p as gcWithScope, c as castShape } from "./shapeTypes-i7VwMRwc.js";
+import { d as downcast, c as cast } from "./cast-BEg1mN7n.js";
+import { h as mirror, a as addHolesInFace, m as makeFace, B as Blueprint, C as Curve2D, i as make2dSegmentCurve, j as make2dArcFromCenter, k as approximateAsSvgCompatibleCurve, e as BoundingBox2d, l as edgeToCurve, n as make2dInerpolatedBSplineCurve, o as make2dCircle, p as make2dEllipse, q as deserializeCurve2D } from "./Blueprint-DnAO3gr5.js";
 import { bug } from "./result.js";
-import { i as distance2d, k as polarAngle2d, p as polarToCartesian, l as PRECISION_OFFSET, m as squareDistance2d, s as samePoint$1, a as subtract2d, b as add2d, c as cornerFinder } from "./query-V6nV-VfL.js";
-import { g as getEdges } from "./shapeFns-BrF97sKt.js";
-import { b as basicFaceExtrusion, r as revolution, c as complexExtrude, t as twistExtrude } from "./loft-CtG5nMq5.js";
+import { d as distance2d, p as polarAngle2d, b as polarToCartesian, P as PRECISION_OFFSET, e as squareDistance2d, s as samePoint$1, h as subtract2d, i as add2d } from "./helpers-CRx_ks-u.js";
+import { m as makeCompound, i as basicFaceExtrusion, r as revolution, e as makeSolid, k as complexExtrude, t as twistExtrude } from "./loft-jIkZRqHm.js";
 import opentype from "opentype.js";
+import { c as cornerFinder } from "./cornerFinder-89obDwGi.js";
 const stitchCurves = (curves, precision = 1e-7) => {
   const startPoints = new Flatbush(curves.length);
   curves.forEach((c) => {
@@ -228,7 +228,6 @@ class Sketcher {
   }
   /** Draw an elliptical arc to an absolute end point (SVG-style parameters). */
   ellipseTo(end, horizontalRadius, verticalRadius, rotation = 0, longAxis = false, sweep = false) {
-    const [, gc] = localGC();
     const [startX, startY] = planeToLocal(this.plane, this.pointer);
     let rotationAngle = rotation;
     let majorRadius = horizontalRadius;
@@ -264,7 +263,6 @@ class Sketcher {
     }
     this.pendingEdges.push(arc);
     this._updatePointer(planeToWorld(this.plane, end));
-    gc();
     return this;
   }
   /** Draw an elliptical arc to a relative end point (SVG-style parameters). */

package/dist/{faceFns-DHu-2JpA.js → faceFns-CyokaCDr.js}

@@ -1,7 +1,7 @@
-import { g as getKernel, a as toVec3, d as toOcPnt } from "./occtBoundary-CwegMzqc.js";
-import { c as castShape, n as gcWithScope } from "./shapeTypes-BlSElW8z.js";
+import { g as getKernel, a as toVec3, b as toOcPnt } from "./occtBoundary-DYsksDtE.js";
+import { c as castShape, p as gcWithScope } from "./shapeTypes-i7VwMRwc.js";
 import { u as unwrap, e as err, p as typeCastError, l as ok } from "./errors-wGhcJMpB.js";
-import { i as iterTopo, d as downcast } from "./cast-DQaUibmm.js";
+import { i as iterTopo, d as downcast } from "./cast-BEg1mN7n.js";
 function getSurfaceType(face) {
   const oc = getKernel().oc;
   const r = gcWithScope();

package/dist/{faceFns-BwK7FP7N.cjs → faceFns-DcSCjDG0.cjs}

@@ -1,8 +1,8 @@
 "use strict";
-const occtBoundary = require("./occtBoundary-du8_ex-p.cjs");
-const shapeTypes = require("./shapeTypes-DKhwEnUM.cjs");
+const occtBoundary = require("./occtBoundary-DHtzU4tz.cjs");
+const shapeTypes = require("./shapeTypes-b_lhwQB7.cjs");
 const errors = require("./errors-DK1VAdP4.cjs");
-const cast = require("./cast-DkB0GKmQ.cjs");
+const cast = require("./cast-CqDc8oFW.cjs");
 function getSurfaceType(face) {
   const oc = occtBoundary.getKernel().oc;
   const r = shapeTypes.gcWithScope();