brepjs 18.20.3 → 18.20.4

package/dist/{shapeTypes-DGtDTS9s.js → shapeTypes-DmHPJc_M.js}

@@ -1,6 +1,6 @@
-import { n as wasmIndex, t as vec3At } from "./vec3-BRj3eI54.js";
-import { _ as serializeCurve2d$2, a as curveTypeName, c as intersectCurves2dFn, d as makeEllipse2d$2, f as makeLine2d$2, g as scaleCurve2d$2, h as rotateCurve2d$2, i as curveBounds, l as makeBezier2d$2, m as mirrorAtPoint, n as addCurveToBBox, o as deserializeCurve2d$2, p as mirrorAcrossAxis, r as createBBox2d, s as evaluateCurve2d$2, u as makeCircle2d$2, v as tangentCurve2d, y as translateCurve2d$2 } from "./occtWasmAdapter--TZGP9DX.js";
-import { A as ok, b as err } from "./errors-8GZS3vy9.js";
+import { n as wasmIndex, t as vec3At } from "./vec3-Dpha8d5k.js";
+import { _ as serializeCurve2d$2, a as curveTypeName, c as intersectCurves2dFn, d as makeEllipse2d$2, f as makeLine2d$2, g as scaleCurve2d$2, h as rotateCurve2d$2, i as curveBounds, l as makeBezier2d$2, m as mirrorAtPoint, n as addCurveToBBox, o as deserializeCurve2d$2, p as mirrorAcrossAxis, r as createBBox2d, s as evaluateCurve2d$2, u as makeCircle2d$2, v as tangentCurve2d, y as translateCurve2d$2 } from "./occtWasmAdapter-Dtp7Wu27.js";
+import { A as ok, b as err } from "./errors-BJSTLaDI.js";
 //#region src/kernel/kernel2dTypes.ts
 /** Check if the kernel supports 2D geometry operations. */
 function supportsKernel2D(kernel) {
@@ -5834,88 +5834,95 @@ function resolveUniformAngle(faces, angleDeg) {
 }
 //#endregion
 //#region src/kernel/brepkit/topologyOps.ts
+function iterCompound(bk, h, type) {
+	const children = syntheticCompounds.get(h);
+	if (children) return children.flatMap((child) => child.type === type ? [child] : iterShapes(bk, child, type));
+	if (type === "solid") return toArray(bk.getCompoundSolids(h)).map(solidHandle);
+	if (type === "face" || type === "edge" || type === "vertex" || type === "wire") return toArray(bk.getCompoundSolids(h)).map(solidHandle).flatMap((s) => iterShapes(bk, s, type));
+	return [];
+}
+function iterSolid(bk, h, type) {
+	switch (type) {
+		case "face": return toArray(bk.getSolidFaces(h)).map(faceHandle);
+		case "edge": return toArray(bk.getSolidEdges(h)).map(edgeHandle);
+		case "vertex": return toArray(bk.getSolidVertices(h)).map(vertexHandle);
+		case "wire": return toArray(bk.getSolidFaces(h)).flatMap((faceId) => toArray(bk.getFaceWires(faceId)).map(wireHandle));
+		default: return [];
+	}
+}
+function iterShellChildren(bk, h, type) {
+	const faces = toArray(bk.getShellFaces(h)).map(faceHandle);
+	const seen = /* @__PURE__ */ new Set();
+	const results = [];
+	for (const face of faces) for (const child of iterShapes(bk, face, type)) {
+		const childId = unwrap(child);
+		if (seen.has(childId)) continue;
+		seen.add(childId);
+		results.push(child);
+	}
+	return results;
+}
+function iterShell(bk, h, type) {
+	if (type === "face") return toArray(bk.getShellFaces(h)).map(faceHandle);
+	if (type === "edge" || type === "vertex") return iterShellChildren(bk, h, type);
+	return [];
+}
+function iterFace(bk, shape, h, type) {
+	if (type === "face") return [shape];
+	if (type === "edge") return toArray(bk.getFaceEdges(h)).map(edgeHandle);
+	if (type === "vertex") return toArray(bk.getFaceVertices(h)).map(vertexHandle);
+	if (type === "wire") return toArray(bk.getFaceWires(h)).map(wireHandle);
+	return [];
+}
+function uniqueWireVertices(bk, h) {
+	const edgeIds = toArray(bk.getWireEdges(h));
+	const seen = /* @__PURE__ */ new Set();
+	const results = [];
+	for (const eid of edgeIds) {
+		const verts = bk.getEdgeVertices(eid);
+		const coords = [[
+			wasmIndex(verts, 0),
+			wasmIndex(verts, 1),
+			wasmIndex(verts, 2)
+		], [
+			wasmIndex(verts, 3),
+			wasmIndex(verts, 4),
+			wasmIndex(verts, 5)
+		]];
+		for (const [x, y, z] of coords) {
+			const key = `${x},${y},${z}`;
+			if (seen.has(key)) continue;
+			seen.add(key);
+			results.push(vertexHandle(bk.makeVertex(x, y, z)));
+		}
+	}
+	return results;
+}
+function iterWire(bk, shape, h, type) {
+	if (type === "wire") return [shape];
+	if (type === "edge") return toArray(bk.getWireEdges(h)).map(edgeHandle);
+	if (type === "vertex") return uniqueWireVertices(bk, h);
+	return [];
+}
+function iterEdge(bk, shape, h, type) {
+	if (type === "edge") return [shape];
+	if (type === "vertex") {
+		const verts = bk.getEdgeVertices(h);
+		const v1 = bk.makeVertex(wasmIndex(verts, 0), wasmIndex(verts, 1), wasmIndex(verts, 2));
+		const v2 = bk.makeVertex(wasmIndex(verts, 3), wasmIndex(verts, 4), wasmIndex(verts, 5));
+		return [vertexHandle(v1), vertexHandle(v2)];
+	}
+	return [];
+}
 function iterShapes(bk, shape, type) {
 	const h = unwrap(shape);
 	switch (shape.type) {
-		case "compound": {
-			const children = syntheticCompounds.get(h);
-			if (children) {
-				const results = [];
-				for (const child of children) if (child.type === type) results.push(child);
-				else results.push(...iterShapes(bk, child, type));
-				return results;
-			}
-			if (type === "solid") return toArray(bk.getCompoundSolids(h)).map(solidHandle);
-			if (type === "face" || type === "edge" || type === "vertex" || type === "wire") return toArray(bk.getCompoundSolids(h)).map(solidHandle).flatMap((s) => iterShapes(bk, s, type));
-			return [];
-		}
-		case "solid": switch (type) {
-			case "face": return toArray(bk.getSolidFaces(h)).map(faceHandle);
-			case "edge": return toArray(bk.getSolidEdges(h)).map(edgeHandle);
-			case "vertex": return toArray(bk.getSolidVertices(h)).map(vertexHandle);
-			case "wire": return toArray(bk.getSolidFaces(h)).flatMap((faceId) => toArray(bk.getFaceWires(faceId)).map(wireHandle));
-			default: return [];
-		}
-		case "shell":
-			if (type === "face") return toArray(bk.getShellFaces(h)).map(faceHandle);
-			if (type === "edge" || type === "vertex") {
-				const faces = toArray(bk.getShellFaces(h)).map(faceHandle);
-				const seen = /* @__PURE__ */ new Set();
-				const results = [];
-				for (const face of faces) for (const child of iterShapes(bk, face, type)) {
-					const childId = unwrap(child);
-					if (!seen.has(childId)) {
-						seen.add(childId);
-						results.push(child);
-					}
-				}
-				return results;
-			}
-			return [];
-		case "face":
-			if (type === "face") return [shape];
-			if (type === "edge") return toArray(bk.getFaceEdges(h)).map(edgeHandle);
-			if (type === "vertex") return toArray(bk.getFaceVertices(h)).map(vertexHandle);
-			if (type === "wire") return toArray(bk.getFaceWires(h)).map(wireHandle);
-			return [];
-		case "wire":
-			if (type === "wire") return [shape];
-			if (type === "edge") return toArray(bk.getWireEdges(h)).map(edgeHandle);
-			if (type === "vertex") {
-				const edgeIds = toArray(bk.getWireEdges(h));
-				const seen = /* @__PURE__ */ new Set();
-				const results = [];
-				for (const eid of edgeIds) {
-					const verts = bk.getEdgeVertices(eid);
-					const coords = [[
-						wasmIndex(verts, 0),
-						wasmIndex(verts, 1),
-						wasmIndex(verts, 2)
-					], [
-						wasmIndex(verts, 3),
-						wasmIndex(verts, 4),
-						wasmIndex(verts, 5)
-					]];
-					for (const [x, y, z] of coords) {
-						const key = `${x},${y},${z}`;
-						if (!seen.has(key)) {
-							seen.add(key);
-							results.push(vertexHandle(bk.makeVertex(x, y, z)));
-						}
-					}
-				}
-				return results;
-			}
-			return [];
-		case "edge":
-			if (type === "edge") return [shape];
-			if (type === "vertex") {
-				const verts = bk.getEdgeVertices(h);
-				const v1 = bk.makeVertex(wasmIndex(verts, 0), wasmIndex(verts, 1), wasmIndex(verts, 2));
-				const v2 = bk.makeVertex(wasmIndex(verts, 3), wasmIndex(verts, 4), wasmIndex(verts, 5));
-				return [vertexHandle(v1), vertexHandle(v2)];
-			}
-			return [];
+		case "compound": return iterCompound(bk, h, type);
+		case "solid": return iterSolid(bk, h, type);
+		case "shell": return iterShell(bk, h, type);
+		case "face": return iterFace(bk, shape, h, type);
+		case "wire": return iterWire(bk, shape, h, type);
+		case "edge": return iterEdge(bk, shape, h, type);
 		default: return [];
 	}
 }
@@ -5960,14 +5967,15 @@ function adjacentFaces(bk, shape, face) {
 	const faceId = unwrap(face, "face");
 	return Array.from(bk.adjacentFaces(solidId, faceId)).map((id) => faceHandle(id));
 }
+function faceIdsForSew(bk, shape) {
+	const h = shape;
+	if (h.type === "face") return [h.id];
+	if (h.type === "solid") return toArray(bk.getSolidFaces(h.id));
+	if (h.type === "shell") return toArray(bk.getShellFaces(h.id));
+	return [];
+}
 function sew(bk, shapes, tolerance) {
-	const faceIds = [];
-	for (const s of shapes) {
-		const h = s;
-		if (h.type === "face") faceIds.push(h.id);
-		else if (h.type === "solid") for (const fid of toArray(bk.getSolidFaces(h.id))) faceIds.push(fid);
-		else if (h.type === "shell") for (const fid of toArray(bk.getShellFaces(h.id))) faceIds.push(fid);
-	}
+	const faceIds = shapes.flatMap((s) => faceIdsForSew(bk, s));
 	const tol = tolerance ?? 1e-7;
 	try {
 		return shellHandle(bk.weldShellsAndFaces(faceIds, tol));
@@ -7284,9 +7292,9 @@ function makeCircleNurbs(bk, center, normal, radius, startAngle, endAngle) {
 		weights.push(1);
 	}
 	const degree = 2;
-	const knots = Array(degree + 1).fill(0);
+	const knots = Array(3).fill(0);
 	for (let i = 1; i < nSegments; i++) knots.push(i, i);
-	knots.push(...Array(degree + 1).fill(nSegments));
+	knots.push(...Array(3).fill(nSegments));
 	const kMax = wasmIndex(knots, knots.length - 1);
 	for (let i = 0; i < knots.length; i++) knots[i] = wasmIndex(knots, i) / kMax;
 	const sx = wasmIndex(controlPoints, 0);
@@ -7365,9 +7373,9 @@ function makeEllipseNurbs(bk, center, normal, majorRadius, minorRadius, startAng
 		weights.push(1);
 	}
 	const degree = 2;
-	const knots = Array(degree + 1).fill(0);
+	const knots = Array(3).fill(0);
 	for (let i = 1; i < nSegments; i++) knots.push(i, i);
-	knots.push(...Array(degree + 1).fill(nSegments));
+	knots.push(...Array(3).fill(nSegments));
 	const kMax = wasmIndex(knots, knots.length - 1);
 	for (let i = 0; i < knots.length; i++) knots[i] = wasmIndex(knots, i) / kMax;
 	const sx = wasmIndex(controlPoints, 0);
@@ -7486,69 +7494,73 @@ function chamferDistAngle(bk, shape, edges, distance, angleDeg) {
 	warnOnce("chamfer-dist-angle", "chamferAsymmetric not available; using averaged distance.");
 	return solidHandle(bk.chamfer(solidId, edgeIds, (distance + d2) / 2));
 }
+function faceCentroid(bk, faceId) {
+	const verts = toArray(bk.getFaceVertices(faceId));
+	if (verts.length < 1) return null;
+	let x = 0, y = 0, z = 0;
+	for (const vid of verts) {
+		const pos = bk.getVertexPosition(vid);
+		x += wasmIndex(pos, 0);
+		y += wasmIndex(pos, 1);
+		z += wasmIndex(pos, 2);
+	}
+	const n = verts.length;
+	return {
+		x: x / n,
+		y: y / n,
+		z: z / n
+	};
+}
+function findBestNormalMatch(bk, origFaceId, solidFaces) {
+	try {
+		const origNormal = bk.getFaceNormal(origFaceId);
+		let bestMatch = -1;
+		let bestDot = -2;
+		for (const sf of solidFaces) try {
+			const sn = bk.getFaceNormal(sf);
+			const dot = (origNormal[0] ?? 0) * (sn[0] ?? 0) + (origNormal[1] ?? 0) * (sn[1] ?? 0) + (origNormal[2] ?? 0) * (sn[2] ?? 0);
+			if (dot > bestDot) {
+				bestDot = dot;
+				bestMatch = sf;
+			}
+		} catch {}
+		if (bestMatch >= 0 && bestDot > .99) return bestMatch;
+	} catch {}
+	return null;
+}
+function findBestCentroidMatch(bk, origFaceId, solidFaces) {
+	try {
+		const origCentroid = faceCentroid(bk, origFaceId);
+		if (origCentroid === null) return null;
+		let bestMatch = -1;
+		let bestDist = Infinity;
+		for (const sf of solidFaces) try {
+			const sc = faceCentroid(bk, sf);
+			if (sc === null) continue;
+			const dist = Math.sqrt((origCentroid.x - sc.x) ** 2 + (origCentroid.y - sc.y) ** 2 + (origCentroid.z - sc.z) ** 2);
+			if (dist < bestDist) {
+				bestDist = dist;
+				bestMatch = sf;
+			}
+		} catch {}
+		if (bestMatch >= 0 && bestDist < .001) return bestMatch;
+	} catch {}
+	return null;
+}
+function resolveShellFaceId(bk, fid, solidFaces, solidFaceSet) {
+	if (solidFaceSet.has(fid)) return fid;
+	const normalMatch = findBestNormalMatch(bk, fid, solidFaces);
+	if (normalMatch !== null) return normalMatch;
+	const centroidMatch = findBestCentroidMatch(bk, fid, solidFaces);
+	if (centroidMatch !== null) return centroidMatch;
+	return fid;
+}
 function shell(bk, shape, faces, thickness, tolerance) {
 	if (tolerance !== void 0) warnOnce("shell-tolerance", "shell() tolerance parameter is not supported; brepkit uses its own internal tolerance.");
 	const solidId = unwrapSolidOrThrow(shape, "shell");
 	const solidFaces = toArray(bk.getSolidFaces(solidId));
 	const solidFaceSet = new Set(solidFaces);
-	const resolvedFaceIds = faces.map((f) => {
-		const fid = unwrap(f, "face");
-		if (solidFaceSet.has(fid)) return fid;
-		try {
-			const origNormal = bk.getFaceNormal(fid);
-			let bestMatch = -1;
-			let bestDot = -2;
-			for (const sf of solidFaces) try {
-				const sn = bk.getFaceNormal(sf);
-				const dot = (origNormal[0] ?? 0) * (sn[0] ?? 0) + (origNormal[1] ?? 0) * (sn[1] ?? 0) + (origNormal[2] ?? 0) * (sn[2] ?? 0);
-				if (dot > bestDot) {
-					bestDot = dot;
-					bestMatch = sf;
-				}
-			} catch {}
-			if (bestMatch >= 0 && bestDot > .99) return bestMatch;
-		} catch {}
-		try {
-			const origVerts = toArray(bk.getFaceVertices(fid));
-			if (origVerts.length >= 1) {
-				let ox = 0, oy = 0, oz = 0;
-				for (const vid of origVerts) {
-					const pos = bk.getVertexPosition(vid);
-					ox += wasmIndex(pos, 0);
-					oy += wasmIndex(pos, 1);
-					oz += wasmIndex(pos, 2);
-				}
-				const n = origVerts.length;
-				ox /= n;
-				oy /= n;
-				oz /= n;
-				let bestCentroidMatch = -1;
-				let bestCentroidDist = Infinity;
-				for (const sf of solidFaces) try {
-					const sv = toArray(bk.getFaceVertices(sf));
-					if (sv.length < 1) continue;
-					let sx = 0, sy = 0, sz = 0;
-					for (const svid of sv) {
-						const spos = bk.getVertexPosition(svid);
-						sx += wasmIndex(spos, 0);
-						sy += wasmIndex(spos, 1);
-						sz += wasmIndex(spos, 2);
-					}
-					const sn = sv.length;
-					sx /= sn;
-					sy /= sn;
-					sz /= sn;
-					const dist = Math.sqrt((ox - sx) ** 2 + (oy - sy) ** 2 + (oz - sz) ** 2);
-					if (dist < bestCentroidDist) {
-						bestCentroidDist = dist;
-						bestCentroidMatch = sf;
-					}
-				} catch {}
-				if (bestCentroidMatch >= 0 && bestCentroidDist < .001) return bestCentroidMatch;
-			}
-		} catch {}
-		return fid;
-	});
+	const resolvedFaceIds = faces.map((f) => resolveShellFaceId(bk, unwrap(f, "face"), solidFaces, solidFaceSet));
 	return solidHandle(bk.shell(solidId, thickness, resolvedFaceIds));
 }
 function thicken(bk, shape, thickness) {
@@ -7700,6 +7712,70 @@ function faceCentroidById(bk, faceId) {
 	}
 }
 /**
+* Snapshot a face's signature (hash + normal + centroid). Non-planar faces
+* fall back to a zero normal so they still participate in centroid-only matching.
+*/
+function snapshotFaceSignature(bk, faceId, hash) {
+	try {
+		return {
+			hash,
+			normal: bk.getFaceNormal(faceId),
+			centroid: faceCentroidById(bk, faceId)
+		};
+	} catch {
+		return {
+			hash,
+			normal: [
+				0,
+				0,
+				0
+			],
+			centroid: faceCentroidById(bk, faceId)
+		};
+	}
+}
+var NORMAL_THRESHOLD = .707;
+var CENTROID_DIST_SQ_MAX = 100;
+var SCORE_TIE_TOL = .05;
+/**
+* Score every input face against `out` by combined normal/centroid similarity,
+* returning the candidate matches above thresholds plus the best observed score.
+*/
+function collectOutputMatches(out, inputSigs) {
+	let bestScore = -Infinity;
+	const matches = [];
+	for (let i = 0; i < inputSigs.length; i++) {
+		const inp = wasmIndex(inputSigs, i);
+		const dot = (out.normal[0] ?? 0) * (inp.normal[0] ?? 0) + (out.normal[1] ?? 0) * (inp.normal[1] ?? 0) + (out.normal[2] ?? 0) * (inp.normal[2] ?? 0);
+		if (dot < NORMAL_THRESHOLD) continue;
+		const distSq = centroidDistSq(out.centroid, inp.centroid);
+		if (distSq > CENTROID_DIST_SQ_MAX) continue;
+		const score = dot - distSq / CENTROID_DIST_SQ_MAX;
+		if (score > bestScore) bestScore = score;
+		matches.push({
+			idx: i,
+			score
+		});
+	}
+	return {
+		matches,
+		bestScore
+	};
+}
+/** Pick the input signature whose centroid is closest to `out`, or undefined if none. */
+function findNearestInputByCentroid(out, inputSigs) {
+	let bestDistSq = Infinity;
+	let nearest;
+	for (const inp of inputSigs) {
+		const distSq = centroidDistSq(out.centroid, inp.centroid);
+		if (distSq < bestDistSq) {
+			bestDistSq = distSq;
+			nearest = inp;
+		}
+	}
+	return nearest;
+}
+/**
 * Match input->output faces geometrically using normal dot product and centroid distance.
 * Mirrors the algorithm in brepkit's `boolean_with_evolution`.
 */
@@ -7711,66 +7787,12 @@ function matchFacesGeometrically(bk, originalShape, inputFaceHashes, outputFaceI
 	const inputSigs = [];
 	for (let i = 0; i < hashCount; i++) {
 		const fid = wasmIndex(inputFaceIds, i);
-		try {
-			const normal = bk.getFaceNormal(fid);
-			const centroid = faceCentroidById(bk, fid);
-			inputSigs.push({
-				hash: inputFaceHashes[i] ?? fid % hashUpperBound,
-				normal,
-				centroid
-			});
-		} catch {
-			inputSigs.push({
-				hash: inputFaceHashes[i] ?? fid % hashUpperBound,
-				normal: [
-					0,
-					0,
-					0
-				],
-				centroid: faceCentroidById(bk, fid)
-			});
-		}
+		inputSigs.push(snapshotFaceSignature(bk, fid, inputFaceHashes[i] ?? fid % hashUpperBound));
 	}
-	const outputSigs = [];
-	for (const fid of outputFaceIds) try {
-		const normal = bk.getFaceNormal(fid);
-		const centroid = faceCentroidById(bk, fid);
-		outputSigs.push({
-			hash: fid % hashUpperBound,
-			normal,
-			centroid
-		});
-	} catch {
-		outputSigs.push({
-			hash: fid % hashUpperBound,
-			normal: [
-				0,
-				0,
-				0
-			],
-			centroid: faceCentroidById(bk, fid)
-		});
-	}
-	const NORMAL_THRESHOLD = .707;
-	const CENTROID_DIST_SQ_MAX = 100;
-	const SCORE_TIE_TOL = .05;
+	const outputSigs = outputFaceIds.map((fid) => snapshotFaceSignature(bk, fid, fid % hashUpperBound));
 	const matchedInputIndices = /* @__PURE__ */ new Set();
 	for (const out of outputSigs) {
-		let bestScore = -Infinity;
-		const matches = [];
-		for (let i = 0; i < inputSigs.length; i++) {
-			const inp = wasmIndex(inputSigs, i);
-			const dot = (out.normal[0] ?? 0) * (inp.normal[0] ?? 0) + (out.normal[1] ?? 0) * (inp.normal[1] ?? 0) + (out.normal[2] ?? 0) * (inp.normal[2] ?? 0);
-			if (dot < NORMAL_THRESHOLD) continue;
-			const distSq = centroidDistSq(out.centroid, inp.centroid);
-			if (distSq > CENTROID_DIST_SQ_MAX) continue;
-			const score = dot - distSq / CENTROID_DIST_SQ_MAX;
-			if (score > bestScore) bestScore = score;
-			matches.push({
-				idx: i,
-				score
-			});
-		}
+		const { matches, bestScore } = collectOutputMatches(out, inputSigs);
 		if (matches.length > 0) {
 			for (const m of matches) if (m.score >= bestScore - SCORE_TIE_TOL) {
 				const inp = wasmIndex(inputSigs, m.idx);
@@ -7780,15 +7802,7 @@ function matchFacesGeometrically(bk, originalShape, inputFaceHashes, outputFaceI
 				matchedInputIndices.add(m.idx);
 			}
 		} else {
-			let bestDistSq = Infinity;
-			let nearestInput;
-			for (const inp of inputSigs) {
-				const distSq = centroidDistSq(out.centroid, inp.centroid);
-				if (distSq < bestDistSq) {
-					bestDistSq = distSq;
-					nearestInput = inp;
-				}
-			}
+			const nearestInput = findNearestInputByCentroid(out, inputSigs);
 			if (nearestInput) {
 				const existing = generated.get(nearestInput.hash) ?? [];
 				existing.push(out.hash);
@@ -7897,6 +7911,55 @@ function chainEvolutionMap(map, stepModified, stepDeleted, intermediateOutputs,
 	}
 }
 /**
+* Fold one child solid of a compound tool into the running boolean accumulator.
+* Chains existing modified/generated outputs through this step's evolution,
+* then merges in any step entries not already covered by the chain.
+*/
+function mergeCompoundChildStep(result, accum) {
+	const intermediateOutputs = /* @__PURE__ */ new Set();
+	chainEvolutionMap(accum.combinedModified, result.evolution.modified, result.evolution.deleted, intermediateOutputs, accum.combinedDeleted);
+	chainEvolutionMap(accum.combinedGenerated, result.evolution.modified, result.evolution.deleted, intermediateOutputs);
+	for (const [k, v] of result.evolution.modified) {
+		if (accum.combinedModified.has(k) || intermediateOutputs.has(k)) continue;
+		accum.combinedModified.set(k, [...v]);
+	}
+	for (const [k, v] of result.evolution.generated) {
+		if (intermediateOutputs.has(k)) continue;
+		const existing = accum.combinedGenerated.get(k) ?? [];
+		accum.combinedGenerated.set(k, [...existing, ...v]);
+	}
+	for (const d of result.evolution.deleted) {
+		if (!accum.inputFaceHashSet.has(d)) continue;
+		accum.combinedDeleted.add(d);
+	}
+}
+/**
+* Iteratively apply native evolution for each solid in a compound tool, chaining
+* evolution maps so the original input face hashes resolve to final output hashes
+* rather than intermediates.
+*/
+function applyCompoundBooleanWithHistory(bk, shape, compoundToolId, inputFaceHashes, hashUpperBound, nativeFn) {
+	const childSolidIds = toArray(bk.getCompoundSolids(compoundToolId));
+	let currentShape = shape;
+	const accum = {
+		combinedModified: /* @__PURE__ */ new Map(),
+		combinedGenerated: /* @__PURE__ */ new Map(),
+		combinedDeleted: /* @__PURE__ */ new Set(),
+		inputFaceHashSet: new Set(inputFaceHashes)
+	};
+	for (const childId of childSolidIds) {
+		const ch = currentShape;
+		if (ch.type !== "solid") break;
+		const result = parseNativeEvolution(nativeFn(ch.id, childId), hashUpperBound);
+		currentShape = result.shape;
+		mergeCompoundChildStep(result, accum);
+	}
+	return {
+		shape: currentShape,
+		accum
+	};
+}
+/**
 * Shared implementation for boolean-with-history operations (fuse, cut, intersect).
 */
 function booleanWithHistoryImpl(bk, shape, tool, inputFaceHashes, hashUpperBound, options, nativeFn, fallbackFn, _label) {
@@ -7917,33 +7980,13 @@ function booleanWithHistoryImpl(bk, shape, tool, inputFaceHashes, hashUpperBound
 			if (!isEmptyBooleanError(e)) throw e;
 		}
 		if (th.type === "compound") {
-			const childSolidIds = toArray(bk.getCompoundSolids(th.id));
-			let currentShape = shape;
-			const combinedModified = /* @__PURE__ */ new Map();
-			const combinedGenerated = /* @__PURE__ */ new Map();
-			const combinedDeleted = /* @__PURE__ */ new Set();
-			const inputFaceHashSet = new Set(inputFaceHashes);
-			for (const childId of childSolidIds) {
-				const ch = currentShape;
-				if (ch.type !== "solid") break;
-				const result = parseNativeEvolution(nativeFn(ch.id, childId), hashUpperBound);
-				currentShape = result.shape;
-				const intermediateOutputs = /* @__PURE__ */ new Set();
-				chainEvolutionMap(combinedModified, result.evolution.modified, result.evolution.deleted, intermediateOutputs, combinedDeleted);
-				chainEvolutionMap(combinedGenerated, result.evolution.modified, result.evolution.deleted, intermediateOutputs);
-				for (const [k, v] of result.evolution.modified) if (!combinedModified.has(k) && !intermediateOutputs.has(k)) combinedModified.set(k, [...v]);
-				for (const [k, v] of result.evolution.generated) if (!intermediateOutputs.has(k)) {
-					const existing = combinedGenerated.get(k) ?? [];
-					combinedGenerated.set(k, [...existing, ...v]);
-				}
-				for (const d of result.evolution.deleted) if (inputFaceHashSet.has(d)) combinedDeleted.add(d);
-			}
+			const { shape: resultShape, accum } = applyCompoundBooleanWithHistory(bk, shape, th.id, inputFaceHashes, hashUpperBound, nativeFn);
 			return {
-				shape: currentShape,
+				shape: resultShape,
 				evolution: {
-					modified: combinedModified,
-					generated: combinedGenerated,
-					deleted: combinedDeleted
+					modified: accum.combinedModified,
+					generated: accum.combinedGenerated,
+					deleted: accum.combinedDeleted
 				},
 				diagnostics: noDiagnostics
 			};
@@ -8967,7 +9010,7 @@ function fillSurface(bk, wires, _options) {
 					pts.push(wasmIndex(p, 0), wasmIndex(p, 1), wasmIndex(p, 2));
 				}
 				allCoords.push(...pts);
-				curveLengths.push(N + 1);
+				curveLengths.push(11);
 			}
 			try {
 				return faceHandle(bk.fillCoonsPatch(allCoords, curveLengths));
@@ -9623,61 +9666,66 @@ function mapStringTransitionMode(mode) {
 		default: return;
 	}
 }
-function sweepPipeShell(bk, profile, spine, options) {
-	const profileHandle = profile;
-	const faceId = profileHandle.type === "wire" ? bk.makeFaceFromWire(profileHandle.id) : unwrap(profile, "face");
-	const shellMode = !!(options && options["shellMode"]);
-	const transitionMode = options?.["transitionMode"];
-	const contactMode = transitionMode ? mapStringTransitionMode(transitionMode) : void 0;
-	if (contactMode) if (spine.type !== "wire") try {
-		const edgeId = unwrap(spine, "edge");
-		const shape = solidHandle(bk.sweepWithOptions(faceId, edgeId, contactMode, [], 0, "transformed"));
-		if (shellMode) return {
-			shape,
-			firstShape: profile,
-			lastShape: profile
-		};
-		return shape;
+function wrapPipeShellResult(shape, profile, shellMode) {
+	if (shellMode) return {
+		shape,
+		firstShape: profile,
+		lastShape: profile
+	};
+	return shape;
+}
+function tryContactModeSweep(bk, faceId, edgeId, contactMode) {
+	try {
+		return solidHandle(bk.sweepWithOptions(faceId, edgeId, contactMode, [], 0, "transformed"));
 	} catch (e) {
 		console.warn("brepkit: sweepWithOptions failed, falling back to sweepSmooth/simplePipe:", e);
+		return;
 	}
-	else {
+}
+function resolveContactModeEdge(bk, spine) {
+	try {
+		if (spine.type !== "wire") return { edgeId: unwrap(spine, "edge") };
 		const edges = iterShapes(bk, spine, "edge");
 		if (edges.length === 1) {
 			const first = edges[0];
-			if (first) try {
-				const edgeId = unwrap(first, "edge");
-				const shape = solidHandle(bk.sweepWithOptions(faceId, edgeId, contactMode, [], 0, "transformed"));
-				if (shellMode) return {
-					shape,
-					firstShape: profile,
-					lastShape: profile
-				};
-				return shape;
-			} catch (e) {
-				console.warn("brepkit: sweepWithOptions failed, falling back to sweepSmooth/simplePipe:", e);
-			}
-		} else warnOnce("sweepPipeShell-transition-multi-edge", "sweepPipeShell transition mode not supported for multi-edge wires; ignored.");
+			if (first) return { edgeId: unwrap(first, "edge") };
+			return;
+		}
+		warnOnce("sweepPipeShell-transition-multi-edge", "sweepPipeShell transition mode not supported for multi-edge wires; ignored.");
+		return;
+	} catch (e) {
+		console.warn("brepkit: resolveContactModeEdge failed for unexpected spine type, falling through:", e);
+		return;
 	}
+}
+function tryContactModePipeShell(bk, faceId, spine, contactMode) {
+	const resolved = resolveContactModeEdge(bk, spine);
+	if (!resolved) return void 0;
+	return tryContactModeSweep(bk, faceId, resolved.edgeId, contactMode);
+}
+function trySmoothPipeShell(bk, faceId, spine) {
 	const nurbsData = extractNurbsFromEdge(bk, spine);
-	if (nurbsData && nurbsData.degree > 1) try {
-		const shape = solidHandle(bk.sweepSmooth(faceId, nurbsData.degree, nurbsData.knots, nurbsData.controlPoints, nurbsData.weights));
-		if (shellMode) return {
-			shape,
-			firstShape: profile,
-			lastShape: profile
-		};
-		return shape;
+	if (!nurbsData || nurbsData.degree <= 1) return void 0;
+	try {
+		return solidHandle(bk.sweepSmooth(faceId, nurbsData.degree, nurbsData.knots, nurbsData.controlPoints, nurbsData.weights));
 	} catch (e) {
 		console.warn("brepkit: sweepSmooth failed, falling back to simplePipe:", e);
+		return;
 	}
-	const shape = simplePipe(bk, profile, spine);
-	if (shellMode) return {
-		shape,
-		firstShape: profile,
-		lastShape: profile
-	};
-	return shape;
+}
+function sweepPipeShell(bk, profile, spine, options) {
+	const profileHandle = profile;
+	const faceId = profileHandle.type === "wire" ? bk.makeFaceFromWire(profileHandle.id) : unwrap(profile, "face");
+	const shellMode = !!(options && options["shellMode"]);
+	const transitionMode = options?.["transitionMode"];
+	const contactMode = transitionMode ? mapStringTransitionMode(transitionMode) : void 0;
+	if (contactMode) {
+		const shape = tryContactModePipeShell(bk, faceId, spine, contactMode);
+		if (shape) return wrapPipeShellResult(shape, profile, shellMode);
+	}
+	const smoothShape = trySmoothPipeShell(bk, faceId, spine);
+	if (smoothShape) return wrapPipeShellResult(smoothShape, profile, shellMode);
+	return wrapPipeShellResult(simplePipe(bk, profile, spine), profile, shellMode);
 }
 function loftAdvanced(bk, wires, options) {
 	const faceIds = wires.map((w) => {
@@ -9948,7 +9996,7 @@ async function init() {
 	throw new Error("brepjs: no kernel package found. Install one of:\n  npm install brepjs-opencascade   (recommended)\n  npm install brepkit-wasm\n  npm install occt-wasm            (requires manual registerKernel)");
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.130.0/helpers/usingCtx.js
+//#region \0@oxc-project+runtime@0.132.0/helpers/usingCtx.js
 function _usingCtx() {
 	var r = "function" == typeof SuppressedError ? SuppressedError : function(r, e) {
 		var n = Error();