react-native-onyx 3.0.80 → 3.0.81

package/dist/OnyxUtils.js

@@ -279,9 +279,10 @@ function multiGet(keys) {
             }
             continue;
         }
-        const cacheValue = OnyxCache_1.default.get(key);
-        if (cacheValue) {
-            dataMap.set(key, cacheValue);
+        // hasCacheForKey catches cached falsy values (0, '', false, null) as cache hits, which
+        // a truthy check on the value would miss.
+        if (OnyxCache_1.default.hasCacheForKey(key)) {
+            dataMap.set(key, OnyxCache_1.default.get(key));
             continue;
         }
         const pendingKey = `${OnyxCache_1.TASK.GET}:${key}`;
@@ -328,6 +329,12 @@ function multiGet(keys) {
                     // The key is not a collection one or something went wrong during split, so we proceed with the function's logic.
                 }
             }
+            // Prefer cache over stale storage if a concurrent write populated it during
+            // the read — otherwise cache.merge(temp) below would resurrect dropped fields.
+            if (OnyxCache_1.default.hasCacheForKey(key)) {
+                dataMap.set(key, OnyxCache_1.default.get(key));
+                continue;
+            }
             dataMap.set(key, value);
             temp[key] = value;
         }
@@ -1338,12 +1345,17 @@ function mergeCollectionWithPatches({ collectionKey, collection, mergeReplaceNul
         const keyValuePairsForNewCollection = prepareKeyValuePairsForStorage(newCollection, true);
         // finalMergedCollection contains all the keys that were merged, without the keys of incompatible updates
         const finalMergedCollection = Object.assign(Object.assign({}, existingKeyCollection), newCollection);
-        // Pre-warm cache for any existing storage keys that aren't yet in cache. get() is a no-op
-        // (sync-resolved) for cache hits, and on a cache miss it reads from storage and writes the
-        // value back to cache. This is required so the subsequent cache.merge() merges the new delta
-        // into the real previous storage value (rather than starting from `undefined` and dropping
-        // the existing keys).
-        return Promise.all(existingKeys.map((key) => get(key))).then(() => {
+        // Pre-warm cache for cache-miss existingKeys so cache.merge() merges the new delta into
+        // the real previous storage value. Fast path (all warm) skips the pre-warm to preserve
+        // promise-chain depth; slow path batches the misses into one Storage.multiGet.
+        const hasColdExistingKey = existingKeys.some((key) => !OnyxCache_1.default.hasCacheForKey(key));
+        // Swallow pre-warm read failures so a transient Storage.multiGet rejection doesn't
+        // skip the cache.merge() + keysChanged() below. Subscribers still see the merge even
+        // when storage reads fail.
+        const prewarmPromise = hasColdExistingKey
+            ? multiGet(existingKeys).catch((err) => Logger.logInfo(`mergeCollectionWithPatches pre-warm failed; proceeding with cache-only merge. Error: ${err}`))
+            : Promise.resolve();
+        return prewarmPromise.then(() => {
             // Snapshot previous values from the (now-warm) cache for keysChanged's diff, then update
             // cache and notify subscribers synchronously BEFORE issuing storage writes. This matches
             // the cache-first / storage-second invariant followed by every other Onyx write method

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "3.0.80",
+  "version": "3.0.81",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",