react-native-onyx 2.0.67 → 2.0.69

package/dist/Onyx.js

@@ -416,8 +416,15 @@ function clear(keysToPreserve = []) {
                 const newValue = (_a = defaultKeyStates[key]) !== null && _a !== void 0 ? _a : null;
                 if (newValue !== oldValue) {
                     OnyxCache_1.default.set(key, newValue);
-                    const collectionKey = OnyxUtils_1.default.getCollectionKey(key);
-                    if (OnyxUtils_1.default.isCollectionKey(collectionKey)) {
+                    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;
+                    }
+                    if (collectionKey) {
                         if (!keyValuesToResetAsCollection[collectionKey]) {
                             keyValuesToResetAsCollection[collectionKey] = {};
                         }

package/dist/OnyxUtils.d.ts

@@ -75,7 +75,8 @@ declare function isCollectionMemberKey<TCollectionKey extends CollectionKeyBase>
 /**
  * Splits a collection member key into the collection key part and the ID part.
  * @param key - The collection member key to split.
- * @returns A tuple where the first element is the collection part and the second element is the ID part.
+ * @returns A tuple where the first element is the collection part and the second element is the ID part,
+ * or throws an Error if the key is not a collection one.
  */
 declare function splitCollectionMemberKey<TKey extends CollectionKey, CollectionKeyType = TKey extends `${infer Prefix}_${string}` ? `${Prefix}_` : never>(key: TKey): [CollectionKeyType, string];
 /**
@@ -86,17 +87,18 @@ declare function isKeyMatch(configKey: OnyxKey, key: OnyxKey): boolean;
 /** Checks to see if this key has been flagged as safe for removal. */
 declare function isSafeEvictionKey(testKey: OnyxKey): boolean;
 /**
- * It extracts the non-numeric collection identifier of a given key.
+ * Extracts the collection identifier of a given collection member key.
  *
  * For example:
  * - `getCollectionKey("report_123")` would return "report_"
- * - `getCollectionKey("report")` would return "report"
  * - `getCollectionKey("report_")` would return "report_"
+ * - `getCollectionKey("report_-1_something")` would return "report_"
+ * - `getCollectionKey("sharedNVP_user_-1_something")` would return "sharedNVP_user_"
  *
- * @param {OnyxKey} key - The key to process.
- * @return {string} The pure key without any numeric
+ * @param key - The collection key to process.
+ * @returns The plain collection key or throws an Error if the key is not a collection one.
  */
-declare function getCollectionKey(key: OnyxKey): string;
+declare function getCollectionKey(key: CollectionKey): string;
 /**
  * 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

@@ -332,16 +332,12 @@ function isCollectionMemberKey(collectionKey, key, collectionKeyLength) {
 /**
  * Splits a collection member key into the collection key part and the ID part.
  * @param key - The collection member key to split.
- * @returns A tuple where the first element is the collection part and the second element is the ID part.
+ * @returns A tuple where the first element is the collection part and the second element is the ID part,
+ * or throws an Error if the key is not a collection one.
  */
 function splitCollectionMemberKey(key) {
-    const underscoreIndex = key.lastIndexOf('_');
-    if (underscoreIndex === -1) {
-        throw new Error(`Invalid ${key} key provided, only collection keys are allowed.`);
-    }
-    const collectionKey = key.substring(0, underscoreIndex + 1);
-    const memberKey = key.substring(underscoreIndex + 1);
-    return [collectionKey, memberKey];
+    const collectionKey = getCollectionKey(key);
+    return [collectionKey, key.slice(collectionKey.length)];
 }
 /**
  * Checks to see if a provided key is the exact configured key of our connected subscriber
@@ -355,22 +351,32 @@ function isSafeEvictionKey(testKey) {
     return evictionAllowList.some((key) => isKeyMatch(key, testKey));
 }
 /**
- * It extracts the non-numeric collection identifier of a given key.
+ * Extracts the collection identifier of a given collection member key.
  *
  * For example:
  * - `getCollectionKey("report_123")` would return "report_"
- * - `getCollectionKey("report")` would return "report"
  * - `getCollectionKey("report_")` would return "report_"
+ * - `getCollectionKey("report_-1_something")` would return "report_"
+ * - `getCollectionKey("sharedNVP_user_-1_something")` would return "sharedNVP_user_"
  *
- * @param {OnyxKey} key - The key to process.
- * @return {string} The pure key without any numeric
+ * @param key - The collection key to process.
+ * @returns The plain collection key or throws an Error if the key is not a collection one.
  */
 function getCollectionKey(key) {
-    const underscoreIndex = key.lastIndexOf('_');
-    if (underscoreIndex === -1) {
-        return key;
+    // Start by finding the position of the last underscore in the string
+    let lastUnderscoreIndex = key.lastIndexOf('_');
+    // Iterate backwards to find the longest key that ends with '_'
+    while (lastUnderscoreIndex > 0) {
+        const possibleKey = key.slice(0, lastUnderscoreIndex + 1);
+        // Check if the substring is a key in the Set
+        if (isCollectionKey(possibleKey)) {
+            // Return the matching key and the rest of the string
+            return possibleKey;
+        }
+        // Move to the next underscore to check smaller possible keys
+        lastUnderscoreIndex = key.lastIndexOf('_', lastUnderscoreIndex - 1);
     }
-    return key.substring(0, underscoreIndex + 1);
+    throw new Error(`Invalid '${key}' key provided, only collection keys are allowed.`);
 }
 /**
  * Tries to get a value from the cache. If the value is not present in cache it will return the default value or undefined.
@@ -639,11 +645,17 @@ function keyChanged(key, value, previousValue, canUpdateSubscriber = () => true,
     // 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 : [];
-    const collectionKey = getCollectionKey(key);
-    const plainCollectionKey = collectionKey.lastIndexOf('_') !== -1 ? collectionKey : undefined;
-    if (plainCollectionKey) {
+    let collectionKey;
+    try {
+        collectionKey = getCollectionKey(key);
+    }
+    catch (e) {
+        // If getCollectionKey() throws an error it means the key is not a collection key.
+        collectionKey = undefined;
+    }
+    if (collectionKey) {
         // Getting the collection key from the specific key because only collection keys were stored in the mapping.
-        stateMappingKeys = [...stateMappingKeys, ...((_b = onyxKeyToSubscriptionIDs.get(plainCollectionKey)) !== null && _b !== void 0 ? _b : [])];
+        stateMappingKeys = [...stateMappingKeys, ...((_b = onyxKeyToSubscriptionIDs.get(collectionKey)) !== null && _b !== void 0 ? _b : [])];
         if (stateMappingKeys.length === 0) {
             return;
         }
@@ -1023,7 +1035,7 @@ function subscribeToKey(connectOptions) {
         // Performance improvement
         // If the mapping is connected to an onyx key that is not a collection
         // we can skip the call to getAllKeys() and return an array with a single item
-        if (Boolean(mapping.key) && typeof mapping.key === 'string' && !mapping.key.endsWith('_') && OnyxCache_1.default.getAllKeys().has(mapping.key)) {
+        if (Boolean(mapping.key) && typeof mapping.key === 'string' && !isCollectionKey(mapping.key) && OnyxCache_1.default.getAllKeys().has(mapping.key)) {
             return new Set([mapping.key]);
         }
         return getAllKeys();

package/package.json

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