@ifc-lite/viewer 1.26.0 → 1.28.0

package/src/hooks/useIfcCache.ts

@@ -17,7 +17,7 @@ import {
   type IfcDataStore as CacheDataStore,
   type GeometryData,
 } from '@ifc-lite/cache';
-import { SpatialHierarchyBuilder, StepTokenizer, CompactEntityIndex, CompactEntityIndexBuilder, extractLengthUnitScale, type IfcDataStore } from '@ifc-lite/parser';
+import { SpatialHierarchyBuilder, StepTokenizer, CompactEntityIndex, CompactEntityIndexBuilder, extractLengthUnitScale, attachDataStoreAccessors, type IfcDataStore } from '@ifc-lite/parser';
 import { buildSpatialIndexGuarded } from '../utils/loadingUtils.js';
 import type { MeshData } from '@ifc-lite/geometry';
 
@@ -109,7 +109,8 @@ export function useIfcCache() {
   const loadFromCache = useCallback(async (
     cacheResult: CacheResult,
     fileName: string,
-    cacheKey?: string
+    cacheKey?: string,
+    fallbackSourceBuffer?: ArrayBufferLike,
   ): Promise<CacheLoadResult> => {
     try {
       const cacheLoadStart = performance.now();
@@ -122,12 +123,23 @@ export function useIfcCache() {
       const result = await reader.read(cacheResult.buffer);
       const cacheReadTime = performance.now() - cacheLoadStart;
 
-      // Convert cache data store to viewer data store format
-      const dataStore = result.dataStore as any;
-
-      // Restore source buffer for on-demand property extraction
-      if (cacheResult.sourceBuffer) {
-        dataStore.source = new Uint8Array(cacheResult.sourceBuffer);
+      // Convert cache data store to viewer data store format.
+      // The cache reader emits a cache-shaped store; this function mutates it
+      // in place into the parser `IfcDataStore` the viewer requires (adding
+      // source, entityIndex, on-demand maps, spatialHierarchy). Cast through
+      // `unknown` to the target shape so the subsequent property writes stay
+      // type-checked against the parser types.
+      const dataStore = result.dataStore as unknown as IfcDataStore;
+
+      // Restore the source buffer — required for on-demand property extraction
+      // AND the lazy entity accessors (getEntity/getProperties/...). The web
+      // cache persists `sourceBuffer`; the desktop cache does not, so fall back
+      // to the freshly read file buffer when the caller provides it. Without a
+      // source, the accessors can't be attached and a cache hit would crash the
+      // Properties panel with "store.getEntity is not a function".
+      const sourceBuffer = cacheResult.sourceBuffer ?? fallbackSourceBuffer;
+      if (sourceBuffer) {
+        dataStore.source = new Uint8Array(sourceBuffer);
 
         if (result.entityIndex) {
           dataStore.entityIndex = buildEntityIndexFromCachedColumns(result.entityIndex);
@@ -155,13 +167,24 @@ export function useIfcCache() {
         // Rebuild on-demand maps from relationships
         // Pass entityIndex which contains ALL entity types including IfcPropertySet/IfcElementQuantity
         // (the entity table may not include these since they're filtered during fresh parse)
-        const { onDemandPropertyMap, onDemandQuantityMap } = rebuildOnDemandMaps(
+        const { onDemandPropertyMap, onDemandQuantityMap, onDemandMaterialMap } = rebuildOnDemandMaps(
           dataStore.entities,
           dataStore.relationships,
           dataStore.entityIndex
         );
         dataStore.onDemandPropertyMap = onDemandPropertyMap;
         dataStore.onDemandQuantityMap = onDemandQuantityMap;
+        // Materials tab + per-material totals read onDemandMaterialMap; without
+        // this a cache hit left the Materials grouping empty (#982 follow-up).
+        dataStore.onDemandMaterialMap = onDemandMaterialMap;
+
+        // Reattach the lazy entity/property/quantity accessors. A freshly parsed
+        // store carries these (wired by attachDataStoreAccessors), but the cache
+        // format only serialises data — so a cache-restored store would be
+        // missing getEntity()/getProperties()/etc. and crash any query path
+        // (e.g. the Properties panel: "store.getEntity is not a function").
+        // Safe here: source, entityIndex and the on-demand maps are all set.
+        attachDataStoreAccessors(dataStore as IfcDataStore);
       } else {
         console.warn('[useIfcCache] No source buffer in cache - on-demand property extraction disabled');
         dataStore.source = new Uint8Array(0);