brepjs 20.12.5 → 20.12.7

package/dist/2d/blueprints/booleanHelpers.d.ts

@@ -6,11 +6,6 @@ export declare const samePoint: (x: Point2D, y: Point2D) => boolean;
  * nearly-equal points.
  */
 export declare function hashPoint(p: Point2D): string;
-/**
- * Hash a segment by both orientations for bidirectional lookup.
- * The smaller hash comes first so that (A,B) and (B,A) produce the same key.
- */
-export declare function hashSegment(first: Point2D, last: Point2D): string;
 export type Segment = Curve2D[];
 export type IntersectionSegment = [Segment, Segment | 'same'];
 export declare function startOfSegment(s: Segment): Point2D;

package/dist/2d/blueprints/intersectionSegments.d.ts

@@ -1,11 +1,12 @@
-import { Point2D } from '../lib/index.js';
+import { Curve2D } from '../lib/index.js';
 import { default as Blueprint } from './blueprint.js';
-import { IntersectionSegment } from './booleanHelpers.js';
+import { Segment, IntersectionSegment } from './booleanHelpers.js';
 /**
- * Check whether a segment's start/end points match one of the common segment
- * point pairs.
+ * Check whether a segment runs along one of the common segments, in either
+ * direction. Matching endpoints are not enough: two outlines that share an
+ * edge also join its endpoints with the rest of their boundaries.
  */
-export declare function isCommonSegmentMatch(commonSegmentsPoints: Point2D[][], segmentStart: Point2D, segmentEnd: Point2D): boolean;
+export declare function isCommonSegmentMatch(commonSegments: Curve2D[], segment: Segment): boolean;
 /**
  * Given two closed blueprints, find their intersection points, split each
  * blueprint's curves at those points, and pair up the resulting segments.

package/dist/2d/lib/offset.d.ts

@@ -10,7 +10,7 @@ import { Point2D } from './definitions.js';
  * instead of a `Curve2D`.
  *
  * @param curve - The source curve to offset.
- * @param offset - Signed offset distance (positive = left of curve direction).
+ * @param offset - Signed offset distance (positive = right of curve direction).
  *
  * @remarks Self-intersecting offset curves are replaced with a collapsed
  *   sentinel. This is a known simplification; a more robust trimming strategy

package/dist/2d.cjs

@@ -1,11 +1,11 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_shapeTypes = require("./shapeTypes-D938X2mg.cjs");
+const require_shapeTypes = require("./shapeTypes-MUEH4XuH.cjs");
 const require_errors = require("./errors-O_blYTWT.cjs");
-const require_topologyQueryFns = require("./topologyQueryFns-4WYqtSFF.cjs");
-const require_blueprintSketcher = require("./blueprintSketcher-CZyokLGJ.cjs");
-const require_blueprint = require("./blueprint-ERmwk6zG.cjs");
-const require_boolean2D = require("./boolean2D-CRuNKgXs.cjs");
-const require_blueprintFns = require("./blueprintFns-B_sxtIo7.cjs");
+const require_topologyQueryFns = require("./topologyQueryFns-C_fXO6xL.cjs");
+const require_blueprintSketcher = require("./blueprintSketcher-BG--DxWB.cjs");
+const require_blueprint = require("./blueprint-17RUHsoP.cjs");
+const require_boolean2D = require("./boolean2D-7SQ3B0pC.cjs");
+const require_blueprintFns = require("./blueprintFns-Dw5_4_Bk.cjs");
 // src/core/curve2dHandle.ts
 /**
 * Wrap a raw kernel 2D curve handle with brand + disposal tracking.

package/dist/2d.js

@@ -1,10 +1,10 @@
-import { F as createKernelHandle, J as getKernel2D, c as createEdge } from "./shapeTypes-PNVEv6ga.js";
+import { F as createKernelHandle, J as getKernel2D, c as createEdge } from "./shapeTypes-BNGu103j.js";
 import { E as ok, d as validationError, g as err, t as BrepErrorCode } from "./errors-BTccWbtE.js";
-import { E as kernelCallRaw } from "./topologyQueryFns-BZUY10TD.js";
-import { a as Blueprints, i as CompoundBlueprint, r as organiseBlueprints } from "./blueprintSketcher-CwTAtrkY.js";
-import { t as Blueprint, v as Curve2D, x as BoundingBox2d } from "./blueprint-Zmt5-07y.js";
-import { a as fuseBlueprints, c as roundedRectangleBlueprint, i as cutBlueprints, n as fuse2D, o as intersectBlueprints, r as intersect2D, s as polysidesBlueprint, t as cut2D } from "./boolean2D-yUpS8onH.js";
-import { S as reverseCurve, _ as curve2dIsOnCurve, a as isInside2D, b as curve2dSplitAt, c as scale2D, d as stretch2D, f as toSVGPathD, g as curve2dFirstPoint, h as curve2dDistanceFrom, i as getOrientation2D, l as sketchOnFace2D, m as curve2dBoundingBox, o as mirror2D, p as translate2D, r as getBounds2D, s as rotate2D, t as createBlueprint, u as sketchOnPlane2D, v as curve2dLastPoint, x as curve2dTangentAt, y as curve2dParameter } from "./blueprintFns-Dtm-XukP.js";
+import { E as kernelCallRaw } from "./topologyQueryFns-CltEv7Pi.js";
+import { a as Blueprints, i as CompoundBlueprint, r as organiseBlueprints } from "./blueprintSketcher-C1WCI6E0.js";
+import { t as Blueprint, v as Curve2D, x as BoundingBox2d } from "./blueprint-BS50D3J_.js";
+import { a as fuseBlueprints, c as roundedRectangleBlueprint, i as cutBlueprints, n as fuse2D, o as intersectBlueprints, r as intersect2D, s as polysidesBlueprint, t as cut2D } from "./boolean2D-CsdyfjFE.js";
+import { S as reverseCurve, _ as curve2dIsOnCurve, a as isInside2D, b as curve2dSplitAt, c as scale2D, d as stretch2D, f as toSVGPathD, g as curve2dFirstPoint, h as curve2dDistanceFrom, i as getOrientation2D, l as sketchOnFace2D, m as curve2dBoundingBox, o as mirror2D, p as translate2D, r as getBounds2D, s as rotate2D, t as createBlueprint, u as sketchOnPlane2D, v as curve2dLastPoint, x as curve2dTangentAt, y as curve2dParameter } from "./blueprintFns-zy5lo2IF.js";
 // src/core/curve2dHandle.ts
 /**
 * Wrap a raw kernel 2D curve handle with brand + disposal tracking.

package/dist/{adjacencyFns-B2Po1gPs.js → adjacencyFns-hMihivxC.js}

@@ -1,6 +1,6 @@
-import { E as GeometryCleanupError, K as getActiveKernelId, q as getKernel, r as castResultShapeWithKnownType, t as borrowShapeWithKnownType } from "./shapeTypes-PNVEv6ga.js";
-import { k as isUnsupportedKernelOperationError } from "./occtWasmAdapter-DlNmVNUn.js";
-import { c as getFaces, f as getVertices, l as getOrCreateCache, s as getEdges } from "./topologyQueryFns-BZUY10TD.js";
+import { E as GeometryCleanupError, K as getActiveKernelId, q as getKernel, r as castResultShapeWithKnownType, t as borrowShapeWithKnownType } from "./shapeTypes-BNGu103j.js";
+import { j as isUnsupportedKernelOperationError } from "./occtWasmAdapter-DA7oMgcQ.js";
+import { c as getFaces, f as getVertices, l as getOrCreateCache, s as getEdges } from "./topologyQueryFns-CltEv7Pi.js";
 import { n as HASH_CODE_MAX } from "./constants-iraOnb2p.js";
 // src/topology/adjacencyFns.ts
 /**

package/dist/{adjacencyFns-Cho9v3Q3.cjs → adjacencyFns-mMmTBUBY.cjs}

@@ -1,6 +1,6 @@
-const require_shapeTypes = require("./shapeTypes-D938X2mg.cjs");
-const require_occtWasmAdapter = require("./occtWasmAdapter-DeoeK2iJ.cjs");
-const require_topologyQueryFns = require("./topologyQueryFns-4WYqtSFF.cjs");
+const require_shapeTypes = require("./shapeTypes-MUEH4XuH.cjs");
+const require_occtWasmAdapter = require("./occtWasmAdapter-D3qerQTq.cjs");
+const require_topologyQueryFns = require("./topologyQueryFns-C_fXO6xL.cjs");
 const require_constants = require("./constants-oee0S_x6.cjs");
 // src/topology/adjacencyFns.ts
 /**

package/dist/{blueprint-ERmwk6zG.cjs → blueprint-17RUHsoP.cjs}

@@ -1,14 +1,14 @@
-const require_shapeTypes = require("./shapeTypes-D938X2mg.cjs");
+const require_shapeTypes = require("./shapeTypes-MUEH4XuH.cjs");
 const require_bug = require("./bug-CBcpIPuf.cjs");
 const require_errors = require("./errors-O_blYTWT.cjs");
 const require_constants = require("./constants-oee0S_x6.cjs");
 const require_types = require("./types-CjF9Rofr.cjs");
 const require_planeOps = require("./planeOps-DZfLToKZ.cjs");
-const require_faceFns = require("./faceFns-Cx7cwUMx.cjs");
-const require_curveFns = require("./curveFns-BKT4Sg8q.cjs");
+const require_faceFns = require("./faceFns-C-2ttg8X.cjs");
+const require_curveFns = require("./curveFns-BAM7QHrP.cjs");
 const require_arrayAccess = require("./arrayAccess-DpJYARwv.cjs");
-const require_surfaceBuilders = require("./surfaceBuilders-BKCiVf7T.cjs");
-const require_helpers = require("./helpers-C4f2MV-r.cjs");
+const require_surfaceBuilders = require("./surfaceBuilders-DOmDVuMs.cjs");
+const require_helpers = require("./helpers-BdGGaLhF.cjs");
 // src/2d/lib/definitions.ts
 /** Type guard that checks whether a value is a `Point2D`. */
 function isPoint2D(point) {
@@ -256,9 +256,8 @@ var Curve2D = class Curve2D {
 		const tmpPt = this._firstPoint;
 		this._firstPoint = this._lastPoint;
 		this._lastPoint = tmpPt;
-		const tmpParam = this._firstParameter;
-		this._firstParameter = this._lastParameter;
-		this._lastParameter = tmpParam;
+		this._firstParameter = null;
+		this._lastParameter = null;
 	}
 	distanceFromPoint(point) {
 		const proj = require_shapeTypes.getKernel().projectPointOnCurve2d(this.wrapped, point[0], point[1]);

package/dist/{blueprint-Zmt5-07y.js → blueprint-BS50D3J_.js}

@@ -1,14 +1,14 @@
-import { B as unregisterFromCleanup, J as getKernel2D, R as registerForCleanup, c as createEdge, p as createWire, q as getKernel } from "./shapeTypes-PNVEv6ga.js";
+import { B as unregisterFromCleanup, J as getKernel2D, R as registerForCleanup, c as createEdge, p as createWire, q as getKernel } from "./shapeTypes-BNGu103j.js";
 import { i as wasmIndex, n as bug } from "./bug-ClMTAJhe.js";
 import { E as ok, P as unwrap, d as validationError, g as err, n as computationError } from "./errors-BTccWbtE.js";
 import { r as RAD2DEG, t as DEG2RAD } from "./constants-iraOnb2p.js";
 import { r as toVec3 } from "./types-CKXsIm9-.js";
 import { r as makePlane } from "./planeOps-D3yDuMux.js";
-import { _ as cast, h as uvCoordinates, i as faceGeomType, m as uvBounds, r as faceCenter } from "./faceFns-lE2OvBfq.js";
-import { p as getOrientation } from "./curveFns-BGPSFUWB.js";
+import { _ as cast, h as uvCoordinates, i as faceGeomType, m as uvBounds, r as faceCenter } from "./faceFns-Q87HCJrp.js";
+import { p as getOrientation } from "./curveFns-CEI-rouh.js";
 import { n as getAtOrThrow, r as lastOrThrow, t as firstOrThrow } from "./arrayAccess-BpgouNir.js";
-import { r as makeFace } from "./surfaceBuilders-CrO_BBKM.js";
-import { l as add2d, m as normalize2d$1, p as distance2d, t as getSingleFace, v as samePoint, x as subtract2d, y as scalarMultiply2d } from "./helpers-CNgipe6l.js";
+import { r as makeFace } from "./surfaceBuilders-DI376ai0.js";
+import { l as add2d, m as normalize2d$1, p as distance2d, t as getSingleFace, v as samePoint, x as subtract2d, y as scalarMultiply2d } from "./helpers-DpGcM2qZ.js";
 // src/2d/lib/definitions.ts
 /** Type guard that checks whether a value is a `Point2D`. */
 function isPoint2D(point) {
@@ -256,9 +256,8 @@ var Curve2D = class Curve2D {
 		const tmpPt = this._firstPoint;
 		this._firstPoint = this._lastPoint;
 		this._lastPoint = tmpPt;
-		const tmpParam = this._firstParameter;
-		this._firstParameter = this._lastParameter;
-		this._lastParameter = tmpParam;
+		this._firstParameter = null;
+		this._lastParameter = null;
 	}
 	distanceFromPoint(point) {
 		const proj = getKernel().projectPointOnCurve2d(this.wrapped, point[0], point[1]);

package/dist/{blueprintFns-B_sxtIo7.cjs → blueprintFns-Dw5_4_Bk.cjs}

@@ -1,6 +1,6 @@
 const require_errors = require("./errors-O_blYTWT.cjs");
-const require_blueprintSketcher = require("./blueprintSketcher-CZyokLGJ.cjs");
-const require_blueprint = require("./blueprint-ERmwk6zG.cjs");
+const require_blueprintSketcher = require("./blueprintSketcher-BG--DxWB.cjs");
+const require_blueprint = require("./blueprint-17RUHsoP.cjs");
 // src/2d/lib/curve2dFns.ts
 /**
 * Return a reversed copy of the curve (non-mutating).

package/dist/{blueprintFns-Dtm-XukP.js → blueprintFns-zy5lo2IF.js}

@@ -1,6 +1,6 @@
 import { E as ok, d as validationError, g as err, t as BrepErrorCode } from "./errors-BTccWbtE.js";
-import { i as CompoundBlueprint } from "./blueprintSketcher-CwTAtrkY.js";
-import { t as Blueprint } from "./blueprint-Zmt5-07y.js";
+import { i as CompoundBlueprint } from "./blueprintSketcher-C1WCI6E0.js";
+import { t as Blueprint } from "./blueprint-BS50D3J_.js";
 // src/2d/lib/curve2dFns.ts
 /**
 * Return a reversed copy of the curve (non-mutating).

package/dist/{blueprintSketcher-CZyokLGJ.cjs → blueprintSketcher-BG--DxWB.cjs}

@@ -1,10 +1,10 @@
-const require_shapeTypes = require("./shapeTypes-D938X2mg.cjs");
+const require_shapeTypes = require("./shapeTypes-MUEH4XuH.cjs");
 const require_bug = require("./bug-CBcpIPuf.cjs");
 const require_errors = require("./errors-O_blYTWT.cjs");
 const require_constants = require("./constants-oee0S_x6.cjs");
 const require_arrayAccess = require("./arrayAccess-DpJYARwv.cjs");
-const require_helpers = require("./helpers-C4f2MV-r.cjs");
-const require_blueprint = require("./blueprint-ERmwk6zG.cjs");
+const require_helpers = require("./helpers-BdGGaLhF.cjs");
+const require_blueprint = require("./blueprint-17RUHsoP.cjs");
 // node_modules/flatqueue/index.js
 /**
 * @typedef {Float64ArrayConstructor | Float32ArrayConstructor |
@@ -609,7 +609,7 @@ var offsetEndPoints = (firstPoint, lastPoint, offset) => {
 * instead of a `Curve2D`.
 *
 * @param curve - The source curve to offset.
-* @param offset - Signed offset distance (positive = left of curve direction).
+* @param offset - Signed offset distance (positive = right of curve direction).
 *
 * @remarks Self-intersecting offset curves are replaced with a collapsed
 *   sentinel. This is a known simplification; a more robust trimming strategy
@@ -627,11 +627,12 @@ var make2dOffset = (curve, offset) => {
 	if (curveType === "CIRCLE") {
 		const circleData = kernel.getCurve2dCircleData(curve.wrapped);
 		if (!circleData) return require_blueprint.make2dSegmentCurve(curve.firstPoint, curve.lastPoint);
-		const { cx, cy, radius, isDirect } = circleData;
-		const orientedOffset = offset * (isDirect ? 1 : -1);
+		const { cx, cy, radius } = circleData;
+		const center = [cx, cy];
+		const counterClockwise = require_helpers.crossProduct2d(require_helpers.subtract2d(curve.firstPoint, center), curve.tangentAt(0)) > 0;
+		const orientedOffset = counterClockwise ? offset : -offset;
 		const newRadius = radius + orientedOffset;
 		if (newRadius < 1e-10) {
-			const center = [cx, cy];
 			const offsetViaCenter = (point) => {
 				const [x, y] = require_blueprint.normalize2d(require_helpers.subtract2d(point, center));
 				return require_helpers.add2d(point, [orientedOffset * x, orientedOffset * y]);
@@ -642,15 +643,22 @@ var make2dOffset = (curve, offset) => {
 				lastPoint: offsetViaCenter(curve.lastPoint)
 			};
 		}
-		const circleHandle = kernel.makeCircle2d(cx, cy, newRadius, isDirect);
-		const fullCircle = new require_blueprint.Curve2D(circleHandle);
-		let trimmedHandle;
+		const radial = (point) => require_helpers.add2d(center, require_helpers.scalarMultiply2d(require_helpers.subtract2d(point, center), newRadius / radius));
+		if (!require_helpers.samePoint(curve.firstPoint, curve.lastPoint)) {
+			const mid = curve.value((curve.firstParameter + curve.lastParameter) / 2);
+			return require_blueprint.make2dThreePointArc(radial(curve.firstPoint), radial(mid), radial(curve.lastPoint));
+		}
+		const fullCircle = new require_blueprint.Curve2D(kernel.makeCircle2d(cx, cy, newRadius, counterClockwise));
+		const start = radial(curve.firstPoint);
+		if (require_helpers.samePoint(fullCircle.firstPoint, start)) return fullCircle;
 		try {
-			trimmedHandle = kernel.trimCurve2d(fullCircle.wrapped, curve.firstParameter, curve.lastParameter);
+			const proj = kernel.projectPointOnCurve2d(fullCircle.wrapped, start[0], start[1]);
+			const from = proj ? proj.param : fullCircle.firstParameter;
+			const period = fullCircle.lastParameter - fullCircle.firstParameter;
+			return new require_blueprint.Curve2D(kernel.trimCurve2d(fullCircle.wrapped, from, from + period));
 		} finally {
 			fullCircle.delete();
 		}
-		return new require_blueprint.Curve2D(trimmedHandle);
 	}
 	if (curveType === "LINE") {
 		const { firstPoint, lastPoint } = offsetEndPoints(curve.firstPoint, curve.lastPoint, offset);
@@ -673,6 +681,16 @@ var make2dOffset = (curve, offset) => {
 	return approximation;
 };
 // src/2d/lib/customCorners.ts
+/**
+* The offset curves of a corner can cross more than once (a line and an arc
+* meeting at both ends of a semicircle); the fillet center is the crossing
+* nearest the corner, whatever order the intersector reports them in.
+*/
+function nearestTo(points, corner) {
+	let best;
+	for (const p of points) if (!best || require_helpers.squareDistance2d(p, corner) < require_helpers.squareDistance2d(best, corner)) best = p;
+	return best;
+}
 /** Unwrap an intersection, discarding the common-segment curves the caller does not use. */
 function intersectionPoints(first, second) {
 	const result = require_errors.unwrap(intersectCurves(first, second));
@@ -733,7 +751,7 @@ function removeCorner(firstCurve, secondCurve, radius) {
 		intersectionResult.value.commonSegments.forEach((c) => {
 			c.delete();
 		});
-		const potentialCenter = intersectionResult.value.intersections.at(-1);
+		const potentialCenter = nearestTo(intersectionResult.value.intersections, firstCurve.lastPoint);
 		if (!require_blueprint.isPoint2D(potentialCenter)) return null;
 		const center = potentialCenter;
 		const splitForFillet = (curve, offsetCurve) => {
@@ -831,7 +849,7 @@ function dogboneFilletCurves(firstCurve, secondCurve, radius) {
 		intersectionResult2.value.commonSegments.forEach((c) => {
 			c.delete();
 		});
-		const potentialCenter = intersectionResult2.value.intersections.at(-1);
+		const potentialCenter = nearestTo(intersectionResult2.value.intersections, firstCurve.lastPoint);
 		if (!require_blueprint.isPoint2D(potentialCenter)) return [firstCurve, secondCurve];
 		circle = require_blueprint.make2dCircle(radius, potentialCenter);
 		const firstInt = intersectionPoints(firstCurve, circle)[0];

package/dist/{blueprintSketcher-CwTAtrkY.js → blueprintSketcher-C1WCI6E0.js}

@@ -1,10 +1,10 @@
-import { J as getKernel2D, q as getKernel } from "./shapeTypes-PNVEv6ga.js";
+import { J as getKernel2D, q as getKernel } from "./shapeTypes-BNGu103j.js";
 import { i as wasmIndex, n as bug } from "./bug-ClMTAJhe.js";
 import { E as ok, P as unwrap, g as err, n as computationError, s as safeIndex, x as isOk } from "./errors-BTccWbtE.js";
 import { r as RAD2DEG, t as DEG2RAD } from "./constants-iraOnb2p.js";
 import { t as firstOrThrow } from "./arrayAccess-BpgouNir.js";
-import { _ as rotate2d, d as cartesianToPolar, f as crossProduct2d, g as polarToCartesian, h as polarAngle2d, l as add2d, p as distance2d, v as samePoint, x as subtract2d, y as scalarMultiply2d } from "./helpers-CNgipe6l.js";
-import { C as isPoint2D, b as normalize2d, c as make2dBezierCurve, d as make2dEllipseArc, g as approximateAsBSpline, h as make2dThreePointArc, l as make2dCircle, m as make2dTangentArc, n as asSVG, p as make2dSegmentCurve, r as viewbox, s as make2dArcFromCenter, t as Blueprint, v as Curve2D, x as BoundingBox2d } from "./blueprint-Zmt5-07y.js";
+import { _ as rotate2d, b as squareDistance2d, d as cartesianToPolar, f as crossProduct2d, g as polarToCartesian, h as polarAngle2d, l as add2d, p as distance2d, v as samePoint, x as subtract2d, y as scalarMultiply2d } from "./helpers-DpGcM2qZ.js";
+import { C as isPoint2D, b as normalize2d, c as make2dBezierCurve, d as make2dEllipseArc, g as approximateAsBSpline, h as make2dThreePointArc, l as make2dCircle, m as make2dTangentArc, n as asSVG, p as make2dSegmentCurve, r as viewbox, s as make2dArcFromCenter, t as Blueprint, v as Curve2D, x as BoundingBox2d } from "./blueprint-BS50D3J_.js";
 // node_modules/flatqueue/index.js
 /**
 * @typedef {Float64ArrayConstructor | Float32ArrayConstructor |
@@ -609,7 +609,7 @@ var offsetEndPoints = (firstPoint, lastPoint, offset) => {
 * instead of a `Curve2D`.
 *
 * @param curve - The source curve to offset.
-* @param offset - Signed offset distance (positive = left of curve direction).
+* @param offset - Signed offset distance (positive = right of curve direction).
 *
 * @remarks Self-intersecting offset curves are replaced with a collapsed
 *   sentinel. This is a known simplification; a more robust trimming strategy
@@ -627,11 +627,12 @@ var make2dOffset = (curve, offset) => {
 	if (curveType === "CIRCLE") {
 		const circleData = kernel.getCurve2dCircleData(curve.wrapped);
 		if (!circleData) return make2dSegmentCurve(curve.firstPoint, curve.lastPoint);
-		const { cx, cy, radius, isDirect } = circleData;
-		const orientedOffset = offset * (isDirect ? 1 : -1);
+		const { cx, cy, radius } = circleData;
+		const center = [cx, cy];
+		const counterClockwise = crossProduct2d(subtract2d(curve.firstPoint, center), curve.tangentAt(0)) > 0;
+		const orientedOffset = counterClockwise ? offset : -offset;
 		const newRadius = radius + orientedOffset;
 		if (newRadius < 1e-10) {
-			const center = [cx, cy];
 			const offsetViaCenter = (point) => {
 				const [x, y] = normalize2d(subtract2d(point, center));
 				return add2d(point, [orientedOffset * x, orientedOffset * y]);
@@ -642,15 +643,22 @@ var make2dOffset = (curve, offset) => {
 				lastPoint: offsetViaCenter(curve.lastPoint)
 			};
 		}
-		const circleHandle = kernel.makeCircle2d(cx, cy, newRadius, isDirect);
-		const fullCircle = new Curve2D(circleHandle);
-		let trimmedHandle;
+		const radial = (point) => add2d(center, scalarMultiply2d(subtract2d(point, center), newRadius / radius));
+		if (!samePoint(curve.firstPoint, curve.lastPoint)) {
+			const mid = curve.value((curve.firstParameter + curve.lastParameter) / 2);
+			return make2dThreePointArc(radial(curve.firstPoint), radial(mid), radial(curve.lastPoint));
+		}
+		const fullCircle = new Curve2D(kernel.makeCircle2d(cx, cy, newRadius, counterClockwise));
+		const start = radial(curve.firstPoint);
+		if (samePoint(fullCircle.firstPoint, start)) return fullCircle;
 		try {
-			trimmedHandle = kernel.trimCurve2d(fullCircle.wrapped, curve.firstParameter, curve.lastParameter);
+			const proj = kernel.projectPointOnCurve2d(fullCircle.wrapped, start[0], start[1]);
+			const from = proj ? proj.param : fullCircle.firstParameter;
+			const period = fullCircle.lastParameter - fullCircle.firstParameter;
+			return new Curve2D(kernel.trimCurve2d(fullCircle.wrapped, from, from + period));
 		} finally {
 			fullCircle.delete();
 		}
-		return new Curve2D(trimmedHandle);
 	}
 	if (curveType === "LINE") {
 		const { firstPoint, lastPoint } = offsetEndPoints(curve.firstPoint, curve.lastPoint, offset);
@@ -673,6 +681,16 @@ var make2dOffset = (curve, offset) => {
 	return approximation;
 };
 // src/2d/lib/customCorners.ts
+/**
+* The offset curves of a corner can cross more than once (a line and an arc
+* meeting at both ends of a semicircle); the fillet center is the crossing
+* nearest the corner, whatever order the intersector reports them in.
+*/
+function nearestTo(points, corner) {
+	let best;
+	for (const p of points) if (!best || squareDistance2d(p, corner) < squareDistance2d(best, corner)) best = p;
+	return best;
+}
 /** Unwrap an intersection, discarding the common-segment curves the caller does not use. */
 function intersectionPoints(first, second) {
 	const result = unwrap(intersectCurves(first, second));
@@ -733,7 +751,7 @@ function removeCorner(firstCurve, secondCurve, radius) {
 		intersectionResult.value.commonSegments.forEach((c) => {
 			c.delete();
 		});
-		const potentialCenter = intersectionResult.value.intersections.at(-1);
+		const potentialCenter = nearestTo(intersectionResult.value.intersections, firstCurve.lastPoint);
 		if (!isPoint2D(potentialCenter)) return null;
 		const center = potentialCenter;
 		const splitForFillet = (curve, offsetCurve) => {
@@ -831,7 +849,7 @@ function dogboneFilletCurves(firstCurve, secondCurve, radius) {
 		intersectionResult2.value.commonSegments.forEach((c) => {
 			c.delete();
 		});
-		const potentialCenter = intersectionResult2.value.intersections.at(-1);
+		const potentialCenter = nearestTo(intersectionResult2.value.intersections, firstCurve.lastPoint);
 		if (!isPoint2D(potentialCenter)) return [firstCurve, secondCurve];
 		circle = make2dCircle(radius, potentialCenter);
 		const firstInt = intersectionPoints(firstCurve, circle)[0];

package/dist/{boolean2D-CRuNKgXs.cjs → boolean2D-7SQ3B0pC.cjs}

@@ -1,10 +1,10 @@
 const require_bug = require("./bug-CBcpIPuf.cjs");
 const require_errors = require("./errors-O_blYTWT.cjs");
 const require_arrayAccess = require("./arrayAccess-DpJYARwv.cjs");
-const require_surfaceBuilders = require("./surfaceBuilders-BKCiVf7T.cjs");
-const require_blueprintSketcher = require("./blueprintSketcher-CZyokLGJ.cjs");
-const require_helpers = require("./helpers-C4f2MV-r.cjs");
-const require_blueprint = require("./blueprint-ERmwk6zG.cjs");
+const require_surfaceBuilders = require("./surfaceBuilders-DOmDVuMs.cjs");
+const require_blueprintSketcher = require("./blueprintSketcher-BG--DxWB.cjs");
+const require_helpers = require("./helpers-BdGGaLhF.cjs");
+const require_blueprint = require("./blueprint-17RUHsoP.cjs");
 // src/2d/blueprints/cannedBlueprints.ts
 /**
 * Create a regular polygon blueprint inscribed in a circle of the given radius.
@@ -91,15 +91,6 @@ var samePoint = (x, y) => require_helpers.samePoint(x, y, require_helpers.PRECIS
 function hashPoint(p) {
 	return `${p[0].toFixed(9)},${p[1].toFixed(9)}`;
 }
-/**
-* Hash a segment by both orientations for bidirectional lookup.
-* The smaller hash comes first so that (A,B) and (B,A) produce the same key.
-*/
-function hashSegment(first, last) {
-	const h1 = hashPoint(first);
-	const h2 = hashPoint(last);
-	return h1 < h2 ? `${h1}|${h2}` : `${h2}|${h1}`;
-}
 function startOfSegment(s) {
 	const first = s[0];
 	if (first === void 0) require_bug.bug("startOfSegment", "empty segment");
@@ -205,15 +196,10 @@ function rotateToStartAtSegment(curves, segment) {
 // src/2d/blueprints/intersectionSegments.ts
 function* createSegmentOnPoints(curves, allIntersections, allCommonSegments) {
 	const intersectionSet = new Set(allIntersections.map(hashPoint));
-	const commonSegmentSet = new Set(allCommonSegments.map((seg) => hashSegment(seg.firstPoint, seg.lastPoint)));
 	const matchesIntersection = (point) => {
 		if (intersectionSet.has(hashPoint(point))) return true;
 		return allIntersections.some((p) => samePoint(p, point));
 	};
-	const matchesCommonSegment = (first, last) => {
-		if (commonSegmentSet.has(hashSegment(first, last))) return true;
-		return allCommonSegments.some((seg) => samePoint(seg.firstPoint, first) && samePoint(seg.lastPoint, last) || samePoint(seg.firstPoint, last) && samePoint(seg.lastPoint, first));
-	};
 	let currentCurves = [];
 	for (const curve of curves) {
 		if (samePoint(curve.firstPoint, curve.lastPoint)) {
@@ -221,7 +207,7 @@ function* createSegmentOnPoints(curves, allIntersections, allCommonSegments) {
 			continue;
 		}
 		const endsAtIntersection = matchesIntersection(curve.lastPoint);
-		const isCommon = matchesCommonSegment(curve.firstPoint, curve.lastPoint);
+		const isCommon = isCommonSegmentMatch(allCommonSegments, [curve]);
 		if (endsAtIntersection) {
 			currentCurves.push(curve);
 			yield currentCurves;
@@ -297,13 +283,16 @@ function splitCurvesAtIntersections(curves, curvePoints) {
 	});
 }
 /**
-* Check whether a segment's start/end points match one of the common segment
-* point pairs.
+* Check whether a segment runs along one of the common segments, in either
+* direction. Matching endpoints are not enough: two outlines that share an
+* edge also join its endpoints with the rest of their boundaries.
 */
-function isCommonSegmentMatch(commonSegmentsPoints, segmentStart, segmentEnd) {
-	return commonSegmentsPoints.some(([startPoint, endPoint]) => {
-		if (startPoint === void 0 || endPoint === void 0) return false;
-		return samePoint(startPoint, segmentStart) && samePoint(endPoint, segmentEnd) || samePoint(startPoint, segmentEnd) && samePoint(endPoint, segmentStart);
+function isCommonSegmentMatch(commonSegments, segment) {
+	if (segment.length === 0) return false;
+	const segmentStart = startOfSegment(segment);
+	const segmentEnd = endOfSegment(segment);
+	return commonSegments.some((common) => {
+		return (samePoint(common.firstPoint, segmentStart) && samePoint(common.lastPoint, segmentEnd) || samePoint(common.firstPoint, segmentEnd) && samePoint(common.lastPoint, segmentStart)) && segment.every((curve) => common.distanceFrom(curveMidPoint(curve)) < 1e-6);
 	});
 }
 /**
@@ -319,7 +308,6 @@ function blueprintsIntersectionSegments(first, second) {
 	if (rawIntersections.length <= 1) return null;
 	let firstCurveSegments = splitCurvesAtIntersections(first.curves, firstCurvePoints);
 	let secondCurveSegments = splitCurvesAtIntersections(second.curves, secondCurvePoints);
-	const commonSegmentsPoints = allCommonSegments.map((c) => [c.firstPoint, c.lastPoint]);
 	const allIntersections = removeNonCrossingPoints(removeNonCrossingPoints(rawIntersections, firstCurveSegments, second), secondCurveSegments, first);
 	if (allIntersections.length === 0 && allCommonSegments.length === 0) return null;
 	if (allCommonSegments.length === 0) {
@@ -340,7 +328,11 @@ function blueprintsIntersectionSegments(first, second) {
 	if (firstSeg !== void 0 && secondSeg !== void 0) {
 		const endpointsMismatch = !samePoint(endOfSegment(secondSeg), endOfSegment(firstSeg));
 		const commonSegmentLengthMismatch = allCommonSegments.length > 0 && secondSeg.length !== 1;
-		if (endpointsMismatch || commonSegmentLengthMismatch) secondIntersectedSegments = reverseSegments(secondIntersectedSegments);
+		if (endpointsMismatch || commonSegmentLengthMismatch) {
+			secondIntersectedSegments = reverseSegments(secondIntersectedSegments);
+			const last = secondIntersectedSegments[secondIntersectedSegments.length - 1];
+			if (last !== void 0 && isCommonSegmentMatch(allCommonSegments, last)) secondIntersectedSegments = [last, ...secondIntersectedSegments.slice(0, -1)];
+		}
 	}
 	const maxLen = Math.max(firstIntersectedSegments.length, secondIntersectedSegments.length);
 	const result = [];
@@ -353,7 +345,7 @@ function blueprintsIntersectionSegments(first, second) {
 			result.push([available, available]);
 			continue;
 		}
-		if (isCommonSegmentMatch(commonSegmentsPoints, startOfSegment(firstSeg2), endOfSegment(firstSeg2))) result.push([firstSeg2, "same"]);
+		if (isCommonSegmentMatch(allCommonSegments, firstSeg2)) result.push([firstSeg2, "same"]);
 		else result.push([firstSeg2, secondSeg2]);
 	}
 	return result;
@@ -512,13 +504,30 @@ function booleanOperation(first, second, config) {
 	}
 	return require_blueprintSketcher.organiseBlueprints(paths);
 }
+/**
+* A point of `outline` that is not on `other`'s boundary. Outlines that only touch
+* can meet at a curve's midpoint, where an inside test cannot tell which side is
+* which, so several points along each curve are tried.
+*/
+function pointOffBoundary(outline, other) {
+	for (const curve of outline.curves) for (const fraction of [
+		.5,
+		.25,
+		.75
+	]) {
+		const point = curve.value(curve.firstParameter + fraction * (curve.lastParameter - curve.firstParameter));
+		if (!other.curves.some((c) => c.isOnCurve(point))) return point;
+	}
+	return null;
+}
 function buildNoIntersectionResult(first, second) {
-	const firstCurve = first.curves[0];
-	const secondCurve = second.curves[0];
+	const firstPoint = pointOffBoundary(first, second);
+	const secondPoint = pointOffBoundary(second, first);
+	if (firstPoint === null || secondPoint === null) return { identical: true };
 	return {
 		identical: false,
-		firstCurveInSecond: firstCurve !== void 0 && second.isInside(curveMidPoint(firstCurve)),
-		secondCurveInFirst: secondCurve !== void 0 && first.isInside(curveMidPoint(secondCurve))
+		firstCurveInSecond: second.isInside(firstPoint),
+		secondCurveInFirst: first.isInside(secondPoint)
 	};
 }
 // src/2d/blueprints/booleanOperations.ts
@@ -603,23 +612,6 @@ function intersectBlueprints(first, second) {
 	return null;
 }
 // src/2d/blueprints/boolean2D.ts
-var genericIntersects = (first, second) => {
-	if (first instanceof require_blueprint.Blueprint && second instanceof require_blueprint.Blueprint) {
-		let allIntersections = [];
-		first.curves.forEach((thisCurve) => {
-			second.curves.forEach((otherCurve) => {
-				const { intersections, commonSegmentsPoints } = require_errors.unwrap(require_blueprintSketcher.intersectCurves(thisCurve, otherCurve));
-				allIntersections.push(...intersections);
-				allIntersections.push(...commonSegmentsPoints);
-			});
-		});
-		allIntersections = require_blueprint.removeDuplicatePoints(allIntersections);
-		return allIntersections.length > 1;
-	}
-	if (first instanceof require_blueprintSketcher.CompoundBlueprint || first instanceof require_blueprintSketcher.Blueprints) return first.blueprints.some((bp) => genericIntersects(bp, second));
-	if (second instanceof require_blueprintSketcher.CompoundBlueprint || second instanceof require_blueprintSketcher.Blueprints) return second.blueprints.some((bp) => genericIntersects(first, bp));
-	require_bug.bug("genericIntersects", "Unhandled shape combination in genericIntersects");
-};
 var genericFuse = (first, second) => {
 	if (first instanceof require_blueprintSketcher.CompoundBlueprint) {
 		if (second instanceof require_blueprint.Blueprint) return fuseBlueprintWithCompound(second, first);
@@ -656,7 +648,6 @@ var fuseIntersectingBlueprints = (blueprints) => {
 				otherIsFused = true;
 			}
 			if (blueprint.boundingBox.isOut(otherBlueprint.boundingBox)) return;
-			if (!genericIntersects(blueprint, otherBlueprint)) return;
 			let newFused;
 			if (blueprint instanceof require_blueprintSketcher.Blueprints || otherBlueprint instanceof require_blueprintSketcher.Blueprints) {
 				const fused = fuse2D(blueprint, otherBlueprint);
@@ -785,6 +776,7 @@ var cut2D = (first, second) => {
 	if (first instanceof require_blueprintSketcher.CompoundBlueprint) {
 		const wrapper = require_errors.safeIndex(first.blueprints, 0, "cut2D");
 		if (second instanceof require_blueprint.Blueprint && !second.intersects(wrapper)) {
+			if (second.isInside(wrapper.firstPoint)) return null;
 			if (!wrapper.isInside(second.firstPoint)) return first.clone();
 			const cuts = fuse2D(second, new require_blueprintSketcher.Blueprints(first.blueprints.slice(1)));
 			return require_blueprintSketcher.organiseBlueprints([wrapper, ...allBlueprints(cuts)]);