brepjs 8.4.0 → 8.7.4

package/dist/2d.cjs

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const Blueprint = require("./Blueprint-zgFe_5Qj.cjs");
-const boolean2D = require("./boolean2D-CfEbRMPF.cjs");
+const Blueprint = require("./Blueprint-BcbOBF-9.cjs");
+const boolean2D = require("./boolean2D-CqacqjME.cjs");
 function reverseCurve(curve) {
   const cloned = curve.clone();
   cloned.reverse();

package/dist/2d.js

@@ -1,6 +1,6 @@
-import { B as Blueprint } from "./Blueprint-Bp45tnh0.js";
-import { e, C, f } from "./Blueprint-Bp45tnh0.js";
-import { b, C as C2, c, d, f as f2, e as e2, i, g, o, p, r } from "./boolean2D-DN6ETTCq.js";
+import { B as Blueprint } from "./Blueprint-Cmh8lKc4.js";
+import { d, C, r } from "./Blueprint-Cmh8lKc4.js";
+import { e, C as C2, f, l, g, n, k, q, o, p, r as r2 } from "./boolean2D-D94Axs3i.js";
 function reverseCurve(curve) {
   const cloned = curve.clone();
   cloned.reverse();
@@ -68,11 +68,11 @@ function sketch2DOnFace(bp, face, scaleMode) {
 }
 export {
   Blueprint,
-  b as Blueprints,
-  e as BoundingBox2d,
+  e as Blueprints,
+  d as BoundingBox2d,
   C2 as CompoundBlueprint,
   C as Curve2D,
-  f as axis2d,
+  r as axis2d,
   createBlueprint,
   curve2dBoundingBox,
   curve2dDistanceFrom,
@@ -82,21 +82,21 @@ export {
   curve2dParameter,
   curve2dSplitAt,
   curve2dTangentAt,
-  c as cut2D,
-  d as cutBlueprints,
-  f2 as fuse2D,
-  e2 as fuseBlueprints,
+  f as cut2D,
+  l as cutBlueprints,
+  g as fuse2D,
+  n as fuseBlueprints,
   getBounds2D,
   getOrientation2D,
-  i as intersect2D,
-  g as intersectBlueprints,
+  k as intersect2D,
+  q as intersectBlueprints,
   isInside2D,
   mirror2D,
   o as organiseBlueprints,
   p as polysidesBlueprint,
   reverseCurve,
   rotate2D,
-  r as roundedRectangleBlueprint,
+  r2 as roundedRectangleBlueprint,
   scale2D,
   sketch2DOnFace,
   sketch2DOnPlane,

package/dist/{Blueprint-zgFe_5Qj.cjs → Blueprint-BcbOBF-9.cjs}

@@ -1,15 +1,13 @@
 "use strict";
-const vectors = require("./vectors-DVmHF4zt.cjs");
-const occtBoundary = require("./occtBoundary-CocN2VKx.cjs");
-const shapeTypes = require("./shapeTypes-BxVxLdiD.cjs");
-const faceFns = require("./faceFns-es3GENII.cjs");
-const curveFns = require("./curveFns-VMxgfkqw.cjs");
-const errors = require("./errors-D13q2HCk.cjs");
-const helpers = require("./helpers-C0q_FVxq.cjs");
-const cast = require("./cast-CPNOTNFm.cjs");
+const vectors = require("./vectors-DwFeX0Ja.cjs");
+const occtBoundary = require("./occtBoundary-DH2VO-rq.cjs");
+const shapeTypes = require("./shapeTypes-CMjrTv36.cjs");
+const faceFns = require("./faceFns-DcndPHWm.cjs");
+const curveFns = require("./curveFns-BXCbASW-.cjs");
+const errors = require("./errors-eRQu29oc.cjs");
+const surfaceBuilders = require("./surfaceBuilders-Xx9DRRxs.cjs");
+const helpers = require("./helpers-CC21GeAr.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const shapeFns = require("./shapeFns-B0zSdO9c.cjs");
-const curveBuilders = require("./curveBuilders-BkEJ-RVn.cjs");
 const result = require("./result.cjs");
 function makePlane(plane, origin) {
   if (plane && typeof plane !== "string") {
@@ -46,86 +44,6 @@ function mirror(shape, inputPlane, origin) {
   gc();
   return newShape;
 }
-function range(len) {
-  return Array.from(Array(len).keys());
-}
-function zip(arrays) {
-  const minLength = Math.min(...arrays.map((arr) => arr.length));
-  return range(minLength).map((i) => arrays.map((arr) => arr[i]));
-}
-function makeFace(wire, holes) {
-  const oc = occtBoundary.getKernel().oc;
-  const faceBuilder = new oc.BRepBuilderAPI_MakeFace_15(wire.wrapped, false);
-  holes?.forEach((hole) => {
-    faceBuilder.Add(hole.wrapped);
-  });
-  if (!faceBuilder.IsDone()) {
-    faceBuilder.delete();
-    return errors.err(
-      errors.occtError("FACE_BUILD_FAILED", "Failed to build the face. Your wire might be non planar.")
-    );
-  }
-  const face = faceBuilder.Face();
-  faceBuilder.delete();
-  return errors.ok(shapeTypes.createFace(face));
-}
-function makeNewFaceWithinFace(originFace, wire) {
-  const oc = occtBoundary.getKernel().oc;
-  const [r, gc] = shapeTypes.localGC();
-  const surface = r(oc.BRep_Tool.Surface_2(originFace.wrapped));
-  const faceBuilder = r(new oc.BRepBuilderAPI_MakeFace_21(surface, wire.wrapped, true));
-  const face = faceBuilder.Face();
-  gc();
-  return shapeTypes.createFace(face);
-}
-function makeNonPlanarFace(wire) {
-  const oc = occtBoundary.getKernel().oc;
-  const [r, gc] = shapeTypes.localGC();
-  const faceBuilder = r(
-    new oc.BRepOffsetAPI_MakeFilling(3, 15, 2, false, 1e-5, 1e-4, 0.01, 0.1, 8, 9)
-  );
-  shapeFns.getEdges(wire).forEach((edge) => {
-    faceBuilder.Add_1(
-      edge.wrapped,
-      oc.GeomAbs_Shape.GeomAbs_C0,
-      true
-    );
-  });
-  const progress = r(new oc.Message_ProgressRange_1());
-  faceBuilder.Build(progress);
-  return errors.andThen(cast.cast(faceBuilder.Shape()), (newFace) => {
-    gc();
-    if (!shapeTypes.isFace(newFace)) {
-      return errors.err(errors.occtError("FACE_BUILD_FAILED", "Failed to create a face"));
-    }
-    return errors.ok(newFace);
-  });
-}
-function addHolesInFace(face, holes) {
-  const oc = occtBoundary.getKernel().oc;
-  const [r, gc] = shapeTypes.localGC();
-  const faceMaker = r(new oc.BRepBuilderAPI_MakeFace_2(face.wrapped));
-  holes.forEach((wire) => {
-    faceMaker.Add(wire.wrapped);
-  });
-  const builtFace = r(faceMaker.Face());
-  const fixer = r(new oc.ShapeFix_Face_2(builtFace));
-  fixer.FixOrientation_1();
-  const newFace = fixer.Face();
-  gc();
-  return shapeTypes.createFace(newFace);
-}
-function makePolygon(points) {
-  if (points.length < 3)
-    return errors.err(
-      errors.validationError("POLYGON_MIN_POINTS", "You need at least 3 points to make a polygon")
-    );
-  const edges = zip([points, [...points.slice(1), points[0]]]).map(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- zip returns untyped pairs
-    ([p1, p2]) => curveBuilders.makeLine(p1, p2)
-  );
-  return errors.andThen(curveBuilders.assembleWire(edges), (wire) => makeFace(wire));
-}
 function isPoint2D(point) {
   return Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number";
 }
@@ -493,7 +411,7 @@ class Curve2D {
     )
       parameters = parameters.slice(0, -1);
     if (!parameters.length) return [this];
-    return zip([
+    return surfaceBuilders.zip([
       [firstParam, ...parameters],
       [...parameters, lastParam]
     ]).map(([first, last]) => {
@@ -1105,7 +1023,7 @@ class Blueprint {
     const originPoint = origin || [...faceFns.faceCenter(face)];
     const originVec3 = occtBoundary.toVec3(originPoint);
     const sketch = this.translate(faceFns.uvCoordinates(face, originVec3)).sketchOnFace(face, "original");
-    return errors.unwrap(makeFace(sketch.wire));
+    return errors.unwrap(surfaceBuilders.makeFace(sketch.wire));
   }
   /**
    * Cut a prism-shaped hole through a solid along a face using this blueprint.
@@ -1142,7 +1060,7 @@ class Blueprint {
     } else {
       maker.PerformThruAll();
     }
-    return errors.unwrap(cast.cast(maker.Shape()));
+    return errors.unwrap(faceFns.cast(maker.Shape()));
   }
   /** Convert the blueprint to an SVG path `d` attribute string. */
   toSVGPathD() {
@@ -1245,7 +1163,6 @@ class Blueprint {
 exports.Blueprint = Blueprint;
 exports.BoundingBox2d = BoundingBox2d;
 exports.Curve2D = Curve2D;
-exports.addHolesInFace = addHolesInFace;
 exports.approximateAsBSpline = approximateAsBSpline;
 exports.approximateAsSvgCompatibleCurve = approximateAsSvgCompatibleCurve;
 exports.asSVG = asSVG;
@@ -1262,12 +1179,7 @@ exports.make2dInerpolatedBSplineCurve = make2dInerpolatedBSplineCurve;
 exports.make2dSegmentCurve = make2dSegmentCurve;
 exports.make2dTangentArc = make2dTangentArc;
 exports.make2dThreePointArc = make2dThreePointArc;
-exports.makeFace = makeFace;
-exports.makeNewFaceWithinFace = makeNewFaceWithinFace;
-exports.makeNonPlanarFace = makeNonPlanarFace;
 exports.makePlane = makePlane;
-exports.makePolygon = makePolygon;
 exports.mirror = mirror;
 exports.removeDuplicatePoints = removeDuplicatePoints;
 exports.viewbox = viewbox;
-exports.zip = zip;

package/dist/{Blueprint-Bp45tnh0.js → Blueprint-Cmh8lKc4.js}

@@ -1,14 +1,12 @@
-import { r as resolvePlane } from "./vectors-DE0XriuQ.js";
-import { g as getKernel, a as toVec3, m as makeOcAx2 } from "./occtBoundary-D_gjqgzo.js";
-import { t as localGC, u as createFace, e as isFace, y as registerForCleanup, z as unregisterFromCleanup, p as gcWithScope, o as createEdge, n as createWire } from "./shapeTypes-c-_pgYCx.js";
-import { u as uvBounds, a as faceGeomType, f as faceCenter, h as uvCoordinates } from "./faceFns-CfJIbHY3.js";
-import { j as findCurveType, m as getOrientation } from "./curveFns-ZuQUBZvd.js";
-import { e as err, o as occtError, l as ok, a as andThen, x as validationError, u as unwrap, b as computationError } from "./errors-CSYOlCCR.js";
-import { d as distance2d, s as samePoint, k as scalarMultiply2d, i as add2d, n as normalize2d, h as subtract2d, g as getSingleFace } from "./helpers-CmVkMubc.js";
-import { c as cast } from "./cast-Cerqtxtb.js";
+import { r as resolvePlane } from "./vectors-CZV4ZrTz.js";
+import { g as getKernel, a as toVec3, c as makeOcAx2 } from "./occtBoundary-CWzWqBCm.js";
+import { r as localGC, v as registerForCleanup, x as unregisterFromCleanup, n as gcWithScope, p as createEdge, o as createWire } from "./shapeTypes-D0vfRxWb.js";
+import { u as uvBounds, f as faceGeomType, e as faceCenter, h as uvCoordinates, c as cast } from "./faceFns-CltrEfOo.js";
+import { f as findCurveType, g as getOrientation } from "./curveFns-B85Glnfo.js";
+import { u as unwrap, l as ok, e as err, b as computationError, x as validationError } from "./errors-Coh_5_19.js";
+import { z as zip, m as makeFace } from "./surfaceBuilders-B7Jxob8g.js";
+import { d as distance2d, s as samePoint, b as scalarMultiply2d, c as add2d, n as normalize2d, e as subtract2d, g as getSingleFace } from "./helpers-SksQIreB.js";
 import { R as RAD2DEG, D as DEG2RAD } from "./vecOps-ZDdZWbwT.js";
-import { e as getEdges } from "./shapeFns-k1YHFwmB.js";
-import { m as makeLine, a as assembleWire$1 } from "./curveBuilders-BREwqvuc.js";
 import { bug } from "./result.js";
 function makePlane(plane, origin) {
   if (plane && typeof plane !== "string") {
@@ -45,86 +43,6 @@ function mirror(shape, inputPlane, origin) {
   gc();
   return newShape;
 }
-function range(len) {
-  return Array.from(Array(len).keys());
-}
-function zip(arrays) {
-  const minLength = Math.min(...arrays.map((arr) => arr.length));
-  return range(minLength).map((i) => arrays.map((arr) => arr[i]));
-}
-function makeFace(wire, holes) {
-  const oc = getKernel().oc;
-  const faceBuilder = new oc.BRepBuilderAPI_MakeFace_15(wire.wrapped, false);
-  holes?.forEach((hole) => {
-    faceBuilder.Add(hole.wrapped);
-  });
-  if (!faceBuilder.IsDone()) {
-    faceBuilder.delete();
-    return err(
-      occtError("FACE_BUILD_FAILED", "Failed to build the face. Your wire might be non planar.")
-    );
-  }
-  const face = faceBuilder.Face();
-  faceBuilder.delete();
-  return ok(createFace(face));
-}
-function makeNewFaceWithinFace(originFace, wire) {
-  const oc = getKernel().oc;
-  const [r, gc] = localGC();
-  const surface = r(oc.BRep_Tool.Surface_2(originFace.wrapped));
-  const faceBuilder = r(new oc.BRepBuilderAPI_MakeFace_21(surface, wire.wrapped, true));
-  const face = faceBuilder.Face();
-  gc();
-  return createFace(face);
-}
-function makeNonPlanarFace(wire) {
-  const oc = getKernel().oc;
-  const [r, gc] = localGC();
-  const faceBuilder = r(
-    new oc.BRepOffsetAPI_MakeFilling(3, 15, 2, false, 1e-5, 1e-4, 0.01, 0.1, 8, 9)
-  );
-  getEdges(wire).forEach((edge) => {
-    faceBuilder.Add_1(
-      edge.wrapped,
-      oc.GeomAbs_Shape.GeomAbs_C0,
-      true
-    );
-  });
-  const progress = r(new oc.Message_ProgressRange_1());
-  faceBuilder.Build(progress);
-  return andThen(cast(faceBuilder.Shape()), (newFace) => {
-    gc();
-    if (!isFace(newFace)) {
-      return err(occtError("FACE_BUILD_FAILED", "Failed to create a face"));
-    }
-    return ok(newFace);
-  });
-}
-function addHolesInFace(face, holes) {
-  const oc = getKernel().oc;
-  const [r, gc] = localGC();
-  const faceMaker = r(new oc.BRepBuilderAPI_MakeFace_2(face.wrapped));
-  holes.forEach((wire) => {
-    faceMaker.Add(wire.wrapped);
-  });
-  const builtFace = r(faceMaker.Face());
-  const fixer = r(new oc.ShapeFix_Face_2(builtFace));
-  fixer.FixOrientation_1();
-  const newFace = fixer.Face();
-  gc();
-  return createFace(newFace);
-}
-function makePolygon(points) {
-  if (points.length < 3)
-    return err(
-      validationError("POLYGON_MIN_POINTS", "You need at least 3 points to make a polygon")
-    );
-  const edges = zip([points, [...points.slice(1), points[0]]]).map(
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any -- zip returns untyped pairs
-    ([p1, p2]) => makeLine(p1, p2)
-  );
-  return andThen(assembleWire$1(edges), (wire) => makeFace(wire));
-}
 function isPoint2D(point) {
   return Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number";
 }
@@ -1242,33 +1160,27 @@ class Blueprint {
   }
 }
 export {
-  removeDuplicatePoints as A,
   Blueprint as B,
   Curve2D as C,
-  addHolesInFace as a,
-  makeNonPlanarFace as b,
-  makePolygon as c,
-  makeNewFaceWithinFace as d,
-  BoundingBox2d as e,
-  axis2d as f,
-  makePlane as g,
-  mirror as h,
-  make2dSegmentCurve as i,
-  make2dArcFromCenter as j,
-  approximateAsSvgCompatibleCurve as k,
-  edgeToCurve as l,
-  makeFace as m,
-  make2dInerpolatedBSplineCurve as n,
-  make2dCircle as o,
-  make2dEllipse as p,
-  deserializeCurve2D as q,
-  approximateAsBSpline as r,
-  isPoint2D as s,
-  make2dThreePointArc as t,
-  asSVG as u,
-  viewbox as v,
-  make2dEllipseArc as w,
-  make2dTangentArc as x,
-  make2dBezierCurve as y,
-  zip as z
+  make2dSegmentCurve as a,
+  make2dArcFromCenter as b,
+  approximateAsSvgCompatibleCurve as c,
+  BoundingBox2d as d,
+  edgeToCurve as e,
+  make2dInerpolatedBSplineCurve as f,
+  make2dCircle as g,
+  make2dEllipse as h,
+  deserializeCurve2D as i,
+  approximateAsBSpline as j,
+  isPoint2D as k,
+  make2dThreePointArc as l,
+  mirror as m,
+  asSVG as n,
+  make2dEllipseArc as o,
+  make2dTangentArc as p,
+  make2dBezierCurve as q,
+  axis2d as r,
+  removeDuplicatePoints as s,
+  makePlane as t,
+  viewbox as v
 };

package/dist/{boolean2D-CfEbRMPF.cjs → boolean2D-CqacqjME.cjs}

@@ -1,17 +1,16 @@
 "use strict";
-const vectors = require("./vectors-DVmHF4zt.cjs");
-const errors = require("./errors-D13q2HCk.cjs");
-const cast = require("./cast-CPNOTNFm.cjs");
-const occtBoundary = require("./occtBoundary-CocN2VKx.cjs");
+const vectors = require("./vectors-DwFeX0Ja.cjs");
+const errors = require("./errors-eRQu29oc.cjs");
+const faceFns = require("./faceFns-DcndPHWm.cjs");
+const occtBoundary = require("./occtBoundary-DH2VO-rq.cjs");
 const vecOps = require("./vecOps-CjRL1jau.cjs");
-const loft = require("./loft-B-UCPW9P.cjs");
-const shapeTypes = require("./shapeTypes-BxVxLdiD.cjs");
-const curveFns = require("./curveFns-VMxgfkqw.cjs");
-const Blueprint = require("./Blueprint-zgFe_5Qj.cjs");
-const faceFns = require("./faceFns-es3GENII.cjs");
+const loft = require("./loft-BcyyvWCj.cjs");
+const shapeTypes = require("./shapeTypes-CMjrTv36.cjs");
+const curveFns = require("./curveFns-BXCbASW-.cjs");
+const surfaceBuilders = require("./surfaceBuilders-Xx9DRRxs.cjs");
 const result = require("./result.cjs");
-const helpers = require("./helpers-C0q_FVxq.cjs");
-const curveBuilders = require("./curveBuilders-BkEJ-RVn.cjs");
+const helpers = require("./helpers-CC21GeAr.cjs");
+const Blueprint = require("./Blueprint-BcbOBF-9.cjs");
 function* pointsIteration(intersector) {
   const nPoints = intersector.NbPoints();
   if (!nPoints) return;
@@ -959,7 +958,7 @@ class Sketch {
   }
   set baseFace(newFace) {
     if (this._baseFace) this._baseFace.delete();
-    this._baseFace = newFace ? shapeTypes.createFace(errors.unwrap(cast.downcast(newFace.wrapped))) : newFace;
+    this._baseFace = newFace ? shapeTypes.createFace(errors.unwrap(faceFns.downcast(newFace.wrapped))) : newFace;
   }
   /** Release all OCCT resources held by this sketch. */
   delete() {
@@ -968,11 +967,11 @@ class Sketch {
   }
   /** Create an independent deep copy of this sketch. */
   clone() {
-    const sketch = new Sketch(shapeTypes.createWire(errors.unwrap(cast.downcast(this.wire.wrapped))), {
+    const sketch = new Sketch(shapeTypes.createWire(errors.unwrap(faceFns.downcast(this.wire.wrapped))), {
       defaultOrigin: this.defaultOrigin,
       defaultDirection: this.defaultDirection
     });
-    if (this.baseFace) sketch.baseFace = shapeTypes.createFace(errors.unwrap(cast.downcast(this.baseFace.wrapped)));
+    if (this.baseFace) sketch.baseFace = shapeTypes.createFace(errors.unwrap(faceFns.downcast(this.baseFace.wrapped)));
     return sketch;
   }
   /** Get the 3D origin used as default for extrusion and revolution. */
@@ -997,15 +996,15 @@ class Sketch {
   face() {
     let face;
     if (!this.baseFace) {
-      face = errors.unwrap(Blueprint.makeFace(this.wire));
+      face = errors.unwrap(surfaceBuilders.makeFace(this.wire));
     } else {
-      face = Blueprint.makeNewFaceWithinFace(this.baseFace, this.wire);
+      face = surfaceBuilders.makeNewFaceWithinFace(this.baseFace, this.wire);
     }
     return face;
   }
   /** Return a clone of the underlying wire. */
   wires() {
-    return shapeTypes.createWire(errors.unwrap(cast.downcast(this.wire.wrapped)));
+    return shapeTypes.createWire(errors.unwrap(faceFns.downcast(this.wire.wrapped)));
   }
   /** Alias for {@link Sketch.face}. */
   faces() {
@@ -1016,7 +1015,7 @@ class Sketch {
    * (defaults to the sketch origin)
    */
   revolve(revolutionAxis, { origin } = {}) {
-    const face = errors.unwrap(Blueprint.makeFace(this.wire));
+    const face = errors.unwrap(surfaceBuilders.makeFace(this.wire));
     const solid = errors.unwrap(loft.revolution(face, origin || this.defaultOrigin, revolutionAxis));
     face.delete();
     this.delete();
@@ -1058,7 +1057,7 @@ class Sketch {
       this.delete();
       return solid2;
     }
-    const face = errors.unwrap(Blueprint.makeFace(this.wire));
+    const face = errors.unwrap(surfaceBuilders.makeFace(this.wire));
     const solid = loft.basicFaceExtrusion(face, [...extrusionVec]);
     gc();
     this.delete();
@@ -1631,7 +1630,7 @@ class FaceSketcher extends BaseSketcher2d {
   _bounds;
   constructor(face, origin = [0, 0]) {
     super(origin);
-    this.face = shapeTypes.createFace(errors.unwrap(cast.downcast(face.wrapped)));
+    this.face = shapeTypes.createFace(errors.unwrap(faceFns.downcast(face.wrapped)));
     this._bounds = faceFns.uvBounds(face);
   }
   _convertToUV([x, y]) {
@@ -1656,7 +1655,7 @@ class FaceSketcher extends BaseSketcher2d {
     const edges = this.pendingCurves.map((curve) => {
       return r(shapeTypes.createEdge(r(new oc.BRepBuilderAPI_MakeEdge_30(curve.wrapped, geomSurf)).Edge()));
     });
-    const wire = errors.unwrap(curveBuilders.assembleWire(edges));
+    const wire = errors.unwrap(surfaceBuilders.assembleWire(edges));
     oc.BRepLib.BuildCurves3d_2(wire.wrapped);
     gc();
     return wire;
@@ -1942,7 +1941,7 @@ function findAllIntersections(first, second) {
   };
 }
 function splitCurvesAtIntersections(curves, curvePoints) {
-  return Blueprint.zip([curves, curvePoints]).flatMap(
+  return surfaceBuilders.zip([curves, curvePoints]).flatMap(
     ([curve, intersections]) => {
       if (intersections.length === 0) return [curve];
       return curve.splitAt(intersections, helpers.PRECISION_INTERSECTION / 100);
@@ -1994,7 +1993,7 @@ function blueprintsIntersectionSegments(first, second) {
       secondIntersectedSegments = reverseSegments(secondIntersectedSegments);
     }
   }
-  return Blueprint.zip([firstIntersectedSegments, secondIntersectedSegments]).map(
+  return surfaceBuilders.zip([firstIntersectedSegments, secondIntersectedSegments]).map(
     ([first2, second2]) => {
       if (first2 === void 0 || second2 === void 0) {
         result.bug("blueprintsIntersectionSegments", "Mismatched segment counts between blueprints");
@@ -2012,12 +2011,12 @@ function splitPaths(curves) {
   const startPoints = curves.map((c) => c.firstPoint);
   const shiftedEndPoints = curves.map((c) => c.lastPoint);
   const endPoints = shiftedEndPoints.slice(-1).concat(shiftedEndPoints.slice(0, -1));
-  const discontinuities = Blueprint.zip([startPoints, endPoints]).map(([startPoint, endPoint], index) => {
+  const discontinuities = surfaceBuilders.zip([startPoints, endPoints]).map(([startPoint, endPoint], index) => {
     if (startPoint === void 0 || endPoint === void 0) return null;
     return samePoint(startPoint, endPoint) ? null : index;
   }).filter((f) => f !== null);
   if (discontinuities.length === 0) return [curves];
-  const paths = Blueprint.zip([discontinuities.slice(0, -1), discontinuities.slice(1)]).map(
+  const paths = surfaceBuilders.zip([discontinuities.slice(0, -1), discontinuities.slice(1)]).map(
     ([start, end]) => curves.slice(start, end)
   );
   let lastPath = curves.slice(discontinuities[discontinuities.length - 1]);

package/dist/{boolean2D-DN6ETTCq.js → boolean2D-D94Axs3i.js}

@@ -1,16 +1,15 @@
-import { a as createPlane } from "./vectors-DE0XriuQ.js";
-import { l as ok, e as err, b as computationError, u as unwrap, g as isOk } from "./errors-CSYOlCCR.js";
-import { d as downcast } from "./cast-Cerqtxtb.js";
-import { g as getKernel, a as toVec3 } from "./occtBoundary-D_gjqgzo.js";
+import { a as createPlane } from "./vectors-CZV4ZrTz.js";
+import { l as ok, e as err, b as computationError, u as unwrap, g as isOk } from "./errors-Coh_5_19.js";
+import { d as downcast, u as uvBounds, p as pointOnSurface, n as normalAt } from "./faceFns-CltrEfOo.js";
+import { g as getKernel, a as toVec3 } from "./occtBoundary-CWzWqBCm.js";
 import { n as vecScale, j as vecNormalize, b as vecCross, D as DEG2RAD, R as RAD2DEG } from "./vecOps-ZDdZWbwT.js";
-import { r as revolution, k as complexExtrude, t as twistExtrude, i as basicFaceExtrusion, j as genericSweep, l as loft } from "./loft-oJq2OD3A.js";
-import { p as gcWithScope, u as createFace, n as createWire, t as localGC, o as createEdge } from "./shapeTypes-c-_pgYCx.js";
-import { e as curveStartPoint, a as curveTangentAt, c as curveIsClosed } from "./curveFns-ZuQUBZvd.js";
-import { C as Curve2D, i as make2dSegmentCurve, r as approximateAsBSpline, j as make2dArcFromCenter, s as isPoint2D, o as make2dCircle, t as make2dThreePointArc, e as BoundingBox2d, v as viewbox, u as asSVG, B as Blueprint, m as makeFace, d as makeNewFaceWithinFace, w as make2dEllipseArc, x as make2dTangentArc, y as make2dBezierCurve, f as axis2d, z as zip, A as removeDuplicatePoints } from "./Blueprint-Bp45tnh0.js";
-import { u as uvBounds, p as pointOnSurface, n as normalAt } from "./faceFns-CfJIbHY3.js";
+import { r as revolution, c as complexExtrude, t as twistExtrude, b as basicFaceExtrusion, g as genericSweep, l as loft } from "./loft-CJMPx1NQ.js";
+import { n as gcWithScope, q as createFace, o as createWire, r as localGC, p as createEdge } from "./shapeTypes-D0vfRxWb.js";
+import { d as curveStartPoint, c as curveTangentAt, e as curveIsClosed } from "./curveFns-B85Glnfo.js";
+import { m as makeFace, l as makeNewFaceWithinFace, b as assembleWire, z as zip } from "./surfaceBuilders-B7Jxob8g.js";
 import { bug } from "./result.js";
-import { s as samePoint$1, n as normalize2d, h as subtract2d, i as add2d, j as crossProduct2d, k as scalarMultiply2d, b as polarToCartesian, r as rotate2d, l as cartesianToPolar, d as distance2d, p as polarAngle2d, m as PRECISION_INTERSECTION } from "./helpers-CmVkMubc.js";
-import { a as assembleWire } from "./curveBuilders-BREwqvuc.js";
+import { s as samePoint$1, n as normalize2d, e as subtract2d, c as add2d, i as crossProduct2d, b as scalarMultiply2d, f as polarToCartesian, r as rotate2d, j as cartesianToPolar, d as distance2d, p as polarAngle2d, k as PRECISION_INTERSECTION } from "./helpers-SksQIreB.js";
+import { C as Curve2D, a as make2dSegmentCurve, j as approximateAsBSpline, b as make2dArcFromCenter, k as isPoint2D, g as make2dCircle, l as make2dThreePointArc, d as BoundingBox2d, v as viewbox, n as asSVG, B as Blueprint, o as make2dEllipseArc, p as make2dTangentArc, q as make2dBezierCurve, r as axis2d, s as removeDuplicatePoints } from "./Blueprint-Cmh8lKc4.js";
 function* pointsIteration(intersector) {
   const nPoints = intersector.NbPoints();
   if (!nPoints) return;
@@ -2441,21 +2440,21 @@ export {
   FaceSketcher as F,
   Sketch as S,
   BlueprintSketcher as a,
-  Blueprints as b,
-  cut2D as c,
-  cutBlueprints as d,
-  fuseBlueprints as e,
-  fuse2D as f,
-  intersectBlueprints as g,
-  Flatbush as h,
-  intersect2D as i,
-  convertSvgEllipseParams as j,
-  defaultsSplineOptions as k,
-  intersectCurves as l,
+  Flatbush as b,
+  convertSvgEllipseParams as c,
+  defaultsSplineOptions as d,
+  Blueprints as e,
+  cut2D as f,
+  fuse2D as g,
+  filletCurves as h,
+  intersectCurves as i,
+  chamferCurves as j,
+  intersect2D as k,
+  cutBlueprints as l,
   make2dOffset as m,
-  filletCurves as n,
+  fuseBlueprints as n,
   organiseBlueprints as o,
   polysidesBlueprint as p,
-  chamferCurves as q,
+  intersectBlueprints as q,
   roundedRectangleBlueprint as r
 };