@ifc-lite/cli 0.26.0 → 0.27.0

package/dist/commands/query-output.js

@@ -5,8 +5,9 @@
  * Output formatting functions for the query command — count, sum,
  * aggregation, group-by, table rendering, and JSON serialization.
  */
-import { printJson, formatTable, hasFlag, fatal } from '../output.js';
-import { getQuantityValue } from './query-aggregation.js';
+import { findPropertyInSets } from '@ifc-lite/query';
+import { printJson, formatTable, hasFlag, fatal, firstNonBlank } from '../output.js';
+import { getQuantityValue, aggregateFinite } from './query-aggregation.js';
 /** Valid built-in grouping keys */
 export const VALID_GROUP_BY_KEYS = ['type', 'storey', 'material'];
 export function outputCount(count, jsonOutput) {
@@ -37,7 +38,12 @@ export function outputSum(entities, quantityName, bim, jsonOutput) {
                     allQuantityNames.set(key, { qsetName: qset.name, count: 1 });
                 }
                 if (q.name === quantityName) {
-                    total += Number(q.value) || 0;
+                    // Mirrors getQuantityValue in query-aggregation.ts: `Number(x) ||
+                    // 0` lets a present-but-Infinite value through (Infinity is
+                    // truthy), which would poison `total` for every other entity in
+                    // the sum. Number.isFinite catches NaN and both infinities.
+                    const n = Number(q.value);
+                    total += Number.isFinite(n) ? n : 0;
                     matched++;
                     matchedQsets.add(qset.name);
                 }
@@ -199,18 +205,19 @@ export function outputGroupBy(entities, groupByKey, sumQuantity, bim, jsonOutput
         }
         else if (groupByKey === 'storey') {
             const storey = bim.storey(e.ref);
-            groupValue = storey?.name ?? '(no storey)';
+            groupValue = firstNonBlank(storey?.name) ?? '(no storey)';
         }
         else if (groupByKey === 'material') {
             const mat = bim.materials(e.ref);
-            groupValue = mat?.materials?.[0] ?? mat?.name ?? '(no material)';
+            const first = mat?.materials?.[0];
+            const firstMatName = typeof first === 'string' ? first : first?.name;
+            groupValue = firstNonBlank(firstMatName, mat?.name) ?? '(no material)';
         }
         else if (groupByKey.includes('.')) {
             // PsetName.PropName
             const [psetName, propName] = groupByKey.split('.', 2);
             const props = bim.properties(e.ref);
-            const pset = props.find((p) => p.name === psetName);
-            const prop = pset?.properties?.find((p) => p.name === propName);
+            const prop = findPropertyInSets(props, psetName, propName);
             groupValue = prop?.value != null ? String(prop.value) : `(no ${propName})`;
         }
         else {
@@ -229,29 +236,14 @@ export function outputGroupBy(entities, groupByKey, sumQuantity, bim, jsonOutput
     const groupAgg = new Map();
     if (sumQuantity) {
         for (const [key, groupEntities] of groups) {
-            let sum = 0;
-            let count = 0;
-            let minVal = Infinity;
-            let maxVal = -Infinity;
+            const vals = [];
             for (const e of groupEntities) {
                 const val = getQuantityValue(bim, e.ref, sumQuantity);
-                if (val !== null) {
-                    sum += val;
-                    count++;
-                    if (val < minVal)
-                        minVal = val;
-                    if (val > maxVal)
-                        maxVal = val;
-                }
+                if (val !== null)
+                    vals.push(val);
             }
-            if (mode === 'avg')
-                groupAgg.set(key, count > 0 ? sum / count : 0);
-            else if (mode === 'min')
-                groupAgg.set(key, count > 0 ? minVal : 0);
-            else if (mode === 'max')
-                groupAgg.set(key, count > 0 ? maxVal : 0);
-            else
-                groupAgg.set(key, sum);
+            // Shared finite-guarded reduction; an empty group stays 0 here.
+            groupAgg.set(key, aggregateFinite(vals, mode) ?? 0);
         }
     }
     const modeLabel = mode === 'sum' ? 'sum' : mode;
@@ -299,6 +291,50 @@ export function outputGroupBy(entities, groupByKey, sumQuantity, bim, jsonOutput
         }
     }
 }
+/**
+ * B6/F8: `--unique` distinct-value counts for `material`, `storey`, `type`,
+ * or a `PsetName.PropName` path. Pulled out of `queryCommand` so the
+ * blank/whitespace-name handling (`firstNonBlank`) is unit-testable without
+ * a fixture model.
+ */
+export function computeUniqueValues(entities, uniqueProp, bim) {
+    const valueCounts = new Map();
+    if (uniqueProp === 'material') {
+        for (const e of entities) {
+            const mat = bim.materials(e.ref);
+            const first = mat?.materials?.[0];
+            const firstName = typeof first === 'string' ? first : first?.name;
+            const val = firstNonBlank(firstName, mat?.name) ?? '(no material)';
+            valueCounts.set(val, (valueCounts.get(val) ?? 0) + 1);
+        }
+    }
+    else if (uniqueProp === 'storey') {
+        for (const e of entities) {
+            const storey = bim.storey(e.ref);
+            const val = firstNonBlank(storey?.name) ?? '(no storey)';
+            valueCounts.set(val, (valueCounts.get(val) ?? 0) + 1);
+        }
+    }
+    else if (uniqueProp === 'type') {
+        for (const e of entities) {
+            valueCounts.set(e.type, (valueCounts.get(e.type) ?? 0) + 1);
+        }
+    }
+    else {
+        const dotIdx = uniqueProp.indexOf('.');
+        if (dotIdx <= 0)
+            fatal(`Invalid --unique path: "${uniqueProp}". Expected: PsetName.PropName, or one of: material, storey, type`);
+        const psetName = uniqueProp.slice(0, dotIdx);
+        const propName = uniqueProp.slice(dotIdx + 1);
+        for (const e of entities) {
+            const psets = bim.properties(e.ref);
+            const prop = findPropertyInSets(psets, psetName, propName);
+            const val = prop?.value != null ? String(prop.value) : '(no value)';
+            valueCounts.set(val, (valueCounts.get(val) ?? 0) + 1);
+        }
+    }
+    return valueCounts;
+}
 export function outputEntities(entities, args, bim, jsonOutput) {
     const showProps = hasFlag(args, '--props');
     const showQuantities = hasFlag(args, '--quantities');

package/dist/commands/query-output.js.map

@@ -1 +1 @@
-{"version":3,"file":"query-output.js","sourceRoot":"","sources":["../../src/commands/query-output.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;GAGG;AAEH,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAC;AAE1D,mCAAmC;AACnC,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,MAAM,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;AAElE,MAAM,UAAU,WAAW,CAAC,KAAa,EAAE,UAAmB;IAC5D,IAAI,UAAU,EAAE,CAAC;QACf,SAAS,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IACrC,CAAC;AACH,CAAC;AAED,MAAM,UAAU,SAAS,CAAC,QAAe,EAAE,YAAoB,EAAE,GAAQ,EAAE,UAAmB;IAC5F,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,6DAA6D;IAC7D,MAAM,gBAAgB,GAAG,IAAI,GAAG,EAA+C,CAAC;IAChF,MAAM,YAAY,GAAG,IAAI,GAAG,EAAU,CAAC;IAEvC,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;QACpC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,KAAK,MAAM,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;gBAChC,0CAA0C;gBAC1C,MAAM,GAAG,GAAG,GAAG,IAAI,CAAC,IAAI,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBAC3C,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACnB,CAAC;qBAAM,CAAC;oBACN,gBAAgB,CAAC,GAAG,CAAC,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,CAAC,IAAI,EAAE,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC;gBAC/D,CAAC;gBACD,IAAI,CAAC,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;oBAC5B,KAAK,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBAC9B,OAAO,EAAE,CAAC;oBACV,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBAC9B,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,4CAA4C;IAC5C,IAAI,OAAO,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACzC,MAAM,cAAc,GAAG,IAAI,GAAG,EAAU,CAAC;QACzC,KAAK,MAAM,CAAC,GAAG,CAAC,IAAI,gBAAgB,EAAE,CAAC;YACrC,cAAc,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC,CAAC;QAC5C,CAAC;QACD,IAAI,UAAU,EAAE,CAAC;YACf,SAAS,CAAC;gBACR,QAAQ,EAAE,YAAY;gBACtB,KAAK,EAAE,CAAC;gBACR,eAAe,EAAE,CAAC;gBAClB,aAAa,EAAE,QAAQ,CAAC,MAAM;gBAC9B,KAAK,EAAE,aAAa,YAAY,6BAA6B,QAAQ,CAAC,MAAM,YAAY;gBACxF,mBAAmB,EAAE,CAAC,GAAG,cAAc,CAAC;gBACxC,IAAI,EAAE,kFAAkF;aACzF,CAAC,CAAC;QACL,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,YAAY,6BAA6B,QAAQ,CAAC,MAAM,cAAc,CAAC,CAAC;YAC1G,IAAI,cAAc,CAAC,IAAI,GAAG,CAAC,EAAE,CAAC;gBAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yBAAyB,CAAC,GAAG,cAAc,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACpF,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAChG,CAAC;QACD,OAAO;IACT,CAAC;IAED,sDAAsD;IACtD,MAAM,YAAY,GAAG,CAAC,GAAG,gBAAgB,CAAC,OAAO,EAAE,CAAC;SACjD,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE;QAChB,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAG,CAAC,WAAW,EAAE,CAAC;QAClD,MAAM,UAAU,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC9C,oFAAoF;QACpF,IAAI,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC;QAC5F,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnE,IAAI,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAAE,OAAO,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC;QACnE,OAAO,KAAK,CAAC;IACf,CAAC,CAAC;SACD,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,KAAK,YAAY,CAAC,CAAC;IAE5D,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,MAAM,GAA4B;YACtC,QAAQ,EAAE,YAAY;YACtB,KAAK;YACL,eAAe,EAAE,OAAO;YACxB,aAAa,EAAE,QAAQ,CAAC,MAAM;YAC9B,gBAAgB,EAAE,CAAC,GAAG,YAAY,CAAC;SACpC,CAAC;QACF,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,MAAM,CAAC,OAAO,GAAG,uEAAuE,CAAC;YACzF,MAAM,CAAC,YAAY,GAAG,YAAY,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;gBACvD,IAAI,EAAE,GAAG;gBACT,eAAe,EAAE,IAAI,CAAC,KAAK;aAC5B,CAAC,CAAC,CAAC;QACN,CAAC;QACD,SAAS,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;QACnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,KAAK,UAAU,OAAO,OAAO,QAAQ,CAAC,MAAM,qBAAqB,CAAC,GAAG,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QAC7I,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC5B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gEAAgE,CAAC,CAAC;YACvF,KAAK,MAAM,CAAC,GAAG,EAAE,IAAI,CAAC,IAAI,YAAY,EAAE,CAAC;gBACvC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,OAAO,GAAG,KAAK,IAAI,CAAC,KAAK,cAAc,CAAC,CAAC;YAChE,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oEAAoE,CAAC,CAAC;YAC3F,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,yEAAyE,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;AACH,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAe,EAAE,YAAoB,EAAE,IAA2B,EAAE,GAAQ,EAAE,UAAmB;IACjI,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,OAAO,GAAG,CAAC,CAAC;IAChB,IAAI,MAAM,GAAG,QAAQ,CAAC;IACtB,IAAI,MAAM,GAAG,CAAC,QAAQ,CAAC;IACvB,IAAI,SAAS,GAAQ,IAAI,CAAC;IAC1B,IAAI,SAAS,GAAQ,IAAI,CAAC;IAE1B,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,MAAM,GAAG,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QACvD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;YACjB,KAAK,IAAI,GAAG,CAAC;YACb,OAAO,EAAE,CAAC;YACV,IAAI,GAAG,GAAG,MAAM,EAAE,CAAC;gBAAC,MAAM,GAAG,GAAG,CAAC;gBAAC,SAAS,GAAG,CAAC,CAAC;YAAC,CAAC;YAClD,IAAI,GAAG,GAAG,MAAM,EAAE,CAAC;gBAAC,MAAM,GAAG,GAAG,CAAC;gBAAC,SAAS,GAAG,CAAC,CAAC;YAAC,CAAC;QACpD,CAAC;IACH,CAAC;IAED,0BAA0B;IAC1B,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;QAClB,IAAI,UAAU,EAAE,CAAC;YACf,SAAS,CAAC,EAAE,QAAQ,EAAE,YAAY,EAAE,KAAK,EAAE,aAAa,YAAY,cAAc,EAAE,IAAI,EAAE,iEAAiE,EAAE,CAAC,CAAC;QACjK,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,YAAY,6BAA6B,QAAQ,CAAC,MAAM,cAAc,CAAC,CAAC;YAC1G,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,uEAAuE,CAAC,CAAC;QAChG,CAAC;QACD,OAAO;IACT,CAAC;IAED,MAAM,GAAG,GAAG,KAAK,GAAG,OAAO,CAAC;IAC5B,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAE3D,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,MAAM,GAA4B,EAAE,QAAQ,EAAE,YAAY,EAAE,eAAe,EAAE,OAAO,EAAE,aAAa,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC;QAC7H,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,MAAM,CAAC,OAAO,GAAG,GAAG,CAAC;QACvB,CAAC;aAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;YACpB,IAAI,SAAS;gBAAE,MAAM,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC9G,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC;YACpB,IAAI,SAAS;gBAAE,MAAM,CAAC,MAAM,GAAG,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC,IAAI,EAAE,QAAQ,EAAE,SAAS,CAAC,QAAQ,EAAE,CAAC;QAC9G,CAAC;QACD,SAAS,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YACnB,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,GAAG,IAAI,CAAC,CAAC;YACjC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,YAAY,KAAK,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,cAAc,CAAC,CAAC;QAC9F,CAAC;aAAM,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;YAC1B,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,CAAC;YACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,YAAY,KAAK,MAAM,KAAK,SAAS,EAAE,IAAI,IAAI,SAAS,KAAK,CAAC,CAAC;QAClG,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,IAAI,CAAC,CAAC;YACpC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,KAAK,IAAI,YAAY,KAAK,MAAM,KAAK,SAAS,EAAE,IAAI,IAAI,SAAS,KAAK,CAAC,CAAC;QAClG,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,QAAe,EAAE,UAAkB,EAAE,WAA+B,EAAE,GAAQ,EAAE,UAAmB,EAAE,UAAmB,EAAE,OAAuC;IAC7L,6BAA6B;IAC7B,IAAI,CAAC,mBAAmB,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC3E,KAAK,CAAC,qBAAqB,UAAU,qBAAqB,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC,wBAAwB,CAAC,CAAC;IACpH,CAAC;IAED,MAAM,MAAM,GAAG,IAAI,GAAG,EAAiB,CAAC;IAExC,KAAK,MAAM,CAAC,IAAI,QAAQ,EAAE,CAAC;QACzB,IAAI,UAAkB,CAAC;QAEvB,IAAI,UAAU,KAAK,MAAM,EAAE,CAAC;YAC1B,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC;QACtB,CAAC;aAAM,IAAI,UAAU,KAAK,QAAQ,EAAE,CAAC;YACnC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACjC,UAAU,GAAG,MAAM,EAAE,IAAI,IAAI,aAAa,CAAC;QAC7C,CAAC;aAAM,IAAI,UAAU,KAAK,UAAU,EAAE,CAAC;YACrC,MAAM,GAAG,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACjC,UAAU,GAAG,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC,IAAI,GAAG,EAAE,IAAI,IAAI,eAAe,CAAC;QACnE,CAAC;aAAM,IAAI,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACpC,oBAAoB;YACpB,MAAM,CAAC,QAAQ,EAAE,QAAQ,CAAC,GAAG,UAAU,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;YACzD,MAAM,IAAI,GAAG,IAAI,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC;YACrE,UAAU,GAAG,IAAI,EAAE,KAAK,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,QAAQ,GAAG,CAAC;QAC7E,CAAC;aAAM,CAAC;YACN,UAAU,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,OAAO,UAAU,GAAG,CAAC;QACrD,CAAC;QAED,MAAM,QAAQ,GAAG,MAAM,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxC,IAAI,QAAQ,EAAE,CAAC;YACb,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,MAAM,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,gFAAgF;IAChF,MAAM,IAAI,GAAG,OAAO,IAAI,KAAK,CAAC;IAC9B,MAAM,QAAQ,GAAG,IAAI,GAAG,EAAkB,CAAC;IAC3C,IAAI,WAAW,EAAE,CAAC;QAChB,KAAK,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,MAAM,EAAE,CAAC;YAC1C,IAAI,GAAG,GAAG,CAAC,CAAC;YACZ,IAAI,KAAK,GAAG,CAAC,CAAC;YACd,IAAI,MAAM,GAAG,QAAQ,CAAC;YACtB,IAAI,MAAM,GAAG,CAAC,QAAQ,CAAC;YACvB,KAAK,MAAM,CAAC,IAAI,aAAa,EAAE,CAAC;gBAC9B,MAAM,GAAG,GAAG,gBAAgB,CAAC,GAAG,EAAE,CAAC,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;gBACtD,IAAI,GAAG,KAAK,IAAI,EAAE,CAAC;oBACjB,GAAG,IAAI,GAAG,CAAC;oBACX,KAAK,EAAE,CAAC;oBACR,IAAI,GAAG,GAAG,MAAM;wBAAE,MAAM,GAAG,GAAG,CAAC;oBAC/B,IAAI,GAAG,GAAG,MAAM;wBAAE,MAAM,GAAG,GAAG,CAAC;gBACjC,CAAC;YACH,CAAC;YACD,IAAI,IAAI,KAAK,KAAK;gBAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC9D,IAAI,IAAI,KAAK,KAAK;gBAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;iBAC9D,IAAI,IAAI,KAAK,KAAK;gBAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;;gBAC9D,QAAQ,CAAC,GAAG,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;QAC9B,CAAC;IACH,CAAC;IAED,MAAM,SAAS,GAAG,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC;IAEhD,IAAI,UAAU,EAAE,CAAC;QACf,MAAM,MAAM,GAA4B,EAAE,CAAC;QAC3C,IAAI,OAAO,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;QACpC,2CAA2C;QAC3C,IAAI,UAAU;YAAE,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACvD,KAAK,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,OAAO,EAAE,CAAC;YAC3C,MAAM,KAAK,GAA4B,EAAE,KAAK,EAAE,aAAa,CAAC,MAAM,EAAE,CAAC;YACvE,IAAI,WAAW;gBAAE,KAAK,CAAC,WAAW,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YAC7D,IAAI,WAAW,IAAI,IAAI,KAAK,KAAK;gBAAE,KAAK,CAAC,WAAW,GAAG,IAAI,CAAC;YAC5D,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;QACtB,CAAC;QACD,SAAS,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC;SAAM,CAAC;QACN,IAAI,MAAM,GAAG,CAAC,GAAG,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;QAC7E,2CAA2C;QAC3C,IAAI,UAAU;YAAE,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,CAAC;QACrD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,gBAAgB,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,SAAS,KAAK,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC;QAC/G,KAAK,MAAM,CAAC,GAAG,EAAE,aAAa,CAAC,IAAI,MAAM,EAAE,CAAC;YAC1C,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;gBACnC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,MAAM,aAAa,CAAC,MAAM,eAAe,WAAW,IAAI,SAAS,KAAK,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,CAAC;YAChJ,CAAC;iBAAM,CAAC;gBACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,GAAG,KAAK,aAAa,CAAC,MAAM,IAAI,CAAC,CAAC;YAC9D,CAAC;QACH,CAAC;QACD,IAAI,WAAW,EAAE,CAAC;YAChB,MAAM,UAAU,GAAG,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;YACrE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,QAAQ,CAAC,MAAM,gBAAgB,MAAM,CAAC,IAAI,WAAW,CAAC,CAAC;YAC1F,IAAI,UAAU,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC5C,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,oBAAoB,WAAW,4EAA4E,CAAC,CAAC;YACpI,CAAC;YACD,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7B,CAAC;aAAM,CAAC;YACN,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,cAAc,QAAQ,CAAC,MAAM,gBAAgB,MAAM,CAAC,IAAI,aAAa,CAAC,CAAC;QAC9F,CAAC;IACH,CAAC;AACH,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,QAAe,EAAE,IAAc,EAAE,GAAQ,EAAE,UAAmB;IAC3F,MAAM,SAAS,GAAG,OAAO,CAAC,IAAI,EAAE,SAAS,CAAC,CAAC;IAC3C,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACrD,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACnD,MAAM,mBAAmB,GAAG,OAAO,CAAC,IAAI,EAAE,mBAAmB,CAAC,CAAC;IAC/D,MAAM,cAAc,GAAG,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACrD,MAAM,iBAAiB,GAAG,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAC;IAC3D,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IACnD,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEvC,MAAM,WAAW,GAAG,SAAS,IAAI,cAAc,IAAI,aAAa,IAAI,mBAAmB;WAClF,cAAc,IAAI,iBAAiB,IAAI,aAAa,IAAI,aAAa,IAAI,OAAO,CAAC;IAEtF,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;QAC9B,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;YACrC,MAAM,KAAK,GAA4B;gBACrC,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,IAAI,EAAE,CAAC,CAAC,IAAI;gBACZ,QAAQ,EAAE,CAAC,CAAC,QAAQ;gBACpB,WAAW,EAAE,CAAC,CAAC,WAAW,IAAI,SAAS;gBACvC,UAAU,EAAE,CAAC,CAAC,UAAU,IAAI,SAAS;aACtC,CAAC;YACF,IAAI,cAAc,IAAI,OAAO;gBAAE,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACxE,IAAI,SAAS,IAAI,OAAO;gBAAE,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACnE,IAAI,cAAc,IAAI,OAAO;gBAAE,KAAK,CAAC,UAAU,GAAG,GAAG,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACxE,IAAI,aAAa,IAAI,OAAO;gBAAE,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACrE,IAAI,mBAAmB,IAAI,OAAO;gBAAE,KAAK,CAAC,eAAe,GAAG,GAAG,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACvF,IAAI,aAAa,IAAI,OAAO;gBAAE,KAAK,CAAC,cAAc,GAAG,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC/E,IAAI,aAAa,IAAI,OAAO;gBAAE,KAAK,CAAC,SAAS,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACrE,IAAI,iBAAiB,IAAI,OAAO;gBAAE,KAAK,CAAC,aAAa,GAAG,GAAG,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YACjF,OAAO,KAAK,CAAC;QACf,CAAC,CAAC,CAAC;QACH,SAAS,CAAC,MAAM,CAAC,CAAC;QAClB,OAAO;IACT,CAAC;IAED,eAAe;IACf,MAAM,IAAI,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;IACpE,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC;IAC7E,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,QAAQ,CAAC,MAAM,aAAa,CAAC,CAAC;AAC1D,CAAC"}
+{"version":3,"file":"query-output.js","sourceRoot":"","sources":["../../src/commands/query-output.ts"],"names":[],"mappings":"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"}

package/dist/commands/query-storey.d.ts

@@ -0,0 +1,24 @@
+/**
+ * Resolve `--storey <filter>` to the set of expressIds of every entity
+ * directly contained in the matching storey/storeys.
+ *
+ * Resolution order:
+ *  1. An exact expressId match (unambiguous — expressIds are unique) wins
+ *     outright and resolves to that single storey.
+ *  2. Otherwise, every storey with an exact Name match. A shared Name is the
+ *     ambiguity this union exists for: the storeys are indistinguishable by
+ *     the very key the user supplied, so all of them are meant.
+ *  3. Otherwise, the storeys whose Name contains the filter
+ *     (case-insensitive) — but only when those matches all share ONE Name.
+ *     A substring spanning differently named storeys ("Level" against
+ *     "Level 1" and "Level 2") is a different situation: the names DO
+ *     distinguish the storeys, the user just did not pick one. Unioning would
+ *     silently merge storeys never asked for, and first-match would pick one
+ *     by array order; both are wrong answers with exit 0, so this errors and
+ *     lists the candidate names instead.
+ *
+ * Exits via `fatal()` (never returns) if no storey matches at all, or if the
+ * substring tier matches storeys with different Names.
+ */
+export declare function resolveStoreyIds(bim: any, storeyFilter: string): Set<number>;
+//# sourceMappingURL=query-storey.d.ts.map

package/dist/commands/query-storey.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-storey.d.ts","sourceRoot":"","sources":["../../src/commands/query-storey.ts"],"names":[],"mappings":"AAmBA;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,GAAG,EAAE,YAAY,EAAE,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,CA8B5E"}

package/dist/commands/query-storey.js

@@ -0,0 +1,71 @@
+/* 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/. */
+/**
+ * `query --storey` resolution — extracted from `query.ts` (module-size
+ * ratchet) but otherwise unchanged behavior.
+ *
+ * IfcBuildingStorey.Name is not unique: two storeys legally share a Name as
+ * siblings under different buildings, or a malformed/federated file can
+ * duplicate a level name outright. Matching by GlobalId/expressId is
+ * unambiguous; matching by Name is not, so every storey with that Name is
+ * included rather than picking an arbitrary first match and silently
+ * dropping the rest (a same-named-storey element would otherwise vanish
+ * from the result depending on array order).
+ */
+import { fatal } from '../output.js';
+/**
+ * Resolve `--storey <filter>` to the set of expressIds of every entity
+ * directly contained in the matching storey/storeys.
+ *
+ * Resolution order:
+ *  1. An exact expressId match (unambiguous — expressIds are unique) wins
+ *     outright and resolves to that single storey.
+ *  2. Otherwise, every storey with an exact Name match. A shared Name is the
+ *     ambiguity this union exists for: the storeys are indistinguishable by
+ *     the very key the user supplied, so all of them are meant.
+ *  3. Otherwise, the storeys whose Name contains the filter
+ *     (case-insensitive) — but only when those matches all share ONE Name.
+ *     A substring spanning differently named storeys ("Level" against
+ *     "Level 1" and "Level 2") is a different situation: the names DO
+ *     distinguish the storeys, the user just did not pick one. Unioning would
+ *     silently merge storeys never asked for, and first-match would pick one
+ *     by array order; both are wrong answers with exit 0, so this errors and
+ *     lists the candidate names instead.
+ *
+ * Exits via `fatal()` (never returns) if no storey matches at all, or if the
+ * substring tier matches storeys with different Names.
+ */
+export function resolveStoreyIds(bim, storeyFilter) {
+    const storeys = bim.storeys();
+    const byExpressId = storeys.find((s) => String(s.ref.expressId) === storeyFilter);
+    let matchedStoreys;
+    if (byExpressId) {
+        matchedStoreys = [byExpressId];
+    }
+    else {
+        const exactNameMatches = storeys.filter((s) => s.name === storeyFilter);
+        if (exactNameMatches.length > 0) {
+            matchedStoreys = exactNameMatches;
+        }
+        else {
+            matchedStoreys = storeys.filter((s) => s.name.toLowerCase().includes(storeyFilter.toLowerCase()));
+            const distinctNames = [...new Set(matchedStoreys.map((s) => s.name))];
+            if (distinctNames.length > 1) {
+                fatal(`Storey "${storeyFilter}" is ambiguous: it matches ${distinctNames.length} differently named storeys ` +
+                    `(${distinctNames.join(', ')}). Use the exact storey name or an expressId.`);
+            }
+        }
+    }
+    if (matchedStoreys.length === 0) {
+        const names = storeys.map((s) => s.name).filter(Boolean).join(', ');
+        fatal(`Storey "${storeyFilter}" not found. Available: ${names || '(none)'}`);
+    }
+    const storeyIds = new Set();
+    for (const storey of matchedStoreys) {
+        for (const e of bim.contains(storey.ref))
+            storeyIds.add(e.ref.expressId);
+    }
+    return storeyIds;
+}
+//# sourceMappingURL=query-storey.js.map

package/dist/commands/query-storey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"query-storey.js","sourceRoot":"","sources":["../../src/commands/query-storey.ts"],"names":[],"mappings":"AAAA;;+DAE+D;AAE/D;;;;;;;;;;;GAWG;AAEH,OAAO,EAAE,KAAK,EAAE,MAAM,cAAc,CAAC;AAErC;;;;;;;;;;;;;;;;;;;;;GAqBG;AACH,MAAM,UAAU,gBAAgB,CAAC,GAAQ,EAAE,YAAoB;IAC7D,MAAM,OAAO,GAAG,GAAG,CAAC,OAAO,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,KAAK,YAAY,CAAC,CAAC;IACvF,IAAI,cAAqB,CAAC;IAC1B,IAAI,WAAW,EAAE,CAAC;QAChB,cAAc,GAAG,CAAC,WAAW,CAAC,CAAC;IACjC,CAAC;SAAM,CAAC;QACN,MAAM,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;QAC7E,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAChC,cAAc,GAAG,gBAAgB,CAAC;QACpC,CAAC;aAAM,CAAC;YACN,cAAc,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC;YACvG,MAAM,aAAa,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC3E,IAAI,aAAa,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBAC7B,KAAK,CACH,WAAW,YAAY,8BAA8B,aAAa,CAAC,MAAM,6BAA6B;oBACpG,IAAI,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,+CAA+C,CAC9E,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IACD,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACzE,KAAK,CAAC,WAAW,YAAY,2BAA2B,KAAK,IAAI,QAAQ,EAAE,CAAC,CAAC;IAC/E,CAAC;IACD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,KAAK,MAAM,MAAM,IAAI,cAAc,EAAE,CAAC;QACpC,KAAK,MAAM,CAAC,IAAI,GAAG,CAAC,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC;YAAE,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAC3E,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/dist/commands/query.d.ts

@@ -1,32 +1,9 @@
+import { applyWhereFilter, parseWhereFilter, compareValues, normalizeBooleanValue } from './where-filter.js';
+export { applyWhereFilter, parseWhereFilter, compareValues, normalizeBooleanValue };
 /**
  * B9/F6: Auto-prefix Ifc for --type if user omits it.
  * Returns the corrected type string, or the original if already prefixed.
  */
 export declare function normalizeTypeName(typeStr: string): string;
-/**
- * Parse a --where filter string into psetName, propName, operator, value.
- * Supported formats:
- *   PsetName.PropName=Value     (equals)
- *   PsetName.PropName!=Value    (not equals)
- *   PsetName.PropName>Value     (greater than)
- *   PsetName.PropName<Value     (less than)
- *   PsetName.PropName>=Value    (greater or equal)
- *   PsetName.PropName<=Value    (less or equal)
- *   PsetName.PropName~Value     (contains)
- *   PsetName.PropName           (exists)
- */
-export declare function parseWhereFilter(filter: string): {
-    psetName: string;
-    propName: string;
-    operator: string;
-    value?: string;
-};
-/**
- * B3/F1: Apply --where filter to entities, searching both property sets AND quantity sets.
- * Falls back to quantity sets when a property set match is not found.
- */
-export declare function applyWhereFilter(entities: any[], parsed: ReturnType<typeof parseWhereFilter>, bim: any): any[];
-export declare function compareValues(actual: any, operator: string, expected: string | undefined): boolean;
-export declare function normalizeBooleanValue(value: unknown): unknown;
 export declare function queryCommand(args: string[]): Promise<void>;
 //# sourceMappingURL=query.d.ts.map

package/dist/commands/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/commands/query.ts"],"names":[],"mappings":"AAiBA;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAWzD;AAED;;;;;;;;;;;GAWG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,MAAM,GAAG;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,KAAK,CAAC,EAAE,MAAM,CAAA;CAAE,CAsBzH;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,QAAQ,EAAE,GAAG,EAAE,EAAE,MAAM,EAAE,UAAU,CAAC,OAAO,gBAAgB,CAAC,EAAE,GAAG,EAAE,GAAG,GAAG,GAAG,EAAE,CA0B9G;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,GAAG,EAAE,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,OAAO,CAclG;AAED,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAI7D;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CAoehE"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../src/commands/query.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAC;AAE7G,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,aAAa,EAAE,qBAAqB,EAAE,CAAC;AAEpF;;;GAGG;AACH,wBAAgB,iBAAiB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAWzD;AAED,wBAAsB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,IAAI,CAAC,CA8bhE"}

package/dist/commands/query.js

@@ -11,7 +11,10 @@
 import { createHeadlessContext } from '../loader.js';
 import { printJson, getFlag, hasFlag, fatal, validateLimit } from '../output.js';
 import { STANDARD_QTO_MAP, sortEntities } from './query-aggregation.js';
-import { VALID_GROUP_BY_KEYS, outputCount, outputSum, outputAggregation, outputGroupBy, outputEntities } from './query-output.js';
+import { resolveStoreyIds } from './query-storey.js';
+import { VALID_GROUP_BY_KEYS, outputCount, outputSum, outputAggregation, outputGroupBy, outputEntities, computeUniqueValues } from './query-output.js';
+import { applyWhereFilter, parseWhereFilter, compareValues, normalizeBooleanValue } from './where-filter.js';
+export { applyWhereFilter, parseWhereFilter, compareValues, normalizeBooleanValue };
 /**
  * B9/F6: Auto-prefix Ifc for --type if user omits it.
  * Returns the corrected type string, or the original if already prefixed.
@@ -28,108 +31,22 @@ export function normalizeTypeName(typeStr) {
         return prefixed;
     }).join(',');
 }
-/**
- * Parse a --where filter string into psetName, propName, operator, value.
- * Supported formats:
- *   PsetName.PropName=Value     (equals)
- *   PsetName.PropName!=Value    (not equals)
- *   PsetName.PropName>Value     (greater than)
- *   PsetName.PropName<Value     (less than)
- *   PsetName.PropName>=Value    (greater or equal)
- *   PsetName.PropName<=Value    (less or equal)
- *   PsetName.PropName~Value     (contains)
- *   PsetName.PropName           (exists)
- */
-export function parseWhereFilter(filter) {
-    const dotIdx = filter.indexOf('.');
-    if (dotIdx <= 0) {
-        fatal(`Invalid --where syntax: "${filter}". Expected: PsetName.PropName[=Value]`);
-    }
-    const psetName = filter.slice(0, dotIdx);
-    const rest = filter.slice(dotIdx + 1);
-    // Try multi-char operators first, then single-char
-    for (const op of ['!=', '>=', '<=', '>', '<', '=', '~']) {
-        const opIdx = rest.indexOf(op);
-        if (opIdx > 0) {
-            const propName = rest.slice(0, opIdx);
-            const value = rest.slice(opIdx + op.length);
-            const mappedOp = op === '~' ? 'contains' : op;
-            return { psetName, propName, operator: mappedOp, value };
-        }
-    }
-    // No operator found — exists check
-    return { psetName, propName: rest, operator: 'exists' };
-}
-/**
- * B3/F1: Apply --where filter to entities, searching both property sets AND quantity sets.
- * Falls back to quantity sets when a property set match is not found.
- */
-export function applyWhereFilter(entities, parsed, bim) {
-    return entities.filter(e => {
-        // First try property sets
-        const props = bim.properties(e.ref);
-        const pset = props.find((p) => p.name === parsed.psetName);
-        if (pset) {
-            const prop = pset.properties.find((p) => p.name === parsed.propName);
-            if (prop) {
-                if (parsed.operator === 'exists')
-                    return true;
-                return compareValues(prop.value, parsed.operator, parsed.value);
-            }
-        }
-        // B3: Also search quantity sets
-        const qsets = bim.quantities(e.ref);
-        const qset = qsets.find((q) => q.name === parsed.psetName);
-        if (qset) {
-            const qty = qset.quantities.find((q) => q.name === parsed.propName);
-            if (qty) {
-                if (parsed.operator === 'exists')
-                    return true;
-                return compareValues(qty.value, parsed.operator, parsed.value);
-            }
-        }
-        return false;
-    });
-}
-export function compareValues(actual, operator, expected) {
-    if (expected === undefined)
-        return actual != null;
-    const normActual = normalizeBooleanValue(actual);
-    const normExpected = normalizeBooleanValue(expected);
-    switch (operator) {
-        case '=': return String(normActual) === String(normExpected);
-        case '!=': return String(normActual) !== String(normExpected);
-        case '>': return Number(normActual) > Number(normExpected);
-        case '<': return Number(normActual) < Number(normExpected);
-        case '>=': return Number(normActual) >= Number(normExpected);
-        case '<=': return Number(normActual) <= Number(normExpected);
-        case 'contains': return String(normActual).toLowerCase().includes(String(normExpected).toLowerCase());
-        default: return false;
-    }
-}
-export function normalizeBooleanValue(value) {
-    if (value === true || value === '.T.' || value === 'true' || value === 'TRUE')
-        return 'true';
-    if (value === false || value === '.F.' || value === 'false' || value === 'FALSE')
-        return 'false';
-    return value;
-}
 export async function queryCommand(args) {
     const filePath = args.find(a => !a.startsWith('-'));
     if (!filePath)
         fatal('Usage: ifc-lite query <file.ifc> --type IfcWall [--props] [--limit N]');
     let type = getFlag(args, '--type');
     const limit = getFlag(args, '--limit');
-    // Validated once, up front, and reused by every branch below (plain,
-    // --where, and --group-by). Each branch used to do its own
-    // `limit ? parseInt(limit, 10) : undefined`, which is truthy for any
-    // non-empty garbage string; the parsed NaN was then either silently
-    // ignored (query builder / group-by paths, via a `> 0`-shaped guard
-    // downstream) or silently emptied the result (`slice(0, NaN)` in the
-    // --where path) -- either way a typo'd --limit exited 0 with a wrong
-    // answer instead of being rejected.
+    // Both validated once, up front, and reused by every branch below (plain,
+    // --where, --storey, --group-by). Each branch used to parse for itself,
+    // and `parseInt` is truthy for any non-empty garbage: a typo'd --limit was
+    // either ignored (`> 0`-shaped guards downstream) or silently emptied the
+    // result (`slice(0, NaN)`), while --offset reached three different wrong
+    // answers -- `slice(NaN)` inert, `slice(-2)` returning the LAST two entries
+    // instead of skipping two, and NaN reaching the backend guard as an
+    // uncaught TypeError. Every one of them exited 0 with a wrong answer.
     const rowLimit = validateLimit(limit);
-    const offset = getFlag(args, '--offset');
+    const offset = validateLimit(getFlag(args, '--offset'), '--offset');
     const propFilter = getFlag(args, '--where');
     const jsonOutput = hasFlag(args, '--json');
     const countOnly = hasFlag(args, '--count');
@@ -291,43 +208,7 @@ export async function queryCommand(args) {
         if (!targetType)
             fatal('--unique requires --type (e.g., --type IfcWall --unique material)');
         const entities = bim.query().byType(...targetType.split(',')).toArray();
-        const valueCounts = new Map();
-        if (uniqueProp === 'material') {
-            // B6: Support --unique material
-            for (const e of entities) {
-                const mat = bim.materials(e.ref);
-                const first = mat?.materials?.[0];
-                const firstName = typeof first === 'string' ? first : first?.name;
-                const val = firstName ?? mat?.name ?? '(no material)';
-                valueCounts.set(val, (valueCounts.get(val) ?? 0) + 1);
-            }
-        }
-        else if (uniqueProp === 'storey') {
-            for (const e of entities) {
-                const storey = bim.storey(e.ref);
-                const val = storey?.name ?? '(no storey)';
-                valueCounts.set(val, (valueCounts.get(val) ?? 0) + 1);
-            }
-        }
-        else if (uniqueProp === 'type') {
-            for (const e of entities) {
-                valueCounts.set(e.type, (valueCounts.get(e.type) ?? 0) + 1);
-            }
-        }
-        else {
-            const dotIdx = uniqueProp.indexOf('.');
-            if (dotIdx <= 0)
-                fatal(`Invalid --unique path: "${uniqueProp}". Expected: PsetName.PropName, or one of: material, storey, type`);
-            const psetName = uniqueProp.slice(0, dotIdx);
-            const propName = uniqueProp.slice(dotIdx + 1);
-            for (const e of entities) {
-                const psets = bim.properties(e.ref);
-                const pset = psets.find((p) => p.name === psetName);
-                const prop = pset?.properties?.find((p) => p.name === propName);
-                const val = prop?.value != null ? String(prop.value) : '(no value)';
-                valueCounts.set(val, (valueCounts.get(val) ?? 0) + 1);
-            }
-        }
+        const valueCounts = computeUniqueValues(entities, uniqueProp, bim);
         if (jsonOutput) {
             const result = {};
             for (const [val, count] of valueCounts)
@@ -407,18 +288,10 @@ export async function queryCommand(args) {
         const types = type.split(',');
         q = q.byType(...types);
     }
-    // --storey filter: restrict to entities in a specific storey
+    // --storey filter: restrict to entities in a specific storey (or storeys
+    // sharing a Name — see resolveStoreyIds).
     if (storeyFilter) {
-        const storeys = bim.storeys();
-        const matchedStorey = storeys.find((s) => s.name === storeyFilter ||
-            s.name.toLowerCase().includes(storeyFilter.toLowerCase()) ||
-            String(s.ref.expressId) === storeyFilter);
-        if (!matchedStorey) {
-            const names = storeys.map((s) => s.name).filter(Boolean).join(', ');
-            fatal(`Storey "${storeyFilter}" not found. Available: ${names || '(none)'}`);
-        }
-        const contained = bim.contains(matchedStorey.ref);
-        const storeyIds = new Set(contained.map((e) => e.ref.expressId));
+        const storeyIds = resolveStoreyIds(bim, storeyFilter);
         // Post-filter: only keep entities that are in this storey
         const baseEntities = q.toArray();
         let storeyEntities = baseEntities.filter((e) => storeyIds.has(e.ref.expressId));
@@ -453,6 +326,11 @@ export async function queryCommand(args) {
             outputGroupBy(storeyEntities, groupBy, undefined, bim, jsonOutput, rowLimit);
             return;
         }
+        // Same slice the --where branch applies; without it both flags were inert here.
+        if (offset)
+            storeyEntities = storeyEntities.slice(offset);
+        if (rowLimit !== undefined)
+            storeyEntities = storeyEntities.slice(0, rowLimit);
         if (countOnly) {
             outputCount(storeyEntities.length, jsonOutput);
             return;
@@ -497,11 +375,10 @@ export async function queryCommand(args) {
             outputAggregation(entities, maxQuantity, 'max', bim, jsonOutput);
             return;
         }
-        // Apply offset/limit only for non-aggregation, non-group paths.
-        // `rowLimit` is validated once, up front (see above) -- slice(0, NaN)
-        // used to silently empty the result on a garbage --limit.
+        // Non-aggregation, non-group paths only. `rowLimit` is validated up
+        // front -- slice(0, NaN) used to silently empty the result.
         if (offset)
-            entities = entities.slice(parseInt(offset, 10));
+            entities = entities.slice(offset);
         if (rowLimit !== undefined)
             entities = entities.slice(0, rowLimit);
         if (countOnly) {
@@ -514,23 +391,27 @@ export async function queryCommand(args) {
         outputEntities(entities, args, bim, jsonOutput);
         return;
     }
-    // Validated, not parseInt'd -- the QueryBuilder forwards this to the
-    // headless backend's descriptor, which only honours it under a `> 0`
-    // check downstream; a garbage/NaN --limit was silently ignored there,
-    // returning every match instead of being rejected.
-    if (rowLimit !== undefined && !groupBy)
+    // Detect aggregation quantity and mode up front: --sum/--avg/--min/--max
+    // must run over the FULL filtered set, matching the --where and --storey
+    // paths' explicit "no offset/limit" rule for aggregations -- a partial sum
+    // over a --limit-sliced set is a silently wrong total, not a preview.
+    const aggQuantity = sumQuantity ?? avgQuantity ?? minQuantity ?? maxQuantity;
+    const aggMode = sumQuantity ? 'sum' : avgQuantity ? 'avg' : minQuantity ? 'min' : maxQuantity ? 'max' : undefined;
+    // Validated, not parseInt'd -- the backend descriptor only honours the
+    // limit under a `> 0` check, so a NaN --limit returned every match.
+    // Both flags need both guards: !groupBy because the --where/--storey
+    // siblings never slice before grouping, and !aggQuantity (#3510) because
+    // an aggregation must run over the whole filtered set.
+    if (rowLimit !== undefined && !groupBy && !aggQuantity)
         q = q.limit(rowLimit);
-    if (offset)
-        q = q.offset(parseInt(offset, 10));
+    if (offset && !groupBy && !aggQuantity)
+        q = q.offset(offset);
     // B11: Validate --group-by key
     if (groupBy) {
         if (!VALID_GROUP_BY_KEYS.includes(groupBy) && !groupBy.includes('.')) {
             fatal(`Unknown grouping "${groupBy}". Valid options: ${VALID_GROUP_BY_KEYS.join(', ')}, or PsetName.PropName`);
         }
     }
-    // Detect aggregation quantity and mode for --group-by combos
-    const aggQuantity = sumQuantity ?? avgQuantity ?? minQuantity ?? maxQuantity;
-    const aggMode = sumQuantity ? 'sum' : avgQuantity ? 'avg' : minQuantity ? 'min' : maxQuantity ? 'max' : undefined;
     // --group-by + aggregation combo: aggregate per group
     if (groupBy && aggQuantity) {
         const entities = q.toArray();