react-native-onyx 1.0.131 → 2.0.1

package/{lib → dist}/Onyx.js

@@ -1,16 +1,43 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
 /* eslint-disable no-continue */
-import {deepEqual} from 'fast-equals';
-import _ from 'underscore';
-import * as Logger from './Logger';
-import cache from './OnyxCache';
-import * as Str from './Str';
-import createDeferredTask from './createDeferredTask';
-import * as PerformanceUtils from './metrics/PerformanceUtils';
-import Storage from './storage';
-import utils from './utils';
-import unstable_batchedUpdates from './batch';
-import DevTools from './DevTools';
-
+const fast_equals_1 = require("fast-equals");
+const underscore_1 = __importDefault(require("underscore"));
+const Logger = __importStar(require("./Logger"));
+const OnyxCache_1 = __importDefault(require("./OnyxCache"));
+const Str = __importStar(require("./Str"));
+const createDeferredTask_1 = __importDefault(require("./createDeferredTask"));
+const PerformanceUtils = __importStar(require("./metrics/PerformanceUtils"));
+const storage_1 = __importDefault(require("./storage"));
+const utils_1 = __importDefault(require("./utils"));
+const batch_1 = __importDefault(require("./batch"));
+const DevTools_1 = __importDefault(require("./DevTools"));
 // Method constants
 const METHOD = {
     SET: 'set',
@@ -19,40 +46,29 @@ const METHOD = {
     MULTI_SET: 'multiset',
     CLEAR: 'clear',
 };
-
 // Key/value store of Onyx key and arrays of values to merge
 const mergeQueue = {};
 const mergeQueuePromise = {};
-
 // Keeps track of the last connectionID that was used so we can keep incrementing it
 let lastConnectionID = 0;
-
 // Holds a mapping of all the react components that want their state subscribed to a store key
 const callbackToStateMapping = {};
-
 // Keeps a copy of the values of the onyx collection keys as a map for faster lookups
 let onyxCollectionKeyMap = new Map();
-
 // Holds a list of keys that have been directly subscribed to or recently modified from least to most recent
 let recentlyAccessedKeys = [];
-
 // Holds a list of keys that are safe to remove when we reach max storage. If a key does not match with
 // whatever appears in this list it will NEVER be a candidate for eviction.
 let evictionAllowList = [];
-
 // Holds a map of keys and connectionID arrays whose keys will never be automatically evicted as
 // long as we have at least one subscriber that returns false for the canEvict property.
 const evictionBlocklist = {};
-
 // Optional user-provided key value states set when Onyx initializes or clears
 let defaultKeyStates = {};
-
 // Connections can be made before `Onyx.init`. They would wait for this task before resolving
-const deferredInitTask = createDeferredTask();
-
+const deferredInitTask = (0, createDeferredTask_1.default)();
 let batchUpdatesPromise = null;
 let batchUpdatesQueue = [];
-
 /**
  * Sends an action to DevTools extension
  *
@@ -62,9 +78,8 @@ let batchUpdatesQueue = [];
  * @param {any} mergedValue - (optional) value that was written in the storage after a merge method was executed.
  */
 function sendActionToDevTools(method, key, value, mergedValue = undefined) {
-    DevTools.registerAction(utils.formatActionName(method, key), value, key ? {[key]: mergedValue || value} : value);
+    DevTools_1.default.registerAction(utils_1.default.formatActionName(method, key), value, key ? { [key]: mergedValue || value } : value);
 }
-
 /**
  * We are batching together onyx updates. This helps with use cases where we schedule onyx updates after each other.
  * This happens for example in the Onyx.update function, where we process API responses that might contain a lot of
@@ -76,7 +91,6 @@ function maybeFlushBatchUpdates() {
     if (batchUpdatesPromise) {
         return batchUpdatesPromise;
     }
-
     batchUpdatesPromise = new Promise((resolve) => {
         /* We use (setTimeout, 0) here which should be called once native module calls are flushed (usually at the end of the frame)
          * We may investigate if (setTimeout, 1) (which in React Native is equal to requestAnimationFrame) works even better
@@ -86,23 +100,20 @@ function maybeFlushBatchUpdates() {
             const updatesCopy = batchUpdatesQueue;
             batchUpdatesQueue = [];
             batchUpdatesPromise = null;
-            unstable_batchedUpdates(() => {
+            (0, batch_1.default)(() => {
                 updatesCopy.forEach((applyUpdates) => {
                     applyUpdates();
                 });
             });
-
             resolve();
         }, 0);
     });
     return batchUpdatesPromise;
 }
-
 function batchUpdates(updates) {
     batchUpdatesQueue.push(updates);
     return maybeFlushBatchUpdates();
 }
-
 /**
  * Uses a selector function to return a simplified version of sourceData
  * @param {Mixed} sourceData
@@ -111,7 +122,6 @@ function batchUpdates(updates) {
  * @returns {Mixed}
  */
 const getSubsetOfData = (sourceData, selector, withOnyxInstanceState) => selector(sourceData, withOnyxInstanceState);
-
 /**
  * Takes a collection of items (eg. {testKey_1:{a:'a'}, testKey_2:{b:'b'}})
  * and runs it through a reducer function to return a subset of the data according to a selector.
@@ -121,18 +131,11 @@ const getSubsetOfData = (sourceData, selector, withOnyxInstanceState) => selecto
  * @param {Object} [withOnyxInstanceState]
  * @returns {Object}
  */
-const reduceCollectionWithSelector = (collection, selector, withOnyxInstanceState) =>
-    _.reduce(
-        collection,
-        (finalCollection, item, key) => {
-            // eslint-disable-next-line no-param-reassign
-            finalCollection[key] = getSubsetOfData(item, selector, withOnyxInstanceState);
-
-            return finalCollection;
-        },
-        {},
-    );
-
+const reduceCollectionWithSelector = (collection, selector, withOnyxInstanceState) => underscore_1.default.reduce(collection, (finalCollection, item, key) => {
+    // eslint-disable-next-line no-param-reassign
+    finalCollection[key] = getSubsetOfData(item, selector, withOnyxInstanceState);
+    return finalCollection;
+}, {});
 /**
  * Get some data from the store
  *
@@ -142,28 +145,23 @@ const reduceCollectionWithSelector = (collection, selector, withOnyxInstanceStat
  */
 function get(key) {
     // When we already have the value in cache - resolve right away
-    if (cache.hasCacheForKey(key)) {
-        return Promise.resolve(cache.getValue(key));
+    if (OnyxCache_1.default.hasCacheForKey(key)) {
+        return Promise.resolve(OnyxCache_1.default.getValue(key));
     }
-
     const taskName = `get:${key}`;
-
     // When a value retrieving task for this key is still running hook to it
-    if (cache.hasPendingTask(taskName)) {
-        return cache.getTaskPromise(taskName);
+    if (OnyxCache_1.default.hasPendingTask(taskName)) {
+        return OnyxCache_1.default.getTaskPromise(taskName);
     }
-
     // Otherwise retrieve the value from storage and capture a promise to aid concurrent usages
-    const promise = Storage.getItem(key)
+    const promise = storage_1.default.getItem(key)
         .then((val) => {
-            cache.set(key, val);
-            return val;
-        })
+        OnyxCache_1.default.set(key, val);
+        return val;
+    })
         .catch((err) => Logger.logInfo(`Unable to get item from persistent storage. Key: ${key} Error: ${err}`));
-
-    return cache.captureTask(taskName, promise);
+    return OnyxCache_1.default.captureTask(taskName, promise);
 }
-
 /**
  * Returns current key names stored in persisted storage
  * @private
@@ -171,27 +169,22 @@ function get(key) {
  */
 function getAllKeys() {
     // When we've already read stored keys, resolve right away
-    const storedKeys = cache.getAllKeys();
+    const storedKeys = OnyxCache_1.default.getAllKeys();
     if (storedKeys.length > 0) {
         return Promise.resolve(storedKeys);
     }
-
     const taskName = 'getAllKeys';
-
     // When a value retrieving task for all keys is still running hook to it
-    if (cache.hasPendingTask(taskName)) {
-        return cache.getTaskPromise(taskName);
+    if (OnyxCache_1.default.hasPendingTask(taskName)) {
+        return OnyxCache_1.default.getTaskPromise(taskName);
     }
-
     // Otherwise retrieve the keys from storage and capture a promise to aid concurrent usages
-    const promise = Storage.getAllKeys().then((keys) => {
-        _.each(keys, (key) => cache.addKey(key));
+    const promise = storage_1.default.getAllKeys().then((keys) => {
+        underscore_1.default.each(keys, (key) => OnyxCache_1.default.addKey(key));
         return keys;
     });
-
-    return cache.captureTask(taskName, promise);
+    return OnyxCache_1.default.captureTask(taskName, promise);
 }
-
 /**
  * Checks to see if the a subscriber's supplied key
  * is associated with a collection of keys.
@@ -203,7 +196,6 @@ function getAllKeys() {
 function isCollectionKey(key) {
     return onyxCollectionKeyMap.has(key);
 }
-
 /**
  * @param {String} collectionKey
  * @param {String} key
@@ -212,7 +204,6 @@ function isCollectionKey(key) {
 function isCollectionMemberKey(collectionKey, key) {
     return Str.startsWith(key, collectionKey) && key.length > collectionKey.length;
 }
-
 /**
  * Checks to see if a provided key is the exact configured key of our connected subscriber
  * or if the provided key is a collection member key (in case our configured key is a "collection key")
@@ -225,7 +216,6 @@ function isCollectionMemberKey(collectionKey, key) {
 function isKeyMatch(configKey, key) {
     return isCollectionKey(configKey) ? Str.startsWith(key, configKey) : configKey === key;
 }
-
 /**
  * Checks to see if this key has been flagged as
  * safe for removal.
@@ -235,9 +225,8 @@ function isKeyMatch(configKey, key) {
  * @returns {Boolean}
  */
 function isSafeEvictionKey(testKey) {
-    return _.some(evictionAllowList, (key) => isKeyMatch(key, testKey));
+    return underscore_1.default.some(evictionAllowList, (key) => isKeyMatch(key, testKey));
 }
-
 /**
  * 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.
@@ -247,34 +236,26 @@ function isSafeEvictionKey(testKey) {
  * @returns {Mixed}
  */
 function tryGetCachedValue(key, mapping = {}) {
-    let val = cache.getValue(key);
-
+    let val = OnyxCache_1.default.getValue(key);
     if (isCollectionKey(key)) {
-        const allCacheKeys = cache.getAllKeys();
-
+        const allCacheKeys = OnyxCache_1.default.getAllKeys();
         // It is possible we haven't loaded all keys yet so we do not know if the
         // collection actually exists.
         if (allCacheKeys.length === 0) {
             return;
         }
-        const matchingKeys = _.filter(allCacheKeys, (k) => k.startsWith(key));
-        const values = _.reduce(
-            matchingKeys,
-            (finalObject, matchedKey) => {
-                const cachedValue = cache.getValue(matchedKey);
-                if (cachedValue) {
-                    // This is permissible because we're in the process of constructing the final object in a reduce function.
-                    // eslint-disable-next-line no-param-reassign
-                    finalObject[matchedKey] = cachedValue;
-                }
-                return finalObject;
-            },
-            {},
-        );
-
+        const matchingKeys = underscore_1.default.filter(allCacheKeys, (k) => k.startsWith(key));
+        const values = underscore_1.default.reduce(matchingKeys, (finalObject, matchedKey) => {
+            const cachedValue = OnyxCache_1.default.getValue(matchedKey);
+            if (cachedValue) {
+                // This is permissible because we're in the process of constructing the final object in a reduce function.
+                // eslint-disable-next-line no-param-reassign
+                finalObject[matchedKey] = cachedValue;
+            }
+            return finalObject;
+        }, {});
         val = values;
     }
-
     if (mapping.selector) {
         const state = mapping.withOnyxInstance ? mapping.withOnyxInstance.state : undefined;
         if (isCollectionKey(key)) {
@@ -282,10 +263,8 @@ function tryGetCachedValue(key, mapping = {}) {
         }
         return getSubsetOfData(val, mapping.selector, state);
     }
-
     return val;
 }
-
 /**
  * Remove a key from the recently accessed key list.
  *
@@ -293,9 +272,8 @@ function tryGetCachedValue(key, mapping = {}) {
  * @param {String} key
  */
 function removeLastAccessedKey(key) {
-    recentlyAccessedKeys = _.without(recentlyAccessedKeys, key);
+    recentlyAccessedKeys = underscore_1.default.without(recentlyAccessedKeys, key);
 }
-
 /**
  * Add a key to the list of recently accessed keys. The least
  * recently accessed key should be at the head and the most
@@ -309,11 +287,9 @@ function addLastAccessedKey(key) {
     if (isCollectionKey(key) || !isSafeEvictionKey(key)) {
         return;
     }
-
     removeLastAccessedKey(key);
     recentlyAccessedKeys.push(key);
 }
-
 /**
  * Removes a key previously added to this list
  * which will enable it to be deleted again.
@@ -323,14 +299,12 @@ function addLastAccessedKey(key) {
  * @param {Number} connectionID
  */
 function removeFromEvictionBlockList(key, connectionID) {
-    evictionBlocklist[key] = _.without(evictionBlocklist[key] || [], connectionID);
-
+    evictionBlocklist[key] = underscore_1.default.without(evictionBlocklist[key] || [], connectionID);
     // Remove the key if there are no more subscribers
     if (evictionBlocklist[key].length === 0) {
         delete evictionBlocklist[key];
     }
 }
-
 /**
  * Keys added to this list can never be deleted.
  *
@@ -340,14 +314,11 @@ function removeFromEvictionBlockList(key, connectionID) {
  */
 function addToEvictionBlockList(key, connectionID) {
     removeFromEvictionBlockList(key, connectionID);
-
     if (!evictionBlocklist[key]) {
         evictionBlocklist[key] = [];
     }
-
     evictionBlocklist[key].push(connectionID);
 }
-
 /**
  * Take all the keys that are safe to evict and add them to
  * the recently accessed list when initializing the app. This
@@ -359,8 +330,8 @@ function addToEvictionBlockList(key, connectionID) {
  */
 function addAllSafeEvictionKeysToRecentlyAccessedList() {
     return getAllKeys().then((keys) => {
-        _.each(evictionAllowList, (safeEvictionKey) => {
-            _.each(keys, (key) => {
+        underscore_1.default.each(evictionAllowList, (safeEvictionKey) => {
+            underscore_1.default.each(keys, (key) => {
                 if (!isKeyMatch(safeEvictionKey, key)) {
                     return;
                 }
@@ -369,31 +340,23 @@ function addAllSafeEvictionKeysToRecentlyAccessedList() {
         });
     });
 }
-
 /**
  * @private
  * @param {String} collectionKey
  * @returns {Object}
  */
 function getCachedCollection(collectionKey) {
-    const collectionMemberKeys = _.filter(cache.getAllKeys(), (storedKey) => isCollectionMemberKey(collectionKey, storedKey));
-
-    return _.reduce(
-        collectionMemberKeys,
-        (prev, curr) => {
-            const cachedValue = cache.getValue(curr);
-            if (!cachedValue) {
-                return prev;
-            }
-
-            // eslint-disable-next-line no-param-reassign
-            prev[curr] = cachedValue;
+    const collectionMemberKeys = underscore_1.default.filter(OnyxCache_1.default.getAllKeys(), (storedKey) => isCollectionMemberKey(collectionKey, storedKey));
+    return underscore_1.default.reduce(collectionMemberKeys, (prev, curr) => {
+        const cachedValue = OnyxCache_1.default.getValue(curr);
+        if (!cachedValue) {
             return prev;
-        },
-        {},
-    );
+        }
+        // eslint-disable-next-line no-param-reassign
+        prev[curr] = cachedValue;
+        return prev;
+    }, {});
 }
-
 /**
  * When a collection of keys change, search for any callbacks matching the collection key and trigger those callbacks
  *
@@ -407,38 +370,32 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
     // We are iterating over all subscribers similar to keyChanged(). However, we are looking for subscribers who are subscribing to either a collection key or
     // 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 = _.keys(callbackToStateMapping);
+    const stateMappingKeys = underscore_1.default.keys(callbackToStateMapping);
     for (let i = 0; i < stateMappingKeys.length; i++) {
         const subscriber = callbackToStateMapping[stateMappingKeys[i]];
         if (!subscriber) {
             continue;
         }
-
         // Skip iteration if we do not have a collection key or a collection member key on this subscriber
         if (!Str.startsWith(subscriber.key, collectionKey)) {
             continue;
         }
-
         /**
          * e.g. Onyx.connect({key: ONYXKEYS.COLLECTION.REPORT, callback: ...});
          */
         const isSubscribedToCollectionKey = subscriber.key === collectionKey;
-
         /**
          * e.g. Onyx.connect({key: `${ONYXKEYS.COLLECTION.REPORT}{reportID}`, callback: ...});
          */
         const isSubscribedToCollectionMemberKey = isCollectionMemberKey(collectionKey, subscriber.key);
-
         // We prepare the "cached collection" which is the entire collection + the new partial data that
         // was merged in via mergeCollection().
         const cachedCollection = getCachedCollection(collectionKey);
-
         // Regular Onyx.connect() subscriber found.
-        if (_.isFunction(subscriber.callback)) {
+        if (underscore_1.default.isFunction(subscriber.callback)) {
             if (!notifyRegularSubscibers) {
                 continue;
             }
-
             // If they are subscribed to the collection key and using waitForCollectionCallback then we'll
             // send the whole cached collection.
             if (isSubscribedToCollectionKey) {
@@ -446,33 +403,28 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
                     subscriber.callback(cachedCollection);
                     continue;
                 }
-
                 // If they are not using waitForCollectionCallback then we notify the subscriber with
                 // the new merged data but only for any keys in the partial collection.
-                const dataKeys = _.keys(partialCollection);
+                const dataKeys = underscore_1.default.keys(partialCollection);
                 for (let j = 0; j < dataKeys.length; j++) {
                     const dataKey = dataKeys[j];
                     subscriber.callback(cachedCollection[dataKey], dataKey);
                 }
                 continue;
             }
-
             // And if the subscriber is specifically only tracking a particular collection member key then we will
             // notify them with the cached data for that key only.
             if (isSubscribedToCollectionMemberKey) {
                 subscriber.callback(cachedCollection[subscriber.key], subscriber.key);
                 continue;
             }
-
             continue;
         }
-
         // React component subscriber found.
         if (subscriber.withOnyxInstance) {
             if (!notifyWithOnyxSubscibers) {
                 continue;
             }
-
             // We are subscribed to a collection key so we must update the data in state with the new
             // collection member key values from the partial update.
             if (isSubscribedToCollectionKey) {
@@ -482,8 +434,7 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
                     subscriber.withOnyxInstance.setStateProxy((prevState) => {
                         const previousData = prevState[subscriber.statePropertyName];
                         const newData = reduceCollectionWithSelector(cachedCollection, subscriber.selector, subscriber.withOnyxInstance.state);
-
-                        if (!deepEqual(previousData, newData)) {
+                        if (!(0, fast_equals_1.deepEqual)(previousData, newData)) {
                             return {
                                 [subscriber.statePropertyName]: newData,
                             };
@@ -492,15 +443,13 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
                     });
                     continue;
                 }
-
                 subscriber.withOnyxInstance.setStateProxy((prevState) => {
-                    const finalCollection = _.clone(prevState[subscriber.statePropertyName] || {});
-                    const dataKeys = _.keys(partialCollection);
+                    const finalCollection = underscore_1.default.clone(prevState[subscriber.statePropertyName] || {});
+                    const dataKeys = underscore_1.default.keys(partialCollection);
                     for (let j = 0; j < dataKeys.length; j++) {
                         const dataKey = dataKeys[j];
                         finalCollection[dataKey] = cachedCollection[dataKey];
                     }
-
                     PerformanceUtils.logSetStateCall(subscriber, prevState[subscriber.statePropertyName], finalCollection, 'keysChanged', collectionKey);
                     return {
                         [subscriber.statePropertyName]: finalCollection,
@@ -508,16 +457,14 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
                 });
                 continue;
             }
-
             // If a React component is only interested in a single key then we can set the cached value directly to the state name.
             if (isSubscribedToCollectionMemberKey) {
                 // However, we only want to update this subscriber if the partial data contains a change.
                 // Otherwise, we would update them with a value they already have and trigger an unnecessary re-render.
                 const dataFromCollection = partialCollection[subscriber.key];
-                if (_.isUndefined(dataFromCollection)) {
+                if (underscore_1.default.isUndefined(dataFromCollection)) {
                     continue;
                 }
-
                 // If the subscriber has a selector, then the component's state must only be updated with the data
                 // returned by the selector and the state should only change when the subset of data changes from what
                 // it was previously.
@@ -525,30 +472,26 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
                     subscriber.withOnyxInstance.setStateProxy((prevState) => {
                         const prevData = prevState[subscriber.statePropertyName];
                         const newData = getSubsetOfData(cachedCollection[subscriber.key], subscriber.selector, subscriber.withOnyxInstance.state);
-                        if (!deepEqual(prevData, newData)) {
+                        if (!(0, fast_equals_1.deepEqual)(prevData, newData)) {
                             PerformanceUtils.logSetStateCall(subscriber, prevData, newData, 'keysChanged', collectionKey);
                             return {
                                 [subscriber.statePropertyName]: newData,
                             };
                         }
-
                         return null;
                     });
                     continue;
                 }
-
                 subscriber.withOnyxInstance.setStateProxy((prevState) => {
                     const data = cachedCollection[subscriber.key];
                     const previousData = prevState[subscriber.statePropertyName];
-
                     // Avoids triggering unnecessary re-renders when feeding empty objects
-                    if (utils.areObjectsEmpty(data, previousData)) {
+                    if (utils_1.default.areObjectsEmpty(data, previousData)) {
                         return null;
                     }
                     if (data === previousData) {
                         return null;
                     }
-
                     PerformanceUtils.logSetStateCall(subscriber, previousData, data, 'keysChanged', collectionKey);
                     return {
                         [subscriber.statePropertyName]: data,
@@ -558,7 +501,6 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
         }
     }
 }
-
 /**
  * When a key change happens, search for any callbacks matching the key or collection key and trigger those callbacks
  *
@@ -574,24 +516,23 @@ function keysChanged(collectionKey, partialCollection, notifyRegularSubscibers =
  */
 function keyChanged(key, data, canUpdateSubscriber, notifyRegularSubscibers = true, notifyWithOnyxSubscibers = true) {
     // Add or remove this key from the recentlyAccessedKeys lists
-    if (!_.isNull(data)) {
+    if (!underscore_1.default.isNull(data)) {
         addLastAccessedKey(key);
-    } else {
+    }
+    else {
         removeLastAccessedKey(key);
     }
-
     // We are iterating over all subscribers to see if they are interested in the key that has just changed. If the subscriber's  key is a collection key then we will
     // notify them if the key that changed is a collection member. Or if it is a regular key notify them when there is an exact match. Depending on whether the subscriber
     // was connected via withOnyx we will call setState() directly on the withOnyx instance. If it is a regular connection we will pass the data to the provided callback.
-    const stateMappingKeys = _.keys(callbackToStateMapping);
+    const stateMappingKeys = underscore_1.default.keys(callbackToStateMapping);
     for (let i = 0; i < stateMappingKeys.length; i++) {
         const subscriber = callbackToStateMapping[stateMappingKeys[i]];
-        if (!subscriber || !isKeyMatch(subscriber.key, key) || (_.isFunction(canUpdateSubscriber) && !canUpdateSubscriber(subscriber))) {
+        if (!subscriber || !isKeyMatch(subscriber.key, key) || (underscore_1.default.isFunction(canUpdateSubscriber) && !canUpdateSubscriber(subscriber))) {
             continue;
         }
-
         // Subscriber is a regular call to connect() and provided a callback
-        if (_.isFunction(subscriber.callback)) {
+        if (underscore_1.default.isFunction(subscriber.callback)) {
             if (!notifyRegularSubscibers) {
                 continue;
             }
@@ -601,17 +542,14 @@ function keyChanged(key, data, canUpdateSubscriber, notifyRegularSubscibers = tr
                 subscriber.callback(cachedCollection);
                 continue;
             }
-
             subscriber.callback(data, key);
             continue;
         }
-
         // Subscriber connected via withOnyx() HOC
         if (subscriber.withOnyxInstance) {
             if (!notifyWithOnyxSubscibers) {
                 continue;
             }
-
             // Check if we are subscribing to a collection key and overwrite the collection member key value in state
             if (isCollectionKey(subscriber.key)) {
                 // If the subscriber has a selector, then the consumer of this data must only be given the data
@@ -622,11 +560,8 @@ function keyChanged(key, data, canUpdateSubscriber, notifyRegularSubscibers = tr
                         const newData = {
                             [key]: getSubsetOfData(data, subscriber.selector, subscriber.withOnyxInstance.state),
                         };
-                        const prevDataWithNewData = {
-                            ...prevData,
-                            ...newData,
-                        };
-                        if (!deepEqual(prevData, prevDataWithNewData)) {
+                        const prevDataWithNewData = Object.assign(Object.assign({}, prevData), newData);
+                        if (!(0, fast_equals_1.deepEqual)(prevData, prevDataWithNewData)) {
                             PerformanceUtils.logSetStateCall(subscriber, prevData, newData, 'keyChanged', key);
                             return {
                                 [subscriber.statePropertyName]: prevDataWithNewData,
@@ -636,13 +571,9 @@ function keyChanged(key, data, canUpdateSubscriber, notifyRegularSubscibers = tr
                     });
                     continue;
                 }
-
                 subscriber.withOnyxInstance.setStateProxy((prevState) => {
                     const collection = prevState[subscriber.statePropertyName] || {};
-                    const newCollection = {
-                        ...collection,
-                        [key]: data,
-                    };
+                    const newCollection = Object.assign(Object.assign({}, collection), { [key]: data });
                     PerformanceUtils.logSetStateCall(subscriber, collection, newCollection, 'keyChanged', key);
                     return {
                         [subscriber.statePropertyName]: newCollection,
@@ -650,14 +581,13 @@ function keyChanged(key, data, canUpdateSubscriber, notifyRegularSubscibers = tr
                 });
                 continue;
             }
-
             // If the subscriber has a selector, then the component's state must only be updated with the data
             // returned by the selector and only if the selected data has changed.
             if (subscriber.selector) {
                 subscriber.withOnyxInstance.setStateProxy((prevState) => {
                     const previousValue = getSubsetOfData(prevState[subscriber.statePropertyName], subscriber.selector, subscriber.withOnyxInstance.state);
                     const newValue = getSubsetOfData(data, subscriber.selector, subscriber.withOnyxInstance.state);
-                    if (!deepEqual(previousValue, newValue)) {
+                    if (!(0, fast_equals_1.deepEqual)(previousValue, newValue)) {
                         return {
                             [subscriber.statePropertyName]: newValue,
                         };
@@ -666,19 +596,16 @@ function keyChanged(key, data, canUpdateSubscriber, notifyRegularSubscibers = tr
                 });
                 continue;
             }
-
             // If we did not match on a collection key then we just set the new data to the state property
             subscriber.withOnyxInstance.setStateProxy((prevState) => {
                 const previousData = prevState[subscriber.statePropertyName];
-
                 // Avoids triggering unnecessary re-renders when feeding empty objects
-                if (utils.areObjectsEmpty(data, previousData)) {
+                if (utils_1.default.areObjectsEmpty(data, previousData)) {
                     return null;
                 }
                 if (previousData === data) {
                     return null;
                 }
-
                 PerformanceUtils.logSetStateCall(subscriber, previousData, data, 'keyChanged', key);
                 return {
                     [subscriber.statePropertyName]: data,
@@ -686,11 +613,9 @@ function keyChanged(key, data, canUpdateSubscriber, notifyRegularSubscibers = tr
             });
             continue;
         }
-
         console.error('Warning: Found a matching subscriber to a key that changed, but no callback or withOnyxInstance could be found.');
     }
 }
-
 /**
  * Sends the data obtained from the keys to the connection. It either:
  *     - sets state on the withOnyxInstances
@@ -712,36 +637,33 @@ function sendDataToConnection(mapping, val, matchedKey, isBatched) {
     if (!callbackToStateMapping[mapping.connectionID]) {
         return;
     }
-
     if (mapping.withOnyxInstance) {
         let newData = val;
-
         // If the mapping has a selector, then the component's state must only be updated with the data
         // returned by the selector.
         if (mapping.selector) {
             if (isCollectionKey(mapping.key)) {
                 newData = reduceCollectionWithSelector(val, mapping.selector, mapping.withOnyxInstance.state);
-            } else {
+            }
+            else {
                 newData = getSubsetOfData(val, mapping.selector, mapping.withOnyxInstance.state);
             }
         }
-
         PerformanceUtils.logSetStateCall(mapping, null, newData, 'sendDataToConnection');
         if (isBatched) {
             batchUpdates(() => {
                 mapping.withOnyxInstance.setWithOnyxState(mapping.statePropertyName, newData);
             });
-        } else {
+        }
+        else {
             mapping.withOnyxInstance.setWithOnyxState(mapping.statePropertyName, newData);
         }
         return;
     }
-
-    if (_.isFunction(mapping.callback)) {
+    if (underscore_1.default.isFunction(mapping.callback)) {
         mapping.callback(val, matchedKey);
     }
 }
-
 /**
  * We check to see if this key is flagged as safe for eviction and add it to the recentlyAccessedKeys list so that when we
  * run out of storage the least recently accessed key can be removed.
@@ -753,20 +675,16 @@ function addKeyToRecentlyAccessedIfNeeded(mapping) {
     if (!isSafeEvictionKey(mapping.key)) {
         return;
     }
-
     // Try to free some cache whenever we connect to a safe eviction key
-    cache.removeLeastRecentlyUsedKeys();
-
+    OnyxCache_1.default.removeLeastRecentlyUsedKeys();
     if (mapping.withOnyxInstance && !isCollectionKey(mapping.key)) {
         // All React components subscribing to a key flagged as a safe eviction key must implement the canEvict property.
-        if (_.isUndefined(mapping.canEvict)) {
+        if (underscore_1.default.isUndefined(mapping.canEvict)) {
             throw new Error(`Cannot subscribe to safe eviction key '${mapping.key}' without providing a canEvict value.`);
         }
-
         addLastAccessedKey(mapping.key);
     }
 }
-
 /**
  * Gets the data for a given an array of matching keys, combines them into an object, and sends the result back to the subscriber.
  *
@@ -775,21 +693,14 @@ function addKeyToRecentlyAccessedIfNeeded(mapping) {
  * @param {Object} mapping
  */
 function getCollectionDataAndSendAsObject(matchingKeys, mapping) {
-    Promise.all(_.map(matchingKeys, (key) => get(key)))
-        .then((values) =>
-            _.reduce(
-                values,
-                (finalObject, value, i) => {
-                    // eslint-disable-next-line no-param-reassign
-                    finalObject[matchingKeys[i]] = value;
-                    return finalObject;
-                },
-                {},
-            ),
-        )
+    Promise.all(underscore_1.default.map(matchingKeys, (key) => get(key)))
+        .then((values) => underscore_1.default.reduce(values, (finalObject, value, i) => {
+        // eslint-disable-next-line no-param-reassign
+        finalObject[matchingKeys[i]] = value;
+        return finalObject;
+    }, {}))
         .then((val) => sendDataToConnection(mapping, val, undefined, true));
 }
-
 /**
  * Subscribes a react component's state directly to a store key
  *
@@ -822,87 +733,75 @@ function connect(mapping) {
     const connectionID = lastConnectionID++;
     callbackToStateMapping[connectionID] = mapping;
     callbackToStateMapping[connectionID].connectionID = connectionID;
-
     if (mapping.initWithStoredValues === false) {
         return connectionID;
     }
-
     // Commit connection only after init passes
     deferredInitTask.promise
         .then(() => addKeyToRecentlyAccessedIfNeeded(mapping))
         .then(() => {
-            // 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('_') && cache.storageKeys.has(mapping.key)) {
-                return [mapping.key];
-            }
-            return getAllKeys();
-        })
+        // 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.storageKeys.has(mapping.key)) {
+            return [mapping.key];
+        }
+        return getAllKeys();
+    })
         .then((keys) => {
-            // We search all the keys in storage to see if any are a "match" for the subscriber we are connecting so that we
-            // can send data back to the subscriber. Note that multiple keys can match as a subscriber could either be
-            // subscribed to a "collection key" or a single key.
-            const matchingKeys = _.filter(keys, (key) => isKeyMatch(mapping.key, key));
-
-            // If the key being connected to does not exist we initialize the value with null. For subscribers that connected
-            // directly via connect() they will simply get a null value sent to them without any information about which key matched
-            // since there are none matched. In withOnyx() we wait for all connected keys to return a value before rendering the child
-            // component. This null value will be filtered out so that the connected component can utilize defaultProps.
-            if (matchingKeys.length === 0) {
-                if (mapping.key && !isCollectionKey(mapping.key)) {
-                    cache.set(mapping.key, null);
-                }
-
-                // Here we cannot use batching because the null value is expected to be set immediately for default props
-                // or they will be undefined.
-                sendDataToConnection(mapping, null, undefined, false);
-                return;
+        // We search all the keys in storage to see if any are a "match" for the subscriber we are connecting so that we
+        // can send data back to the subscriber. Note that multiple keys can match as a subscriber could either be
+        // subscribed to a "collection key" or a single key.
+        const matchingKeys = underscore_1.default.filter(keys, (key) => isKeyMatch(mapping.key, key));
+        // If the key being connected to does not exist we initialize the value with null. For subscribers that connected
+        // directly via connect() they will simply get a null value sent to them without any information about which key matched
+        // since there are none matched. In withOnyx() we wait for all connected keys to return a value before rendering the child
+        // component. This null value will be filtered out so that the connected component can utilize defaultProps.
+        if (matchingKeys.length === 0) {
+            if (mapping.key && !isCollectionKey(mapping.key)) {
+                OnyxCache_1.default.set(mapping.key, null);
             }
-
-            // When using a callback subscriber we will either trigger the provided callback for each key we find or combine all values
-            // into an object and just make a single call. The latter behavior is enabled by providing a waitForCollectionCallback key
-            // combined with a subscription to a collection key.
-            if (_.isFunction(mapping.callback)) {
-                if (isCollectionKey(mapping.key)) {
-                    if (mapping.waitForCollectionCallback) {
-                        getCollectionDataAndSendAsObject(matchingKeys, mapping);
-                        return;
-                    }
-
-                    // We did not opt into using waitForCollectionCallback mode so the callback is called for every matching key.
-                    for (let i = 0; i < matchingKeys.length; i++) {
-                        get(matchingKeys[i]).then((val) => sendDataToConnection(mapping, val, matchingKeys[i], true));
-                    }
+            // Here we cannot use batching because the null value is expected to be set immediately for default props
+            // or they will be undefined.
+            sendDataToConnection(mapping, null, undefined, false);
+            return;
+        }
+        // When using a callback subscriber we will either trigger the provided callback for each key we find or combine all values
+        // into an object and just make a single call. The latter behavior is enabled by providing a waitForCollectionCallback key
+        // combined with a subscription to a collection key.
+        if (underscore_1.default.isFunction(mapping.callback)) {
+            if (isCollectionKey(mapping.key)) {
+                if (mapping.waitForCollectionCallback) {
+                    getCollectionDataAndSendAsObject(matchingKeys, mapping);
                     return;
                 }
-
-                // If we are not subscribed to a collection key then there's only a single key to send an update for.
-                get(mapping.key).then((val) => sendDataToConnection(mapping, val, mapping.key, true));
+                // We did not opt into using waitForCollectionCallback mode so the callback is called for every matching key.
+                for (let i = 0; i < matchingKeys.length; i++) {
+                    get(matchingKeys[i]).then((val) => sendDataToConnection(mapping, val, matchingKeys[i], true));
+                }
                 return;
             }
-
-            // If we have a withOnyxInstance that means a React component has subscribed via the withOnyx() HOC and we need to
-            // group collection key member data into an object.
-            if (mapping.withOnyxInstance) {
-                if (isCollectionKey(mapping.key)) {
-                    getCollectionDataAndSendAsObject(matchingKeys, mapping);
-                    return;
-                }
-
-                // If the subscriber is not using a collection key then we just send a single value back to the subscriber
-                get(mapping.key).then((val) => sendDataToConnection(mapping, val, mapping.key, true));
+            // If we are not subscribed to a collection key then there's only a single key to send an update for.
+            get(mapping.key).then((val) => sendDataToConnection(mapping, val, mapping.key, true));
+            return;
+        }
+        // If we have a withOnyxInstance that means a React component has subscribed via the withOnyx() HOC and we need to
+        // group collection key member data into an object.
+        if (mapping.withOnyxInstance) {
+            if (isCollectionKey(mapping.key)) {
+                getCollectionDataAndSendAsObject(matchingKeys, mapping);
                 return;
             }
-
-            console.error('Warning: Onyx.connect() was found without a callback or withOnyxInstance');
-        });
-
+            // If the subscriber is not using a collection key then we just send a single value back to the subscriber
+            get(mapping.key).then((val) => sendDataToConnection(mapping, val, mapping.key, true));
+            return;
+        }
+        console.error('Warning: Onyx.connect() was found without a callback or withOnyxInstance');
+    });
     // The connectionID is returned back to the caller so that it can be used to clean up the connection when it's no longer needed
     // by calling Onyx.disconnect(connectionID).
     return connectionID;
 }
-
 /**
  * Remove the listener for a react component
  * @example
@@ -915,16 +814,13 @@ function disconnect(connectionID, keyToRemoveFromEvictionBlocklist) {
     if (!callbackToStateMapping[connectionID]) {
         return;
     }
-
     // Remove this key from the eviction block list as we are no longer
     // subscribing to it and it should be safe to delete again
     if (keyToRemoveFromEvictionBlocklist) {
         removeFromEvictionBlockList(keyToRemoveFromEvictionBlocklist, connectionID);
     }
-
     delete callbackToStateMapping[connectionID];
 }
-
 /**
  * Schedules an update that will be appended to the macro task queue (so it doesn't update the subscribers immediately).
  *
@@ -941,7 +837,6 @@ function scheduleSubscriberUpdate(key, value, canUpdateSubscriber) {
     batchUpdates(() => keyChanged(key, value, canUpdateSubscriber, false, true));
     return Promise.all([maybeFlushBatchUpdates(), promise]);
 }
-
 /**
  * This method is similar to notifySubscribersOnNextTick but it is built for working specifically with collections
  * so that keysChanged() is triggered for the collection and not keyChanged(). If this was not done, then the
@@ -956,7 +851,6 @@ function scheduleNotifyCollectionSubscribers(key, value) {
     batchUpdates(() => keysChanged(key, value, false, true));
     return Promise.all([maybeFlushBatchUpdates(), promise]);
 }
-
 /**
  * Remove a key from Onyx and update the subscribers
  *
@@ -965,25 +859,23 @@ function scheduleNotifyCollectionSubscribers(key, value) {
  * @return {Promise}
  */
 function remove(key) {
-    cache.drop(key);
+    OnyxCache_1.default.drop(key);
     scheduleSubscriberUpdate(key, null);
-    return Storage.removeItem(key);
+    return storage_1.default.removeItem(key);
 }
-
 /**
  * @private
  * @returns {Promise<void>}
  */
 function reportStorageQuota() {
-    return Storage.getDatabaseSize()
-        .then(({bytesUsed, bytesRemaining}) => {
-            Logger.logInfo(`Storage Quota Check -- bytesUsed: ${bytesUsed} bytesRemaining: ${bytesRemaining}`);
-        })
+    return storage_1.default.getDatabaseSize()
+        .then(({ bytesUsed, bytesRemaining }) => {
+        Logger.logInfo(`Storage Quota Check -- bytesUsed: ${bytesUsed} bytesRemaining: ${bytesRemaining}`);
+    })
         .catch((dbSizeError) => {
-            Logger.logAlert(`Unable to get database size. Error: ${dbSizeError}`);
-        });
+        Logger.logAlert(`Unable to get database size. Error: ${dbSizeError}`);
+    });
 }
-
 /**
  * If we fail to set or merge we must handle this by
  * evicting some data from Onyx and then retrying to do
@@ -997,14 +889,12 @@ function reportStorageQuota() {
  */
 function evictStorageAndRetry(error, onyxMethod, ...args) {
     Logger.logInfo(`Failed to save to storage. Error: ${error}. onyxMethod: ${onyxMethod.name}`);
-
     if (error && Str.startsWith(error.message, "Failed to execute 'put' on 'IDBObjectStore'")) {
         Logger.logAlert('Attempted to set invalid data set in Onyx. Please ensure all data is serializable.');
         throw error;
     }
-
     // Find the first key that we can remove that has no subscribers in our blocklist
-    const keyForRemoval = _.find(recentlyAccessedKeys, (key) => !evictionBlocklist[key]);
+    const keyForRemoval = underscore_1.default.find(recentlyAccessedKeys, (key) => !evictionBlocklist[key]);
     if (!keyForRemoval) {
         // If we have no acceptable keys to remove then we are possibly trying to save mission critical data. If this is the case,
         // then we should stop retrying as there is not much the user can do to fix this. Instead of getting them stuck in an infinite loop we
@@ -1012,13 +902,11 @@ function evictStorageAndRetry(error, onyxMethod, ...args) {
         Logger.logAlert('Out of storage. But found no acceptable keys to remove.');
         return reportStorageQuota();
     }
-
     // Remove the least recently viewed key that is not currently being accessed and retry.
     Logger.logInfo(`Out of storage. Evicting least recently accessed key (${keyForRemoval}) and retrying.`);
     reportStorageQuota();
     return remove(keyForRemoval).then(() => onyxMethod(...args));
 }
-
 /**
  * Notifys subscribers and writes current value to cache
  *
@@ -1031,19 +919,17 @@ function evictStorageAndRetry(error, onyxMethod, ...args) {
  */
 function broadcastUpdate(key, value, method, hasChanged, wasRemoved = false) {
     // Logging properties only since values could be sensitive things we don't want to log
-    Logger.logInfo(`${method}() called for key: ${key}${_.isObject(value) ? ` properties: ${_.keys(value).join(',')}` : ''}`);
-
+    Logger.logInfo(`${method}() called for key: ${key}${underscore_1.default.isObject(value) ? ` properties: ${underscore_1.default.keys(value).join(',')}` : ''}`);
     // Update subscribers if the cached value has changed, or when the subscriber specifically requires
     // all updates regardless of value changes (indicated by initWithStoredValues set to false).
     if (hasChanged && !wasRemoved) {
-        cache.set(key, value);
-    } else {
-        cache.addToAccessedKeys(key);
+        OnyxCache_1.default.set(key, value);
+    }
+    else {
+        OnyxCache_1.default.addToAccessedKeys(key);
     }
-
     return scheduleSubscriberUpdate(key, value, (subscriber) => hasChanged || subscriber.initWithStoredValues === false);
 }
-
 /**
  * @param {String} key
  * @returns {Boolean}
@@ -1051,7 +937,6 @@ function broadcastUpdate(key, value, method, hasChanged, wasRemoved = false) {
 function hasPendingMergeForKey(key) {
     return Boolean(mergeQueue[key]);
 }
-
 /**
  * Removes a key from storage if the value is null.
  * Otherwise removes all nested null values in objects and returns the object
@@ -1060,17 +945,15 @@ function hasPendingMergeForKey(key) {
  * @returns {Mixed} The value without null values and a boolean "wasRemoved", which indicates if the key got removed completely
  */
 function removeNullValues(key, value) {
-    if (_.isNull(value)) {
+    if (underscore_1.default.isNull(value)) {
         remove(key);
-        return {value, wasRemoved: true};
+        return { value, wasRemoved: true };
     }
-
     // We can remove all null values in an object by merging it with itself
     // utils.fastMerge recursively goes through the object and removes all null values
     // Passing two identical objects as source and target to fastMerge will not change it, but only remove the null values
-    return {value: utils.removeNestedNullValues(value), wasRemoved: false};
+    return { value: utils_1.default.removeNestedNullValues(value), wasRemoved: false };
 }
-
 /**
  * Write a value to our store with the given key
  *
@@ -1081,30 +964,24 @@ function removeNullValues(key, value) {
  */
 function set(key, value) {
     // If the value is null, we remove the key from storage
-    const {value: valueAfterRemoving, wasRemoved} = removeNullValues(key, value);
-
+    const { value: valueAfterRemoving, wasRemoved } = removeNullValues(key, value);
     if (hasPendingMergeForKey(key)) {
         delete mergeQueue[key];
     }
-
-    const hasChanged = cache.hasValueChanged(key, valueAfterRemoving);
-
+    const hasChanged = OnyxCache_1.default.hasValueChanged(key, valueAfterRemoving);
     // This approach prioritizes fast UI changes without waiting for data to be stored in device storage.
     const updatePromise = broadcastUpdate(key, valueAfterRemoving, 'set', hasChanged, wasRemoved);
-
     // If the value has not changed or the key got removed, calling Storage.setItem() would be redundant and a waste of performance, so return early instead.
     if (!hasChanged || wasRemoved) {
         return updatePromise;
     }
-
-    return Storage.setItem(key, valueAfterRemoving)
+    return storage_1.default.setItem(key, valueAfterRemoving)
         .catch((error) => evictStorageAndRetry(error, set, key, valueAfterRemoving))
         .then(() => {
-            sendActionToDevTools(METHOD.SET, key, valueAfterRemoving);
-            return updatePromise;
-        });
+        sendActionToDevTools(METHOD.SET, key, valueAfterRemoving);
+        return updatePromise;
+    });
 }
-
 /**
  * Storage expects array like: [["@MyApp_user", value_1], ["@MyApp_key", value_2]]
  * This method transforms an object like {'@MyApp_user': myUserValue, '@MyApp_key': myKeyValue}
@@ -1115,18 +992,14 @@ function set(key, value) {
  */
 function prepareKeyValuePairsForStorage(data) {
     const keyValuePairs = [];
-
-    _.forEach(data, (value, key) => {
-        const {value: valueAfterRemoving, wasRemoved} = removeNullValues(key, value);
-
-        if (wasRemoved) return;
-
+    underscore_1.default.forEach(data, (value, key) => {
+        const { value: valueAfterRemoving, wasRemoved } = removeNullValues(key, value);
+        if (wasRemoved)
+            return;
         keyValuePairs.push([key, valueAfterRemoving]);
     });
-
     return keyValuePairs;
 }
-
 /**
  * Sets multiple keys and values
  *
@@ -1137,21 +1010,18 @@ function prepareKeyValuePairsForStorage(data) {
  */
 function multiSet(data) {
     const keyValuePairs = prepareKeyValuePairsForStorage(data);
-
-    const updatePromises = _.map(keyValuePairs, ([key, value]) => {
+    const updatePromises = underscore_1.default.map(keyValuePairs, ([key, value]) => {
         // Update cache and optimistically inform subscribers on the next tick
-        cache.set(key, value);
+        OnyxCache_1.default.set(key, value);
         return scheduleSubscriberUpdate(key, value);
     });
-
-    return Storage.multiSet(keyValuePairs)
+    return storage_1.default.multiSet(keyValuePairs)
         .catch((error) => evictStorageAndRetry(error, multiSet, data))
         .then(() => {
-            sendActionToDevTools(METHOD.MULTI_SET, undefined, data);
-            return Promise.all(updatePromises);
-        });
+        sendActionToDevTools(METHOD.MULTI_SET, undefined, data);
+        return Promise.all(updatePromises);
+    });
 }
-
 /**
  * Merges an array of changes with an existing value
  *
@@ -1162,22 +1032,18 @@ function multiSet(data) {
  * @returns {*}
  */
 function applyMerge(existingValue, changes, shouldRemoveNullObjectValues) {
-    const lastChange = _.last(changes);
-
-    if (_.isArray(lastChange)) {
+    const lastChange = underscore_1.default.last(changes);
+    if (underscore_1.default.isArray(lastChange)) {
         return lastChange;
     }
-
-    if (_.some(changes, _.isObject)) {
+    if (underscore_1.default.some(changes, underscore_1.default.isObject)) {
         // Object values are then merged one after the other
-        return _.reduce(changes, (modifiedData, change) => utils.fastMerge(modifiedData, change, shouldRemoveNullObjectValues), existingValue || {});
+        return underscore_1.default.reduce(changes, (modifiedData, change) => utils_1.default.fastMerge(modifiedData, change, shouldRemoveNullObjectValues), existingValue || {});
     }
-
     // If we have anything else we can't merge it so we'll
     // simply return the last value that was queued
     return lastChange;
 }
-
 /**
  * Merge a new value into an existing value at a key.
  *
@@ -1201,10 +1067,9 @@ function applyMerge(existingValue, changes, shouldRemoveNullObjectValues) {
 function merge(key, changes) {
     // Top-level undefined values are ignored
     // Therefore we need to prevent adding them to the merge queue
-    if (_.isUndefined(changes)) {
+    if (underscore_1.default.isUndefined(changes)) {
         return mergeQueue[key] ? mergeQueuePromise[key] : Promise.resolve();
     }
-
     // Merge attempts are batched together. The delta should be applied after a single call to get() to prevent a race condition.
     // Using the initial value from storage in subsequent merge attempts will lead to an incorrect final merged value.
     if (mergeQueue[key]) {
@@ -1212,32 +1077,26 @@ function merge(key, changes) {
         return mergeQueuePromise[key];
     }
     mergeQueue[key] = [changes];
-
     mergeQueuePromise[key] = get(key).then((existingValue) => {
         // Calls to Onyx.set after a merge will terminate the current merge process and clear the merge queue
-        if (mergeQueue[key] == null) return;
-
+        if (mergeQueue[key] == null)
+            return;
         try {
             // We first only merge the changes, so we can provide these to the native implementation (SQLite uses only delta changes in "JSON_PATCH" to merge)
             // We don't want to remove null values from the "batchedChanges", because SQLite uses them to remove keys from storage natively.
             let batchedChanges = applyMerge(undefined, mergeQueue[key], false);
-
             // The presence of a `null` in the merge queue instructs us to drop the existing value.
             // In this case, we can't simply merge the batched changes with the existing value, because then the null in the merge queue would have no effect
-            const shouldOverwriteExistingValue = _.includes(mergeQueue[key], null);
-
+            const shouldOverwriteExistingValue = underscore_1.default.includes(mergeQueue[key], null);
             // Clean up the write queue, so we don't apply these changes again
             delete mergeQueue[key];
             delete mergeQueuePromise[key];
-
             // If the batched changes equal null, we want to remove the key from storage, to reduce storage size
-            const {wasRemoved} = removeNullValues(key, batchedChanges);
-
+            const { wasRemoved } = removeNullValues(key, batchedChanges);
             // After that we merge the batched changes with the existing value
             // We can remove null values from the "modifiedData", because "null" implicates that the user wants to remove a value from storage.
             // The "modifiedData" will be directly "set" in storage instead of being merged
             const modifiedData = shouldOverwriteExistingValue ? batchedChanges : applyMerge(existingValue, [batchedChanges], true);
-
             // On native platforms we use SQLite which utilises JSON_PATCH to merge changes.
             // JSON_PATCH generally removes null values from the stored object.
             // When there is no existing value though, SQLite will just insert the changes as a new value and thus the null values won't be removed.
@@ -1245,45 +1104,38 @@ function merge(key, changes) {
             if (!existingValue) {
                 batchedChanges = applyMerge(undefined, [batchedChanges], true);
             }
-
-            const hasChanged = cache.hasValueChanged(key, modifiedData);
-
+            const hasChanged = OnyxCache_1.default.hasValueChanged(key, modifiedData);
             // This approach prioritizes fast UI changes without waiting for data to be stored in device storage.
             const updatePromise = broadcastUpdate(key, modifiedData, 'merge', hasChanged, wasRemoved);
-
             // If the value has not changed, calling Storage.setItem() would be redundant and a waste of performance, so return early instead.
             if (!hasChanged || wasRemoved) {
                 return updatePromise;
             }
-
-            return Storage.mergeItem(key, batchedChanges, modifiedData).then(() => {
+            return storage_1.default.mergeItem(key, batchedChanges, modifiedData).then(() => {
                 sendActionToDevTools(METHOD.MERGE, key, changes, modifiedData);
                 return updatePromise;
             });
-        } catch (error) {
+        }
+        catch (error) {
             Logger.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error}`);
             return Promise.resolve();
         }
     });
-
     return mergeQueuePromise[key];
 }
-
 /**
  * Merge user provided default key value pairs.
  * @private
  * @returns {Promise}
  */
 function initializeWithDefaultKeyStates() {
-    return Storage.multiGet(_.keys(defaultKeyStates)).then((pairs) => {
-        const asObject = _.object(pairs);
-
-        const merged = utils.fastMerge(asObject, defaultKeyStates);
-        cache.merge(merged);
-        _.each(merged, (val, key) => keyChanged(key, val));
+    return storage_1.default.multiGet(underscore_1.default.keys(defaultKeyStates)).then((pairs) => {
+        const asObject = underscore_1.default.object(pairs);
+        const merged = utils_1.default.fastMerge(asObject, defaultKeyStates);
+        OnyxCache_1.default.merge(merged);
+        underscore_1.default.each(merged, (val, key) => keyChanged(key, val));
     });
 }
-
 /**
  * Clear out all the data in the store
  *
@@ -1311,68 +1163,60 @@ function clear(keysToPreserve = []) {
         const keysToBeClearedFromStorage = [];
         const keyValuesToResetAsCollection = {};
         const keyValuesToResetIndividually = {};
-
         // The only keys that should not be cleared are:
         // 1. Anything specifically passed in keysToPreserve (because some keys like language preferences, offline
         //      status, or activeClients need to remain in Onyx even when signed out)
         // 2. Any keys with a default state (because they need to remain in Onyx as their default, and setting them
         //      to null would cause unknown behavior)
-        _.each(keys, (key) => {
-            const isKeyToPreserve = _.contains(keysToPreserve, key);
-            const isDefaultKey = _.has(defaultKeyStates, key);
-
+        underscore_1.default.each(keys, (key) => {
+            const isKeyToPreserve = underscore_1.default.contains(keysToPreserve, key);
+            const isDefaultKey = underscore_1.default.has(defaultKeyStates, key);
             // If the key is being removed or reset to default:
             // 1. Update it in the cache
             // 2. Figure out whether it is a collection key or not,
             //      since collection key subscribers need to be updated differently
             if (!isKeyToPreserve) {
-                const oldValue = cache.getValue(key);
-                const newValue = _.get(defaultKeyStates, key, null);
+                const oldValue = OnyxCache_1.default.getValue(key);
+                const newValue = underscore_1.default.get(defaultKeyStates, key, null);
                 if (newValue !== oldValue) {
-                    cache.set(key, newValue);
+                    OnyxCache_1.default.set(key, newValue);
                     const collectionKey = key.substring(0, key.indexOf('_') + 1);
                     if (collectionKey) {
                         if (!keyValuesToResetAsCollection[collectionKey]) {
                             keyValuesToResetAsCollection[collectionKey] = {};
                         }
                         keyValuesToResetAsCollection[collectionKey][key] = newValue;
-                    } else {
+                    }
+                    else {
                         keyValuesToResetIndividually[key] = newValue;
                     }
                 }
             }
-
             if (isKeyToPreserve || isDefaultKey) {
                 return;
             }
-
             // If it isn't preserved and doesn't have a default, we'll remove it
             keysToBeClearedFromStorage.push(key);
         });
-
         const updatePromises = [];
-
         // Notify the subscribers for each key/value group so they can receive the new values
-        _.each(keyValuesToResetIndividually, (value, key) => {
+        underscore_1.default.each(keyValuesToResetIndividually, (value, key) => {
             updatePromises.push(scheduleSubscriberUpdate(key, value));
         });
-        _.each(keyValuesToResetAsCollection, (value, key) => {
+        underscore_1.default.each(keyValuesToResetAsCollection, (value, key) => {
             updatePromises.push(scheduleNotifyCollectionSubscribers(key, value));
         });
-
-        const defaultKeyValuePairs = _.pairs(_.omit(defaultKeyStates, keysToPreserve));
-
+        const defaultKeyValuePairs = underscore_1.default.pairs(underscore_1.default.omit(defaultKeyStates, keysToPreserve));
         // Remove only the items that we want cleared from storage, and reset others to default
-        _.each(keysToBeClearedFromStorage, (key) => cache.drop(key));
-        return Storage.removeItems(keysToBeClearedFromStorage)
-            .then(() => Storage.multiSet(defaultKeyValuePairs))
+        underscore_1.default.each(keysToBeClearedFromStorage, (key) => OnyxCache_1.default.drop(key));
+        return storage_1.default.removeItems(keysToBeClearedFromStorage)
+            .then(() => storage_1.default.multiSet(defaultKeyValuePairs))
             .then(() => {
-                DevTools.clearState(keysToPreserve);
-                return Promise.all(updatePromises);
-            });
+            DevTools_1.default.clearState(keysToPreserve);
+            return Promise.all(updatePromises);
+        });
     });
 }
-
 /**
  * Merges a collection based on their keys
  *
@@ -1388,78 +1232,66 @@ function clear(keysToPreserve = []) {
  * @returns {Promise}
  */
 function mergeCollection(collectionKey, collection) {
-    if (!_.isObject(collection) || _.isArray(collection) || _.isEmpty(collection)) {
+    if (!underscore_1.default.isObject(collection) || underscore_1.default.isArray(collection) || underscore_1.default.isEmpty(collection)) {
         Logger.logInfo('mergeCollection() called with invalid or empty value. Skipping this update.');
         return Promise.resolve();
     }
-
     // Confirm all the collection keys belong to the same parent
     let hasCollectionKeyCheckFailed = false;
-    _.each(collection, (_data, dataKey) => {
+    underscore_1.default.each(collection, (_data, dataKey) => {
         if (isKeyMatch(collectionKey, dataKey)) {
             return;
         }
-
         if (process.env.NODE_ENV === 'development') {
             throw new Error(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${collectionKey}, DataKey: ${dataKey}`);
         }
-
         hasCollectionKeyCheckFailed = true;
         Logger.logAlert(`Provided collection doesn't have all its data belonging to the same parent. CollectionKey: ${collectionKey}, DataKey: ${dataKey}`);
     });
-
     // Gracefully handle bad mergeCollection updates so it doesn't block the merge queue
     if (hasCollectionKeyCheckFailed) {
         return Promise.resolve();
     }
-
     return getAllKeys().then((persistedKeys) => {
         // Split to keys that exist in storage and keys that don't
-        const [existingKeys, newKeys] = _.chain(collection)
+        const [existingKeys, newKeys] = underscore_1.default.chain(collection)
             .pick((value, key) => {
-                if (_.isNull(value)) {
-                    remove(key);
-                    return false;
-                }
-                return true;
-            })
+            if (underscore_1.default.isNull(value)) {
+                remove(key);
+                return false;
+            }
+            return true;
+        })
             .keys()
             .partition((key) => persistedKeys.includes(key))
             .value();
-
-        const existingKeyCollection = _.pick(collection, existingKeys);
-        const newCollection = _.pick(collection, newKeys);
+        const existingKeyCollection = underscore_1.default.pick(collection, existingKeys);
+        const newCollection = underscore_1.default.pick(collection, newKeys);
         const keyValuePairsForExistingCollection = prepareKeyValuePairsForStorage(existingKeyCollection);
         const keyValuePairsForNewCollection = prepareKeyValuePairsForStorage(newCollection);
-
         const promises = [];
-
         // New keys will be added via multiSet while existing keys will be updated using multiMerge
         // This is because setting a key that doesn't exist yet with multiMerge will throw errors
         if (keyValuePairsForExistingCollection.length > 0) {
-            promises.push(Storage.multiMerge(keyValuePairsForExistingCollection));
+            promises.push(storage_1.default.multiMerge(keyValuePairsForExistingCollection));
         }
-
         if (keyValuePairsForNewCollection.length > 0) {
-            promises.push(Storage.multiSet(keyValuePairsForNewCollection));
+            promises.push(storage_1.default.multiSet(keyValuePairsForNewCollection));
         }
-
         // Prefill cache if necessary by calling get() on any existing keys and then merge original data to cache
         // and update all subscribers
-        const promiseUpdate = Promise.all(_.map(existingKeys, get)).then(() => {
-            cache.merge(collection);
+        const promiseUpdate = Promise.all(underscore_1.default.map(existingKeys, get)).then(() => {
+            OnyxCache_1.default.merge(collection);
             return scheduleNotifyCollectionSubscribers(collectionKey, collection);
         });
-
         return Promise.all(promises)
             .catch((error) => evictStorageAndRetry(error, mergeCollection, collection))
             .then(() => {
-                sendActionToDevTools(METHOD.MERGE_COLLECTION, undefined, collection);
-                return promiseUpdate;
-            });
+            sendActionToDevTools(METHOD.MERGE_COLLECTION, undefined, collection);
+            return promiseUpdate;
+        });
     });
 }
-
 /**
  * Insert API responses and lifecycle data into Onyx
  *
@@ -1468,24 +1300,23 @@ function mergeCollection(collectionKey, collection) {
  */
 function update(data) {
     // First, validate the Onyx object is in the format we expect
-    _.each(data, ({onyxMethod, key, value}) => {
-        if (!_.contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION, METHOD.MULTI_SET], onyxMethod)) {
+    underscore_1.default.each(data, ({ onyxMethod, key, value }) => {
+        if (!underscore_1.default.contains([METHOD.CLEAR, METHOD.SET, METHOD.MERGE, METHOD.MERGE_COLLECTION, METHOD.MULTI_SET], onyxMethod)) {
             throw new Error(`Invalid onyxMethod ${onyxMethod} in Onyx update.`);
         }
         if (onyxMethod === METHOD.MULTI_SET) {
             // For multiset, we just expect the value to be an object
-            if (!_.isObject(value) || _.isArray(value) || _.isFunction(value)) {
+            if (!underscore_1.default.isObject(value) || underscore_1.default.isArray(value) || underscore_1.default.isFunction(value)) {
                 throw new Error('Invalid value provided in Onyx multiSet. Onyx multiSet value must be of type object.');
             }
-        } else if (onyxMethod !== METHOD.CLEAR && !_.isString(key)) {
+        }
+        else if (onyxMethod !== METHOD.CLEAR && !underscore_1.default.isString(key)) {
             throw new Error(`Invalid ${typeof key} key provided in Onyx update. Onyx key must be of type string.`);
         }
     });
-
     const promises = [];
     let clearPromise = Promise.resolve();
-
-    _.each(data, ({onyxMethod, key, value}) => {
+    underscore_1.default.each(data, ({ onyxMethod, key, value }) => {
         switch (onyxMethod) {
             case METHOD.SET:
                 promises.push(() => set(key, value));
@@ -1506,21 +1337,17 @@ function update(data) {
                 break;
         }
     });
-
-    return clearPromise.then(() => Promise.all(_.map(promises, (p) => p())));
+    return clearPromise.then(() => Promise.all(underscore_1.default.map(promises, (p) => p())));
 }
-
 /**
  * When set these keys will not be persisted to storage
  * @param {string[]} keyList
  */
 function setMemoryOnlyKeys(keyList) {
-    Storage.setMemoryOnlyKeys(keyList);
-
+    storage_1.default.setMemoryOnlyKeys(keyList);
     // When in memory only mode for certain keys we do not want to ever drop items from the cache as the user will have no way to recover them again via storage.
-    cache.setRecentKeysLimit(Infinity);
+    OnyxCache_1.default.setRecentKeysLimit(Infinity);
 }
-
 /**
  * Initialize the store with actions and listening for storage events
  *
@@ -1546,60 +1373,39 @@ function setMemoryOnlyKeys(keyList) {
  *     },
  * });
  */
-function init({
-    keys = {},
-    initialKeyStates = {},
-    safeEvictionKeys = [],
-    maxCachedKeysCount = 1000,
-    captureMetrics = false,
-    shouldSyncMultipleInstances = Boolean(global.localStorage),
-    debugSetState = false,
-} = {}) {
+function init({ keys = {}, initialKeyStates = {}, safeEvictionKeys = [], maxCachedKeysCount = 1000, captureMetrics = false, shouldSyncMultipleInstances = Boolean(global.localStorage), debugSetState = false, } = {}) {
     if (captureMetrics) {
         // The code here is only bundled and applied when the captureMetrics is set
         // eslint-disable-next-line no-use-before-define
         applyDecorators();
     }
-
     if (debugSetState) {
         PerformanceUtils.setShouldDebugSetState(true);
     }
-
     if (maxCachedKeysCount > 0) {
-        cache.setRecentKeysLimit(maxCachedKeysCount);
+        OnyxCache_1.default.setRecentKeysLimit(maxCachedKeysCount);
     }
-
     // We need the value of the collection keys later for checking if a
     // key is a collection. We store it in a map for faster lookup.
-    const collectionValues = _.values(keys.COLLECTION);
-    onyxCollectionKeyMap = _.reduce(
-        collectionValues,
-        (acc, val) => {
-            acc.set(val, true);
-            return acc;
-        },
-        new Map(),
-    );
-
+    const collectionValues = underscore_1.default.values(keys.COLLECTION);
+    onyxCollectionKeyMap = underscore_1.default.reduce(collectionValues, (acc, val) => {
+        acc.set(val, true);
+        return acc;
+    }, new Map());
     // Set our default key states to use when initializing and clearing Onyx data
     defaultKeyStates = initialKeyStates;
-
-    DevTools.initState(initialKeyStates);
-
+    DevTools_1.default.initState(initialKeyStates);
     // Let Onyx know about which keys are safe to evict
     evictionAllowList = safeEvictionKeys;
-
     // Initialize all of our keys with data provided then give green light to any pending connections
     Promise.all([addAllSafeEvictionKeysToRecentlyAccessedList(), initializeWithDefaultKeyStates()]).then(deferredInitTask.resolve);
-
-    if (shouldSyncMultipleInstances && _.isFunction(Storage.keepInstancesSync)) {
-        Storage.keepInstancesSync((key, value) => {
-            cache.set(key, value);
+    if (shouldSyncMultipleInstances && underscore_1.default.isFunction(storage_1.default.keepInstancesSync)) {
+        storage_1.default.keepInstancesSync((key, value) => {
+            OnyxCache_1.default.set(key, value);
             keyChanged(key, value);
         });
     }
 }
-
 const Onyx = {
     connect,
     disconnect,
@@ -1620,7 +1426,6 @@ const Onyx = {
     tryGetCachedValue,
     hasPendingMergeForKey,
 };
-
 /**
  * Apply calls statistic decorators to benchmark Onyx
  *
@@ -1629,7 +1434,6 @@ const Onyx = {
 function applyDecorators() {
     // We're requiring the script dynamically here so that it's only evaluated when decorators are used
     const decorate = require('./metrics');
-
     // Re-assign with decorated functions
     /* eslint-disable no-func-assign */
     get = decorate.decorateWithMetrics(get, 'Onyx:get');
@@ -1642,7 +1446,6 @@ function applyDecorators() {
     initializeWithDefaultKeyStates = decorate.decorateWithMetrics(initializeWithDefaultKeyStates, 'Onyx:defaults');
     update = decorate.decorateWithMetrics(update, 'Onyx:update');
     /* eslint-enable */
-
     // Re-expose decorated methods
     /* eslint-disable rulesdir/prefer-actions-set-data */
     Onyx.set = set;
@@ -1652,11 +1455,9 @@ function applyDecorators() {
     Onyx.mergeCollection = mergeCollection;
     Onyx.update = update;
     /* eslint-enable */
-
     // Expose stats methods on Onyx
     Onyx.getMetrics = decorate.getMetrics;
     Onyx.resetMetrics = decorate.resetMetrics;
     Onyx.printMetrics = decorate.printMetrics;
 }
-
-export default Onyx;
+exports.default = Onyx;