Resolve member keys to the most specific collection prefix in registerMemberKey

Author: fabioh8010

lib/OnyxKeys.ts

@@ -115,20 +115,28 @@ function registerMemberKey(key: OnyxKey): void {
         members.add(key);
         return;
     }
+    // Find the longest (most specific) matching collection key.
+    // e.g. for 'test_level_1', prefer 'test_level_' over 'test_'.
+    let matchedCollectionKey: OnyxKey | undefined;
     for (const collectionKey of collectionKeySet) {
         if (isCollectionMemberKey(collectionKey, key)) {
-            memberToCollectionKeyMap.set(key, collectionKey);
-
-            // Also register in the forward lookup (collection → members)
-            let members = collectionToMembersMap.get(collectionKey);
-            if (!members) {
-                members = new Set();
-                collectionToMembersMap.set(collectionKey, members);
+            if (!matchedCollectionKey || collectionKey.length > matchedCollectionKey.length) {
+                matchedCollectionKey = collectionKey;
             }
-            members.add(key);
-            return;
         }
     }
+
+    if (matchedCollectionKey) {
+        memberToCollectionKeyMap.set(key, matchedCollectionKey);
+
+        // Also register in the forward lookup (collection → members)
+        let members = collectionToMembersMap.get(matchedCollectionKey);
+        if (!members) {
+            members = new Set();
+            collectionToMembersMap.set(matchedCollectionKey, members);
+        }
+        members.add(key);
+    }
 }
 
 /**

tests/unit/OnyxKeysTest.ts

@@ -209,6 +209,24 @@ describe('OnyxKeys', () => {
             OnyxKeys.deregisterMemberKey(memberKey);
         });
 
+        it('should resolve to the most specific (longest) collection key for overlapping prefixes', () => {
+            // 'test_level_' and 'test_' both match 'test_level_1', but 'test_level_' is more specific
+            const memberKey = `${ONYXKEYS.COLLECTION.TEST_LEVEL_KEY}1`;
+            OnyxKeys.registerMemberKey(memberKey);
+
+            expect(OnyxKeys.getCollectionKey(memberKey)).toBe(ONYXKEYS.COLLECTION.TEST_LEVEL_KEY);
+
+            const testLevelMembers = OnyxKeys.getMembersOfCollection(ONYXKEYS.COLLECTION.TEST_LEVEL_KEY);
+            expect(testLevelMembers?.has(memberKey)).toBe(true);
+
+            // Should NOT be registered under the shorter 'test_' collection
+            const testMembers = OnyxKeys.getMembersOfCollection(ONYXKEYS.COLLECTION.TEST_KEY);
+            expect(testMembers?.has(memberKey)).toBeFalsy();
+
+            // Clean up
+            OnyxKeys.deregisterMemberKey(memberKey);
+        });
+
         it('should populate the reverse lookup so getCollectionKey returns O(1)', () => {
             const memberKey = `${ONYXKEYS.COLLECTION.ROUTES}xyz`;
             OnyxKeys.registerMemberKey(memberKey);