brepjs 18.35.1 → 18.35.3

package/dist/{historyFns-ByJG4mBP.js → historyFns-BSSA9qoA.js}

@@ -1,9 +1,9 @@
-import { B as createKernelHandle, Z as getKernel, t as castShape } from "./shapeTypes-C-MpR5-e.js";
+import { B as createKernelHandle, Z as getKernel, t as castShape } from "./shapeTypes-BH-9bXON.js";
 import { A as ok, b as err, d as validationError, n as computationError, r as ioError } from "./errors-DNWJsfVU.js";
 import { d as vecNormalize, s as vecIsZero } from "./vecOps-SKPRvPH-.js";
-import { v as fromBREP } from "./faceFns-eVWgSIzt.js";
-import { s as toBREP } from "./shapeFns-BbHQjI5-.js";
-import { a as fuseAll } from "./booleanFns-nHsLqZ7Y.js";
+import { v as fromBREP } from "./faceFns-DBEEcVC-.js";
+import { s as toBREP } from "./shapeFns-oS8Us7JQ.js";
+import { a as fuseAll } from "./booleanFns-BPWMgD1t.js";
 //#region src/utils/uuid.ts
 /** Generate a v4-style UUID string using `crypto.getRandomValues`. */
 function uuidv() {

package/dist/{historyFns-C2glA6vu.cjs → historyFns-DrjICLPB.cjs}

@@ -1,9 +1,9 @@
-const require_shapeTypes = require("./shapeTypes-Bbh2doYh.cjs");
+const require_shapeTypes = require("./shapeTypes-BiX2PjaO.cjs");
 const require_errors = require("./errors-CXJtc4I7.cjs");
 const require_vecOps = require("./vecOps-CCnJt-yH.cjs");
-const require_faceFns = require("./faceFns-C6qUr_gw.cjs");
-const require_shapeFns = require("./shapeFns-B3v9_keQ.cjs");
-const require_booleanFns = require("./booleanFns-D19tR8Gn.cjs");
+const require_faceFns = require("./faceFns-ThsHosgU.cjs");
+const require_shapeFns = require("./shapeFns-lDEvCF5Q.cjs");
+const require_booleanFns = require("./booleanFns-NkgP7bZA.cjs");
 //#region src/utils/uuid.ts
 /** Generate a v4-style UUID string using `crypto.getRandomValues`. */
 function uuidv() {

package/dist/{importFns-CJc5NYJp.cjs → importFns-B7nffQNd.cjs}

@@ -1,8 +1,8 @@
-const require_shapeTypes = require("./shapeTypes-Bbh2doYh.cjs");
+const require_shapeTypes = require("./shapeTypes-BiX2PjaO.cjs");
 const require_vec3 = require("./vec3-CFwOI0ZI.cjs");
 const require_errors = require("./errors-CXJtc4I7.cjs");
 const require_arrayAccess = require("./arrayAccess-e4H9cBfh.cjs");
-const require_blueprint = require("./blueprint-BF0DcVwE.cjs");
+const require_blueprint = require("./blueprint-BZtQ37hZ.cjs");
 //#region src/io/objExportFns.ts
 /** Read a vec3 from a typed array at the given vertex index. */
 function vec3At(arr, i) {

package/dist/{importFns-DuAmdf0Q.js → importFns-Cq-bKeDn.js}

@@ -1,8 +1,8 @@
-import { Z as getKernel, t as castShape } from "./shapeTypes-C-MpR5-e.js";
+import { Z as getKernel, t as castShape } from "./shapeTypes-BH-9bXON.js";
 import { n as wasmIndex, t as vec3At$1 } from "./vec3-Dpha8d5k.js";
 import { A as ok, b as err, r as ioError, t as BrepErrorCode } from "./errors-DNWJsfVU.js";
 import { n as getAtOrThrow } from "./arrayAccess-DrUGPADn.js";
-import { f as make2dSegmentCurve, m as make2dThreePointArc, s as make2dBezierCurve, t as Blueprint } from "./blueprint-KwH2JNPU.js";
+import { f as make2dSegmentCurve, m as make2dThreePointArc, s as make2dBezierCurve, t as Blueprint } from "./blueprint-BugZrlJZ.js";
 //#region src/io/objExportFns.ts
 /** Read a vec3 from a typed array at the given vertex index. */
 function vec3At(arr, i) {

package/dist/io.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_meshFns = require("./meshFns-D66okPxP.cjs");
-const require_importFns = require("./importFns-CJc5NYJp.cjs");
+const require_meshFns = require("./meshFns-BcYvu4zj.cjs");
+const require_importFns = require("./importFns-B7nffQNd.cjs");
 exports.blueprintToDXF = require_importFns.blueprintToDXF;
 exports.exportDXF = require_importFns.exportDXF;
 exports.exportGlb = require_importFns.exportGlb;

package/dist/io.js

@@ -1,3 +1,3 @@
-import { n as exportSTEP, r as exportSTL, t as exportIGES } from "./meshFns-Bbm7_5wS.js";
-import { a as importSVG, c as blueprintToDXF, d as exportGltf, f as exportOBJ, i as exportSTEPConfigured, l as exportDXF, n as importSTEP, o as importSVGPathD, r as importSTL, s as exportThreeMF, t as importIGES, u as exportGlb } from "./importFns-DuAmdf0Q.js";
+import { n as exportSTEP, r as exportSTL, t as exportIGES } from "./meshFns-CR68GwS8.js";
+import { a as importSVG, c as blueprintToDXF, d as exportGltf, f as exportOBJ, i as exportSTEPConfigured, l as exportDXF, n as importSTEP, o as importSVGPathD, r as importSTL, s as exportThreeMF, t as importIGES, u as exportGlb } from "./importFns-Cq-bKeDn.js";
 export { blueprintToDXF, exportDXF, exportGlb, exportGltf, exportIGES, exportOBJ, exportSTEP, exportSTEPConfigured, exportSTL, exportThreeMF, importIGES, importSTEP, importSTL, importSVG, importSVGPathD };

package/dist/kernel/occtWasm/constructionOps.d.ts

@@ -3,6 +3,7 @@ import { OcctKernelWasm, OcctWasmModule } from './occtWasmTypes.js';
 export declare function makeVertex(k: OcctKernelWasm, x: number, y: number, z: number): KernelShape;
 export declare function makeEdge(_k: OcctKernelWasm, curve: KernelType): KernelShape;
 export declare function makeWire(k: OcctKernelWasm, Module: OcctWasmModule, edges: KernelShape[]): KernelShape;
+export declare function makeWireFromMixed(k: OcctKernelWasm, Module: OcctWasmModule, items: KernelShape[]): KernelShape;
 export declare function makeFace(k: OcctKernelWasm, wire: KernelShape, _planar?: boolean): KernelShape;
 export declare function makeLineEdge(k: OcctKernelWasm, p1: [number, number, number], p2: [number, number, number]): KernelShape;
 export declare function makeCircleEdge(k: OcctKernelWasm, center: [number, number, number], normal: [number, number, number], radius: number): KernelShape;

package/dist/kernel/occtWasm/ioOps.d.ts

@@ -31,7 +31,7 @@ export declare function exportOBJ(mesh: MeshFn, shape: KernelShape, tolerance: n
 export declare function exportPLY(mesh: MeshFn, shape: KernelShape, tolerance: number): ArrayBuffer;
 export declare function toBREP(k: OcctKernelWasm, shape: KernelShape): string;
 export declare function fromBREP(k: OcctKernelWasm, data: string): KernelShape;
-export declare function createXCAFDocument(k: OcctKernelWasm, Module: OcctWasmModule, shapes: Array<{
+export declare function createXCAFDocument(k: OcctKernelWasm, _Module: OcctWasmModule, shapes: Array<{
     shape: KernelShape;
     name: string;
     color?: [number, number, number, number] | undefined;

package/dist/kernel/occtWasm/occtWasmAdapter.cjs

@@ -1,3 +1,3 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_occtWasmAdapter = require("../../occtWasmAdapter-CdyaMnBW.cjs");
+const require_occtWasmAdapter = require("../../occtWasmAdapter-R8zCS1h7.cjs");
 exports.OcctWasmAdapter = require_occtWasmAdapter.OcctWasmAdapter;

package/dist/kernel/occtWasm/occtWasmAdapter.js

@@ -1,2 +1,2 @@
-import { t as OcctWasmAdapter } from "../../occtWasmAdapter-COKB8ItA.js";
+import { t as OcctWasmAdapter } from "../../occtWasmAdapter-DUruQhFF.js";
 export { OcctWasmAdapter };

package/dist/kernel/occtWasm/occtWasmTypes.d.ts

@@ -230,8 +230,13 @@ export interface OcctKernelWasm {
     projectEdges(shapeId: number, ox: number, oy: number, oz: number, dx: number, dy: number, dz: number, xx: number, xy: number, xz: number, hasXAxis: boolean): EmProjectionData;
     getNurbsCurveData(edgeId: number): EmNurbsCurveData;
     liftCurve2dToPlane(flatPoints2d: EmVectorDouble, planeOx: number, planeOy: number, planeOz: number, planeZx: number, planeZy: number, planeZz: number, planeXx: number, planeXy: number, planeXz: number): number;
-    createXCAFDocument(shapeIds: EmVectorUint32, joinedNames: string, flatColors: EmVectorDouble): number;
-    writeXCAFToSTEP(docId: number): string;
+    xcafNewDocument(): number;
+    xcafClose(docId: number): void;
+    xcafAddShape(docId: number, shapeId: number): number;
+    xcafSetColor(docId: number, labelId: number, r: number, g: number, b: number): void;
+    xcafSetName(docId: number, labelId: number, name: string): void;
+    xcafGetRootLabels(docId: number): EmVectorInt;
+    xcafExportSTEP(docId: number): string;
     bsplineSurface(flatPoints: EmVectorDouble, rows: number, cols: number): number;
     makeFaceOnSurface(faceId: number, wireId: number): number;
     makeNullShape(): number;

package/dist/kernel/occtWasm/sweepOps.d.ts

@@ -2,7 +2,7 @@ import { KernelShape, KernelType } from '../types.js';
 import { OcctKernelWasm, OcctWasmModule } from './occtWasmTypes.js';
 export declare function extrude(k: OcctKernelWasm, face: KernelShape, direction: [number, number, number], length: number): KernelShape;
 export declare function revolve(k: OcctKernelWasm, shape: KernelShape, axis: KernelType, angle: number): KernelShape;
-export declare function loft(k: OcctKernelWasm, Module: OcctWasmModule, wires: KernelShape[], ruled?: boolean, _startShape?: KernelShape, _endShape?: KernelShape): KernelShape;
+export declare function loft(k: OcctKernelWasm, Module: OcctWasmModule, wires: KernelShape[], ruled?: boolean, startShape?: KernelShape, endShape?: KernelShape): KernelShape;
 export declare function sweep(k: OcctKernelWasm, wire: KernelShape, spine: KernelShape, options?: {
     transitionMode?: number;
 }): KernelShape;

package/dist/{measureFns-D7lxkIjt.cjs → measureFns-BT_G8lXZ.cjs}

@@ -1,7 +1,7 @@
-const require_shapeTypes = require("./shapeTypes-Bbh2doYh.cjs");
+const require_shapeTypes = require("./shapeTypes-BiX2PjaO.cjs");
 const require_errors = require("./errors-CXJtc4I7.cjs");
-const require_topologyQueryFns = require("./topologyQueryFns-C0kAqcn5.cjs");
-const require_faceFns = require("./faceFns-C6qUr_gw.cjs");
+const require_topologyQueryFns = require("./topologyQueryFns-BoMkI1jZ.cjs");
+const require_faceFns = require("./faceFns-ThsHosgU.cjs");
 //#region src/measurement/measureCache.ts
 var cache = /* @__PURE__ */ new WeakMap();
 function getCachedMeasurement(shape, key) {

package/dist/{measureFns-BiflqrZ_.js → measureFns-BTn_t0LK.js}

@@ -1,7 +1,7 @@
-import { Z as getKernel } from "./shapeTypes-C-MpR5-e.js";
+import { Z as getKernel } from "./shapeTypes-BH-9bXON.js";
 import { A as ok, b as err, d as validationError, t as BrepErrorCode } from "./errors-DNWJsfVU.js";
-import { w as kernelCallRaw } from "./topologyQueryFns-B81GSST_.js";
-import { p as uvBounds } from "./faceFns-eVWgSIzt.js";
+import { w as kernelCallRaw } from "./topologyQueryFns-B8uqQlEU.js";
+import { p as uvBounds } from "./faceFns-DBEEcVC-.js";
 //#region src/measurement/measureCache.ts
 var cache = /* @__PURE__ */ new WeakMap();
 function getCachedMeasurement(shape, key) {

package/dist/measurement.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_measureFns = require("./measureFns-D7lxkIjt.cjs");
+const require_measureFns = require("./measureFns-BT_G8lXZ.cjs");
 exports.createDistanceQuery = require_measureFns.createDistanceQuery;
 exports.measureArea = require_measureFns.measureArea;
 exports.measureDistance = require_measureFns.measureDistance;

package/dist/measurement.js

@@ -1,2 +1,2 @@
-import { a as measureDistance, c as measureLinearProps, d as measureVolumeProps, l as measureSurfaceProps, n as measureArea, o as measureDistanceProps, s as measureLength, t as createDistanceQuery, u as measureVolume } from "./measureFns-BiflqrZ_.js";
+import { a as measureDistance, c as measureLinearProps, d as measureVolumeProps, l as measureSurfaceProps, n as measureArea, o as measureDistanceProps, s as measureLength, t as createDistanceQuery, u as measureVolume } from "./measureFns-BTn_t0LK.js";
 export { createDistanceQuery, measureArea, measureDistance, measureDistanceProps, measureLength, measureLinearProps, measureSurfaceProps, measureVolume, measureVolumeProps };

package/dist/{meshFns-D66okPxP.cjs → meshFns-BcYvu4zj.cjs}

@@ -1,7 +1,7 @@
-const require_shapeTypes = require("./shapeTypes-Bbh2doYh.cjs");
+const require_shapeTypes = require("./shapeTypes-BiX2PjaO.cjs");
 const require_errors = require("./errors-CXJtc4I7.cjs");
-const require_topologyQueryFns = require("./topologyQueryFns-C0kAqcn5.cjs");
-const require_shapeFns = require("./shapeFns-B3v9_keQ.cjs");
+const require_topologyQueryFns = require("./topologyQueryFns-BoMkI1jZ.cjs");
+const require_shapeFns = require("./shapeFns-lDEvCF5Q.cjs");
 //#region src/topology/meshCache.ts
 /**
 * Build a parameter key for the inner cache map (excludes shape identity).
@@ -196,6 +196,32 @@ function exportError(e, fmt) {
 	return require_errors.ioError(`${fmt}_FILE_READ_ERROR`, `Failed to read exported ${fmt} file`, e);
 }
 /**
+* When a compound's bounds probe fails, localize the offending sub-solid(s) so the
+* caller can heal or drop them. Returns a suffix for the error message; empty when
+* the shape is a single solid or localization itself fails. Only reached on the
+* error path, so the extra per-solid probes cost nothing in the happy case.
+*/
+function describeOffendingSolids(shape) {
+	let solids;
+	try {
+		solids = require_topologyQueryFns.getSolids(shape);
+	} catch {
+		return "";
+	}
+	if (solids.length <= 1) return "";
+	const bad = [];
+	solids.forEach((solid, i) => {
+		try {
+			require_topologyQueryFns.getBounds(solid);
+		} catch (e) {
+			if (e instanceof TypeError) throw e;
+			bad.push(i);
+		}
+	});
+	if (bad.length === 0) return `; could not localize the offending sub-solid among ${solids.length} solids`;
+	return `; offending sub-solid${bad.length > 1 ? "s" : ""} (of ${solids.length}): index ${bad.join(", ")}`;
+}
+/**
 * Probe a shape's bounding box before handing it to the STEP/STL writer.
 *
 * Some sub-shapes pass `isValid`/`validSolid` yet are degenerate enough that the
@@ -205,6 +231,13 @@ function exportError(e, fmt) {
 * cheap pre-export probe lets us return a clean `Err` instead of crashing.
 * Heuristic, not universal: it only catches shapes whose bounding-box evaluation
 * also throws.
+*
+* Note: the canonical #1126 shape (an annular-sector tread fused with a frenet
+* helical rail) is NOT caught here — `getBounds` *succeeds* on it, as do
+* `isValid`/`validSolid`/`mesh`/`measureArea`, and `autoHeal` cannot repair it.
+* No known non-trapping check detects that BOPAlgo corruption; the only safety net
+* for it is `exportError` classifying the writer's `WebAssembly.RuntimeError` as
+* `*_EXPORT_CRASHED`. A real fix must come from the kernel (OCCT BOPAlgo).
 */
 function probeSerializable(shape, fmt) {
 	try {
@@ -212,7 +245,7 @@ function probeSerializable(shape, fmt) {
 		return null;
 	} catch (e) {
 		if (e instanceof TypeError) throw e;
-		return require_errors.ioError(`${fmt}_EXPORT_UNSERIALIZABLE`, `${fmt} export aborted: the shape contains degenerate geometry the ${fmt} writer cannot serialize (bounding-box evaluation failed); export was skipped to avoid crashing the kernel`, e);
+		return require_errors.ioError(`${fmt}_EXPORT_UNSERIALIZABLE`, `${fmt} export aborted: the shape contains degenerate geometry the ${fmt} writer cannot serialize (bounding-box evaluation failed); export was skipped to avoid crashing the kernel${describeOffendingSolids(shape)}`, e);
 	}
 }
 function exportSTEP(shape) {

package/dist/{meshFns-Bbm7_5wS.js → meshFns-CR68GwS8.js}

@@ -1,7 +1,7 @@
-import { Z as getKernel } from "./shapeTypes-C-MpR5-e.js";
+import { Z as getKernel } from "./shapeTypes-BH-9bXON.js";
 import { A as ok, b as err, r as ioError } from "./errors-DNWJsfVU.js";
-import { n as getBounds } from "./topologyQueryFns-B81GSST_.js";
-import { O as getFaceOrigins } from "./shapeFns-BbHQjI5-.js";
+import { d as getSolids, n as getBounds } from "./topologyQueryFns-B8uqQlEU.js";
+import { O as getFaceOrigins } from "./shapeFns-oS8Us7JQ.js";
 //#region src/topology/meshCache.ts
 /**
 * Build a parameter key for the inner cache map (excludes shape identity).
@@ -196,6 +196,32 @@ function exportError(e, fmt) {
 	return ioError(`${fmt}_FILE_READ_ERROR`, `Failed to read exported ${fmt} file`, e);
 }
 /**
+* When a compound's bounds probe fails, localize the offending sub-solid(s) so the
+* caller can heal or drop them. Returns a suffix for the error message; empty when
+* the shape is a single solid or localization itself fails. Only reached on the
+* error path, so the extra per-solid probes cost nothing in the happy case.
+*/
+function describeOffendingSolids(shape) {
+	let solids;
+	try {
+		solids = getSolids(shape);
+	} catch {
+		return "";
+	}
+	if (solids.length <= 1) return "";
+	const bad = [];
+	solids.forEach((solid, i) => {
+		try {
+			getBounds(solid);
+		} catch (e) {
+			if (e instanceof TypeError) throw e;
+			bad.push(i);
+		}
+	});
+	if (bad.length === 0) return `; could not localize the offending sub-solid among ${solids.length} solids`;
+	return `; offending sub-solid${bad.length > 1 ? "s" : ""} (of ${solids.length}): index ${bad.join(", ")}`;
+}
+/**
 * Probe a shape's bounding box before handing it to the STEP/STL writer.
 *
 * Some sub-shapes pass `isValid`/`validSolid` yet are degenerate enough that the
@@ -205,6 +231,13 @@ function exportError(e, fmt) {
 * cheap pre-export probe lets us return a clean `Err` instead of crashing.
 * Heuristic, not universal: it only catches shapes whose bounding-box evaluation
 * also throws.
+*
+* Note: the canonical #1126 shape (an annular-sector tread fused with a frenet
+* helical rail) is NOT caught here — `getBounds` *succeeds* on it, as do
+* `isValid`/`validSolid`/`mesh`/`measureArea`, and `autoHeal` cannot repair it.
+* No known non-trapping check detects that BOPAlgo corruption; the only safety net
+* for it is `exportError` classifying the writer's `WebAssembly.RuntimeError` as
+* `*_EXPORT_CRASHED`. A real fix must come from the kernel (OCCT BOPAlgo).
 */
 function probeSerializable(shape, fmt) {
 	try {
@@ -212,7 +245,7 @@ function probeSerializable(shape, fmt) {
 		return null;
 	} catch (e) {
 		if (e instanceof TypeError) throw e;
-		return ioError(`${fmt}_EXPORT_UNSERIALIZABLE`, `${fmt} export aborted: the shape contains degenerate geometry the ${fmt} writer cannot serialize (bounding-box evaluation failed); export was skipped to avoid crashing the kernel`, e);
+		return ioError(`${fmt}_EXPORT_UNSERIALIZABLE`, `${fmt} export aborted: the shape contains degenerate geometry the ${fmt} writer cannot serialize (bounding-box evaluation failed); export was skipped to avoid crashing the kernel${describeOffendingSolids(shape)}`, e);
 	}
 }
 function exportSTEP(shape) {

package/dist/{occtWasmAdapter-COKB8ItA.js → occtWasmAdapter-DUruQhFF.js}

@@ -1894,9 +1894,12 @@ function revolve(k, shape, axis, angle) {
 	const d = axis.direction;
 	return wrapResult(k, k.revolve(unwrap(shape), o.x, o.y, o.z, d.x, d.y, d.z, angle));
 }
-function loft(k, Module, wires, ruled, _startShape, _endShape) {
+function loft(k, Module, wires, ruled, startShape, endShape) {
+	const startV = startShape ? unwrap(startShape) : 0;
+	const endV = endShape ? unwrap(endShape) : 0;
 	const vec = makeVecU32(Module, wires.map(unwrap));
 	try {
+		if (startV || endV) return wrapResult(k, k.loftWithVertices(vec, true, ruled ?? false, startV, endV));
 		return wrapResult(k, k.loft(vec, true, ruled ?? false));
 	} finally {
 		vec.delete();
@@ -2520,52 +2523,33 @@ function toBREP(k, shape) {
 function fromBREP(k, data) {
 	return wrapResult(k, k.fromBREP(data));
 }
-function createXCAFDocument(k, Module, shapes) {
-	const ids = new Module.VectorUint32();
-	const colors = new Module.VectorDouble();
-	const nameParts = [];
+function createXCAFDocument(k, _Module, shapes) {
+	const docId = k.xcafNewDocument();
 	for (const entry of shapes) {
-		ids.push_back(unwrap(entry.shape));
-		nameParts.push(entry.name);
-		const [r, g, b, a] = entry.color ?? [
-			.5,
-			.5,
-			.5,
-			1
-		];
-		colors.push_back(r);
-		colors.push_back(g);
-		colors.push_back(b);
-		colors.push_back(a);
-	}
-	try {
-		const joinedNames = nameParts.join("\0");
-		return handle("compound", k.createXCAFDocument(ids, joinedNames, colors));
-	} finally {
-		ids.delete();
-		colors.delete();
+		const labelId = k.xcafAddShape(docId, unwrap(entry.shape));
+		if (entry.name) k.xcafSetName(docId, labelId, entry.name);
+		if (entry.color) {
+			const [r, g, b] = entry.color;
+			k.xcafSetColor(docId, labelId, r / 255, g / 255, b / 255);
+		}
 	}
+	return handle("compound", docId);
 }
 function writeXCAFToSTEP(k, doc, _options) {
-	const id = unwrap(doc);
-	const subs = k.getSubShapes(id, "solid");
-	if (!(() => {
+	const docId = unwrap(doc);
+	const roots = k.xcafGetRootLabels(docId);
+	const hasShapes = (() => {
 		try {
-			return subs.size() > 0;
+			return roots.size() > 0;
 		} finally {
-			subs.delete();
+			roots.delete();
 		}
-	})()) {
-		const faces = k.getSubShapes(id, "face");
-		if (!(() => {
-			try {
-				return faces.size() > 0;
-			} finally {
-				faces.delete();
-			}
-		})()) return "";
+	})();
+	try {
+		return hasShapes ? k.xcafExportSTEP(docId) : "";
+	} finally {
+		k.xcafClose(docId);
 	}
-	return k.writeXCAFToSTEP(id);
 }
 function exportSTEPConfigured(k, Module, shapes, _options) {
 	if (shapes.length === 0) return "";
@@ -2597,6 +2581,24 @@ function makeWire(k, Module, edges) {
 		vec.delete();
 	}
 }
+function makeWireFromMixed(k, Module, items) {
+	const edgeIds = [];
+	for (const item of items) {
+		const sub = k.getSubShapes(unwrap(item), "edge");
+		try {
+			const n = sub.size();
+			for (let i = 0; i < n; i++) edgeIds.push(sub.get(i));
+		} finally {
+			sub.delete();
+		}
+	}
+	const vec = makeVecU32(Module, edgeIds);
+	try {
+		return handle("wire", k.makeWire(vec));
+	} finally {
+		vec.delete();
+	}
+}
 function makeFace(k, wire, _planar) {
 	return handle("face", k.makeFace(unwrap(wire)));
 }
@@ -3947,7 +3949,7 @@ var OcctWasmAdapter = class OcctWasmAdapter {
 		return makeHelixWire(this.k, pitch, height, radius, center, direction);
 	}
 	makeWireFromMixed(items) {
-		return this.makeWire(items);
+		return makeWireFromMixed(this.k, this.Module, items);
 	}
 	makeCompound(shapes) {
 		return makeCompound(this.k, this.Module, shapes);

package/dist/{occtWasmAdapter-CdyaMnBW.cjs → occtWasmAdapter-R8zCS1h7.cjs}

@@ -1894,9 +1894,12 @@ function revolve(k, shape, axis, angle) {
 	const d = axis.direction;
 	return wrapResult(k, k.revolve(unwrap(shape), o.x, o.y, o.z, d.x, d.y, d.z, angle));
 }
-function loft(k, Module, wires, ruled, _startShape, _endShape) {
+function loft(k, Module, wires, ruled, startShape, endShape) {
+	const startV = startShape ? unwrap(startShape) : 0;
+	const endV = endShape ? unwrap(endShape) : 0;
 	const vec = makeVecU32(Module, wires.map(unwrap));
 	try {
+		if (startV || endV) return wrapResult(k, k.loftWithVertices(vec, true, ruled ?? false, startV, endV));
 		return wrapResult(k, k.loft(vec, true, ruled ?? false));
 	} finally {
 		vec.delete();
@@ -2520,52 +2523,33 @@ function toBREP(k, shape) {
 function fromBREP(k, data) {
 	return wrapResult(k, k.fromBREP(data));
 }
-function createXCAFDocument(k, Module, shapes) {
-	const ids = new Module.VectorUint32();
-	const colors = new Module.VectorDouble();
-	const nameParts = [];
+function createXCAFDocument(k, _Module, shapes) {
+	const docId = k.xcafNewDocument();
 	for (const entry of shapes) {
-		ids.push_back(unwrap(entry.shape));
-		nameParts.push(entry.name);
-		const [r, g, b, a] = entry.color ?? [
-			.5,
-			.5,
-			.5,
-			1
-		];
-		colors.push_back(r);
-		colors.push_back(g);
-		colors.push_back(b);
-		colors.push_back(a);
-	}
-	try {
-		const joinedNames = nameParts.join("\0");
-		return handle("compound", k.createXCAFDocument(ids, joinedNames, colors));
-	} finally {
-		ids.delete();
-		colors.delete();
+		const labelId = k.xcafAddShape(docId, unwrap(entry.shape));
+		if (entry.name) k.xcafSetName(docId, labelId, entry.name);
+		if (entry.color) {
+			const [r, g, b] = entry.color;
+			k.xcafSetColor(docId, labelId, r / 255, g / 255, b / 255);
+		}
 	}
+	return handle("compound", docId);
 }
 function writeXCAFToSTEP(k, doc, _options) {
-	const id = unwrap(doc);
-	const subs = k.getSubShapes(id, "solid");
-	if (!(() => {
+	const docId = unwrap(doc);
+	const roots = k.xcafGetRootLabels(docId);
+	const hasShapes = (() => {
 		try {
-			return subs.size() > 0;
+			return roots.size() > 0;
 		} finally {
-			subs.delete();
+			roots.delete();
 		}
-	})()) {
-		const faces = k.getSubShapes(id, "face");
-		if (!(() => {
-			try {
-				return faces.size() > 0;
-			} finally {
-				faces.delete();
-			}
-		})()) return "";
+	})();
+	try {
+		return hasShapes ? k.xcafExportSTEP(docId) : "";
+	} finally {
+		k.xcafClose(docId);
 	}
-	return k.writeXCAFToSTEP(id);
 }
 function exportSTEPConfigured(k, Module, shapes, _options) {
 	if (shapes.length === 0) return "";
@@ -2597,6 +2581,24 @@ function makeWire(k, Module, edges) {
 		vec.delete();
 	}
 }
+function makeWireFromMixed(k, Module, items) {
+	const edgeIds = [];
+	for (const item of items) {
+		const sub = k.getSubShapes(unwrap(item), "edge");
+		try {
+			const n = sub.size();
+			for (let i = 0; i < n; i++) edgeIds.push(sub.get(i));
+		} finally {
+			sub.delete();
+		}
+	}
+	const vec = makeVecU32(Module, edgeIds);
+	try {
+		return handle("wire", k.makeWire(vec));
+	} finally {
+		vec.delete();
+	}
+}
 function makeFace(k, wire, _planar) {
 	return handle("face", k.makeFace(unwrap(wire)));
 }
@@ -3947,7 +3949,7 @@ var OcctWasmAdapter = class OcctWasmAdapter {
 		return makeHelixWire(this.k, pitch, height, radius, center, direction);
 	}
 	makeWireFromMixed(items) {
-		return this.makeWire(items);
+		return makeWireFromMixed(this.k, this.Module, items);
 	}
 	makeCompound(shapes) {
 		return makeCompound(this.k, this.Module, shapes);

package/dist/operations.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_historyFns = require("./historyFns-C2glA6vu.cjs");
-const require_extrudeFns = require("./extrudeFns-DpRGUaxD.cjs");
+const require_historyFns = require("./historyFns-DrjICLPB.cjs");
+const require_extrudeFns = require("./extrudeFns-Bg-IXT_O.cjs");
 exports.addChild = require_historyFns.addChild;
 exports.addStep = require_historyFns.addStep;
 exports.circularPattern = require_historyFns.circularPattern;

package/dist/operations.js

@@ -1,3 +1,3 @@
-import { C as walkAssembly, D as exportAssemblySTEP, E as linearPattern, O as createAssembly, S as updateNode, T as gridPattern, _ as collectShapes, a as findStep, b as findNode, c as registerOperation, d as replayHistory, g as addChild, h as undoLast, l as registerShape, m as stepsFrom, n as createHistory, o as getShape, p as stepCount, r as createRegistry, s as modifyStep, t as addStep, u as replayFrom, v as countNodes, w as circularPattern, x as removeChild, y as createAssemblyNode } from "./historyFns-ByJG4mBP.js";
-import { c as sweep, i as complexExtrude, l as twistExtrude, s as supportExtrude } from "./extrudeFns-Cl_azGgy.js";
+import { C as walkAssembly, D as exportAssemblySTEP, E as linearPattern, O as createAssembly, S as updateNode, T as gridPattern, _ as collectShapes, a as findStep, b as findNode, c as registerOperation, d as replayHistory, g as addChild, h as undoLast, l as registerShape, m as stepsFrom, n as createHistory, o as getShape, p as stepCount, r as createRegistry, s as modifyStep, t as addStep, u as replayFrom, v as countNodes, w as circularPattern, x as removeChild, y as createAssemblyNode } from "./historyFns-BSSA9qoA.js";
+import { c as sweep, i as complexExtrude, l as twistExtrude, s as supportExtrude } from "./extrudeFns-DWeYb6cu.js";
 export { addChild, addStep, circularPattern, collectShapes, complexExtrude, countNodes, createAssembly, createAssemblyNode, createHistory, createRegistry, exportAssemblySTEP, findNode, findStep, getShape as getHistoryShape, gridPattern, linearPattern, modifyStep, registerOperation, registerShape, removeChild, replayFrom, replayHistory, stepCount, stepsFrom, supportExtrude, sweep, twistExtrude, undoLast, updateNode, walkAssembly };

package/dist/{primitiveFns-vQh7Lz7B.js → primitiveFns-BjeLfI12.js}

@@ -1,13 +1,13 @@
-import { Z as getKernel, _ as isSolid, c as createSolid, h as isShape3D, p as isFace, r as castShapeWithKnownType, t as castShape, x as isClosedWire, y as isWire } from "./shapeTypes-C-MpR5-e.js";
+import { Z as getKernel, _ as isSolid, c as createSolid, h as isShape3D, p as isFace, r as castShapeWithKnownType, t as castShape, x as isClosedWire, y as isWire } from "./shapeTypes-BH-9bXON.js";
 import { A as ok, T as isOk, b as err, d as validationError, i as kernelError, l as typeCastError, t as BrepErrorCode, v as andThen, w as isErr } from "./errors-DNWJsfVU.js";
-import { c as getFaces, i as getCachedIsValid, l as getOrCreateCache, m as invalidateShapeCache, p as getWires, s as getEdges } from "./topologyQueryFns-B81GSST_.js";
+import { c as getFaces, i as getCachedIsValid, l as getOrCreateCache, m as invalidateShapeCache, p as getWires, s as getEdges } from "./topologyQueryFns-B8uqQlEU.js";
 import { n as HASH_CODE_MAX, t as DEG2RAD } from "./constants-ITRzCnCp.js";
-import { _ as downcast } from "./faceFns-eVWgSIzt.js";
-import { _ as propagateAllMetadata, g as collectInputFaceHashes, h as translate } from "./shapeFns-BbHQjI5-.js";
+import { _ as downcast } from "./faceFns-DBEEcVC-.js";
+import { _ as propagateAllMetadata, g as collectInputFaceHashes, h as translate } from "./shapeFns-oS8Us7JQ.js";
 import { t as firstOrThrow } from "./arrayAccess-DrUGPADn.js";
-import { _ as makeThreePointArc, a as makeNonPlanarFace, c as makeBSplineApproximation, d as makeCircle, f as makeEllipse, g as makeTangentArc, h as makeLine, i as makeNewFaceWithinFace, m as makeHelix, o as makePolygon, p as makeEllipseArc, r as makeFace, s as assembleWire, t as addHolesInFace, u as makeBezierCurve } from "./surfaceBuilders-D4p1YPCz.js";
-import { a as fuseAll, i as fuse, n as cut, r as cutAll } from "./booleanFns-nHsLqZ7Y.js";
-import { a as makeOffset, c as makeTorus, i as makeEllipsoid, l as makeVertex, n as makeCone, o as makeSolid, r as makeCylinder, s as makeSphere, t as makeCompound, u as weldShellsAndFaces } from "./solidBuilders-C44fKbQQ.js";
+import { _ as makeThreePointArc, a as makeNonPlanarFace, c as makeBSplineApproximation, d as makeCircle, f as makeEllipse, g as makeTangentArc, h as makeLine, i as makeNewFaceWithinFace, m as makeHelix, o as makePolygon, p as makeEllipseArc, r as makeFace, s as assembleWire, t as addHolesInFace, u as makeBezierCurve } from "./surfaceBuilders-xmm7fFbW.js";
+import { a as fuseAll, i as fuse, n as cut, r as cutAll } from "./booleanFns-BPWMgD1t.js";
+import { a as makeOffset, c as makeTorus, i as makeEllipsoid, l as makeVertex, n as makeCone, o as makeSolid, r as makeCylinder, s as makeSphere, t as makeCompound, u as weldShellsAndFaces } from "./solidBuilders-BiduNSRx.js";
 //#region src/topology/threeHelpers.ts
 /**
 * Convert a ShapeMesh into BufferGeometry-compatible typed arrays.

package/dist/{primitiveFns-CXn9Jl4q.cjs → primitiveFns-DtY84t7q.cjs}

@@ -1,13 +1,13 @@
-const require_shapeTypes = require("./shapeTypes-Bbh2doYh.cjs");
+const require_shapeTypes = require("./shapeTypes-BiX2PjaO.cjs");
 const require_errors = require("./errors-CXJtc4I7.cjs");
-const require_topologyQueryFns = require("./topologyQueryFns-C0kAqcn5.cjs");
+const require_topologyQueryFns = require("./topologyQueryFns-BoMkI1jZ.cjs");
 const require_constants = require("./constants-BOVyEYGH.cjs");
-const require_faceFns = require("./faceFns-C6qUr_gw.cjs");
-const require_shapeFns = require("./shapeFns-B3v9_keQ.cjs");
+const require_faceFns = require("./faceFns-ThsHosgU.cjs");
+const require_shapeFns = require("./shapeFns-lDEvCF5Q.cjs");
 const require_arrayAccess = require("./arrayAccess-e4H9cBfh.cjs");
-const require_surfaceBuilders = require("./surfaceBuilders-DsISMCwj.cjs");
-const require_booleanFns = require("./booleanFns-D19tR8Gn.cjs");
-const require_solidBuilders = require("./solidBuilders-Ck6gpdQR.cjs");
+const require_surfaceBuilders = require("./surfaceBuilders-s2Uo2ard.cjs");
+const require_booleanFns = require("./booleanFns-NkgP7bZA.cjs");
+const require_solidBuilders = require("./solidBuilders-DR3oU7Fb.cjs");
 //#region src/topology/threeHelpers.ts
 /**
 * Convert a ShapeMesh into BufferGeometry-compatible typed arrays.

package/dist/projection.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_cameraFns = require("./cameraFns-D_8-JO0p.cjs");
+const require_cameraFns = require("./cameraFns-Bb5fmsNi.cjs");
 exports.PROJECTION_PLANES = require_cameraFns.PROJECTION_PLANES;
 exports.cameraFromPlane = require_cameraFns.cameraFromPlane;
 exports.cameraLookAt = require_cameraFns.cameraLookAt;

package/dist/projection.js

@@ -1,2 +1,2 @@
-import { a as makeProjectedEdges, i as projectEdges, n as cameraLookAt, o as PROJECTION_PLANES, r as createCamera, s as isProjectionPlane, t as cameraFromPlane } from "./cameraFns-Bhjy2SuC.js";
+import { a as makeProjectedEdges, i as projectEdges, n as cameraLookAt, o as PROJECTION_PLANES, r as createCamera, s as isProjectionPlane, t as cameraFromPlane } from "./cameraFns-B5FrSRRP.js";
 export { PROJECTION_PLANES, cameraFromPlane, cameraLookAt, createCamera, isProjectionPlane, makeProjectedEdges, projectEdges };

package/dist/query.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const require_helpers = require("./helpers-DNVILwHA.cjs");
-const require_cornerFinder = require("./cornerFinder-Bmp3Vm5g.cjs");
+const require_helpers = require("./helpers-D6XMORWy.cjs");
+const require_cornerFinder = require("./cornerFinder-Nd00yMHA.cjs");
 exports.cornerFinder = require_cornerFinder.cornerFinder;
 exports.edgeFinder = require_helpers.edgeFinder;
 exports.faceFinder = require_helpers.faceFinder;