Reintroduce clearOnyxUtilsInternals

Author: fabioh8010

lib/OnyxUtils.ts

@@ -48,17 +48,17 @@ const METHOD = {
 type OnyxMethod = ValueOf<typeof METHOD>;
 
 // Key/value store of Onyx key and arrays of values to merge
-const mergeQueue: Record<OnyxKey, Array<OnyxValue<OnyxKey>>> = {};
-const mergeQueuePromise: Record<OnyxKey, Promise<void>> = {};
+let mergeQueue: Record<OnyxKey, Array<OnyxValue<OnyxKey>>> = {};
+let mergeQueuePromise: Record<OnyxKey, Promise<void>> = {};
 
 // Holds a mapping of all the React components that want their state subscribed to a store key
-const callbackToStateMapping: Record<string, Mapping<OnyxKey>> = {};
+let callbackToStateMapping: Record<string, Mapping<OnyxKey>> = {};
 
 // Keeps a copy of the values of the onyx collection keys as a map for faster lookups
 let onyxCollectionKeySet = new Set<OnyxKey>();
 
 // Holds a mapping of the connected key to the subscriptionID for faster lookups
-const onyxKeyToSubscriptionIDs = new Map();
+let onyxKeyToSubscriptionIDs = new Map();
 
 // Optional user-provided key value states set when Onyx initializes or clears
 let defaultKeyStates: Record<OnyxKey, OnyxValue<OnyxKey>> = {};
@@ -67,7 +67,7 @@ let batchUpdatesPromise: Promise<void> | null = null;
 let batchUpdatesQueue: Array<() => void> = [];
 
 // Used for comparison with a new update to avoid invoking the Onyx.connect callback with the same data.
-const lastConnectionCallbackData = new Map<number, OnyxValue<OnyxKey>>();
+let lastConnectionCallbackData = new Map<number, OnyxValue<OnyxKey>>();
 
 let snapshotKey: OnyxKey | null = null;
 
@@ -1431,6 +1431,15 @@ function updateSnapshots(data: OnyxUpdate[], mergeFn: typeof Onyx.merge): Array<
     return promises;
 }
 
+function clearOnyxUtilsInternals() {
+    mergeQueue = {};
+    mergeQueuePromise = {};
+    callbackToStateMapping = {};
+    onyxKeyToSubscriptionIDs = new Map();
+    batchUpdatesQueue = [];
+    lastConnectionCallbackData = new Map();
+}
+
 const OnyxUtils = {
     METHOD,
     getMergeQueue,
@@ -1480,6 +1489,12 @@ const OnyxUtils = {
     addKeyToRecentlyAccessedIfNeeded,
     reduceCollectionWithSelector,
     updateSnapshots,
+    mergeQueue,
+    mergeQueuePromise,
+    callbackToStateMapping,
+    defaultKeyStates,
+    batchUpdatesPromise,
+    batchUpdatesQueue,
 };
 
 GlobalSettings.addGlobalSettingsChangeListener(({enablePerformanceMetrics}) => {
@@ -1532,3 +1547,4 @@ GlobalSettings.addGlobalSettingsChangeListener(({enablePerformanceMetrics}) => {
 
 export type {OnyxMethod};
 export default OnyxUtils;
+export {clearOnyxUtilsInternals};

tests/perf-test/OnyxUtils.perf-test.ts

@@ -4,7 +4,7 @@ import type {OnyxKey, Selector} from '../../lib';
 import Onyx from '../../lib';
 import StorageMock from '../../lib/storage';
 import OnyxCache from '../../lib/OnyxCache';
-import OnyxUtils from '../../lib/OnyxUtils';
+import OnyxUtils, {clearOnyxUtilsInternals} from '../../lib/OnyxUtils';
 import type GenericCollection from '../utils/GenericCollection';
 import type {Mapping, OnyxUpdate} from '../../lib/Onyx';
 import createDeferredTask from '../../lib/createDeferredTask';
@@ -44,6 +44,7 @@ const mockedReportActionsMap = getRandomReportActions(collectionKey);
 const mockedReportActionsKeys = Object.keys(mockedReportActionsMap);
 
 const clearOnyxAfterEachMeasure = async () => {
+    clearOnyxUtilsInternals();
     await Onyx.clear();
 };
 
@@ -59,6 +60,7 @@ describe('OnyxUtils', () => {
     });
 
     afterEach(async () => {
+        clearOnyxUtilsInternals();
         await Onyx.clear();
     });