react-native-onyx 3.0.38 → 3.0.40

package/dist/Onyx.js

@@ -317,14 +317,7 @@ function clear(keysToPreserve = []) {
                     const newValue = (_a = defaultKeyStates[key]) !== null && _a !== void 0 ? _a : null;
                     if (newValue !== oldValue) {
                         OnyxCache_1.default.set(key, newValue);
-                        let collectionKey;
-                        try {
-                            collectionKey = OnyxUtils_1.default.getCollectionKey(key);
-                        }
-                        catch (e) {
-                            // If getCollectionKey() throws an error it means the key is not a collection key.
-                            collectionKey = undefined;
-                        }
+                        const collectionKey = OnyxUtils_1.default.getCollectionKey(key);
                         if (collectionKey) {
                             if (!keyValuesToResetAsCollection[collectionKey]) {
                                 keyValuesToResetAsCollection[collectionKey] = { oldValues: {}, newValues: {} };

package/dist/OnyxCache.d.ts

@@ -162,7 +162,7 @@ declare class OnyxCache {
     /**
      * Get the collection key for a given member key
      */
-    getCollectionKey(key: OnyxKey): OnyxKey | null;
+    getCollectionKey(key: OnyxKey): OnyxKey | undefined;
     /**
      * Get all data for a collection key
      */

package/dist/OnyxCache.js

@@ -383,7 +383,7 @@ class OnyxCache {
                 return collectionKey;
             }
         }
-        return null;
+        return undefined;
     }
     /**
      * Get all data for a collection key

package/dist/OnyxSnapshotCache.js

@@ -100,14 +100,11 @@ class OnyxSnapshotCache {
     invalidateForKey(keyToInvalidate) {
         // Always invalidate the exact key
         this.snapshotCache.delete(keyToInvalidate);
-        try {
-            // Check if the key is a collection member and invalidate the collection base key
-            const collectionBaseKey = OnyxUtils_1.default.getCollectionKey(keyToInvalidate);
+        // Check if the key is a collection member and invalidate the collection base key
+        const collectionBaseKey = OnyxUtils_1.default.getCollectionKey(keyToInvalidate);
+        if (collectionBaseKey) {
             this.snapshotCache.delete(collectionBaseKey);
         }
-        catch (e) {
-            // do nothing - this just means the key is not a collection member
-        }
     }
     /**
      * Clear all snapshot cache

package/dist/OnyxUtils.d.ts

@@ -163,9 +163,9 @@ declare function isKeyMatch(configKey: OnyxKey, key: OnyxKey): boolean;
  * - `getCollectionKey("sharedNVP_user_-1_something")` would return "sharedNVP_user_"
  *
  * @param key - The collection key to process.
- * @returns The plain collection key or throws an Error if the key is not a collection one.
+ * @returns The plain collection key or undefined if the key is not a collection one.
  */
-declare function getCollectionKey(key: CollectionKey): string;
+declare function getCollectionKey(key: CollectionKey): string | undefined;
 /**
  * Tries to get a value from the cache. If the value is not present in cache it will return the default value or undefined.
  * If the requested key is a collection, it will return an object with all the collection members.

package/dist/OnyxUtils.js

@@ -389,15 +389,9 @@ function isCollectionMemberKey(collectionKey, key) {
  * @returns true if the key is a collection member, false otherwise
  */
 function isCollectionMember(key) {
-    try {
-        const collectionKey = getCollectionKey(key);
-        // If the key is longer than the collection key, it's a collection member
-        return key.length > collectionKey.length;
-    }
-    catch (e) {
-        // If getCollectionKey throws, the key is not a collection member
-        return false;
-    }
+    const collectionKey = getCollectionKey(key);
+    // If the key is longer than the collection key, it's a collection member
+    return !!collectionKey && key.length > collectionKey.length;
 }
 /**
  * Checks if a given key is a RAM-only key, RAM-only collection key, or a RAM-only collection member
@@ -417,14 +411,10 @@ function isCollectionMember(key) {
  * @returns true if key is a RAM-only key, RAM-only collection key, or a RAM-only collection member
  */
 function isRamOnlyKey(key) {
-    try {
-        const collectionKey = getCollectionKey(key);
-        // If collectionKey exists for a given key, check if it's a RAM-only key
+    const collectionKey = getCollectionKey(key);
+    if (collectionKey) {
         return OnyxCache_1.default.isRamOnlyKey(collectionKey);
     }
-    catch (_a) {
-        // If getCollectionKey throws, the key is not a collection member
-    }
     return OnyxCache_1.default.isRamOnlyKey(key);
 }
 /**
@@ -439,8 +429,12 @@ function splitCollectionMemberKey(key, collectionKey) {
         throw new Error(`Invalid '${collectionKey}' collection key provided, it isn't compatible with '${key}' key.`);
     }
     if (!collectionKey) {
+        const resolvedKey = getCollectionKey(key);
+        if (!resolvedKey) {
+            throw new Error(`Invalid '${key}' key provided, only collection keys are allowed.`);
+        }
         // eslint-disable-next-line no-param-reassign
-        collectionKey = getCollectionKey(key);
+        collectionKey = resolvedKey;
     }
     return [collectionKey, key.slice(collectionKey.length)];
 }
@@ -461,7 +455,7 @@ function isKeyMatch(configKey, key) {
  * - `getCollectionKey("sharedNVP_user_-1_something")` would return "sharedNVP_user_"
  *
  * @param key - The collection key to process.
- * @returns The plain collection key or throws an Error if the key is not a collection one.
+ * @returns The plain collection key or undefined if the key is not a collection one.
  */
 function getCollectionKey(key) {
     // Start by finding the position of the last underscore in the string
@@ -477,7 +471,7 @@ function getCollectionKey(key) {
         // Move to the next underscore to check smaller possible keys
         lastUnderscoreIndex = key.lastIndexOf('_', lastUnderscoreIndex - 1);
     }
-    throw new Error(`Invalid '${key}' key provided, only collection keys are allowed.`);
+    return undefined;
 }
 /**
  * Tries to get a value from the cache. If the value is not present in cache it will return the default value or undefined.
@@ -625,14 +619,7 @@ function keyChanged(key, value, canUpdateSubscriber = () => true, isProcessingCo
     // do the same in keysChanged, because we only call that function when a collection key changes, and it doesn't happen that often.
     // For performance reason, we look for the given key and later if don't find it we look for the collection key, instead of checking if it is a collection key first.
     let stateMappingKeys = (_a = onyxKeyToSubscriptionIDs.get(key)) !== null && _a !== void 0 ? _a : [];
-    let collectionKey;
-    try {
-        collectionKey = getCollectionKey(key);
-    }
-    catch (e) {
-        // If getCollectionKey() throws an error it means the key is not a collection key.
-        collectionKey = undefined;
-    }
+    const collectionKey = getCollectionKey(key);
     if (collectionKey) {
         // Getting the collection key from the specific key because only collection keys were stored in the mapping.
         stateMappingKeys = [...stateMappingKeys, ...((_b = onyxKeyToSubscriptionIDs.get(collectionKey)) !== null && _b !== void 0 ? _b : [])];

package/package.json

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