minor update

Author: FitseTLT

lib/OnyxUtils.ts

@@ -72,7 +72,7 @@ const lastConnectionCallbackData = new Map<number, OnyxValue<OnyxKey>>();
 
 let snapshotKey: OnyxKey | null = null;
 
-let fullyMergedSnapshotKeys: string[] | undefined = [];
+let fullyMergedSnapshotKeys: string[] = [];
 
 // Keeps track of the last subscriptionID that was used so we can keep incrementing it
 let lastSubscriptionID = 0;
@@ -87,7 +87,7 @@ function getSnapshotKey(): OnyxKey | null {
     return snapshotKey;
 }
 
-function getFullyMergedSnapshotKeys(): string[] | undefined {
+function getFullyMergedSnapshotKeys(): string[] {
     return fullyMergedSnapshotKeys;
 }
 
@@ -160,7 +160,7 @@ function initStoreValues(keys: DeepRecord<string, OnyxKey>, initialKeyStates: Pa
 
     if (typeof keys.COLLECTION === 'object' && typeof keys.COLLECTION.SNAPSHOT === 'string') {
         snapshotKey = keys.COLLECTION.SNAPSHOT;
-        fullyMergedSnapshotKeys = fullyMergedSnapshotKeysParam;
+        fullyMergedSnapshotKeys = fullyMergedSnapshotKeysParam ?? [];
     }
 }
 
@@ -455,8 +455,8 @@ function isCollectionKey(key: OnyxKey): key is CollectionKeyBase {
     return onyxCollectionKeySet.has(key);
 }
 
-function isCollectionMemberKey<TCollectionKey extends CollectionKeyBase>(collectionKey: TCollectionKey, key: string, collectionKeyLength: number): key is `${TCollectionKey}${string}` {
-    return key.startsWith(collectionKey) && key.length > collectionKeyLength;
+function isCollectionMemberKey<TCollectionKey extends CollectionKeyBase>(collectionKey: TCollectionKey, key: string): key is `${TCollectionKey}${string}` {
+    return key.startsWith(collectionKey) && key.length > collectionKey.length;
 }
 
 /**
@@ -470,7 +470,7 @@ function splitCollectionMemberKey<TKey extends CollectionKey, CollectionKeyType
     key: TKey,
     collectionKey?: string,
 ): [CollectionKeyType, string] {
-    if (collectionKey && !isCollectionMemberKey(collectionKey, key, collectionKey.length)) {
+    if (collectionKey && !isCollectionMemberKey(collectionKey, key)) {
         throw new Error(`Invalid '${collectionKey}' collection key provided, it isn't compatible with '${key}' key.`);
     }
 
@@ -565,14 +565,12 @@ function getCachedCollection<TKey extends CollectionKeyBase>(collectionKey: TKey
     const allKeys = collectionMemberKeys || cache.getAllKeys();
     const collection: OnyxCollection<KeyValueMapping[TKey]> = {};
 
-    const collectionKeyLength = collectionKey.length;
-
     // forEach exists on both Set and Array
     allKeys.forEach((key) => {
         // If we don't have collectionMemberKeys array then we have to check whether a key is a collection member key.
         // Because in that case the keys will be coming from `cache.getAllKeys()` and we need to filter out the keys that
         // are not part of the collection.
-        if (!collectionMemberKeys && !isCollectionMemberKey(collectionKey, key, collectionKeyLength)) {
+        if (!collectionMemberKeys && !isCollectionMemberKey(collectionKey, key)) {
             return;
         }
 
@@ -608,7 +606,6 @@ function keysChanged<TKey extends CollectionKeyBase>(
     // individual collection key member for the collection that is being updated. It is important to note that the collection parameter cane be a PARTIAL collection
     // and does not represent all of the combined keys and values for a collection key. It is just the "new" data that was merged in via mergeCollection().
     const stateMappingKeys = Object.keys(callbackToStateMapping);
-    const collectionKeyLength = collectionKey.length;
 
     for (const stateMappingKey of stateMappingKeys) {
         const subscriber = callbackToStateMapping[stateMappingKey];
@@ -629,7 +626,7 @@ function keysChanged<TKey extends CollectionKeyBase>(
         /**
          * e.g. Onyx.connect({key: `${ONYXKEYS.COLLECTION.REPORT}{reportID}`, callback: ...});
          */
-        const isSubscribedToCollectionMemberKey = isCollectionMemberKey(collectionKey, subscriber.key, collectionKeyLength);
+        const isSubscribedToCollectionMemberKey = isCollectionMemberKey(collectionKey, subscriber.key);
 
         // Regular Onyx.connect() subscriber found.
         if (typeof subscriber.callback === 'function') {
@@ -1389,7 +1386,6 @@ function updateSnapshots(data: OnyxUpdate[], mergeFn: typeof Onyx.merge): Array<
     const promises: Array<() => Promise<void>> = [];
 
     const snapshotCollection = OnyxUtils.getCachedCollection(snapshotCollectionKey);
-    const snapshotCollectionKeyLength = snapshotCollectionKey.length;
 
     Object.entries(snapshotCollection).forEach(([snapshotEntryKey, snapshotEntryValue]) => {
         // Snapshots may not be present in cache. We don't know how to update them so we skip.
@@ -1401,7 +1397,7 @@ function updateSnapshots(data: OnyxUpdate[], mergeFn: typeof Onyx.merge): Array<
 
         data.forEach(({key, value}) => {
             // snapshots are normal keys so we want to skip update if they are written to Onyx
-            if (OnyxUtils.isCollectionMemberKey(snapshotCollectionKey, key, snapshotCollectionKeyLength)) {
+            if (OnyxUtils.isCollectionMemberKey(snapshotCollectionKey, key)) {
                 return;
             }
 
@@ -1426,10 +1422,7 @@ function updateSnapshots(data: OnyxUpdate[], mergeFn: typeof Onyx.merge): Array<
 
             const oldValue = updatedData[key] || {};
             const fullyMergedKeys = getFullyMergedSnapshotKeys();
-            const newValue =
-                fullyMergedKeys && fullyMergedKeys.some((collectionKey) => isCollectionMemberKey(collectionKey, key, collectionKey.length))
-                    ? value
-                    : lodashPick(value, Object.keys(snapshotData[key]));
+            const newValue = fullyMergedKeys.some((collectionKey) => isCollectionMemberKey(collectionKey, key)) ? value : lodashPick(value, Object.keys(snapshotData[key]));
 
             updatedData = {...updatedData, [key]: Object.assign(oldValue, newValue)};
         });