react-native-onyx 2.0.136 → 2.0.138

package/dist/OnyxCache.d.ts

@@ -19,8 +19,8 @@ declare class OnyxCache {
     private recentKeys;
     /** A map of cached values */
     private storageMap;
-    /** Index mapping collection keys to their member keys for O(1) lookup */
-    private collectionIndex;
+    /** Cache of complete collection data objects for O(1) retrieval */
+    private collectionData;
     /**
      * Captured pending tasks for already running storage methods
      * Using a map yields better performance on operations such a delete
@@ -165,10 +165,6 @@ declare class OnyxCache {
      * Get all data for a collection key
      */
     getCollectionData(collectionKey: OnyxKey): Record<OnyxKey, OnyxValue<OnyxKey>> | undefined;
-    /**
-     * Get all member keys for a collection key
-     */
-    getCollectionMemberKeys(collectionKey: OnyxKey): Set<OnyxKey> | undefined;
 }
 declare const instance: OnyxCache;
 export default instance;

package/dist/OnyxCache.js

@@ -68,10 +68,10 @@ class OnyxCache {
         this.nullishStorageKeys = new Set();
         this.recentKeys = new Set();
         this.storageMap = {};
-        this.collectionIndex = {};
+        this.collectionData = {};
         this.pendingPromises = new Map();
         // bind all public methods to prevent problems with `this`
-        (0, bindAll_1.default)(this, 'getAllKeys', 'get', 'hasCacheForKey', 'addKey', 'addNullishStorageKey', 'hasNullishStorageKey', 'clearNullishStorageKeys', 'set', 'drop', 'merge', 'hasPendingTask', 'getTaskPromise', 'captureTask', 'addToAccessedKeys', 'removeLeastRecentlyUsedKeys', 'setRecentKeysLimit', 'setAllKeys', 'setEvictionAllowList', 'getEvictionBlocklist', 'isEvictableKey', 'removeLastAccessedKey', 'addLastAccessedKey', 'addEvictableKeysToRecentlyAccessedList', 'getKeyForEviction', 'setCollectionKeys', 'isCollectionKey', 'getCollectionKey', 'getCollectionData', 'getCollectionMemberKeys');
+        (0, bindAll_1.default)(this, 'getAllKeys', 'get', 'hasCacheForKey', 'addKey', 'addNullishStorageKey', 'hasNullishStorageKey', 'clearNullishStorageKeys', 'set', 'drop', 'merge', 'hasPendingTask', 'getTaskPromise', 'captureTask', 'addToAccessedKeys', 'removeLeastRecentlyUsedKeys', 'setRecentKeysLimit', 'setAllKeys', 'setEvictionAllowList', 'getEvictionBlocklist', 'isEvictableKey', 'removeLastAccessedKey', 'addLastAccessedKey', 'addEvictableKeysToRecentlyAccessedList', 'getKeyForEviction', 'setCollectionKeys', 'isCollectionKey', 'getCollectionKey', 'getCollectionData');
     }
     /** Get all the storage keys */
     getAllKeys() {
@@ -136,33 +136,33 @@ class OnyxCache {
         const collectionKey = this.getCollectionKey(key);
         if (value === null || value === undefined) {
             delete this.storageMap[key];
-            // Remove from collection index if it's a collection member
-            if (collectionKey && this.getCollectionMemberKeys(collectionKey)) {
-                this.collectionIndex[collectionKey].delete(key);
+            // Remove from collection data cache if it's a collection member
+            if (collectionKey && this.collectionData[collectionKey]) {
+                delete this.collectionData[collectionKey][key];
             }
             return undefined;
         }
         this.storageMap[key] = value;
-        // Update collection index if this is a collection member
+        // Update collection data cache if this is a collection member
         if (collectionKey) {
-            if (!this.getCollectionMemberKeys(collectionKey)) {
-                this.collectionIndex[collectionKey] = new Set();
+            if (!this.collectionData[collectionKey]) {
+                this.collectionData[collectionKey] = {};
             }
-            this.collectionIndex[collectionKey].add(key);
+            this.collectionData[collectionKey][key] = value;
         }
         return value;
     }
     /** Forget the cached value for the given key */
     drop(key) {
         delete this.storageMap[key];
-        // Update collection index if this is a collection member
+        // Remove from collection data cache if this is a collection member
         const collectionKey = this.getCollectionKey(key);
-        if (collectionKey && this.getCollectionMemberKeys(collectionKey)) {
-            this.collectionIndex[collectionKey].delete(key);
+        if (collectionKey && this.collectionData[collectionKey]) {
+            delete this.collectionData[collectionKey][key];
         }
-        // If this is a collection key, clear its index
+        // If this is a collection key, clear its data
         if (this.isCollectionKey(key)) {
-            delete this.collectionIndex[key];
+            delete this.collectionData[key];
         }
         this.storageKeys.delete(key);
         this.recentKeys.delete(key);
@@ -185,19 +185,19 @@ class OnyxCache {
             const collectionKey = this.getCollectionKey(key);
             if (value === null || value === undefined) {
                 this.addNullishStorageKey(key);
-                // Remove from collection index if it's a collection member
-                if (collectionKey && this.getCollectionMemberKeys(collectionKey)) {
-                    this.collectionIndex[collectionKey].delete(key);
+                // Remove from collection data cache if it's a collection member
+                if (collectionKey && this.collectionData[collectionKey]) {
+                    delete this.collectionData[collectionKey][key];
                 }
             }
             else {
                 this.nullishStorageKeys.delete(key);
-                // Update collection index if this is a collection member
+                // Update collection data cache if this is a collection member
                 if (collectionKey) {
-                    if (!this.getCollectionMemberKeys(collectionKey)) {
-                        this.collectionIndex[collectionKey] = new Set();
+                    if (!this.collectionData[collectionKey]) {
+                        this.collectionData[collectionKey] = {};
                     }
-                    this.collectionIndex[collectionKey].add(key);
+                    this.collectionData[collectionKey][key] = this.storageMap[key];
                 }
             }
         });
@@ -257,10 +257,10 @@ class OnyxCache {
         }
         for (const key of keysToRemove) {
             delete this.storageMap[key];
-            // Update collection index if this is a collection member
+            // Remove from collection data cache if this is a collection member
             const collectionKey = this.getCollectionKey(key);
-            if (collectionKey && this.getCollectionMemberKeys(collectionKey)) {
-                this.collectionIndex[collectionKey].delete(key);
+            if (collectionKey && this.collectionData[collectionKey]) {
+                delete this.collectionData[collectionKey][key];
             }
             this.recentKeys.delete(key);
         }
@@ -358,12 +358,12 @@ class OnyxCache {
      */
     setCollectionKeys(collectionKeys) {
         this.collectionKeys = collectionKeys;
-        // Initialize collection indexes for existing collection keys
+        // Initialize collection data for existing collection keys
         collectionKeys.forEach((collectionKey) => {
-            if (this.getCollectionMemberKeys(collectionKey)) {
+            if (this.collectionData[collectionKey]) {
                 return;
             }
-            this.collectionIndex[collectionKey] = new Set();
+            this.collectionData[collectionKey] = {};
         });
     }
     /**
@@ -387,24 +387,12 @@ class OnyxCache {
      * Get all data for a collection key
      */
     getCollectionData(collectionKey) {
-        const memberKeys = this.getCollectionMemberKeys(collectionKey);
-        if (!memberKeys || memberKeys.size === 0) {
+        const cachedCollection = this.collectionData[collectionKey];
+        if (!cachedCollection || Object.keys(cachedCollection).length === 0) {
             return undefined;
         }
-        const collectionData = {};
-        memberKeys.forEach((memberKey) => {
-            const value = this.storageMap[memberKey];
-            if (value !== undefined) {
-                collectionData[memberKey] = value;
-            }
-        });
-        return collectionData;
-    }
-    /**
-     * Get all member keys for a collection key
-     */
-    getCollectionMemberKeys(collectionKey) {
-        return this.collectionIndex[collectionKey];
+        // Return a shallow copy to ensure React detects changes when items are added/removed
+        return Object.assign({}, cachedCollection);
     }
 }
 const instance = new OnyxCache();

package/dist/OnyxUtils.d.ts

@@ -143,14 +143,14 @@ declare function getCachedCollection<TKey extends CollectionKeyBase>(collectionK
 /**
  * When a collection of keys change, search for any callbacks matching the collection key and trigger those callbacks
  */
-declare function keysChanged<TKey extends CollectionKeyBase>(collectionKey: TKey, partialCollection: OnyxCollection<KeyValueMapping[TKey]>, partialPreviousCollection: OnyxCollection<KeyValueMapping[TKey]> | undefined, notifyConnectSubscribers?: boolean, notifyWithOnyxSubscribers?: boolean, notifyUseOnyxHookSubscribers?: boolean): void;
+declare function keysChanged<TKey extends CollectionKeyBase>(collectionKey: TKey, partialCollection: OnyxCollection<KeyValueMapping[TKey]>, partialPreviousCollection: OnyxCollection<KeyValueMapping[TKey]> | undefined, notifyConnectSubscribers?: boolean, notifyWithOnyxSubscribers?: boolean): void;
 /**
  * When a key change happens, search for any callbacks matching the key or collection key and trigger those callbacks
  *
  * @example
  * keyChanged(key, value, subscriber => subscriber.initWithStoredValues === false)
  */
-declare function keyChanged<TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>, previousValue: OnyxValue<TKey>, canUpdateSubscriber?: (subscriber?: Mapping<OnyxKey>) => boolean, notifyConnectSubscribers?: boolean, notifyWithOnyxSubscribers?: boolean, notifyUseOnyxHookSubscribers?: boolean): void;
+declare function keyChanged<TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>, previousValue: OnyxValue<TKey>, canUpdateSubscriber?: (subscriber?: Mapping<OnyxKey>) => boolean, notifyConnectSubscribers?: boolean, notifyWithOnyxSubscribers?: boolean): void;
 /**
  * Sends the data obtained from the keys to the connection. It either:
  *     - sets state on the withOnyxInstances

package/dist/OnyxUtils.js

@@ -440,25 +440,16 @@ function tryGetCachedValue(key, mapping) {
     let val = OnyxCache_1.default.get(key);
     if (isCollectionKey(key)) {
         const collectionData = OnyxCache_1.default.getCollectionData(key);
-        const allCacheKeys = OnyxCache_1.default.getAllKeys();
-        if (collectionData !== undefined && allCacheKeys.size > 0) {
+        if (collectionData !== undefined) {
             val = collectionData;
         }
         else {
-            // Fallback to original logic
-            // It is possible we haven't loaded all keys yet so we do not know if the
-            // collection actually exists.
-            if (allCacheKeys.size === 0) {
+            // If we haven't loaded all keys yet, we can't determine if the collection exists
+            if (OnyxCache_1.default.getAllKeys().size === 0) {
                 return;
             }
-            const values = {};
-            allCacheKeys.forEach((cacheKey) => {
-                if (!cacheKey.startsWith(key)) {
-                    return;
-                }
-                values[cacheKey] = OnyxCache_1.default.get(cacheKey);
-            });
-            val = values;
+            // Set an empty collection object for collections that exist but have no data
+            val = {};
         }
     }
     if (mapping === null || mapping === void 0 ? void 0 : mapping.selector) {
@@ -512,7 +503,7 @@ function getCachedCollection(collectionKey, collectionMemberKeys) {
 /**
  * When a collection of keys change, search for any callbacks matching the collection key and trigger those callbacks
  */
-function keysChanged(collectionKey, partialCollection, partialPreviousCollection, notifyConnectSubscribers = true, notifyWithOnyxSubscribers = true, notifyUseOnyxHookSubscribers = true) {
+function keysChanged(collectionKey, partialCollection, partialPreviousCollection, notifyConnectSubscribers = true, notifyWithOnyxSubscribers = true) {
     // We prepare the "cached collection" which is the entire collection + the new partial data that
     // was merged in via mergeCollection().
     const cachedCollection = getCachedCollection(collectionKey);
@@ -540,8 +531,7 @@ function keysChanged(collectionKey, partialCollection, partialPreviousCollection
         const isSubscribedToCollectionMemberKey = isCollectionMemberKey(collectionKey, subscriber.key);
         // Regular Onyx.connect() subscriber found.
         if (typeof subscriber.callback === 'function') {
-            // Check if it's a useOnyx or a regular Onyx.connect() subscriber
-            if ((subscriber.isUseOnyxSubscriber && !notifyUseOnyxHookSubscribers) || (!subscriber.isUseOnyxSubscriber && !notifyConnectSubscribers)) {
+            if (!notifyConnectSubscribers) {
                 continue;
             }
             // If they are subscribed to the collection key and using waitForCollectionCallback then we'll
@@ -671,7 +661,7 @@ function keysChanged(collectionKey, partialCollection, partialPreviousCollection
  * @example
  * keyChanged(key, value, subscriber => subscriber.initWithStoredValues === false)
  */
-function keyChanged(key, value, previousValue, canUpdateSubscriber = () => true, notifyConnectSubscribers = true, notifyWithOnyxSubscribers = true, notifyUseOnyxHookSubscribers = true) {
+function keyChanged(key, value, previousValue, canUpdateSubscriber = () => true, notifyConnectSubscribers = true, notifyWithOnyxSubscribers = true) {
     var _a, _b;
     // Add or remove this key from the recentlyAccessedKeys lists
     if (value !== null) {
@@ -710,8 +700,7 @@ function keyChanged(key, value, previousValue, canUpdateSubscriber = () => true,
         }
         // Subscriber is a regular call to connect() and provided a callback
         if (typeof subscriber.callback === 'function') {
-            // Check if it's a useOnyx or a regular Onyx.connect() subscriber
-            if ((subscriber.isUseOnyxSubscriber && !notifyUseOnyxHookSubscribers) || (!subscriber.isUseOnyxSubscriber && !notifyConnectSubscribers)) {
+            if (!notifyConnectSubscribers) {
                 continue;
             }
             if (lastConnectionCallbackData.has(subscriber.subscriptionID) && lastConnectionCallbackData.get(subscriber.subscriptionID) === value) {
@@ -891,8 +880,8 @@ function getCollectionDataAndSendAsObject(matchingKeys, mapping) {
  * scheduleSubscriberUpdate(key, value, subscriber => subscriber.initWithStoredValues === false)
  */
 function scheduleSubscriberUpdate(key, value, previousValue, canUpdateSubscriber = () => true) {
-    const promise = Promise.resolve().then(() => keyChanged(key, value, previousValue, canUpdateSubscriber, true, false, false));
-    batchUpdates(() => keyChanged(key, value, previousValue, canUpdateSubscriber, false, true, true));
+    const promise = Promise.resolve().then(() => keyChanged(key, value, previousValue, canUpdateSubscriber, true, false));
+    batchUpdates(() => keyChanged(key, value, previousValue, canUpdateSubscriber, false, true));
     return Promise.all([maybeFlushBatchUpdates(), promise]).then(() => undefined);
 }
 /**
@@ -901,8 +890,8 @@ function scheduleSubscriberUpdate(key, value, previousValue, canUpdateSubscriber
  * subscriber callbacks receive the data in a different format than they normally expect and it breaks code.
  */
 function scheduleNotifyCollectionSubscribers(key, value, previousValue) {
-    const promise = Promise.resolve().then(() => keysChanged(key, value, previousValue, true, false, false));
-    batchUpdates(() => keysChanged(key, value, previousValue, false, true, true));
+    const promise = Promise.resolve().then(() => keysChanged(key, value, previousValue, true, false));
+    batchUpdates(() => keysChanged(key, value, previousValue, false, true));
     return Promise.all([maybeFlushBatchUpdates(), promise]).then(() => undefined);
 }
 /**

package/dist/types.d.ts

@@ -235,8 +235,6 @@ type BaseConnectOptions = {
      * with the same connect configurations.
      */
     reuseConnection?: boolean;
-    /** Indicates whether this subscriber is created from the useOnyx hook. */
-    isUseOnyxSubscriber?: boolean;
 };
 /** Represents the callback function used in `Onyx.connect()` method with a regular key. */
 type DefaultConnectCallback<TKey extends OnyxKey> = (value: OnyxEntry<KeyValueMapping[TKey]>, key: TKey) => void;

package/dist/useOnyx.js

@@ -276,7 +276,6 @@ function useOnyx(key, options, dependencies = []) {
             initWithStoredValues: options === null || options === void 0 ? void 0 : options.initWithStoredValues,
             waitForCollectionCallback: OnyxUtils_1.default.isCollectionKey(key),
             reuseConnection: options === null || options === void 0 ? void 0 : options.reuseConnection,
-            isUseOnyxSubscriber: true,
         });
         checkEvictableKey();
         return () => {

package/package.json

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