brepjs 18.124.0 → 18.124.2

package/dist/{cornerFinder-CPwSLgpM.cjs → cornerFinder-zEgIFMnk.cjs}

@@ -1,6 +1,6 @@
 const require_constants = require("./constants-BOVyEYGH.cjs");
 const require_arrayAccess = require("./arrayAccess-e4H9cBfh.cjs");
-const require_helpers = require("./helpers-DuTAcGVX.cjs");
+const require_helpers = require("./helpers-CHYzwQMk.cjs");
 //#region src/query/cornerFinder.ts
 var PI_2 = 2 * Math.PI;
 function positiveHalfAngle(angle) {

package/dist/{curveFns-BBLaLG1U.cjs → curveFns-BZZYHVow.cjs}

@@ -1,4 +1,4 @@
-const require_shapeTypes = require("./shapeTypes-DZKuRt24.cjs");
+const require_shapeTypes = require("./shapeTypes-D5Y41q7x.cjs");
 const require_errors = require("./errors-RHkKO5bZ.cjs");
 //#region src/topology/curveFns.ts
 /**
@@ -133,7 +133,8 @@ function flipOrientation(shape) {
 function interpolateCurve(points, options = {}) {
 	if (points.length < 2) return require_errors.err(require_errors.typeCastError("INTERPOLATE_MIN_POINTS", "Interpolation requires at least 2 points"));
 	try {
-		const cast = require_shapeTypes.castResultShape(require_shapeTypes.getKernel().interpolatePoints(points, options));
+		const result = require_shapeTypes.getKernel().interpolatePoints(points, options);
+		const cast = require_shapeTypes.castResultShape(result);
 		if (!require_shapeTypes.isEdge(cast)) {
 			require_shapeTypes.disposeResultShape(cast);
 			return require_errors.err(require_errors.typeCastError("INTERPOLATE_NOT_EDGE", "Interpolation did not produce an edge"));
@@ -153,7 +154,8 @@ function interpolateCurve(points, options = {}) {
 function approximateCurve(points, options = {}) {
 	if (points.length < 2) return require_errors.err(require_errors.typeCastError("APPROXIMATE_MIN_POINTS", "Approximation requires at least 2 points"));
 	try {
-		const cast = require_shapeTypes.castResultShape(require_shapeTypes.getKernel().approximatePoints(points, options));
+		const result = require_shapeTypes.getKernel().approximatePoints(points, options);
+		const cast = require_shapeTypes.castResultShape(result);
 		if (!require_shapeTypes.isEdge(cast)) {
 			require_shapeTypes.disposeResultShape(cast);
 			return require_errors.err(require_errors.typeCastError("APPROXIMATE_NOT_EDGE", "Approximation did not produce an edge"));
@@ -172,12 +174,13 @@ function approximateCurve(points, options = {}) {
 * @returns Ok with the offset wire, or Err if the operation fails.
 */
 function offsetWire2D(wire, offset, kind = "arc") {
-	const wrapped = require_shapeTypes.castResultShape(require_shapeTypes.getKernel().offsetWire2D(wire.wrapped, offset, {
+	const resultShape = require_shapeTypes.getKernel().offsetWire2D(wire.wrapped, offset, {
 		arc: "arc",
 		intersection: "intersection",
 		tangent: "tangent",
 		chamfer: "intersection"
-	}[kind]));
+	}[kind]);
+	const wrapped = require_shapeTypes.castResultShape(resultShape);
 	if (!require_shapeTypes.isWire(wrapped)) {
 		require_shapeTypes.disposeResultShape(wrapped);
 		return require_errors.err(require_errors.typeCastError("OFFSET_NOT_WIRE", "Offset did not produce a Wire"));

package/dist/{curveFns-BoHbhtqX.js → curveFns-RczIU30U.js}

@@ -1,4 +1,4 @@
-import { K as getKernel, T as isWire, h as disposeResultShape, n as castResultShape, v as isEdge } from "./shapeTypes-bHlssytH.js";
+import { K as getKernel, T as isWire, h as disposeResultShape, n as castResultShape, v as isEdge } from "./shapeTypes-BHRboc_x.js";
 import { E as ok, g as err, l as typeCastError } from "./errors-MHLiNE-C.js";
 //#region src/topology/curveFns.ts
 /**
@@ -133,7 +133,8 @@ function flipOrientation(shape) {
 function interpolateCurve(points, options = {}) {
 	if (points.length < 2) return err(typeCastError("INTERPOLATE_MIN_POINTS", "Interpolation requires at least 2 points"));
 	try {
-		const cast = castResultShape(getKernel().interpolatePoints(points, options));
+		const result = getKernel().interpolatePoints(points, options);
+		const cast = castResultShape(result);
 		if (!isEdge(cast)) {
 			disposeResultShape(cast);
 			return err(typeCastError("INTERPOLATE_NOT_EDGE", "Interpolation did not produce an edge"));
@@ -153,7 +154,8 @@ function interpolateCurve(points, options = {}) {
 function approximateCurve(points, options = {}) {
 	if (points.length < 2) return err(typeCastError("APPROXIMATE_MIN_POINTS", "Approximation requires at least 2 points"));
 	try {
-		const cast = castResultShape(getKernel().approximatePoints(points, options));
+		const result = getKernel().approximatePoints(points, options);
+		const cast = castResultShape(result);
 		if (!isEdge(cast)) {
 			disposeResultShape(cast);
 			return err(typeCastError("APPROXIMATE_NOT_EDGE", "Approximation did not produce an edge"));
@@ -172,12 +174,13 @@ function approximateCurve(points, options = {}) {
 * @returns Ok with the offset wire, or Err if the operation fails.
 */
 function offsetWire2D(wire, offset, kind = "arc") {
-	const wrapped = castResultShape(getKernel().offsetWire2D(wire.wrapped, offset, {
+	const resultShape = getKernel().offsetWire2D(wire.wrapped, offset, {
 		arc: "arc",
 		intersection: "intersection",
 		tangent: "tangent",
 		chamfer: "intersection"
-	}[kind]));
+	}[kind]);
+	const wrapped = castResultShape(resultShape);
 	if (!isWire(wrapped)) {
 		disposeResultShape(wrapped);
 		return err(typeCastError("OFFSET_NOT_WIRE", "Offset did not produce a Wire"));

package/dist/{drawFns-DOkSdo8E.cjs → drawFns-BcXzWFfn.cjs}

@@ -1,22 +1,22 @@
-const require_shapeTypes = require("./shapeTypes-DZKuRt24.cjs");
+const require_shapeTypes = require("./shapeTypes-D5Y41q7x.cjs");
 const require_bug = require("./bug-O02CsAmt.cjs");
 const require_errors = require("./errors-RHkKO5bZ.cjs");
-const require_topologyQueryFns = require("./topologyQueryFns-DZUpJz2p.cjs");
+const require_topologyQueryFns = require("./topologyQueryFns-gah07J7-.cjs");
 const require_constants = require("./constants-BOVyEYGH.cjs");
 const require_types = require("./types-KjA8tY4Y.cjs");
 const require_vecOps = require("./vecOps-CCnJt-yH.cjs");
 const require_planeOps = require("./planeOps-VlFxtvzY.cjs");
-const require_faceFns = require("./faceFns-UozswcwP.cjs");
-const require_curveFns = require("./curveFns-BBLaLG1U.cjs");
+const require_faceFns = require("./faceFns-C4xNv2zn.cjs");
+const require_curveFns = require("./curveFns-BZZYHVow.cjs");
 const require_arrayAccess = require("./arrayAccess-e4H9cBfh.cjs");
-const require_surfaceBuilders = require("./surfaceBuilders-0x7j0ibk.cjs");
-const require_blueprintSketcher = require("./blueprintSketcher-Bd5ZS9p6.cjs");
-const require_helpers = require("./helpers-DuTAcGVX.cjs");
-const require_blueprint = require("./blueprint-BSfG0Uik.cjs");
-const require_cornerFinder = require("./cornerFinder-CPwSLgpM.cjs");
-const require_boolean2D = require("./boolean2D-Cr6oLsbf.cjs");
-const require_textBlueprints = require("./textBlueprints-BPbIpA4-.cjs");
-const require_cameraFns = require("./cameraFns-j2I9G3L_.cjs");
+const require_surfaceBuilders = require("./surfaceBuilders-BXNZydNl.cjs");
+const require_blueprintSketcher = require("./blueprintSketcher-4e0yYtCY.cjs");
+const require_helpers = require("./helpers-CHYzwQMk.cjs");
+const require_blueprint = require("./blueprint-CpJLcUJV.cjs");
+const require_cornerFinder = require("./cornerFinder-zEgIFMnk.cjs");
+const require_boolean2D = require("./boolean2D-7heWA1co.cjs");
+const require_textBlueprints = require("./textBlueprints-t8MdWfki.cjs");
+const require_cameraFns = require("./cameraFns-CGwrxgqB.cjs");
 //#region src/2d/lib/stitching.ts
 /**
 * Group a flat list of curves into connected chains by matching endpoints.
@@ -116,7 +116,8 @@ var Sketcher = class extends require_blueprintSketcher.BaseSketcher2d {
 			var _usingCtx$4 = require_shapeTypes._usingCtx();
 			if (!this.pendingCurves.length) require_bug.bug("Sketcher.buildWire", "No lines to convert into a wire");
 			const scope = _usingCtx$4.u(new require_shapeTypes.DisposalScope());
-			return require_errors.unwrap(require_surfaceBuilders.assembleWire(require_blueprint.curvesAsEdgesOnPlane(this.pendingCurves, this.plane).map((e) => scope.register(e))));
+			const edges = require_blueprint.curvesAsEdgesOnPlane(this.pendingCurves, this.plane).map((e) => scope.register(e));
+			return require_errors.unwrap(require_surfaceBuilders.assembleWire(edges));
 		} catch (_) {
 			_usingCtx$4.e = _;
 		} finally {
@@ -145,9 +146,16 @@ var Sketcher = class extends require_blueprintSketcher.BaseSketcher2d {
 		if (require_helpers.samePoint(this.pointer, this.firstPoint)) require_bug.bug("Sketcher.closeWithMirror", "Cannot close with a mirror when the sketch is already closed");
 		const wire = this.buildWire();
 		const pointer3d = require_planeOps.planeToWorld(this.plane, this.pointer);
-		const normal = require_vecOps.vecCross(require_vecOps.vecNormalize(require_vecOps.vecSub(pointer3d, require_planeOps.planeToWorld(this.plane, this.firstPoint))), this.plane.zDir);
+		const firstPoint3d = require_planeOps.planeToWorld(this.plane, this.firstPoint);
+		const diff = require_vecOps.vecSub(pointer3d, firstPoint3d);
+		const startToEndVector = require_vecOps.vecNormalize(diff);
+		const normal = require_vecOps.vecCross(startToEndVector, this.plane.zDir);
 		const clonedWrapped = require_errors.unwrap(require_faceFns.downcast(wire.wrapped));
-		return new require_textBlueprints.Sketch(require_errors.unwrap(require_surfaceBuilders.assembleWire([wire, require_shapeTypes.createWire(require_errors.unwrap(require_faceFns.downcast(require_shapeTypes.getKernel().mirror(clonedWrapped, require_types.toVec3(pointer3d), require_types.toVec3(normal)))))])), {
+		const mirroredRaw = require_shapeTypes.getKernel().mirror(clonedWrapped, require_types.toVec3(pointer3d), require_types.toVec3(normal));
+		const mirroredWrapped = require_errors.unwrap(require_faceFns.downcast(mirroredRaw));
+		const mirroredWire = require_shapeTypes.createWire(mirroredWrapped);
+		const combinedWire = require_errors.unwrap(require_surfaceBuilders.assembleWire([wire, mirroredWire]));
+		return new require_textBlueprints.Sketch(combinedWire, {
 			defaultOrigin: this.plane.origin,
 			defaultDirection: this.plane.zDir
 		});
@@ -205,9 +213,10 @@ var FaceSketcher = class extends require_blueprintSketcher.BaseSketcher2d {
 	buildWire() {
 		const kernel = require_shapeTypes.getKernel();
 		const geomSurf = this._adaptSurface();
-		const wire = require_errors.unwrap(require_surfaceBuilders.assembleWire(this.pendingCurves.map((curve) => {
+		const edges = this.pendingCurves.map((curve) => {
 			return require_shapeTypes.createEdge(kernel.buildEdgeOnSurface(curve.wrapped, geomSurf));
-		})));
+		});
+		const wire = require_errors.unwrap(require_surfaceBuilders.assembleWire(edges));
 		kernel.buildCurves3d(wire.wrapped);
 		return wire;
 	}
@@ -221,7 +230,8 @@ var FaceSketcher = class extends require_blueprintSketcher.BaseSketcher2d {
 			if (require_curveFns.curveIsClosed(wire)) {
 				const face = scope.register(sketch.clone().face());
 				const origin = require_faceFns.pointOnSurface(face, .5, .5);
-				const direction = require_vecOps.vecScale(require_faceFns.normalAt(face), -1);
+				const normal = require_faceFns.normalAt(face);
+				const direction = require_vecOps.vecScale(normal, -1);
 				sketch.defaultOrigin = [
 					origin[0],
 					origin[1],
@@ -302,7 +312,9 @@ var sketchCircle = (radius, planeConfig = {}) => {
 	try {
 		var _usingCtx$2 = require_shapeTypes._usingCtx();
 		const plane = planeConfig.plane && typeof planeConfig.plane !== "string" ? { ...planeConfig.plane } : require_errors.unwrap(require_planeOps.resolvePlane(planeConfig.plane ?? "XY", planeConfig.origin));
-		return new require_textBlueprints.Sketch(require_errors.unwrap(require_surfaceBuilders.assembleWire([_usingCtx$2.u(new require_shapeTypes.DisposalScope()).register(require_surfaceBuilders.makeCircle(radius, plane.origin, plane.zDir))])), {
+		const scope = _usingCtx$2.u(new require_shapeTypes.DisposalScope());
+		const wire = require_errors.unwrap(require_surfaceBuilders.assembleWire([scope.register(require_surfaceBuilders.makeCircle(radius, plane.origin, plane.zDir))]));
+		return new require_textBlueprints.Sketch(wire, {
 			defaultOrigin: [...plane.origin],
 			defaultDirection: [...plane.zDir]
 		});
@@ -334,7 +346,9 @@ var sketchEllipse = (xRadius = 1, yRadius = 2, planeConfig = {}) => {
 			majR = yRadius;
 			minR = xRadius;
 		}
-		return new require_textBlueprints.Sketch(require_errors.unwrap(require_surfaceBuilders.assembleWire([_usingCtx3.u(new require_shapeTypes.DisposalScope()).register(require_errors.unwrap(require_surfaceBuilders.makeEllipse(majR, minR, plane.origin, plane.zDir, xDir)))])), {
+		const scope = _usingCtx3.u(new require_shapeTypes.DisposalScope());
+		const wire = require_errors.unwrap(require_surfaceBuilders.assembleWire([scope.register(require_errors.unwrap(require_surfaceBuilders.makeEllipse(majR, minR, plane.origin, plane.zDir, xDir)))]));
+		return new require_textBlueprints.Sketch(wire, {
 			defaultOrigin: [...plane.origin],
 			defaultDirection: [...plane.zDir]
 		});
@@ -440,7 +454,8 @@ var polysideInnerRadius = (outerRadius, sidesCount, sagitta = 0) => {
 var sketchFaceOffset = (face, offset) => {
 	const defaultOrigin = [...require_faceFns.faceCenter(face)];
 	const defaultDirection = [...require_faceFns.normalAt(face)];
-	return new require_textBlueprints.Sketch(require_errors.unwrap(require_curveFns.offsetWire2D(require_faceFns.outerWire(face), offset)), {
+	const wire = require_errors.unwrap(require_curveFns.offsetWire2D(require_faceFns.outerWire(face), offset));
+	return new require_textBlueprints.Sketch(wire, {
 		defaultOrigin,
 		defaultDirection
 	});
@@ -468,7 +483,8 @@ var sketchParametricFunction = (func, planeConfig = {}, { pointsCount = 400, sta
 			const point = func(start + t * stepSize);
 			return require_planeOps.planeToWorld(plane, point);
 		});
-		return new require_textBlueprints.Sketch(require_errors.unwrap(require_surfaceBuilders.assembleWire([scope.register(require_errors.unwrap(require_surfaceBuilders.makeBSplineApproximation(points, approximationConfig)))])), {
+		const wire = require_errors.unwrap(require_surfaceBuilders.assembleWire([scope.register(require_errors.unwrap(require_surfaceBuilders.makeBSplineApproximation(points, approximationConfig)))]));
+		return new require_textBlueprints.Sketch(wire, {
 			defaultOrigin: [...plane.origin],
 			defaultDirection: [...plane.zDir]
 		});
@@ -500,7 +516,9 @@ var sketchHelix = (pitch, height, radius, center = [
 	0,
 	1
 ], lefthand = false) => {
-	return new require_textBlueprints.Sketch(require_errors.unwrap(require_surfaceBuilders.assembleWire([require_surfaceBuilders.makeHelix(pitch, height, radius, require_types.toVec3(center), require_types.toVec3(dir), lefthand)])));
+	const centerVec3 = require_types.toVec3(center);
+	const dirVec3 = require_types.toVec3(dir);
+	return new require_textBlueprints.Sketch(require_errors.unwrap(require_surfaceBuilders.assembleWire([require_surfaceBuilders.makeHelix(pitch, height, radius, centerVec3, dirVec3, lefthand)])));
 };
 //#endregion
 //#region src/sketching/shortcuts.ts
@@ -552,7 +570,8 @@ function joinMiter(appendCurve, previousLastPoint, firstPoint, previousCurve, cu
 		appendCurve(bevelJoiner);
 		return;
 	}
-	const miterDist = require_helpers.squareDistance2d([(previousLastPoint[0] + firstPoint[0]) / 2, (previousLastPoint[1] + firstPoint[1]) / 2], offsetIntersectionPoint);
+	const midpoint = [(previousLastPoint[0] + firstPoint[0]) / 2, (previousLastPoint[1] + firstPoint[1]) / 2];
+	const miterDist = require_helpers.squareDistance2d(midpoint, offsetIntersectionPoint);
 	const endpointDist = require_helpers.squareDistance2d(previousLastPoint, firstPoint);
 	if (endpointDist < 1e-18 || miterDist > 16 * endpointDist) {
 		const bevelJoiner = require_blueprint.make2dSegmentCurve(previousLastPoint, firstPoint);
@@ -837,7 +856,10 @@ function modifyCorners(makeCorner, blueprint, radius, finder) {
 function modifyCorner2D(makeCorner, shape, radius, finder) {
 	if (shape instanceof require_blueprint.Blueprint) return modifyCorners(makeCorner, shape, radius, finder);
 	if (shape instanceof require_blueprintSketcher.CompoundBlueprint) return new require_blueprintSketcher.CompoundBlueprint(shape.blueprints.map((b) => modifyCorners(makeCorner, b, radius, finder)));
-	if (shape instanceof require_blueprintSketcher.Blueprints) return new require_blueprintSketcher.Blueprints(shape.blueprints.map((b) => modifyCorner2D(makeCorner, b, radius, finder)).filter((b) => b !== null));
+	if (shape instanceof require_blueprintSketcher.Blueprints) {
+		const bps = shape.blueprints.map((b) => modifyCorner2D(makeCorner, b, radius, finder)).filter((b) => b !== null);
+		return new require_blueprintSketcher.Blueprints(bps);
+	}
 	return null;
 }
 /**
@@ -1078,10 +1100,16 @@ var Drawing = class Drawing {
 */
 function deserializeDrawing(data) {
 	function deserializeHelper(json) {
-		if (json["type"] === "CompoundBlueprint") return new require_blueprintSketcher.CompoundBlueprint(json["blueprints"].map(deserializeHelper));
-		else if (json["type"] === "Blueprints") return new require_blueprintSketcher.Blueprints(json["blueprints"].map(deserializeHelper));
-		else if (json["type"] === "Blueprint") return new require_blueprint.Blueprint(json["curves"].map((c) => require_blueprint.deserializeCurve2D(c)));
-		else require_bug.bug("Drawing.deserialize", "Unknown shape type for deserialization");
+		if (json["type"] === "CompoundBlueprint") {
+			const blueprints = json["blueprints"].map(deserializeHelper);
+			return new require_blueprintSketcher.CompoundBlueprint(blueprints);
+		} else if (json["type"] === "Blueprints") {
+			const blueprints = json["blueprints"].map(deserializeHelper);
+			return new require_blueprintSketcher.Blueprints(blueprints);
+		} else if (json["type"] === "Blueprint") {
+			const curves = json["curves"].map((c) => require_blueprint.deserializeCurve2D(c));
+			return new require_blueprint.Blueprint(curves);
+		} else require_bug.bug("Drawing.deserialize", "Unknown shape type for deserialization");
 	}
 	return new Drawing(deserializeHelper(JSON.parse(data)));
 }
@@ -1299,7 +1327,8 @@ function drawFaceOutline(face) {
 		var _usingCtx3 = require_shapeTypes._usingCtx();
 		const scope = _usingCtx3.u(new require_shapeTypes.DisposalScope());
 		const clonedFace = scope.register(require_shapeTypes.createFace(require_errors.unwrap(require_faceFns.copyShape(face.wrapped))));
-		const stitchedCurves = stitchCurves(require_topologyQueryFns.getEdges(scope.register(require_faceFns.outerWire(clonedFace))).map((e) => require_blueprint.edgeToCurve(e, face))).map((s) => new require_blueprint.Blueprint(s));
+		const faceOuterWire = scope.register(require_faceFns.outerWire(clonedFace));
+		const stitchedCurves = stitchCurves(require_topologyQueryFns.getEdges(faceOuterWire).map((e) => require_blueprint.edgeToCurve(e, face))).map((s) => new require_blueprint.Blueprint(s));
 		if (stitchedCurves.length === 0) return new Drawing();
 		if (stitchedCurves.length === 1) return new Drawing(stitchedCurves[0]);
 		return new Drawing(new require_blueprintSketcher.Blueprints(stitchedCurves));

package/dist/{drawFns-BrRbAeYB.js → drawFns-BjT3RaeQ.js}

@@ -1,22 +1,22 @@
-import { K as getKernel, M as DisposalScope, W as _usingCtx, c as createEdge, l as createFace, p as createWire } from "./shapeTypes-bHlssytH.js";
+import { K as getKernel, M as DisposalScope, W as _usingCtx, c as createEdge, l as createFace, p as createWire } from "./shapeTypes-BHRboc_x.js";
 import { i as wasmIndex, n as bug } from "./bug-BdOHwn_e.js";
 import { P as unwrap, s as safeIndex } from "./errors-MHLiNE-C.js";
-import { s as getEdges } from "./topologyQueryFns-DVhWxBwT.js";
+import { s as getEdges } from "./topologyQueryFns-QvPyCF-7.js";
 import { t as DEG2RAD } from "./constants-ITRzCnCp.js";
 import { r as toVec3 } from "./types-D24Y27N0.js";
 import { d as vecNormalize, g as vecSub, h as vecScale, m as vecRotate, r as vecCross } from "./vecOps-SKPRvPH-.js";
 import { a as planeToWorld, o as resolvePlane } from "./planeOps-CQahLrCx.js";
-import { d as pointOnSurface, l as normalAt, m as uvBounds, r as faceCenter, u as outerWire, v as copyShape, y as downcast } from "./faceFns-Ce7Fq6j5.js";
-import { h as offsetWire2D, i as curveIsClosed, l as curveStartPoint } from "./curveFns-BoHbhtqX.js";
+import { d as pointOnSurface, l as normalAt, m as uvBounds, r as faceCenter, u as outerWire, v as copyShape, y as downcast } from "./faceFns-fvp_zfuI.js";
+import { h as offsetWire2D, i as curveIsClosed, l as curveStartPoint } from "./curveFns-RczIU30U.js";
 import { n as getAtOrThrow, r as lastOrThrow, t as firstOrThrow } from "./arrayAccess-DrUGPADn.js";
-import { c as makeBSplineApproximation, d as makeCircle, f as makeEllipse, m as makeHelix, r as makeFace, s as assembleWire } from "./surfaceBuilders-B7UnwkQz.js";
-import { a as Blueprints, c as make2dOffset, i as CompoundBlueprint, l as intersectCurves, n as BaseSketcher2d, o as chamferCurves, s as filletCurves, u as Flatbush } from "./blueprintSketcher-BTGRoQ_G.js";
-import { _ as samePoint$1, b as subtract2d, c as add2d, s as PRECISION_OFFSET, y as squareDistance2d } from "./helpers-CZsK8STz.js";
-import { _ as Curve2D, a as edgeToCurve, b as BoundingBox2d, c as make2dCircle, d as make2dInerpolatedBSplineCurve, f as make2dSegmentCurve, g as approximateAsSvgCompatibleCurve, i as curvesAsEdgesOnPlane, l as make2dEllipse, o as make2dArcFromCenter, t as Blueprint, v as deserializeCurve2D } from "./blueprint-BGWbpQ-w.js";
-import { t as cornerFinder } from "./cornerFinder-CaXBdZz9.js";
-import { c as roundedRectangleBlueprint, n as fuse2D, r as intersect2D, s as polysidesBlueprint, t as cut2D } from "./boolean2D-zZ9-qR5a.js";
-import { _ as wrapSketchDataArray, a as Sketch, g as wrapSketchData, i as Sketches, t as textBlueprints } from "./textBlueprints-DE3M-E9o.js";
-import { i as projectEdges, t as cameraFromPlane } from "./cameraFns-CGMawqfi.js";
+import { c as makeBSplineApproximation, d as makeCircle, f as makeEllipse, m as makeHelix, r as makeFace, s as assembleWire } from "./surfaceBuilders-C8k0K7DR.js";
+import { a as Blueprints, c as make2dOffset, i as CompoundBlueprint, l as intersectCurves, n as BaseSketcher2d, o as chamferCurves, s as filletCurves, u as Flatbush } from "./blueprintSketcher-BjBjj2cK.js";
+import { _ as samePoint$1, b as subtract2d, c as add2d, s as PRECISION_OFFSET, y as squareDistance2d } from "./helpers-CyLQ07aD.js";
+import { _ as Curve2D, a as edgeToCurve, b as BoundingBox2d, c as make2dCircle, d as make2dInerpolatedBSplineCurve, f as make2dSegmentCurve, g as approximateAsSvgCompatibleCurve, i as curvesAsEdgesOnPlane, l as make2dEllipse, o as make2dArcFromCenter, t as Blueprint, v as deserializeCurve2D } from "./blueprint-CaY00-X2.js";
+import { t as cornerFinder } from "./cornerFinder-C4s6pVZ-.js";
+import { c as roundedRectangleBlueprint, n as fuse2D, r as intersect2D, s as polysidesBlueprint, t as cut2D } from "./boolean2D-Bk-VrRyQ.js";
+import { _ as wrapSketchDataArray, a as Sketch, g as wrapSketchData, i as Sketches, t as textBlueprints } from "./textBlueprints-BAyLXffK.js";
+import { i as projectEdges, t as cameraFromPlane } from "./cameraFns-DKEilV2v.js";
 //#region src/2d/lib/stitching.ts
 /**
 * Group a flat list of curves into connected chains by matching endpoints.
@@ -116,7 +116,8 @@ var Sketcher = class extends BaseSketcher2d {
 			var _usingCtx$4 = _usingCtx();
 			if (!this.pendingCurves.length) bug("Sketcher.buildWire", "No lines to convert into a wire");
 			const scope = _usingCtx$4.u(new DisposalScope());
-			return unwrap(assembleWire(curvesAsEdgesOnPlane(this.pendingCurves, this.plane).map((e) => scope.register(e))));
+			const edges = curvesAsEdgesOnPlane(this.pendingCurves, this.plane).map((e) => scope.register(e));
+			return unwrap(assembleWire(edges));
 		} catch (_) {
 			_usingCtx$4.e = _;
 		} finally {
@@ -145,9 +146,16 @@ var Sketcher = class extends BaseSketcher2d {
 		if (samePoint$1(this.pointer, this.firstPoint)) bug("Sketcher.closeWithMirror", "Cannot close with a mirror when the sketch is already closed");
 		const wire = this.buildWire();
 		const pointer3d = planeToWorld(this.plane, this.pointer);
-		const normal = vecCross(vecNormalize(vecSub(pointer3d, planeToWorld(this.plane, this.firstPoint))), this.plane.zDir);
+		const firstPoint3d = planeToWorld(this.plane, this.firstPoint);
+		const diff = vecSub(pointer3d, firstPoint3d);
+		const startToEndVector = vecNormalize(diff);
+		const normal = vecCross(startToEndVector, this.plane.zDir);
 		const clonedWrapped = unwrap(downcast(wire.wrapped));
-		return new Sketch(unwrap(assembleWire([wire, createWire(unwrap(downcast(getKernel().mirror(clonedWrapped, toVec3(pointer3d), toVec3(normal)))))])), {
+		const mirroredRaw = getKernel().mirror(clonedWrapped, toVec3(pointer3d), toVec3(normal));
+		const mirroredWrapped = unwrap(downcast(mirroredRaw));
+		const mirroredWire = createWire(mirroredWrapped);
+		const combinedWire = unwrap(assembleWire([wire, mirroredWire]));
+		return new Sketch(combinedWire, {
 			defaultOrigin: this.plane.origin,
 			defaultDirection: this.plane.zDir
 		});
@@ -205,9 +213,10 @@ var FaceSketcher = class extends BaseSketcher2d {
 	buildWire() {
 		const kernel = getKernel();
 		const geomSurf = this._adaptSurface();
-		const wire = unwrap(assembleWire(this.pendingCurves.map((curve) => {
+		const edges = this.pendingCurves.map((curve) => {
 			return createEdge(kernel.buildEdgeOnSurface(curve.wrapped, geomSurf));
-		})));
+		});
+		const wire = unwrap(assembleWire(edges));
 		kernel.buildCurves3d(wire.wrapped);
 		return wire;
 	}
@@ -221,7 +230,8 @@ var FaceSketcher = class extends BaseSketcher2d {
 			if (curveIsClosed(wire)) {
 				const face = scope.register(sketch.clone().face());
 				const origin = pointOnSurface(face, .5, .5);
-				const direction = vecScale(normalAt(face), -1);
+				const normal = normalAt(face);
+				const direction = vecScale(normal, -1);
 				sketch.defaultOrigin = [
 					origin[0],
 					origin[1],
@@ -302,7 +312,9 @@ var sketchCircle = (radius, planeConfig = {}) => {
 	try {
 		var _usingCtx$2 = _usingCtx();
 		const plane = planeConfig.plane && typeof planeConfig.plane !== "string" ? { ...planeConfig.plane } : unwrap(resolvePlane(planeConfig.plane ?? "XY", planeConfig.origin));
-		return new Sketch(unwrap(assembleWire([_usingCtx$2.u(new DisposalScope()).register(makeCircle(radius, plane.origin, plane.zDir))])), {
+		const scope = _usingCtx$2.u(new DisposalScope());
+		const wire = unwrap(assembleWire([scope.register(makeCircle(radius, plane.origin, plane.zDir))]));
+		return new Sketch(wire, {
 			defaultOrigin: [...plane.origin],
 			defaultDirection: [...plane.zDir]
 		});
@@ -334,7 +346,9 @@ var sketchEllipse = (xRadius = 1, yRadius = 2, planeConfig = {}) => {
 			majR = yRadius;
 			minR = xRadius;
 		}
-		return new Sketch(unwrap(assembleWire([_usingCtx3.u(new DisposalScope()).register(unwrap(makeEllipse(majR, minR, plane.origin, plane.zDir, xDir)))])), {
+		const scope = _usingCtx3.u(new DisposalScope());
+		const wire = unwrap(assembleWire([scope.register(unwrap(makeEllipse(majR, minR, plane.origin, plane.zDir, xDir)))]));
+		return new Sketch(wire, {
 			defaultOrigin: [...plane.origin],
 			defaultDirection: [...plane.zDir]
 		});
@@ -440,7 +454,8 @@ var polysideInnerRadius = (outerRadius, sidesCount, sagitta = 0) => {
 var sketchFaceOffset = (face, offset) => {
 	const defaultOrigin = [...faceCenter(face)];
 	const defaultDirection = [...normalAt(face)];
-	return new Sketch(unwrap(offsetWire2D(outerWire(face), offset)), {
+	const wire = unwrap(offsetWire2D(outerWire(face), offset));
+	return new Sketch(wire, {
 		defaultOrigin,
 		defaultDirection
 	});
@@ -468,7 +483,8 @@ var sketchParametricFunction = (func, planeConfig = {}, { pointsCount = 400, sta
 			const point = func(start + t * stepSize);
 			return planeToWorld(plane, point);
 		});
-		return new Sketch(unwrap(assembleWire([scope.register(unwrap(makeBSplineApproximation(points, approximationConfig)))])), {
+		const wire = unwrap(assembleWire([scope.register(unwrap(makeBSplineApproximation(points, approximationConfig)))]));
+		return new Sketch(wire, {
 			defaultOrigin: [...plane.origin],
 			defaultDirection: [...plane.zDir]
 		});
@@ -500,7 +516,9 @@ var sketchHelix = (pitch, height, radius, center = [
 	0,
 	1
 ], lefthand = false) => {
-	return new Sketch(unwrap(assembleWire([makeHelix(pitch, height, radius, toVec3(center), toVec3(dir), lefthand)])));
+	const centerVec3 = toVec3(center);
+	const dirVec3 = toVec3(dir);
+	return new Sketch(unwrap(assembleWire([makeHelix(pitch, height, radius, centerVec3, dirVec3, lefthand)])));
 };
 //#endregion
 //#region src/sketching/shortcuts.ts
@@ -552,7 +570,8 @@ function joinMiter(appendCurve, previousLastPoint, firstPoint, previousCurve, cu
 		appendCurve(bevelJoiner);
 		return;
 	}
-	const miterDist = squareDistance2d([(previousLastPoint[0] + firstPoint[0]) / 2, (previousLastPoint[1] + firstPoint[1]) / 2], offsetIntersectionPoint);
+	const midpoint = [(previousLastPoint[0] + firstPoint[0]) / 2, (previousLastPoint[1] + firstPoint[1]) / 2];
+	const miterDist = squareDistance2d(midpoint, offsetIntersectionPoint);
 	const endpointDist = squareDistance2d(previousLastPoint, firstPoint);
 	if (endpointDist < 1e-18 || miterDist > 16 * endpointDist) {
 		const bevelJoiner = make2dSegmentCurve(previousLastPoint, firstPoint);
@@ -837,7 +856,10 @@ function modifyCorners(makeCorner, blueprint, radius, finder) {
 function modifyCorner2D(makeCorner, shape, radius, finder) {
 	if (shape instanceof Blueprint) return modifyCorners(makeCorner, shape, radius, finder);
 	if (shape instanceof CompoundBlueprint) return new CompoundBlueprint(shape.blueprints.map((b) => modifyCorners(makeCorner, b, radius, finder)));
-	if (shape instanceof Blueprints) return new Blueprints(shape.blueprints.map((b) => modifyCorner2D(makeCorner, b, radius, finder)).filter((b) => b !== null));
+	if (shape instanceof Blueprints) {
+		const bps = shape.blueprints.map((b) => modifyCorner2D(makeCorner, b, radius, finder)).filter((b) => b !== null);
+		return new Blueprints(bps);
+	}
 	return null;
 }
 /**
@@ -1078,10 +1100,16 @@ var Drawing = class Drawing {
 */
 function deserializeDrawing(data) {
 	function deserializeHelper(json) {
-		if (json["type"] === "CompoundBlueprint") return new CompoundBlueprint(json["blueprints"].map(deserializeHelper));
-		else if (json["type"] === "Blueprints") return new Blueprints(json["blueprints"].map(deserializeHelper));
-		else if (json["type"] === "Blueprint") return new Blueprint(json["curves"].map((c) => deserializeCurve2D(c)));
-		else bug("Drawing.deserialize", "Unknown shape type for deserialization");
+		if (json["type"] === "CompoundBlueprint") {
+			const blueprints = json["blueprints"].map(deserializeHelper);
+			return new CompoundBlueprint(blueprints);
+		} else if (json["type"] === "Blueprints") {
+			const blueprints = json["blueprints"].map(deserializeHelper);
+			return new Blueprints(blueprints);
+		} else if (json["type"] === "Blueprint") {
+			const curves = json["curves"].map((c) => deserializeCurve2D(c));
+			return new Blueprint(curves);
+		} else bug("Drawing.deserialize", "Unknown shape type for deserialization");
 	}
 	return new Drawing(deserializeHelper(JSON.parse(data)));
 }
@@ -1299,7 +1327,8 @@ function drawFaceOutline(face) {
 		var _usingCtx3 = _usingCtx();
 		const scope = _usingCtx3.u(new DisposalScope());
 		const clonedFace = scope.register(createFace(unwrap(copyShape(face.wrapped))));
-		const stitchedCurves = stitchCurves(getEdges(scope.register(outerWire(clonedFace))).map((e) => edgeToCurve(e, face))).map((s) => new Blueprint(s));
+		const faceOuterWire = scope.register(outerWire(clonedFace));
+		const stitchedCurves = stitchCurves(getEdges(faceOuterWire).map((e) => edgeToCurve(e, face))).map((s) => new Blueprint(s));
 		if (stitchedCurves.length === 0) return new Drawing();
 		if (stitchedCurves.length === 1) return new Drawing(stitchedCurves[0]);
 		return new Drawing(new Blueprints(stitchedCurves));

package/dist/{faceFns-UozswcwP.cjs → faceFns-C4xNv2zn.cjs}

@@ -1,6 +1,6 @@
-const require_shapeTypes = require("./shapeTypes-DZKuRt24.cjs");
+const require_shapeTypes = require("./shapeTypes-D5Y41q7x.cjs");
 const require_errors = require("./errors-RHkKO5bZ.cjs");
-const require_topologyQueryFns = require("./topologyQueryFns-DZUpJz2p.cjs");
+const require_topologyQueryFns = require("./topologyQueryFns-gah07J7-.cjs");
 const require_types = require("./types-KjA8tY4Y.cjs");
 //#region src/topology/cast.ts
 var TOPO_ENUM = {
@@ -180,10 +180,11 @@ function projectPointOnFace(face, point) {
 		const dx = v[0] - projectedPoint[0];
 		const dy = v[1] - projectedPoint[1];
 		const dz = v[2] - projectedPoint[2];
+		const distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
 		return require_errors.ok({
 			uv: uvResult,
 			point: projectedPoint,
-			distance: Math.sqrt(dx * dx + dy * dy + dz * dz)
+			distance
 		});
 	} catch (e) {
 		return require_errors.err(require_errors.typeCastError("PROJECTION_FAILED", `Point projection failed: ${e instanceof Error ? e.message : String(e)}`));

package/dist/{faceFns-Ce7Fq6j5.js → faceFns-fvp_zfuI.js}

@@ -1,6 +1,6 @@
-import { K as getKernel, i as castShape } from "./shapeTypes-bHlssytH.js";
+import { K as getKernel, i as castShape } from "./shapeTypes-BHRboc_x.js";
 import { E as ok, P as unwrap, g as err, l as typeCastError } from "./errors-MHLiNE-C.js";
-import { a as getCachedSurfaceType } from "./topologyQueryFns-DVhWxBwT.js";
+import { a as getCachedSurfaceType } from "./topologyQueryFns-QvPyCF-7.js";
 import { r as toVec3 } from "./types-D24Y27N0.js";
 //#region src/topology/cast.ts
 var TOPO_ENUM = {
@@ -125,7 +125,8 @@ var KERNEL_TO_PUBLIC_SURFACE_TYPE = {
 * @returns Ok with the surface type, or Err for unrecognized kernel surface types.
 */
 function getSurfaceType(face) {
-	return ok(KERNEL_TO_PUBLIC_SURFACE_TYPE[getCachedSurfaceType(face)]);
+	const kernelType = getCachedSurfaceType(face);
+	return ok(KERNEL_TO_PUBLIC_SURFACE_TYPE[kernelType]);
 }
 /** Get the surface type of a face (unwrapped convenience). */
 function faceGeomType(face) {
@@ -179,10 +180,11 @@ function projectPointOnFace(face, point) {
 		const dx = v[0] - projectedPoint[0];
 		const dy = v[1] - projectedPoint[1];
 		const dz = v[2] - projectedPoint[2];
+		const distance = Math.sqrt(dx * dx + dy * dy + dz * dz);
 		return ok({
 			uv: uvResult,
 			point: projectedPoint,
-			distance: Math.sqrt(dx * dx + dy * dy + dz * dz)
+			distance
 		});
 	} catch (e) {
 		return err(typeCastError("PROJECTION_FAILED", `Point projection failed: ${e instanceof Error ? e.message : String(e)}`));