@ifc-lite/export 4.7.2 → 4.7.4

package/dist/merged-decomposition-parents.d.ts

@@ -0,0 +1,99 @@
+/**
+ * One-parent-per-object bookkeeping for the decomposition relationships of a
+ * merge (#5471, #5726).
+ *
+ * Split out of {@link ../merged-exporter.ts} (kept under its module-size
+ * budget) rather than duplicated: `findEntitiesByType`/`extractStepAttribute`
+ * stay the single source of truth in `MergedExporter` and are passed in here,
+ * so this file has no data-model logic of its own to drift from it.
+ */
+import type { IfcDataStore } from '@ifc-lite/parser';
+import type { IfcSchemaVersion } from './schema-converter.js';
+/**
+ * The final ids already given a WRITTEN parent in the merge output, per
+ * single-valued decomposition inverse of the output schema. One instance per
+ * merge, grown model by model in merge order.
+ */
+export declare class DecompositionClaims {
+    /** Relationship type (uppercase) → the inverse it fills; see {@link IFC4_INVERSES}. */
+    readonly inverseOf: ReadonlyMap<string, string>;
+    private readonly parented;
+    /** `only` narrows the claimed relationship types (the #5725 drop planner's view). */
+    constructor(outputSchema: IfcSchemaVersion, only?: (relType: string) => boolean);
+    /** The final ids that already fill `inverse` in the output. */
+    parentedVia(inverse: string): Set<number>;
+}
+/** What {@link claimDecompositionParents} needs to know about one model's plan. */
+export interface DecompositionClaimInput {
+    dataStore: IfcDataStore;
+    /** Local id → final id for every unified entity (spatial, infrastructure, GlobalId). */
+    sharedRemap: ReadonlyMap<number, number>;
+    /** This model's id offset: an unremapped local id's final id is `id + idOffset`. */
+    idOffset: number;
+    /** Local ids not written; a skipped rel claims nothing, and a rel skipped here is added. */
+    skipEntityIds: Set<number>;
+    /** Local rel id → member ids to drop from its written RelatedObjects list. */
+    relParentStrip: Map<number, Set<number>>;
+    /**
+     * Whether a local id survives into the output as a reference: false for a
+     * hidden product under `visibleOnly` or a dropped empty container, which
+     * `renderEntity` narrows out of (or, as a RelatingObject, withholds) the rel.
+     */
+    isEmitted: (localId: number) => boolean;
+    /** Whether the rel line itself is in the written set at all (visibility closure). */
+    isIncluded: (localId: number) => boolean;
+    /** Strip already-parented members (a later, unified model); false just records claims. */
+    dedupe: boolean;
+}
+/**
+ * Keep one decomposition parent per object and inverse across a merge (#5471,
+ * #5726).
+ *
+ * `IfcObjectDefinition.Decomposes` (and, from IFC4, `.Nests`) is `SET [0:1]`,
+ * and `IfcSpatialStructureElement.WR41` requires exactly one for a building or
+ * storey. Once a later model's Building unifies with the primary's, the
+ * primary's own rel already gives it a parent, so a later rel naming the same
+ * (remapped) Building gives it a second one, whether that rel's RelatingObject
+ * remaps to the same parent (a duplicate edge, e.g. `(Project, (Site))` twice)
+ * or a different one (model B aggregates its Building under its Project, model
+ * A under a Site). Which relationships share an inverse is the output schema's
+ * call, held by {@link DecompositionClaims}.
+ *
+ * `claims` holds the final ids that already have a parent WRITTEN to the
+ * output. Called once per model in merge order, after all of that model's
+ * unification and container drops: every rel the model will write adds its
+ * written members. A rel that will not be written (skipped, outside the
+ * visibility closure, or with a hidden or dropped RelatingObject) claims
+ * nothing, and neither does a member narrowed out of it, so a later model's rel
+ * stays the parent of an object whose primary parent is not in the output.
+ *
+ * With `dedupe`, a written member already claimed for the rel's inverse is
+ * redundant: a rel whose written members are ALL redundant is skipped, one with
+ * SOME is kept for its new members and the redundant ids go to
+ * `relParentStrip` for {@link applyRelParentStrip}. A unified member with no
+ * parent yet is kept, since that rel is then its only parentage statement
+ * (#3550).
+ */
+export declare function claimDecompositionParents(input: DecompositionClaimInput, claims: DecompositionClaims, findEntitiesByType: (dataStore: IfcDataStore, typeUpper: string) => number[], extractStepAttribute: (expressId: number, dataStore: IfcDataStore, attrIndex: number) => string | null): void;
+/**
+ * Render-time counterpart of {@link claimDecompositionParents}: drop the
+ * RelatedObjects members of a partially redundant IFCRELAGGREGATES or
+ * IFCRELNESTS that already have a parent of that kind in the output.
+ * Reuses the same list/scalar-aware ref filter the
+ * `visibleOnly`/deletion dangling-ref path uses. Must run in LOCAL id
+ * space, before any id offset/remap — `localId` and the ids inside
+ * `relParentStrip` are both local to the model being rendered.
+ *
+ * Returns `entityText` unchanged when `localId` has no strip entry, and
+ * `null` when the filter would withhold the whole line — a strip set built
+ * by {@link claimDecompositionParents} is a strict subset of the
+ * RelatedObjects list, so for well-formed input the filter only narrows,
+ * but a degenerate file (a stripped member id that also appears as a
+ * single-valued ref, e.g. self-aggregation) can null the line. The caller
+ * must withhold it, like every other user of the filter: every edge the
+ * line declared is already declared by the primary model, and emitting the
+ * unfiltered bytes instead would reintroduce the duplicate membership this
+ * module exists to remove.
+ */
+export declare function applyRelParentStrip(entityText: string, localId: number, relParentStrip: ReadonlyMap<number, ReadonlySet<number>>): string | null;
+//# sourceMappingURL=merged-decomposition-parents.d.ts.map

package/dist/merged-decomposition-parents.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merged-decomposition-parents.d.ts","sourceRoot":"","sources":["../src/merged-decomposition-parents.ts"],"names":[],"mappings":"AAIA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAuB9D;;;;GAIG;AACH,qBAAa,mBAAmB;IAC9B,uFAAuF;IACvF,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAChD,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAkC;IAE3D,qFAAqF;gBACzE,YAAY,EAAE,gBAAgB,EAAE,IAAI,GAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAoB;IAK3F,+DAA+D;IAC/D,WAAW,CAAC,OAAO,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;CAK1C;AAED,mFAAmF;AACnF,MAAM,WAAW,uBAAuB;IACtC,SAAS,EAAE,YAAY,CAAC;IACxB,wFAAwF;IACxF,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,oFAAoF;IACpF,QAAQ,EAAE,MAAM,CAAC;IACjB,4FAA4F;IAC5F,aAAa,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC;IAC3B,8EAA8E;IAC9E,cAAc,EAAE,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC;;;;OAIG;IACH,SAAS,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACxC,qFAAqF;IACrF,UAAU,EAAE,CAAC,OAAO,EAAE,MAAM,KAAK,OAAO,CAAC;IACzC,0FAA0F;IAC1F,MAAM,EAAE,OAAO,CAAC;CACjB;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA4BG;AACH,wBAAgB,yBAAyB,CACvC,KAAK,EAAE,uBAAuB,EAC9B,MAAM,EAAE,mBAAmB,EAC3B,kBAAkB,EAAE,CAAC,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,KAAK,MAAM,EAAE,EAC5E,oBAAoB,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,SAAS,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,GACrG,IAAI,CAwBN;AAYD;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,mBAAmB,CACjC,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,MAAM,EACf,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,GACvD,MAAM,GAAG,IAAI,CAIf"}

package/dist/merged-decomposition-parents.js

@@ -0,0 +1,142 @@
+/* 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';
+/**
+ * Each decomposition relationship → the `SET [0:1]` inverse on
+ * `IfcObjectDefinition` its RelatedObjects fill, in the OUTPUT schema. Both
+ * relationships carry RelatingObject at attr 4 and RelatedObjects at attr 5 in
+ * every schema.
+ *
+ * IFC2X3: `Decomposes : SET [0:1] OF IfcRelDecomposes`, and IfcRelAggregates
+ * and IfcRelNests are both IfcRelDecomposes, so one nesting and one
+ * aggregation parent together are already two (#5726). IFC4 and later split
+ * `Nests : SET [0:1] OF IfcRelNests` off `Decomposes : SET [0:1] OF
+ * IfcRelAggregates`: one parent of each kind, but still only one each.
+ */
+const IFC2X3_INVERSES = new Map([
+    ['IFCRELAGGREGATES', 'Decomposes'],
+    ['IFCRELNESTS', 'Decomposes'],
+]);
+const IFC4_INVERSES = new Map([
+    ['IFCRELAGGREGATES', 'Decomposes'],
+    ['IFCRELNESTS', 'Nests'],
+]);
+/**
+ * The final ids already given a WRITTEN parent in the merge output, per
+ * single-valued decomposition inverse of the output schema. One instance per
+ * merge, grown model by model in merge order.
+ */
+export class DecompositionClaims {
+    /** Relationship type (uppercase) → the inverse it fills; see {@link IFC4_INVERSES}. */
+    inverseOf;
+    parented = new Map();
+    /** `only` narrows the claimed relationship types (the #5725 drop planner's view). */
+    constructor(outputSchema, only = () => true) {
+        const inverses = outputSchema === 'IFC2X3' ? IFC2X3_INVERSES : IFC4_INVERSES;
+        this.inverseOf = new Map([...inverses].filter(([relType]) => only(relType)));
+    }
+    /** The final ids that already fill `inverse` in the output. */
+    parentedVia(inverse) {
+        let ids = this.parented.get(inverse);
+        if (ids === undefined)
+            this.parented.set(inverse, (ids = new Set()));
+        return ids;
+    }
+}
+/**
+ * Keep one decomposition parent per object and inverse across a merge (#5471,
+ * #5726).
+ *
+ * `IfcObjectDefinition.Decomposes` (and, from IFC4, `.Nests`) is `SET [0:1]`,
+ * and `IfcSpatialStructureElement.WR41` requires exactly one for a building or
+ * storey. Once a later model's Building unifies with the primary's, the
+ * primary's own rel already gives it a parent, so a later rel naming the same
+ * (remapped) Building gives it a second one, whether that rel's RelatingObject
+ * remaps to the same parent (a duplicate edge, e.g. `(Project, (Site))` twice)
+ * or a different one (model B aggregates its Building under its Project, model
+ * A under a Site). Which relationships share an inverse is the output schema's
+ * call, held by {@link DecompositionClaims}.
+ *
+ * `claims` holds the final ids that already have a parent WRITTEN to the
+ * output. Called once per model in merge order, after all of that model's
+ * unification and container drops: every rel the model will write adds its
+ * written members. A rel that will not be written (skipped, outside the
+ * visibility closure, or with a hidden or dropped RelatingObject) claims
+ * nothing, and neither does a member narrowed out of it, so a later model's rel
+ * stays the parent of an object whose primary parent is not in the output.
+ *
+ * With `dedupe`, a written member already claimed for the rel's inverse is
+ * redundant: a rel whose written members are ALL redundant is skipped, one with
+ * SOME is kept for its new members and the redundant ids go to
+ * `relParentStrip` for {@link applyRelParentStrip}. A unified member with no
+ * parent yet is kept, since that rel is then its only parentage statement
+ * (#3550).
+ */
+export function claimDecompositionParents(input, claims, findEntitiesByType, extractStepAttribute) {
+    const { dataStore, sharedRemap, idOffset, skipEntityIds, relParentStrip, isEmitted, isIncluded, dedupe } = input;
+    const finalId = (ref) => sharedRemap.get(ref) ?? ref + idOffset;
+    for (const [relType, inverse] of claims.inverseOf) {
+        const parented = claims.parentedVia(inverse);
+        for (const relId of findEntitiesByType(dataStore, relType)) {
+            if (skipEntityIds.has(relId) || !isIncluded(relId))
+                continue;
+            // RelatingObject is attr 4 — a single #ref; a hidden or dropped one withholds the line.
+            const relating = extractStepAttribute(relId, dataStore, 4)?.match(/^#(\d+)$/);
+            if (relating && !isEmitted(parseInt(relating[1], 10)))
+                continue;
+            // RelatedObjects is attr 5 — list of #refs like (#2,#3); hidden members are narrowed out.
+            const refs = listRefs(extractStepAttribute(relId, dataStore, 5)).filter(isEmitted);
+            if (refs.length === 0)
+                continue;
+            const redundantRefs = dedupe ? refs.filter(ref => parented.has(finalId(ref))) : [];
+            if (redundantRefs.length === refs.length) {
+                // Every written member already has a parent in the output — fully redundant.
+                skipEntityIds.add(relId);
+                continue;
+            }
+            if (redundantRefs.length > 0)
+                relParentStrip.set(relId, new Set(redundantRefs));
+            for (const ref of refs)
+                parented.add(finalId(ref));
+        }
+    }
+}
+/** The `#id`s in one STEP list attribute, in order; `[]` for a missing one. */
+function listRefs(attr) {
+    if (!attr)
+        return [];
+    const refs = [];
+    const refRegex = /#(\d+)/g;
+    let match;
+    while ((match = refRegex.exec(attr)) !== null)
+        refs.push(parseInt(match[1], 10));
+    return refs;
+}
+/**
+ * Render-time counterpart of {@link claimDecompositionParents}: drop the
+ * RelatedObjects members of a partially redundant IFCRELAGGREGATES or
+ * IFCRELNESTS that already have a parent of that kind in the output.
+ * Reuses the same list/scalar-aware ref filter the
+ * `visibleOnly`/deletion dangling-ref path uses. Must run in LOCAL id
+ * space, before any id offset/remap — `localId` and the ids inside
+ * `relParentStrip` are both local to the model being rendered.
+ *
+ * Returns `entityText` unchanged when `localId` has no strip entry, and
+ * `null` when the filter would withhold the whole line — a strip set built
+ * by {@link claimDecompositionParents} is a strict subset of the
+ * RelatedObjects list, so for well-formed input the filter only narrows,
+ * but a degenerate file (a stripped member id that also appears as a
+ * single-valued ref, e.g. self-aggregation) can null the line. The caller
+ * must withhold it, like every other user of the filter: every edge the
+ * line declared is already declared by the primary model, and emitting the
+ * unfiltered bytes instead would reintroduce the duplicate membership this
+ * module exists to remove.
+ */
+export function applyRelParentStrip(entityText, localId, relParentStrip) {
+    const toStrip = relParentStrip.get(localId);
+    if (toStrip === undefined)
+        return entityText;
+    return filterHiddenRefsFromRelationshipLine(entityText, id => toStrip.has(id));
+}
+//# sourceMappingURL=merged-decomposition-parents.js.map

package/dist/merged-decomposition-parents.js.map

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

package/dist/merged-empty-containers-refs.d.ts

@@ -0,0 +1,24 @@
+/** Top-level arguments of a `#id=TYPE(…);` line, or `null` when unparseable. */
+export declare function topLevelAttrs(line: string): string[] | null;
+/** `"#7"` → `7` via shared, trivia-tolerant {@link BARE_REF_RE} (#4227 — a narrower regex misclassified a comment-wrapped `RelatingObject`). */
+export declare function singleRef(arg: string): number | null;
+/** Parse a `(#a,#b,…)` list argument into ids. */
+export declare function refList(arg: string): number[];
+/**
+ * Every reference in a line's argument list, paired with whether it sits
+ * somewhere neither `filterHiddenRefsFromRelationshipLine` can strip (a direct
+ * list element) nor withhold the line for (a whole single-valued attribute) —
+ * i.e. nested inside a list of lists or a typed value. `null` when the line's
+ * argument list cannot be parsed at all: a line no rewrite can narrow, which the
+ * analysis must treat as a blocker rather than as "names nothing".
+ */
+export declare function classifyRefs(line: string): Array<[number, boolean]> | null;
+/**
+ * Every `#N` reference in a chunk of STEP text, skipping quoted strings (where a
+ * `#` is literal) and any leading `#id=` (the line's own id). Reads bytes rather
+ * than decoded text so the reverse-reference scan never decodes a whole model.
+ */
+export declare function argRefs(text: Uint8Array | string): number[];
+/** The GlobalId (first quoted attribute) of a rooted entity's line. */
+export declare function leadingGuid(line: string): string | null;
+//# sourceMappingURL=merged-empty-containers-refs.d.ts.map

package/dist/merged-empty-containers-refs.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"merged-empty-containers-refs.d.ts","sourceRoot":"","sources":["../src/merged-empty-containers-refs.ts"],"names":[],"mappings":"AAkBA,gFAAgF;AAChF,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,GAAG,IAAI,CAG3D;AAED,gJAAgJ;AAChJ,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAGpD;AAED,kDAAkD;AAClD,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,EAAE,CAW7C;AAED;;;;;;;GAOG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,GAAG,IAAI,CAuB1E;AAED;;;;GAIG;AACH,wBAAgB,OAAO,CAAC,IAAI,EAAE,UAAU,GAAG,MAAM,GAAG,MAAM,EAAE,CAyB3D;AAED,uEAAuE;AACvE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CASvD"}

package/dist/merged-empty-containers-refs.js

@@ -0,0 +1,126 @@
+/* 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/. */
+/**
+ * STEP reference reading for the empty-container analysis in
+ * `merged-empty-containers.ts` (#3643): which `#N` a line names, and where.
+ * Split out of that module when #5725 grew it past the module-size limit.
+ *
+ * Every reader here tolerates STEP trivia (whitespace and/or a `/* ... *​/`
+ * comment, #3789) between tokens; a line whose arguments cannot be read comes
+ * back `null`, which the analysis treats as "can't safely rewrite" and so blocks
+ * the drop, never as "names nothing".
+ */
+import { readStepSlots, splitTopLevelListItems } from './step-argument-parser.js';
+import { BARE_REF_RE } from './reference-collector.js';
+/** Top-level arguments of a `#id=TYPE(…);` line, or `null` when unparseable. */
+export function topLevelAttrs(line) {
+    const record = readStepSlots(line);
+    return record === null ? null : record.slots.map(arg => arg.trim());
+}
+/** `"#7"` → `7` via shared, trivia-tolerant {@link BARE_REF_RE} (#4227 — a narrower regex misclassified a comment-wrapped `RelatingObject`). */
+export function singleRef(arg) {
+    const match = BARE_REF_RE.exec(arg);
+    return match ? Number(match[1]) : null;
+}
+/** Parse a `(#a,#b,…)` list argument into ids. */
+export function refList(arg) {
+    const trimmed = arg.trim();
+    if (!trimmed.startsWith('(') || !trimmed.endsWith(')'))
+        return [];
+    const inner = trimmed.slice(1, -1).trim();
+    if (inner === '')
+        return [];
+    const ids = [];
+    for (const item of splitTopLevelListItems(inner)) {
+        const id = singleRef(item);
+        if (id !== null)
+            ids.push(id);
+    }
+    return ids;
+}
+/**
+ * Every reference in a line's argument list, paired with whether it sits
+ * somewhere neither `filterHiddenRefsFromRelationshipLine` can strip (a direct
+ * list element) nor withhold the line for (a whole single-valued attribute) —
+ * i.e. nested inside a list of lists or a typed value. `null` when the line's
+ * argument list cannot be parsed at all: a line no rewrite can narrow, which the
+ * analysis must treat as a blocker rather than as "names nothing".
+ */
+export function classifyRefs(line) {
+    const attrs = topLevelAttrs(line);
+    if (attrs === null)
+        return null;
+    const out = [];
+    for (const attr of attrs) {
+        const direct = singleRef(attr);
+        if (direct !== null) {
+            out.push([direct, false]);
+            continue;
+        }
+        if (attr.startsWith('(') && attr.endsWith(')')) {
+            const inner = attr.slice(1, -1).trim();
+            if (inner === '')
+                continue;
+            for (const item of splitTopLevelListItems(inner)) {
+                const id = singleRef(item);
+                if (id !== null)
+                    out.push([id, false]);
+                else
+                    for (const nested of argRefs(item))
+                        out.push([nested, true]);
+            }
+            continue;
+        }
+        for (const nested of argRefs(attr))
+            out.push([nested, true]);
+    }
+    return out;
+}
+/**
+ * Every `#N` reference in a chunk of STEP text, skipping quoted strings (where a
+ * `#` is literal) and any leading `#id=` (the line's own id). Reads bytes rather
+ * than decoded text so the reverse-reference scan never decodes a whole model.
+ */
+export function argRefs(text) {
+    const bytes = typeof text === 'string' ? new TextEncoder().encode(text) : text;
+    const eq = bytes.indexOf(0x3d /* = */);
+    const from = eq === -1 ? 0 : eq + 1;
+    const out = [];
+    let inString = false;
+    for (let i = from; i < bytes.length; i++) {
+        const byte = bytes[i];
+        if (byte === 0x27 /* ' */) {
+            inString = !inString;
+            continue;
+        }
+        if (inString || byte !== 0x23 /* # */)
+            continue;
+        let j = i + 1;
+        let value = 0;
+        while (j < bytes.length && bytes[j] >= 0x30 && bytes[j] <= 0x39) {
+            value = value * 10 + (bytes[j] - 0x30);
+            j++;
+        }
+        if (j > i + 1) {
+            out.push(value);
+            i = j - 1;
+        }
+    }
+    return out;
+}
+/** The GlobalId (first quoted attribute) of a rooted entity's line. */
+export function leadingGuid(line) {
+    const open = line.indexOf('(');
+    if (open === -1)
+        return null;
+    const first = line.indexOf("'", open + 1);
+    if (first === -1)
+        return null;
+    const second = line.indexOf("'", first + 1);
+    if (second === -1)
+        return null;
+    const raw = line.slice(first + 1, second);
+    return /^[0-9A-Za-z_$]{22}$/.test(raw) ? raw : null;
+}
+//# sourceMappingURL=merged-empty-containers-refs.js.map

package/dist/merged-empty-containers-refs.js.map

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

package/dist/merged-empty-containers.d.ts

@@ -36,6 +36,35 @@ export interface EmptyContainerModelView {
     offset: number;
     /** True when the model unifies into the first model's project / unit space. */
     compatible: boolean;
+    /**
+     * Run this model's one-parent claim pass (#5471) and return the aggregation
+     * edges it withholds. Called once per model in merge order, on a claim set
+     * of the plan's own. Omitted: every edge counts.
+     *
+     * The drops must be known before emission, yet the emit-time claim pass
+     * withholds aggregation edges, and a container that loses its only edge is
+     * empty (#5725). This pass runs with no drops applied, and that is already
+     * the fixed point: a claim that would differ once drops are known needs a
+     * dropped parent, but a parent whose kept edge reaches a kept child is kept
+     * itself. That holds only if this pass never withholds an edge the emit pass
+     * writes, or a still-full child loses its only parent. So it may see LESS
+     * than the emit pass, never more. It claims only through
+     * {@link isStructureRelation} types, and resolves ids through `sharedRemap`
+     * (spatial unification, which the emit pass repeats exactly), not through
+     * this module's GlobalId canonicalisation, which the emit pass does not
+     * always repeat (a GlobalId duplicated within one model, or an
+     * `assume-shared` emitter in another unit). What it misses is an edge the
+     * emit pass withholds and this one counts, which only keeps a container
+     * (#3643's behaviour before #5725).
+     */
+    claimParents?: () => WithheldParents;
+}
+/** Aggregation edges the one-parent pass keeps out of the output (#5725). */
+export interface WithheldParents {
+    /** Rels skipped outright: every member already had a parent. */
+    skipEntityIds: ReadonlySet<number>;
+    /** Rel → members stripped from its RelatedObjects list. */
+    relParentStrip: ReadonlyMap<number, ReadonlySet<number>>;
 }
 /** Which containers the emit loop must not write. */
 export interface EmptyContainerPlan {
@@ -45,6 +74,8 @@ export interface EmptyContainerPlan {
      *  across three inputs counts once). */
     droppedCount: number;
 }
+/** True when `typeUpper` is a relationship the analysis counts as spatial structure. */
+export declare function isStructureRelation(typeUpper: string): boolean;
 /**
  * A model with nothing to analyse — the placeholder for an input whose source
  * bytes are missing (a cache-restored, metadata-only store), which the emit loop

package/dist/merged-empty-containers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merged-empty-containers.d.ts","sourceRoot":"","sources":["../src/merged-empty-containers.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAIvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAgCjE,mEAAmE;AACnE,MAAM,WAAW,uBAAuB;IACtC,wDAAwD;IACxD,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,gCAAgC;IAChC,MAAM,EAAE,cAAc,CAAC;IACvB,uEAAuE;IACvE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACrC;2DACuD;IACvD,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC;IACf,+EAA+E;IAC/E,UAAU,EAAE,OAAO,CAAC;CACrB;AAED,qDAAqD;AACrD,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;IAC9B;4CACwC;IACxC,YAAY,EAAE,MAAM,CAAC;CACtB;AAOD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAO9B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,uBAAuB,EAAE,GAAG,kBAAkB,CA2C7F"}
+{"version":3,"file":"merged-empty-containers.d.ts","sourceRoot":"","sources":["../src/merged-empty-containers.ts"],"names":[],"mappings":"AAIA;;;;;;;;;;;;;;;;;;;;GAoBG;AAEH,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGvD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAwBjE,mEAAmE;AACnE,MAAM,WAAW,uBAAuB;IACtC,wDAAwD;IACxD,QAAQ,EAAE,mBAAmB,CAAC;IAC9B,gCAAgC;IAChC,MAAM,EAAE,cAAc,CAAC;IACvB,uEAAuE;IACvE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC;IACrC;2DACuD;IACvD,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACzC,kEAAkE;IAClE,MAAM,EAAE,MAAM,CAAC;IACf,+EAA+E;IAC/E,UAAU,EAAE,OAAO,CAAC;IACpB;;;;;;;;;;;;;;;;;;;;OAoBG;IACH,YAAY,CAAC,EAAE,MAAM,eAAe,CAAC;CACtC;AAED,6EAA6E;AAC7E,MAAM,WAAW,eAAe;IAC9B,gEAAgE;IAChE,aAAa,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACnC,2DAA2D;IAC3D,cAAc,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC;CAC1D;AAED,qDAAqD;AACrD,MAAM,WAAW,kBAAkB;IACjC,qEAAqE;IACrE,cAAc,EAAE,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC;IAC9B;4CACwC;IACxC,YAAY,EAAE,MAAM,CAAC;CACtB;AAED,wFAAwF;AACxF,wBAAgB,mBAAmB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE9D;AAOD;;;;GAIG;AACH,eAAO,MAAM,gBAAgB,EAAE,uBAO9B,CAAC;AAEF;;;;;;;GAOG;AACH,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,uBAAuB,EAAE,GAAG,kBAAkB,CA2C7F"}

package/dist/merged-empty-containers.js

@@ -2,16 +2,7 @@
  * 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 { asSourceBytes } from '@ifc-lite/parser';
-import { readStepSlots, splitTopLevelListItems } from './step-argument-parser.js';
-import { BARE_REF_RE } from './reference-collector.js';
-/**
- * `#N=TYPE(...)` record, with STEP trivia (whitespace and/or a
- * `/* ... *​/` comment, #3789) tolerated between the type name and `(` —
- * same adjacency fix as `entity-extractor.ts`'s `extractEntity`. Without it
- * a wrapped line's arguments are unreadable here (`topLevelAttrs` returns
- * `null`), which the caller treats as "can't safely rewrite" and blocks the
- * empty-container drop for that entity.
- */
+import { argRefs, classifyRefs, leadingGuid, refList, singleRef, topLevelAttrs } from './merged-empty-containers-refs.js';
 /**
  * Spatial container types dropped when they end up empty. `IfcProject` is
  * deliberately absent: it is the file's root, never a candidate.
@@ -32,6 +23,10 @@ const STRUCTURE_RELATIONS = {
     IFCRELCONTAINEDINSPATIALSTRUCTURE: [5, 4],
     IFCRELREFERENCEDINSPATIALSTRUCTURE: [5, 4],
 };
+/** True when `typeUpper` is a relationship the analysis counts as spatial structure. */
+export function isStructureRelation(typeUpper) {
+    return typeUpper in STRUCTURE_RELATIONS;
+}
 /** True when `typeUpper` is a droppable spatial container type. */
 function isSpatialContainerType(typeUpper) {
     return CONTAINER_TYPES.has(typeUpper);
@@ -70,7 +65,7 @@ export function planEmptyContainerDrops(models) {
         containersByModel.push(canon);
         for (const node of canon.values())
             nodes.add(node);
-        recordEdges(view, canon, hasContent, parents);
+        recordEdges(view, canon, hasContent, parents, view.claimParents?.());
         recordBlocks(view, canon, blocked);
     }
     // A container is non-empty when it holds something, is blocked, or has a
@@ -138,14 +133,17 @@ function canonicalContainers(view, guidNode) {
 /**
  * Record what this model contributes to each container: contained elements and
  * aggregated objects become content; aggregated spatial children become upward
- * edges, so a non-empty storey keeps its building and its site.
+ * edges, so a non-empty storey keeps its building and its site. An aggregation
+ * edge the one-parent pass withholds is never written, so it counts for nothing.
  */
-function recordEdges(view, canon, hasContent, parents) {
+function recordEdges(view, canon, hasContent, parents, withheld) {
     if (canon.size === 0)
         return;
     for (const [localId, ref] of view.entities) {
         if (view.included !== null && !view.included.has(localId))
             continue;
+        if (withheld?.skipEntityIds.has(localId))
+            continue;
         const slots = STRUCTURE_RELATIONS[ref.type.toUpperCase()];
         if (slots === undefined)
             continue;
@@ -161,9 +159,12 @@ function recordEdges(view, canon, hasContent, parents) {
         const parent = canon.get(relating);
         if (parent === undefined)
             continue;
+        const stripped = withheld?.relParentStrip.get(localId);
         for (const child of refList(attrs[relatedIndex] ?? '')) {
             if (view.included !== null && !view.included.has(child))
                 continue;
+            if (stripped?.has(child))
+                continue;
             const childNode = canon.get(child);
             if (childNode === undefined) {
                 hasContent.add(parent);
@@ -239,114 +240,4 @@ function lineOf(view, localId) {
         return '';
     return view.source.decodeUtf8(ref.byteOffset, ref.byteOffset + ref.byteLength);
 }
-/** Top-level arguments of a `#id=TYPE(…);` line, or `null` when unparseable. */
-function topLevelAttrs(line) {
-    const record = readStepSlots(line);
-    return record === null ? null : record.slots.map(arg => arg.trim());
-}
-/** `"#7"` → `7` via shared, trivia-tolerant {@link BARE_REF_RE} (#4227 — a narrower regex misclassified a comment-wrapped `RelatingObject`). */
-function singleRef(arg) {
-    const match = BARE_REF_RE.exec(arg);
-    return match ? Number(match[1]) : null;
-}
-/** Parse a `(#a,#b,…)` list argument into ids. */
-function refList(arg) {
-    const trimmed = arg.trim();
-    if (!trimmed.startsWith('(') || !trimmed.endsWith(')'))
-        return [];
-    const inner = trimmed.slice(1, -1).trim();
-    if (inner === '')
-        return [];
-    const ids = [];
-    for (const item of splitTopLevelListItems(inner)) {
-        const id = singleRef(item);
-        if (id !== null)
-            ids.push(id);
-    }
-    return ids;
-}
-/**
- * Every reference in a line's argument list, paired with whether it sits
- * somewhere neither `filterHiddenRefsFromRelationshipLine` can strip (a direct
- * list element) nor withhold the line for (a whole single-valued attribute) —
- * i.e. nested inside a list of lists or a typed value. `null` when the line's
- * argument list cannot be parsed at all: a line no rewrite can narrow, which the
- * analysis must treat as a blocker rather than as "names nothing".
- */
-function classifyRefs(line) {
-    const attrs = topLevelAttrs(line);
-    if (attrs === null)
-        return null;
-    const out = [];
-    for (const attr of attrs) {
-        const direct = singleRef(attr);
-        if (direct !== null) {
-            out.push([direct, false]);
-            continue;
-        }
-        if (attr.startsWith('(') && attr.endsWith(')')) {
-            const inner = attr.slice(1, -1).trim();
-            if (inner === '')
-                continue;
-            for (const item of splitTopLevelListItems(inner)) {
-                const id = singleRef(item);
-                if (id !== null)
-                    out.push([id, false]);
-                else
-                    for (const nested of argRefs(item))
-                        out.push([nested, true]);
-            }
-            continue;
-        }
-        for (const nested of argRefs(attr))
-            out.push([nested, true]);
-    }
-    return out;
-}
-/**
- * Every `#N` reference in a chunk of STEP text, skipping quoted strings (where a
- * `#` is literal) and any leading `#id=` (the line's own id). Reads bytes rather
- * than decoded text so the reverse-reference scan never decodes a whole model.
- */
-function argRefs(text) {
-    const bytes = typeof text === 'string' ? new TextEncoder().encode(text) : text;
-    const eq = bytes.indexOf(0x3d /* = */);
-    const from = eq === -1 ? 0 : eq + 1;
-    const out = [];
-    let inString = false;
-    for (let i = from; i < bytes.length; i++) {
-        const byte = bytes[i];
-        if (byte === 0x27 /* ' */) {
-            inString = !inString;
-            continue;
-        }
-        if (inString || byte !== 0x23 /* # */)
-            continue;
-        let j = i + 1;
-        let value = 0;
-        while (j < bytes.length && bytes[j] >= 0x30 && bytes[j] <= 0x39) {
-            value = value * 10 + (bytes[j] - 0x30);
-            j++;
-        }
-        if (j > i + 1) {
-            out.push(value);
-            i = j - 1;
-        }
-    }
-    return out;
-}
-/** The GlobalId (first quoted attribute) of a rooted entity's line. */
-function leadingGuid(line) {
-    const open = line.indexOf('(');
-    if (open === -1)
-        return null;
-    const first = line.indexOf("'", open + 1);
-    if (first === -1)
-        return null;
-    const second = line.indexOf("'", first + 1);
-    if (second === -1)
-        return null;
-    const raw = line.slice(first + 1, second);
-    return /^[0-9A-Za-z_$]{22}$/.test(raw) ? raw : null;
-}
 //# sourceMappingURL=merged-empty-containers.js.map