@signalium/query 1.1.0 → 1.1.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @signalium/query
 
+## 1.1.1
+
+### Patch Changes
+
+- bb0a5a9: Fix entity proxies not being created for preloaded entities from cache, and `__entityRef` not being resolved in proxy get handler. This fixes validation errors when accessing nested entities loaded from persistent cache.
+
 ## 1.1.0
 
 ### Minor Changes

package/dist/cjs/development/index.js

@@ -912,6 +912,43 @@ function createEntityProxy(id, entityRecord, def, entityRelay, scopeOwner, warn
       if (!Object.hasOwnProperty.call(shape, prop)) {
         return value;
       }
+      if (value && typeof value === "object") {
+        const ownerWithHydrate = scopeOwner;
+        if (typeof value.__entityRef === "number") {
+          const nestedRecord = ownerWithHydrate.hydrateEntity?.(
+            value.__entityRef,
+            propDef
+          );
+          if (nestedRecord && nestedRecord.proxy) {
+            cache.set(prop, nestedRecord.proxy);
+            return nestedRecord.proxy;
+          }
+        }
+        if (Array.isArray(value) && value.length > 0) {
+          const firstItem = value[0];
+          if (firstItem && typeof firstItem === "object" && typeof firstItem.__entityRef === "number") {
+            const arrayTypeDef = propDef;
+            const isArrayType = typeof arrayTypeDef.mask === "number" && (arrayTypeDef.mask & Mask.ARRAY) !== 0;
+            const itemDef = isArrayType ? arrayTypeDef.shape : void 0;
+            if (itemDef) {
+              const hydratedArray = value.map((item) => {
+                if (item && typeof item === "object" && typeof item.__entityRef === "number") {
+                  const nestedRecord = ownerWithHydrate.hydrateEntity?.(
+                    item.__entityRef,
+                    itemDef
+                  );
+                  if (nestedRecord && nestedRecord.proxy) {
+                    return nestedRecord.proxy;
+                  }
+                }
+                return item;
+              });
+              cache.set(prop, hydratedArray);
+              return hydratedArray;
+            }
+          }
+        }
+      }
       const parsed = parseValue(value, propDef, `[[${desc}]].${prop}`, false, warn);
       cache.set(prop, parsed);
       return parsed;
@@ -1052,6 +1089,9 @@ class EntityStore {
       record.data = mergeValues(record.data, obj);
       record.notifier.notify();
       record.cache.clear();
+      if (record.proxy === void 0) {
+        record.proxy = this.createEntityProxy(record, shape);
+      }
     }
     record.entityRefs = entityRefs;
     return record;