brepjs-bim 0.24.3 → 0.24.4

package/README.md

@@ -198,3 +198,9 @@ npm run test --workspace=brepjs-bim
 Exact Wall quantities measure occupied material across all retained items. Overlapping solids count once. Bounds include every item. Measurement and temporary cleanup failures make these optional measurements unavailable and preserve the borrowed inputs. Cleanup never retries an uncertain native release.
 
 The BIM package requires `brepjs >=19.0.5` for native cleanup-error reporting.
+
+### Wall quantity failures
+
+Wall `NetVolume` measures retained occupied material for both `PARAMETRIC` and `EXACT` geometry. Recipe Walls retain supported area and weight quantities. Exact takeover has no recipe quantity eligibility.
+
+If measurement or temporary cleanup fails, serialization omits optional Wall quantities. `toIfcValidated` reports an element-specific `WALL_QUANTITY_OMITTED` warning from that same serialization. `toIfc` still returns a bytes `Result`.

package/dist/brepjs-bim.cjs

@@ -13092,7 +13092,7 @@ function pushWeightQuantity(w, qtyIds, volumeM3, densityKgM3) {
 	if (densityKgM3 === void 0) return;
 	qtyIds.push(writeWeightQuantity(w, "GrossWeight", volumeM3, densityKgM3));
 }
-function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, openings, densityKgM3) {
+function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, openings, netVolumeM3, densityKgM3) {
 	const lengthM = toIfcLengthM(spec.length);
 	const widthM = toIfcLengthM(spec.thickness);
 	const heightM = toIfcLengthM(spec.height);
@@ -13108,7 +13108,6 @@ function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, opening
 		if (toIfcLengthM(op.offsetFromFloor) < FLOOR_TOUCH_EPSILON_M) sumFloorTouchingFootprintM2 += opWidthM * widthM;
 	}
 	const netSideAreaM2 = grossSideAreaM2 - sumOpeningAreaM2;
-	const netVolumeM3 = grossVolumeM3 - sumOpeningAreaM2 * widthM;
 	const netFootprintM2 = grossFootprintM2 - sumFloorTouchingFootprintM2;
 	const qtyIds = [
 		writeQtyLength(w, "Length", lengthM),
@@ -13124,7 +13123,7 @@ function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, opening
 	pushWeightQuantity(w, qtyIds, netVolumeM3, densityKgM3);
 	writeRelDefinesByProperties(w, ownerHistoryId, wallExpressId, writeElementQuantity(w, ownerHistoryId, "Qto_WallBaseQuantities", qtyIds));
 }
-function writeExactWallBaseQuantities(w, ownerHistoryId, wallExpressId, values) {
+function writeWallBodyQuantities(w, ownerHistoryId, wallExpressId, values) {
 	writeRelDefinesByProperties(w, ownerHistoryId, wallExpressId, writeElementQuantity(w, ownerHistoryId, "Qto_WallBaseQuantities", [
 		writeQtyLength(w, "Length", values.lengthM),
 		writeQtyLength(w, "Width", values.widthM),
@@ -15188,10 +15187,25 @@ function preflightExactBody(input) {
 	return (0, brepjs.ok)([first.value, ...remainingPrepared]);
 }
 //#endregion
-//#region src/serialize/exactWallQuantities.ts
-function deriveExactWallQuantities(input) {
+//#region src/serialize/wallQuantities.ts
+function deriveWallQuantities(input) {
 	try {
-		const measured = measureProductBodyMaterial(input.solids);
+		const items = [];
+		for (const retained of input.solids) {
+			if ((0, brepjs.getKernel)().shapeType(retained.wrapped) !== "compound") {
+				items.push(retained);
+				continue;
+			}
+			const cardinality = singleWrapperChild(retained);
+			if (!cardinality.ok) return cardinality;
+			const children = (0, brepjs.getSolids)(retained);
+			const [child] = children;
+			if (children.length !== 1 || child === void 0 || !(0, brepjs.isValidSolid)(child)) return wallVolumeError(/* @__PURE__ */ new Error("Expected one valid solid in a retained recipe wrapper"));
+			items.push(child);
+		}
+		const [first, ...rest] = items;
+		if (first === void 0) return wallVolumeError(/* @__PURE__ */ new Error("Expected retained Wall material"));
+		const measured = measureProductBodyMaterial([first, ...rest]);
 		if (!measured.ok) return wallVolumeError(measured.error);
 		return (0, brepjs.ok)({
 			lengthM: toIfcLengthM(input.spec.length),
@@ -15203,8 +15217,24 @@ function deriveExactWallQuantities(input) {
 		return wallVolumeError(cause);
 	}
 }
+/** Count before cached extraction: a failed later cast cannot strand earlier children. */
+function singleWrapperChild(retained) {
+	const kernel = (0, brepjs.getKernel)();
+	let count;
+	if (kernel.subShapeCount !== void 0) count = kernel.subShapeCount(retained.wrapped, "solid");
+	else {
+		const rawChildren = kernel.iterShapes(retained.wrapped, "solid");
+		const cleanup = cleanupOwnedResources(rawChildren.map((raw, itemIndex) => ({
+			resource: { [Symbol.dispose]: () => kernel.dispose(raw) },
+			itemIndex
+		})), { operation: "wallQuantityWrapperCount" });
+		if (cleanup.kind === "FAILED") return wallVolumeError({ cleanup });
+		count = rawChildren.length;
+	}
+	return count === 1 ? (0, brepjs.ok)(void 0) : wallVolumeError(/* @__PURE__ */ new Error("Expected one valid solid in a retained recipe wrapper"));
+}
 function wallVolumeError(cause) {
-	return (0, brepjs.err)(ifcError("IFC_EXACT_WALL_QUANTITY_DERIVATION_FAILED", "Failed to derive a positive finite NetVolume for the retained Wall Body", cause));
+	return (0, brepjs.err)(ifcError("IFC_WALL_QUANTITY_DERIVATION_FAILED", "Failed to derive a positive finite NetVolume for the retained Wall Body", cause));
 }
 //#endregion
 //#region src/serialize/toIfc.ts
@@ -15235,8 +15265,13 @@ function preflightProductBodies(elements) {
 	return (0, brepjs.ok)(preflighted);
 }
 async function toIfc(model, meta) {
+	const serialized = await serializeIfc(model, meta);
+	return serialized.ok ? (0, brepjs.ok)(serialized.value.bytes) : serialized;
+}
+async function serializeIfc(model, meta) {
 	try {
 		var _usingCtx$2 = _usingCtx();
+		const issues = [];
 		const project = model.getProject();
 		if (!project) return (0, brepjs.err)(ifcError("NO_PROJECT", "BimModel has no project — call model.init() first"));
 		if ((model.getBridges().length > 0 || model.getBridgeParts().length > 0 || model.getEarthworksFills().length > 0) && (meta.ifcSchema ?? "IFC4") !== "IFC4X3") return (0, brepjs.err)(ifcError("IFC4X3_REQUIRED", "Bridge, Bridge Part, and Earthworks Fill entities require IFC4X3 serialization"));
@@ -15354,10 +15389,10 @@ async function toIfc(model, meta) {
 			const wall = preflighted.element;
 			const containingId = findContainerOf(wall.localId, relationships);
 			const storeyPlacementId = containingId !== null ? placementMap.get(containingId) ?? null : null;
-			const exactQuantities = preflighted.kind === "EXACT" ? deriveExactWallQuantities({
+			const bodyQuantities = deriveWallQuantities({
 				spec: wall.spec,
-				solids: preflighted.solids
-			}) : null;
+				solids: bodySolids(wall.geometry)
+			});
 			const { localPlacementId, productDefinitionShapeId } = preflighted.kind === "EXACT" ? writeExactBodyGeometry(w, wall.spec, preflighted.items, geomSubContextId, storeyPlacementId) : writeWallGeometry(w, wall.spec, geomSubContextId, storeyPlacementId);
 			const wallExpressId = writeWallEntity(w, wall.guid, `Wall ${i + 1}`, ownerHistoryId, localPlacementId, productDefinitionShapeId);
 			idMap.set(wall.localId, wallExpressId);
@@ -15365,9 +15400,12 @@ async function toIfc(model, meta) {
 			writeWallCommonPset(w, ownerHistoryId, wallExpressId, wall.spec);
 			writeManufacturerPset(w, ownerHistoryId, wallExpressId, wall.spec);
 			if (wall.spec.customProperties !== void 0) writeCustomPsets(w, ownerHistoryId, wallExpressId, wall.spec.customProperties);
-			if (preflighted.kind === "EXACT") {
-				if (exactQuantities !== null && exactQuantities.ok) writeExactWallBaseQuantities(w, ownerHistoryId, wallExpressId, exactQuantities.value);
-			} else writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, wall.spec, openingsByWall.get(wall.localId) ?? [], densityByElement.get(wall.localId));
+			if (!bodyQuantities.ok) issues.push(issue("warning", "WALL_QUANTITY_OMITTED", "Wall quantities omitted because occupied material volume could not be measured", wall.localId, {
+				guid: wall.guid,
+				cause: bodyQuantities.error
+			}));
+			else if (wall.geometry.kind === "PARAMETRIC") writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, wall.spec, openingsByWall.get(wall.localId) ?? [], bodyQuantities.value.netVolumeM3, densityByElement.get(wall.localId));
+			else writeWallBodyQuantities(w, ownerHistoryId, wallExpressId, bodyQuantities.value);
 		}
 		for (const [i, slab] of slabs.entries()) {
 			const containingId = findContainerOf(slab.localId, relationships);
@@ -15711,7 +15749,11 @@ async function toIfc(model, meta) {
 		for (const { ref, ids } of classByKey.values()) byClassification.set(ref, ids);
 		if (byClassification.size > 0) writeClassificationRefs(w, ownerHistoryId, byClassification);
 		writeTypeLayer(w, ownerHistoryId, model, idMap);
-		return w.save();
+		const saved = w.save();
+		return saved.ok ? (0, brepjs.ok)({
+			bytes: saved.value,
+			issues
+		}) : saved;
 	} catch (_) {
 		_usingCtx$2.e = _;
 	} finally {
@@ -15831,15 +15873,16 @@ function toOccurrences(elements, predefined) {
 async function toIfcValidated(model, meta) {
 	const integrity = checkReferentialIntegrity(model);
 	if (hasErrors(integrity)) return (0, brepjs.err)(ifcError("INTEGRITY_FAILURE", "Model failed referential integrity check", integrity.issues.filter((i) => i.severity === "error")));
-	const bytesResult = await toIfc(model, meta);
-	if (!bytesResult.ok) return bytesResult;
-	const bytes = bytesResult.value;
+	const serialized = await serializeIfc(model, meta);
+	if (!serialized.ok) return serialized;
+	const { bytes } = serialized.value;
 	const geometry = collectGeometryIssues(model);
 	const schema = await checkSchema(bytes);
 	const roundTrip = await checkRoundTrip(bytes);
 	const gherkin = await checkGherkinRules(bytes);
 	const report = { issues: [
 		...integrity.issues,
+		...serialized.value.issues,
 		...geometry.issues,
 		...schema.issues,
 		...roundTrip.issues,

package/dist/brepjs-bim.js

@@ -13069,7 +13069,7 @@ function pushWeightQuantity(w, qtyIds, volumeM3, densityKgM3) {
 	if (densityKgM3 === void 0) return;
 	qtyIds.push(writeWeightQuantity(w, "GrossWeight", volumeM3, densityKgM3));
 }
-function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, openings, densityKgM3) {
+function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, openings, netVolumeM3, densityKgM3) {
 	const lengthM = toIfcLengthM(spec.length);
 	const widthM = toIfcLengthM(spec.thickness);
 	const heightM = toIfcLengthM(spec.height);
@@ -13085,7 +13085,6 @@ function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, opening
 		if (toIfcLengthM(op.offsetFromFloor) < FLOOR_TOUCH_EPSILON_M) sumFloorTouchingFootprintM2 += opWidthM * widthM;
 	}
 	const netSideAreaM2 = grossSideAreaM2 - sumOpeningAreaM2;
-	const netVolumeM3 = grossVolumeM3 - sumOpeningAreaM2 * widthM;
 	const netFootprintM2 = grossFootprintM2 - sumFloorTouchingFootprintM2;
 	const qtyIds = [
 		writeQtyLength(w, "Length", lengthM),
@@ -13101,7 +13100,7 @@ function writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, spec, opening
 	pushWeightQuantity(w, qtyIds, netVolumeM3, densityKgM3);
 	writeRelDefinesByProperties(w, ownerHistoryId, wallExpressId, writeElementQuantity(w, ownerHistoryId, "Qto_WallBaseQuantities", qtyIds));
 }
-function writeExactWallBaseQuantities(w, ownerHistoryId, wallExpressId, values) {
+function writeWallBodyQuantities(w, ownerHistoryId, wallExpressId, values) {
 	writeRelDefinesByProperties(w, ownerHistoryId, wallExpressId, writeElementQuantity(w, ownerHistoryId, "Qto_WallBaseQuantities", [
 		writeQtyLength(w, "Length", values.lengthM),
 		writeQtyLength(w, "Width", values.widthM),
@@ -15165,10 +15164,25 @@ function preflightExactBody(input) {
 	return ok([first.value, ...remainingPrepared]);
 }
 //#endregion
-//#region src/serialize/exactWallQuantities.ts
-function deriveExactWallQuantities(input) {
+//#region src/serialize/wallQuantities.ts
+function deriveWallQuantities(input) {
 	try {
-		const measured = measureProductBodyMaterial(input.solids);
+		const items = [];
+		for (const retained of input.solids) {
+			if (getKernel().shapeType(retained.wrapped) !== "compound") {
+				items.push(retained);
+				continue;
+			}
+			const cardinality = singleWrapperChild(retained);
+			if (!cardinality.ok) return cardinality;
+			const children = getSolids(retained);
+			const [child] = children;
+			if (children.length !== 1 || child === void 0 || !isValidSolid(child)) return wallVolumeError(/* @__PURE__ */ new Error("Expected one valid solid in a retained recipe wrapper"));
+			items.push(child);
+		}
+		const [first, ...rest] = items;
+		if (first === void 0) return wallVolumeError(/* @__PURE__ */ new Error("Expected retained Wall material"));
+		const measured = measureProductBodyMaterial([first, ...rest]);
 		if (!measured.ok) return wallVolumeError(measured.error);
 		return ok({
 			lengthM: toIfcLengthM(input.spec.length),
@@ -15180,8 +15194,24 @@ function deriveExactWallQuantities(input) {
 		return wallVolumeError(cause);
 	}
 }
+/** Count before cached extraction: a failed later cast cannot strand earlier children. */
+function singleWrapperChild(retained) {
+	const kernel = getKernel();
+	let count;
+	if (kernel.subShapeCount !== void 0) count = kernel.subShapeCount(retained.wrapped, "solid");
+	else {
+		const rawChildren = kernel.iterShapes(retained.wrapped, "solid");
+		const cleanup = cleanupOwnedResources(rawChildren.map((raw, itemIndex) => ({
+			resource: { [Symbol.dispose]: () => kernel.dispose(raw) },
+			itemIndex
+		})), { operation: "wallQuantityWrapperCount" });
+		if (cleanup.kind === "FAILED") return wallVolumeError({ cleanup });
+		count = rawChildren.length;
+	}
+	return count === 1 ? ok(void 0) : wallVolumeError(/* @__PURE__ */ new Error("Expected one valid solid in a retained recipe wrapper"));
+}
 function wallVolumeError(cause) {
-	return err(ifcError("IFC_EXACT_WALL_QUANTITY_DERIVATION_FAILED", "Failed to derive a positive finite NetVolume for the retained Wall Body", cause));
+	return err(ifcError("IFC_WALL_QUANTITY_DERIVATION_FAILED", "Failed to derive a positive finite NetVolume for the retained Wall Body", cause));
 }
 //#endregion
 //#region src/serialize/toIfc.ts
@@ -15212,8 +15242,13 @@ function preflightProductBodies(elements) {
 	return ok(preflighted);
 }
 async function toIfc(model, meta) {
+	const serialized = await serializeIfc(model, meta);
+	return serialized.ok ? ok(serialized.value.bytes) : serialized;
+}
+async function serializeIfc(model, meta) {
 	try {
 		var _usingCtx$2 = _usingCtx();
+		const issues = [];
 		const project = model.getProject();
 		if (!project) return err(ifcError("NO_PROJECT", "BimModel has no project — call model.init() first"));
 		if ((model.getBridges().length > 0 || model.getBridgeParts().length > 0 || model.getEarthworksFills().length > 0) && (meta.ifcSchema ?? "IFC4") !== "IFC4X3") return err(ifcError("IFC4X3_REQUIRED", "Bridge, Bridge Part, and Earthworks Fill entities require IFC4X3 serialization"));
@@ -15331,10 +15366,10 @@ async function toIfc(model, meta) {
 			const wall = preflighted.element;
 			const containingId = findContainerOf(wall.localId, relationships);
 			const storeyPlacementId = containingId !== null ? placementMap.get(containingId) ?? null : null;
-			const exactQuantities = preflighted.kind === "EXACT" ? deriveExactWallQuantities({
+			const bodyQuantities = deriveWallQuantities({
 				spec: wall.spec,
-				solids: preflighted.solids
-			}) : null;
+				solids: bodySolids(wall.geometry)
+			});
 			const { localPlacementId, productDefinitionShapeId } = preflighted.kind === "EXACT" ? writeExactBodyGeometry(w, wall.spec, preflighted.items, geomSubContextId, storeyPlacementId) : writeWallGeometry(w, wall.spec, geomSubContextId, storeyPlacementId);
 			const wallExpressId = writeWallEntity(w, wall.guid, `Wall ${i + 1}`, ownerHistoryId, localPlacementId, productDefinitionShapeId);
 			idMap.set(wall.localId, wallExpressId);
@@ -15342,9 +15377,12 @@ async function toIfc(model, meta) {
 			writeWallCommonPset(w, ownerHistoryId, wallExpressId, wall.spec);
 			writeManufacturerPset(w, ownerHistoryId, wallExpressId, wall.spec);
 			if (wall.spec.customProperties !== void 0) writeCustomPsets(w, ownerHistoryId, wallExpressId, wall.spec.customProperties);
-			if (preflighted.kind === "EXACT") {
-				if (exactQuantities !== null && exactQuantities.ok) writeExactWallBaseQuantities(w, ownerHistoryId, wallExpressId, exactQuantities.value);
-			} else writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, wall.spec, openingsByWall.get(wall.localId) ?? [], densityByElement.get(wall.localId));
+			if (!bodyQuantities.ok) issues.push(issue("warning", "WALL_QUANTITY_OMITTED", "Wall quantities omitted because occupied material volume could not be measured", wall.localId, {
+				guid: wall.guid,
+				cause: bodyQuantities.error
+			}));
+			else if (wall.geometry.kind === "PARAMETRIC") writeWallBaseQuantities(w, ownerHistoryId, wallExpressId, wall.spec, openingsByWall.get(wall.localId) ?? [], bodyQuantities.value.netVolumeM3, densityByElement.get(wall.localId));
+			else writeWallBodyQuantities(w, ownerHistoryId, wallExpressId, bodyQuantities.value);
 		}
 		for (const [i, slab] of slabs.entries()) {
 			const containingId = findContainerOf(slab.localId, relationships);
@@ -15688,7 +15726,11 @@ async function toIfc(model, meta) {
 		for (const { ref, ids } of classByKey.values()) byClassification.set(ref, ids);
 		if (byClassification.size > 0) writeClassificationRefs(w, ownerHistoryId, byClassification);
 		writeTypeLayer(w, ownerHistoryId, model, idMap);
-		return w.save();
+		const saved = w.save();
+		return saved.ok ? ok({
+			bytes: saved.value,
+			issues
+		}) : saved;
 	} catch (_) {
 		_usingCtx$2.e = _;
 	} finally {
@@ -15808,15 +15850,16 @@ function toOccurrences(elements, predefined) {
 async function toIfcValidated(model, meta) {
 	const integrity = checkReferentialIntegrity(model);
 	if (hasErrors(integrity)) return err(ifcError("INTEGRITY_FAILURE", "Model failed referential integrity check", integrity.issues.filter((i) => i.severity === "error")));
-	const bytesResult = await toIfc(model, meta);
-	if (!bytesResult.ok) return bytesResult;
-	const bytes = bytesResult.value;
+	const serialized = await serializeIfc(model, meta);
+	if (!serialized.ok) return serialized;
+	const { bytes } = serialized.value;
 	const geometry = collectGeometryIssues(model);
 	const schema = await checkSchema(bytes);
 	const roundTrip = await checkRoundTrip(bytes);
 	const gherkin = await checkGherkinRules(bytes);
 	const report = { issues: [
 		...integrity.issues,
+		...serialized.value.issues,
 		...geometry.issues,
 		...schema.issues,
 		...roundTrip.issues,

package/dist/ifc-writer/psetWriter.d.ts

@@ -44,8 +44,8 @@ export declare function writeCustomPsets(w: IfcWriter, ownerHistoryId: number, e
  * so the caller can skip emitting a weight quantity.
  */
 export declare function resolveDensityKgM3(materialName: string | undefined, explicitDensityKgM3: number | undefined): number | undefined;
-export declare function writeWallBaseQuantities(w: IfcWriter, ownerHistoryId: number, wallExpressId: number, spec: WallSpec, openings: readonly WallOpeningSpec[], densityKgM3?: number): void;
-export declare function writeExactWallBaseQuantities(w: IfcWriter, ownerHistoryId: number, wallExpressId: number, values: {
+export declare function writeWallBaseQuantities(w: IfcWriter, ownerHistoryId: number, wallExpressId: number, spec: WallSpec, openings: readonly WallOpeningSpec[], netVolumeM3: number, densityKgM3?: number): void;
+export declare function writeWallBodyQuantities(w: IfcWriter, ownerHistoryId: number, wallExpressId: number, values: {
     readonly lengthM: number;
     readonly widthM: number;
     readonly heightM: number;

package/dist/serialize/{exactWallQuantities.d.ts → wallQuantities.d.ts}

@@ -2,15 +2,15 @@ import { Result, ValidSolid } from 'brepjs';
 import { BimError } from '../errors/bimError.js';
 import { WallSpec } from '../specs/wallSpec.js';
 import { NonEmpty } from '../types/productBody.js';
-interface ExactWallQuantityValues {
+interface WallQuantityValues {
     readonly lengthM: number;
     readonly widthM: number;
     readonly heightM: number;
     readonly netVolumeM3: number;
 }
-interface ExactWallQuantityInput {
+interface WallQuantityInput {
     readonly spec: WallSpec;
     readonly solids: NonEmpty<ValidSolid>;
 }
-export declare function deriveExactWallQuantities(input: ExactWallQuantityInput): Result<ExactWallQuantityValues, BimError>;
+export declare function deriveWallQuantities(input: WallQuantityInput): Result<WallQuantityValues, BimError>;
 export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "brepjs-bim",
-  "version": "0.24.3",
+  "version": "0.24.4",
   "description": "BIM layer for brepjs — IFC4-aligned parametric building elements",
   "keywords": [
     "bim",