Revert "move collection keys methods to seperate module to not create dependecy cycle"

Author: kubabutkiewicz

lib/CollectionKeyUtils.ts

@@ -2,7 +2,6 @@ import bindAll from 'lodash/bindAll';
 import type {OnyxKey} from '../types';
 import Storage from '../storage';
 import * as Logger from '../Logger';
-import {isCollectionKey, isKeyMatch} from '../CollectionKeyUtils';
 import type {StorageUsageConfig, StorageKeyInfo, StorageMetadata, StorageCleanupResult, CleanupExecutionResult} from './types';
 import {DEFAULT_STORAGE_CONFIG} from './types';
 
@@ -216,7 +215,10 @@ class OnyxStorageManager {
 
     private isKeyEvictable(key: OnyxKey): boolean {
         return this.evictableKeys.some((pattern) => {
-            return isKeyMatch(pattern, key);
+            if (pattern.endsWith('_')) {
+                return key.startsWith(pattern);
+            }
+            return key === pattern;
         });
     }
 

lib/OnyxStorageManager/index.ts

@@ -12,7 +12,6 @@ import * as PerformanceUtils from './PerformanceUtils';
 import * as Str from './Str';
 import unstable_batchedUpdates from './batch';
 import Storage from './storage';
-import * as CollectionKeyUtils from './CollectionKeyUtils';
 import type {
     CollectionKey,
     CollectionKeyBase,
@@ -154,9 +153,6 @@ function initStoreValues(keys: DeepRecord<string, OnyxKey>, initialKeyStates: Pa
         return acc;
     }, new Set<OnyxKey>());
 
-    // Initialize the shared collection key utility
-    CollectionKeyUtils.setCollectionKeys(onyxCollectionKeySet);
-
     // Set our default key states to use when initializing and clearing Onyx data
     defaultKeyStates = initialKeyStates;
 
@@ -462,11 +458,11 @@ function getCollectionKeys(): Set<OnyxKey> {
  * is associated with a collection of keys.
  */
 function isCollectionKey(key: OnyxKey): key is CollectionKeyBase {
-    return CollectionKeyUtils.isCollectionKey(key);
+    return onyxCollectionKeySet.has(key);
 }
 
 function isCollectionMemberKey<TCollectionKey extends CollectionKeyBase>(collectionKey: TCollectionKey, key: string): key is `${TCollectionKey}${string}` {
-    return CollectionKeyUtils.isCollectionMemberKey(collectionKey, key);
+    return key.startsWith(collectionKey) && key.length > collectionKey.length;
 }
 
 /**
@@ -497,7 +493,7 @@ function splitCollectionMemberKey<TKey extends CollectionKey, CollectionKeyType
  * or if the provided key is a collection member key (in case our configured key is a "collection key")
  */
 function isKeyMatch(configKey: OnyxKey, key: OnyxKey): boolean {
-    return CollectionKeyUtils.isKeyMatch(configKey, key);
+    return isCollectionKey(configKey) ? Str.startsWith(key, configKey) : configKey === key;
 }
 
 /**
@@ -513,7 +509,24 @@ function isKeyMatch(configKey: OnyxKey, key: OnyxKey): boolean {
  * @returns The plain collection key or throws an Error if the key is not a collection one.
  */
 function getCollectionKey(key: CollectionKey): string {
-    return CollectionKeyUtils.getCollectionKey(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);
+    }
+
+    throw new Error(`Invalid '${key}' key provided, only collection keys are allowed.`);
 }
 
 /**

lib/OnyxUtils.ts

@@ -2,7 +2,6 @@ import {jest} from '@jest/globals';
 import waitForPromisesToResolve from '../utils/waitForPromisesToResolve';
 import Storage from '../../lib/storage';
 import {OnyxStorageManager} from '../../lib/OnyxStorageManager';
-import * as CollectionKeyUtils from '../../lib/CollectionKeyUtils';
 import type {StorageUsageConfig, StorageMetadata} from '../../lib/OnyxStorageManager/types';
 
 // Mock the Storage module
@@ -300,8 +299,6 @@ describe('Storage Eviction Tests', () => {
         });
 
         it('should support key patterns with underscore suffix', async () => {
-            CollectionKeyUtils.setCollectionKeys(new Set(['temp_']));
-
             const config: StorageUsageConfig = {
                 enabled: true,
                 evictableKeys: ['temp_'], // Pattern: keys starting with 'temp_'