@ifc-lite/export 2.9.4 → 3.0.1

package/dist/step-source-iteration.js

@@ -0,0 +1,178 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
+import { filterHiddenRefsFromRelationshipLine } from './reference-collector.js';
+import { convertStepLine } from './schema-converter.js';
+import { nominateDeliveredInPlaceEdits } from './in-place-nomination.js';
+import { decodeRange } from './source-ref-bounds.js';
+import { getPropertyIdsInSet } from './step-property-set-readers.js';
+/**
+ * Un-skip property/quantity atoms that a surviving (non-skipped, and — under
+ * visible-only export — still-included) IfcPropertySet / IfcElementQuantity
+ * still references.
+ *
+ * When a property is edited, the modified pset is replaced and its member atoms
+ * are added to `skipIds` wholesale. Because exporters deduplicate shared
+ * Pset_*Common atoms (e.g. a single IsExternal / IsLoadBearing value referenced
+ * by many psets), that wholesale skip can drop an atom another pset still needs.
+ * This pass restores any such atom: the edited pset still emits its replacement
+ * with the new value, while the shared atom stays for the psets that keep their
+ * original value.
+ */
+function retainSharedAtoms(skipIds, allowedEntityIds, ctxOf) {
+    if (skipIds.size === 0)
+        return;
+    // Built once for the whole sweep rather than per container: the readers in
+    // `step-property-set-readers.ts` take the context, and this loop calls one
+    // of them once per IfcPropertySet / IfcElementQuantity in the file.
+    const ctx = ctxOf.propertySetContext();
+    const byType = ctxOf.dataStore.entityIndex.byType;
+    const containerIds = [
+        ...(byType.get('IFCPROPERTYSET') ?? []),
+        ...(byType.get('IFCELEMENTQUANTITY') ?? []),
+    ];
+    for (const containerId of containerIds) {
+        // Skipped containers are being dropped/replaced — their atoms may go.
+        if (skipIds.has(containerId))
+            continue;
+        // Under visible-only export a container outside the closure is not emitted,
+        // so it cannot keep an atom alive.
+        if (allowedEntityIds !== null && !allowedEntityIds.has(containerId))
+            continue;
+        for (const atomId of getPropertyIdsInSet(ctx, containerId)) {
+            skipIds.delete(atomId);
+        }
+    }
+}
+/**
+ * Write every source-backed record this export keeps, into `pass.entities`.
+ *
+ * Mutates the pass in place and returns nothing: three later readers take its
+ * output at a distance — the assembly step reads `pass.entities`, `settle()`
+ * reads `pass.modifications`, and the header count reads both.
+ *
+ * `mayNameOmittedRefs` is passed rather than read off the pass because it is
+ * deliberately not a pass member: it folds in `hiddenProductIds`, which the
+ * visible-only closure walk only assigns after the pass is constructed, so
+ * hoisting it would change what it computes rather than where it is named. The
+ * overlay-created-entities block reads the same local. `isOmittedFromOutput`
+ * is passed alongside it for the same reason — it closes over `pass` but is
+ * built once by the caller (`step-exporter.ts`), not re-derived here.
+ */
+export function writeSourceEntityLines(pass, options, mayNameOmittedRefs, isOmittedFromOutput, ctx) {
+    // A modified pset is replaced wholesale, which skips ALL of its member atoms.
+    // But IFC exporters deduplicate identical Pset_*Common atoms (e.g. one
+    // IsExternal IfcPropertySingleValue shared by dozens of psets), so skipping a
+    // shared atom would orphan every OTHER pset that still references it, leaving
+    // dangling refs and an invalid file. Keep any atom a surviving container needs.
+    retainSharedAtoms(pass.skipPropertySetIds, pass.allowedEntityIds, ctx);
+    // Export original entities from source buffer, SKIPPING modified property sets
+    if (!options.deltaOnly && ctx.dataStore.source) {
+        const source = ctx.dataStore.source;
+        // Extract existing entities from source. The effective index has already
+        // dropped everything the overlay tombstoned, so there is no separate
+        // deleted check to forget here.
+        for (const [expressId, entityRef] of pass.effective) {
+            // Skip overlay-only entities — emitted by the overlay-created-entities
+            // block back in `export()`.
+            // A ref this source cannot address is skipped by the same test rather
+            // than decoded: `decodeUtf8` clamps such a range and the empty string
+            // it returns used to be pushed into the file as a blank line, leaving
+            // every generated record that names the host dangling (#2491).
+            if (!pass.isReadableSourceRef(entityRef)) {
+                continue;
+            }
+            // Skip entities outside the visible closure
+            if (pass.allowedEntityIds !== null && !pass.allowedEntityIds.has(expressId)) {
+                continue;
+            }
+            // Skip property sets/relationships that are being replaced
+            if (pass.skipPropertySetIds.has(expressId) || pass.skipRelationshipIds.has(expressId)) {
+                continue;
+            }
+            // Skip type entities whose HasPropertySets attribute will be rewritten
+            if (pass.rewrittenEntityIds.has(expressId)) {
+                continue;
+            }
+            // Skip geometry if not included. Classified via `isGeometryExcluded`
+            // (which reads the EFFECTIVE type, `effective.effectiveType`) rather
+            // than `entityRef.type` directly: a retype can move a record across
+            // the geometry boundary in either direction, and this check has to
+            // agree with `hasEmittableHostBytes`/`willBeEmitted`'s use of the
+            // same predicate — otherwise a wall retyped to `IfcCartesianPoint`
+            // still ships its (rewritten) geometry line under
+            // `includeGeometry: false`, the exact "predicate must agree" failure
+            // this file already guards for the non-retyped case (#2414).
+            if (pass.isGeometryExcluded(expressId, entityRef.type)) {
+                continue;
+            }
+            // Get original entity text — decodeRange handles SAB-backed
+            // sources (Firefox/Chrome reject `TextDecoder.decode()` on a
+            // SharedArrayBuffer-backed view; the parser deliberately keeps
+            // `source` zero-copy SAB-backed for worker sharing).
+            const entityText = decodeRange(source, entityRef.byteOffset, entityRef.byteOffset + entityRef.byteLength);
+            // Retype, named attribute edits and positional edits, in that order.
+            // Shared verbatim with the type-object `HasPropertySets` rewrite in
+            // `step-property-sets.ts`, which writes the line this pass would
+            // otherwise have written — hence injected rather than moved here.
+            const mutated = ctx.applySourceLineMutations(expressId, entityText, entityRef.type, pass.modifiedAttributes.get(expressId), pass.sourceSchema, pass.overlayActive, (attr, value) => pass.warnings.push(`entity #${expressId}: attribute ${attr} not written - ` +
+                `${JSON.stringify(value)} is not a number and the slot is REAL-typed`));
+            let nextEntityText = mutated.text;
+            // A hidden PRODUCT's own line is already out of the export via
+            // `allowedEntityIds`, and a TOMBSTONED entity's via `effective` — this
+            // is the relationship that NAMED either one. `IFCREL*` is an
+            // unconditional root (see `getVisibleEntityIds`), so its bytes reach
+            // here unfiltered even when one of the ids they name was just
+            // excluded; left alone that ships a `#N` with no `#N=` line, whether
+            // the exclusion came from `visibleOnly` or from a plain deletion
+            // (#2398). Checked before the nomination below: a relationship this
+            // withholds must not also be counted as a delivered modification.
+            //
+            // Classified by the EFFECTIVE type (`effective.effectiveType`), not
+            // the source's authored type: a retype can move a record across
+            // the `IFCREL*` boundary in either direction (`applySourceLineMutations`
+            // already rewrote `nextEntityText` to the new class), and this check
+            // has to agree with what actually got written, the same way
+            // `getVisibleEntityIds` already does for the visibility walk itself.
+            const effectiveRelType = pass.effective.effectiveType(expressId, entityRef.type).toUpperCase();
+            if (mayNameOmittedRefs && effectiveRelType.startsWith('IFCREL')) {
+                const filtered = filterHiddenRefsFromRelationshipLine(nextEntityText, isOmittedFromOutput);
+                if (filtered === null) {
+                    pass.warnings.push(ctx.relationshipWithheldWarning(expressId, effectiveRelType));
+                    continue;
+                }
+                nextEntityText = filtered;
+            }
+            // A retype or a positional edit that CHANGED the line is what makes
+            // this entity count; a named attribute edit was already nominated by
+            // the collection pass. Both flags report effect, so retyping an entity
+            // to the class it already is — or writing a slot the token it already
+            // holds — no longer claims a modification over a line the export left
+            // byte-identical. This pass is full-export-only (`deltaOnly` skips it
+            // wholesale), so nomination IS emission here and the kinds only have to
+            // be right for the entity count — which is per entity, hence unchanged.
+            if (mutated.retyped || mutated.positional)
+                pass.modifiedEntities.add(expressId);
+            if (mutated.retyped)
+                pass.modifications.nominate(expressId, 'retype');
+            if (mutated.positional)
+                pass.modifications.nominate(expressId, 'positional');
+            // The named-attribute kinds join them here rather than at their
+            // collection sites, for the same reason and on the same signal (#2483).
+            // This pass is full-export-only, so there is nothing to gate.
+            nominateDeliveredInPlaceEdits(pass.modifications, expressId, mutated, pass.inPlaceNominees);
+            // Apply schema conversion if exporting to a different schema version
+            if (pass.converting) {
+                const converted = convertStepLine(nextEntityText, pass.sourceSchema, pass.schema, options.guidRandom);
+                if (converted !== null) {
+                    pass.entities.push(converted);
+                }
+                // null means entity should be skipped (no valid representation in target schema)
+            }
+            else {
+                pass.entities.push(nextEntityText);
+            }
+        }
+    }
+}
+//# sourceMappingURL=step-source-iteration.js.map

package/dist/step-source-iteration.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"step-source-iteration.js","sourceRoot":"","sources":["../src/step-source-iteration.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ifc-lite/export",
-  "version": "2.9.4",
+  "version": "3.0.1",
   "description": "Export formats for IFC-Lite",
   "type": "module",
   "main": "./dist/index.js",
@@ -16,16 +16,16 @@
     "parquet-wasm": "^0.7.2",
     "apache-arrow": "^21.2.0",
     "jszip": "^3.10.0",
-    "@ifc-lite/geometry": "^3.8.4",
-    "@ifc-lite/data": "^3.4.0",
-    "@ifc-lite/encoding": "^2.0.0",
-    "@ifc-lite/parser": "^4.2.0",
-    "@ifc-lite/mutations": "^1.26.1"
+    "@ifc-lite/data": "^3.5.0",
+    "@ifc-lite/encoding": "^2.1.0",
+    "@ifc-lite/parser": "^4.3.2",
+    "@ifc-lite/mutations": "^1.27.0",
+    "@ifc-lite/geometry": "^4.1.0"
   },
   "devDependencies": {
     "typescript": "^6.0.3",
     "vitest": "^4.1.10",
-    "@ifc-lite/ifcx": "^2.3.7"
+    "@ifc-lite/ifcx": "^3.0.1"
   },
   "license": "MPL-2.0",
   "author": "Louis True",