react-native-onyx 1.0.1 → 1.0.4

package/API.md

@@ -33,6 +33,9 @@ applied in the order they were called. Note: <code>Onyx.set()</code> calls do no
 <dt><a href="#mergeCollection">mergeCollection(collectionKey, collection)</a> ⇒ <code>Promise</code></dt>
 <dd><p>Merges a collection based on their keys</p>
 </dd>
+<dt><a href="#update">update(data)</a></dt>
+<dd><p>Insert API responses and lifecycle data into Onyx</p>
+</dd>
 <dt><a href="#init">init([options])</a></dt>
 <dd><p>Initialize the store with actions and listening for storage events</p>
 </dd>
@@ -158,6 +161,17 @@ Onyx.mergeCollection(ONYXKEYS.COLLECTION.REPORT, {
     [`${ONYXKEYS.COLLECTION.REPORT}2`]: report2,
 });
 ```
+<a name="update"></a>
+
+## update(data)
+Insert API responses and lifecycle data into Onyx
+
+**Kind**: global function  
+
+| Param | Type | Description |
+| --- | --- | --- |
+| data | <code>Array</code> | An array of objects with shape {onyxMethod: oneOf('set', 'merge'), key: string, value: *} |
+
 <a name="init"></a>
 
 ## init([options])

package/README.md

@@ -17,12 +17,10 @@ Persistent storage solution wrapped in a Pub/Sub library.
 
 ## Installation
 
-At the moment, Onyx is not yet published to `npm`. To use in your project, reference the latest sha of the main branch directly in `package.json`
+Onyx is published to [`npm`](https://www.npmjs.com/package/react-native-onyx)
 
-```json
-  "dependencies": {
-    "react-native-onyx": "git+https://github.com/Expensify/react-native-onyx.git#ccb64c738b8bbe933b8997eb177f864e5139bd8d"
-  }
+```shell
+npm install react-native-onyx --save 
 ```
 
 ## Initialization
@@ -253,6 +251,6 @@ To quickly test small changes you can directly go to `node_modules/react-native-
 To continuously work on Onyx we have to set up a task that copies content to parent project's `node_modules/react-native-onyx`:
 1. Work on Onyx feature or a fix
 2. Save files
-3. Optional: run `npm build:web` (if you're working or want to test on a non react-native project)
+3. Optional: run `npm build` (if you're working or want to test on a non react-native project)
    - `npm link` would actually work outside of `react-native` and it can be used to link Onyx locally for a web only project
 4. Copy Onyx to consumer project's `node_modules/react-native-onyx`

package/dist/web.development.js

@@ -1,13 +1,13 @@
 (function webpackUniversalModuleDefinition(root, factory) {
 	if(typeof exports === 'object' && typeof module === 'object')
-		module.exports = factory(require("underscore"), require("expensify-common/lib/str"), require("lodash/merge"), require("localforage"), require("react"));
+		module.exports = factory(require("underscore"), require("expensify-common/lib/str"), require("lodash/merge"), require("lodash/get"), require("localforage"), require("react"));
 	else if(typeof define === 'function' && define.amd)
-		define(["underscore", "expensify-common/lib/str", "lodash/merge", "localforage", "react"], factory);
+		define(["underscore", "expensify-common/lib/str", "lodash/merge", "lodash/get", "localforage", "react"], factory);
 	else if(typeof exports === 'object')
-		exports["react-native-onyx/web"] = factory(require("underscore"), require("expensify-common/lib/str"), require("lodash/merge"), require("localforage"), require("react"));
+		exports["react-native-onyx/web"] = factory(require("underscore"), require("expensify-common/lib/str"), require("lodash/merge"), require("lodash/get"), require("localforage"), require("react"));
 	else
-		root["react-native-onyx/web"] = factory(root["underscore"], root["expensify-common/lib/str"], root["lodash/merge"], root["localforage"], root["react"]);
-})(self, (__WEBPACK_EXTERNAL_MODULE_underscore__, __WEBPACK_EXTERNAL_MODULE_expensify_common_lib_str__, __WEBPACK_EXTERNAL_MODULE_lodash_merge__, __WEBPACK_EXTERNAL_MODULE_localforage__, __WEBPACK_EXTERNAL_MODULE_react__) => {
+		root["react-native-onyx/web"] = factory(root["underscore"], root["expensify-common/lib/str"], root["lodash/merge"], root["lodash/get"], root["localforage"], root["react"]);
+})(self, (__WEBPACK_EXTERNAL_MODULE_underscore__, __WEBPACK_EXTERNAL_MODULE_expensify_common_lib_str__, __WEBPACK_EXTERNAL_MODULE_lodash_merge__, __WEBPACK_EXTERNAL_MODULE_lodash_get__, __WEBPACK_EXTERNAL_MODULE_localforage__, __WEBPACK_EXTERNAL_MODULE_react__) => {
 return /******/ (() => { // webpackBootstrap
 /******/ 	var __webpack_modules__ = ({
 
@@ -492,11 +492,11 @@ function logInfo(message) {
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "./node_modules/@babel/runtime/helpers/interopRequireDefault.js");Object.defineProperty(exports, "__esModule", ({ value: true }));exports["default"] = void 0;var _slicedToArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/slicedToArray */ "./node_modules/@babel/runtime/helpers/slicedToArray.js"));var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js"));var _defineProperty2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/defineProperty */ "./node_modules/@babel/runtime/helpers/defineProperty.js"));var _extends4 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/extends */ "./node_modules/@babel/runtime/helpers/extends.js"));var _underscore = _interopRequireDefault(__webpack_require__(/*! underscore */ "underscore"));
 var _str = _interopRequireDefault(__webpack_require__(/*! expensify-common/lib/str */ "expensify-common/lib/str"));
 var _merge = _interopRequireDefault(__webpack_require__(/*! lodash/merge */ "lodash/merge"));
+var _get = _interopRequireDefault(__webpack_require__(/*! lodash/get */ "lodash/get"));
 var _storage = _interopRequireDefault(__webpack_require__(/*! ./storage */ "./lib/storage/index.web.js"));
-
-var _Logger = __webpack_require__(/*! ./Logger */ "./lib/Logger.js");
+var Logger = _interopRequireWildcard(__webpack_require__(/*! ./Logger */ "./lib/Logger.js"));
 var _OnyxCache = _interopRequireDefault(__webpack_require__(/*! ./OnyxCache */ "./lib/OnyxCache.js"));
-var _createDeferredTask = _interopRequireDefault(__webpack_require__(/*! ./createDeferredTask */ "./lib/createDeferredTask.js"));
+var _createDeferredTask = _interopRequireDefault(__webpack_require__(/*! ./createDeferredTask */ "./lib/createDeferredTask.js"));function _getRequireWildcardCache(nodeInterop) {if (typeof WeakMap !== "function") return null;var cacheBabelInterop = new WeakMap();var cacheNodeInterop = new WeakMap();return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) {return nodeInterop ? cacheNodeInterop : cacheBabelInterop;})(nodeInterop);}function _interopRequireWildcard(obj, nodeInterop) {if (!nodeInterop && obj && obj.__esModule) {return obj;}if (obj === null || typeof obj !== "object" && typeof obj !== "function") {return { default: obj };}var cache = _getRequireWildcardCache(nodeInterop);if (cache && cache.has(obj)) {return cache.get(obj);}var newObj = {};var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var key in obj) {if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;if (desc && (desc.get || desc.set)) {Object.defineProperty(newObj, key, desc);} else {newObj[key] = obj[key];}}}newObj.default = obj;if (cache) {cache.set(obj, newObj);}return newObj;}
 
 // Keeps track of the last connectionID that was used so we can keep incrementing it
 var lastConnectionID = 0;
@@ -550,7 +550,7 @@ function get(key) {
     _OnyxCache.default.set(key, val);
     return val;
   }).
-  catch(function (err) {return (0, _Logger.logInfo)("Unable to get item from persistent storage. Key: " + key + " Error: " + err);});
+  catch(function (err) {return Logger.logInfo("Unable to get item from persistent storage. Key: " + key + " Error: " + err);});
 
   return _OnyxCache.default.captureTask(taskName, promise);
 }
@@ -699,9 +699,10 @@ function addAllSafeEvictionKeysToRecentlyAccessedList() {
   then(function (keys) {
     _underscore.default.each(evictionAllowList, function (safeEvictionKey) {
       _underscore.default.each(keys, function (key) {
-        if (isKeyMatch(safeEvictionKey, key)) {
-          addLastAccessedKey(key);
+        if (!isKeyMatch(safeEvictionKey, key)) {
+          return;
         }
+        addLastAccessedKey(key);
       });
     });
   });
@@ -749,7 +750,6 @@ function keysChanged(collectionKey, collection) {
 
     if (isSubscribedToCollectionKey) {
       if (_underscore.default.isFunction(subscriber.callback)) {
-        // eslint-disable-next-line no-use-before-define
         var cachedCollection = getCachedCollection(collectionKey);
         _underscore.default.each(collection, function (data, dataKey) {
           subscriber.callback(cachedCollection[dataKey], dataKey);
@@ -808,29 +808,31 @@ function keyChanged(key, data) {
 
   // Find all subscribers that were added with connect() and trigger the callback or setState() with the new data
   _underscore.default.each(callbackToStateMapping, function (subscriber) {
-    if (subscriber && isKeyMatch(subscriber.key, key)) {
-      if (_underscore.default.isFunction(subscriber.callback)) {
-        subscriber.callback(data, key);
-      }
+    if (!subscriber || !isKeyMatch(subscriber.key, key)) {
+      return;
+    }
 
-      if (!subscriber.withOnyxInstance) {
-        return;
-      }
+    if (_underscore.default.isFunction(subscriber.callback)) {
+      subscriber.callback(data, key);
+    }
 
-      // Check if we are subscribing to a collection key and add this item as a collection
-      if (isCollectionKey(subscriber.key)) {
-        subscriber.withOnyxInstance.setState(function (prevState) {
-          var collection = _underscore.default.clone(prevState[subscriber.statePropertyName] || {});
-          collection[key] = data;
-          return (0, _defineProperty2.default)({},
-          subscriber.statePropertyName, collection);
+    if (!subscriber.withOnyxInstance) {
+      return;
+    }
 
-        });
-      } else {
-        subscriber.withOnyxInstance.setState((0, _defineProperty2.default)({},
-        subscriber.statePropertyName, data));
+    // Check if we are subscribing to a collection key and add this item as a collection
+    if (isCollectionKey(subscriber.key)) {
+      subscriber.withOnyxInstance.setState(function (prevState) {
+        var collection = _underscore.default.clone(prevState[subscriber.statePropertyName] || {});
+        collection[key] = data;
+        return (0, _defineProperty2.default)({},
+        subscriber.statePropertyName, collection);
+
+      });
+    } else {
+      subscriber.withOnyxInstance.setState((0, _defineProperty2.default)({},
+      subscriber.statePropertyName, data));
 
-      }
     }
   });
 }
@@ -895,21 +897,23 @@ function connect(mapping) {
   deferredInitTask.promise.
   then(function () {
     // Check to see if this key is flagged as a safe eviction key and add it to the recentlyAccessedKeys list
-    if (isSafeEvictionKey(mapping.key)) {
-      // Try to free some cache whenever we connect to a safe eviction key
-      _OnyxCache.default.removeLeastRecentlyUsedKeys();
+    if (!isSafeEvictionKey(mapping.key)) {
+      return;
+    }
 
-      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 (_underscore.default.isUndefined(mapping.canEvict)) {
-          throw new Error("Cannot subscribe to safe eviction key '" +
-          mapping.key + "' without providing a canEvict value.");
+    // Try to free some cache whenever we connect to a safe eviction key
+    _OnyxCache.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 (_underscore.default.isUndefined(mapping.canEvict)) {
+        throw new Error("Cannot subscribe to safe eviction key '" +
+        mapping.key + "' without providing a canEvict value.");
 
-        addLastAccessedKey(mapping.key);
       }
+
+      addLastAccessedKey(mapping.key);
     }
   }).
   then(getAllKeys).
@@ -996,10 +1000,10 @@ function remove(key) {
  * @return {Promise}
  */
 function evictStorageAndRetry(error, onyxMethod) {for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {args[_key - 2] = arguments[_key];}
-  (0, _Logger.logInfo)("Handled error: " + error);
+  Logger.logInfo("Handled error: " + error);
 
   if (error && _str.default.startsWith(error.message, 'Failed to execute \'put\' on \'IDBObjectStore\'')) {
-    (0, _Logger.logAlert)('Attempted to set invalid data set in Onyx. Please ensure all data is serializable.');
+    Logger.logAlert('Attempted to set invalid data set in Onyx. Please ensure all data is serializable.');
     throw error;
   }
 
@@ -1007,12 +1011,12 @@ function evictStorageAndRetry(error, onyxMethod) {for (var _len = arguments.leng
   var keyForRemoval = _underscore.default.find(recentlyAccessedKeys, function (key) {return !evictionBlocklist[key];});
 
   if (!keyForRemoval) {
-    (0, _Logger.logAlert)('Out of storage. But found no acceptable keys to remove.');
+    Logger.logAlert('Out of storage. But found no acceptable keys to remove.');
     throw error;
   }
 
   // Remove the least recently viewed key that is not currently being accessed and retry.
-  (0, _Logger.logInfo)("Out of storage. Evicting least recently accessed key (" + keyForRemoval + ") and retrying.");
+  Logger.logInfo("Out of storage. Evicting least recently accessed key (" + keyForRemoval + ") and retrying.");
   return remove(keyForRemoval).
   then(function () {return onyxMethod.apply(void 0, args);});
 }
@@ -1027,12 +1031,11 @@ function evictStorageAndRetry(error, onyxMethod) {for (var _len = arguments.leng
  */
 function set(key, value) {
   // Logging properties only since values could be sensitive things we don't want to log
-  (0, _Logger.logInfo)("set() called for key: " + key + (_underscore.default.isObject(value) ? " properties: " + _underscore.default.keys(value).join(',') : ''));
+  Logger.logInfo("set() called for key: " + key + (_underscore.default.isObject(value) ? " properties: " + _underscore.default.keys(value).join(',') : ''));
 
   // eslint-disable-next-line no-use-before-define
   if (hasPendingMergeForKey(key)) {
-    // eslint-disable-next-line max-len
-    (0, _Logger.logAlert)("Onyx.set() called after Onyx.merge() for key: " + key + ". It is recommended to use set() or merge() not both.");
+    Logger.logAlert("Onyx.set() called after Onyx.merge() for key: " + key + ". It is recommended to use set() or merge() not both.");
   }
 
   // Adds the key to cache when it's not available
@@ -1171,7 +1174,7 @@ function merge(key, value) {
 
       return set(key, modifiedData);
     } catch (error) {
-      (0, _Logger.logAlert)("An error occurred while applying merge for key: " + key + ", Error: " + error);
+      Logger.logAlert("An error occurred while applying merge for key: " + key + ", Error: " + error);
     }
 
     return Promise.resolve();
@@ -1197,18 +1200,36 @@ function initializeWithDefaultKeyStates() {
 /**
  * Clear out all the data in the store
  *
+ * Note that calling Onyx.clear() and then Onyx.set() on a key with a default
+ * key state may store an unexpected value in Storage.
+ *
+ * E.g.
+ * Onyx.clear();
+ * Onyx.set(ONYXKEYS.DEFAULT_KEY, 'default');
+ * Storage.getItem(ONYXKEYS.DEFAULT_KEY)
+ *     .then((storedValue) => console.log(storedValue));
+ * null is logged instead of the expected 'default'
+ *
+ * Onyx.set() might call Storage.setItem() before Onyx.clear() calls
+ * Storage.setItem(). Use Onyx.merge() instead if possible. Onyx.merge() calls
+ * Onyx.get(key) before calling Storage.setItem() via Onyx.set().
+ * Storage.setItem() from Onyx.clear() will have already finished and the merged
+ * value will be saved to storage after the default value.
+ *
  * @returns {Promise<void>}
  */
 function clear() {
   return getAllKeys().
   then(function (keys) {
     _underscore.default.each(keys, function (key) {
-      keyChanged(key, null);
-      _OnyxCache.default.set(key, null);
+      var resetValue = (0, _get.default)(defaultKeyStates, key, null);
+      _OnyxCache.default.set(key, resetValue);
+
+      // Optimistically inform subscribers on the next tick
+      Promise.resolve().then(function () {return keyChanged(key, resetValue);});
     });
-  }).
-  then(_storage.default.clear).
-  then(initializeWithDefaultKeyStates);
+    _storage.default.clear();
+  });
 }
 
 /**
@@ -1228,10 +1249,11 @@ function clear() {
 function mergeCollection(collectionKey, collection) {
   // Confirm all the collection keys belong to the same parent
   _underscore.default.each(collection, function (data, dataKey) {
-    if (!isKeyMatch(collectionKey, dataKey)) {
-      // eslint-disable-next-line max-len
-      throw new Error("Provided collection does not have all its data belonging to the same parent. CollectionKey: " + collectionKey + ", DataKey: " + dataKey);
+    if (isKeyMatch(collectionKey, dataKey)) {
+      return;
     }
+
+    throw new Error("Provided collection doesn't have all its data belonging to the same parent. CollectionKey: " + collectionKey + ", DataKey: " + dataKey);
   });
 
   return getAllKeys().
@@ -1271,6 +1293,36 @@ function mergeCollection(collectionKey, collection) {
   });
 }
 
+/**
+ * Insert API responses and lifecycle data into Onyx
+ *
+ * @param {Array} data An array of objects with shape {onyxMethod: oneOf('set', 'merge'), key: string, value: *}
+ */
+function update(data) {
+  // First, validate the Onyx object is in the format we expect
+  _underscore.default.each(data, function (_ref4) {var onyxMethod = _ref4.onyxMethod,key = _ref4.key;
+    if (!_underscore.default.contains(['set', 'merge'], onyxMethod)) {
+      throw new Error("Invalid onyxMethod " + onyxMethod + " in Onyx update.");
+    }
+    if (!_underscore.default.isString(key)) {
+      throw new Error("Invalid " + typeof key + " key provided in Onyx update. Onyx key must be of type string.");
+    }
+  });
+
+  _underscore.default.each(data, function (_ref5) {var onyxMethod = _ref5.onyxMethod,key = _ref5.key,value = _ref5.value;
+    switch (onyxMethod) {
+      case 'set':
+        set(key, value);
+        break;
+      case 'merge':
+        merge(key, value);
+        break;
+      default:
+        break;}
+
+  });
+}
+
 /**
  * Initialize the store with actions and listening for storage events
  *
@@ -1305,7 +1357,7 @@ function init()
 
 
 
-{var _ref4 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},_ref4$keys = _ref4.keys,keys = _ref4$keys === void 0 ? {} : _ref4$keys,_ref4$initialKeyState = _ref4.initialKeyStates,initialKeyStates = _ref4$initialKeyState === void 0 ? {} : _ref4$initialKeyState,_ref4$safeEvictionKey = _ref4.safeEvictionKeys,safeEvictionKeys = _ref4$safeEvictionKey === void 0 ? [] : _ref4$safeEvictionKey,_ref4$maxCachedKeysCo = _ref4.maxCachedKeysCount,maxCachedKeysCount = _ref4$maxCachedKeysCo === void 0 ? 1000 : _ref4$maxCachedKeysCo,_ref4$captureMetrics = _ref4.captureMetrics,captureMetrics = _ref4$captureMetrics === void 0 ? false : _ref4$captureMetrics,_ref4$shouldSyncMulti = _ref4.shouldSyncMultipleInstances,shouldSyncMultipleInstances = _ref4$shouldSyncMulti === void 0 ? Boolean(__webpack_require__.g.localStorage) : _ref4$shouldSyncMulti,_ref4$keysToDisableSy = _ref4.keysToDisableSyncEvents,keysToDisableSyncEvents = _ref4$keysToDisableSy === void 0 ? [] : _ref4$keysToDisableSy;
+{var _ref6 = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {},_ref6$keys = _ref6.keys,keys = _ref6$keys === void 0 ? {} : _ref6$keys,_ref6$initialKeyState = _ref6.initialKeyStates,initialKeyStates = _ref6$initialKeyState === void 0 ? {} : _ref6$initialKeyState,_ref6$safeEvictionKey = _ref6.safeEvictionKeys,safeEvictionKeys = _ref6$safeEvictionKey === void 0 ? [] : _ref6$safeEvictionKey,_ref6$maxCachedKeysCo = _ref6.maxCachedKeysCount,maxCachedKeysCount = _ref6$maxCachedKeysCo === void 0 ? 1000 : _ref6$maxCachedKeysCo,_ref6$captureMetrics = _ref6.captureMetrics,captureMetrics = _ref6$captureMetrics === void 0 ? false : _ref6$captureMetrics,_ref6$shouldSyncMulti = _ref6.shouldSyncMultipleInstances,shouldSyncMultipleInstances = _ref6$shouldSyncMulti === void 0 ? Boolean(__webpack_require__.g.localStorage) : _ref6$shouldSyncMulti,_ref6$keysToDisableSy = _ref6.keysToDisableSyncEvents,keysToDisableSyncEvents = _ref6$keysToDisableSy === void 0 ? [] : _ref6$keysToDisableSy;
   if (captureMetrics) {
     // The code here is only bundled and applied when the captureMetrics is set
     // eslint-disable-next-line no-use-before-define
@@ -1347,9 +1399,10 @@ var Onyx = {
   multiSet: multiSet,
   merge: merge,
   mergeCollection: mergeCollection,
+  update: update,
   clear: clear,
   init: init,
-  registerLogger: _Logger.registerLogger,
+  registerLogger: Logger.registerLogger,
   addToEvictionBlockList: addToEvictionBlockList,
   removeFromEvictionBlockList: removeFromEvictionBlockList,
   isSafeEvictionKey: isSafeEvictionKey };
@@ -1374,14 +1427,18 @@ function applyDecorators() {
   mergeCollection = decorate.decorateWithMetrics(mergeCollection, 'Onyx:mergeCollection');
   getAllKeys = decorate.decorateWithMetrics(getAllKeys, 'Onyx:getAllKeys');
   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;
   Onyx.multiSet = multiSet;
   Onyx.clear = clear;
   Onyx.merge = merge;
   Onyx.mergeCollection = mergeCollection;
+  Onyx.update = update;
+  /* eslint-enable */
 
   // Expose stats methods on Onyx
   Onyx.getMetrics = decorate.getMetrics;
@@ -1402,7 +1459,6 @@ Onyx;exports["default"] = _default;
 var _interopRequireDefault = __webpack_require__(/*! @babel/runtime/helpers/interopRequireDefault */ "./node_modules/@babel/runtime/helpers/interopRequireDefault.js");Object.defineProperty(exports, "__esModule", ({ value: true }));exports["default"] = void 0;var _toConsumableArray2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/toConsumableArray */ "./node_modules/@babel/runtime/helpers/toConsumableArray.js"));var _classCallCheck2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/classCallCheck */ "./node_modules/@babel/runtime/helpers/classCallCheck.js"));var _createClass2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime/helpers/createClass */ "./node_modules/@babel/runtime/helpers/createClass.js"));var _underscore = _interopRequireDefault(__webpack_require__(/*! underscore */ "underscore"));
 var _merge = _interopRequireDefault(__webpack_require__(/*! lodash/merge */ "lodash/merge"));
 
-
 var isDefined = _underscore.default.negate(_underscore.default.isUndefined);
 
 /**
@@ -1572,14 +1628,16 @@ OnyxCache = /*#__PURE__*/function () {
      * Remove keys that don't fall into the range of recently used keys
      */ }, { key: "removeLeastRecentlyUsedKeys", value: function removeLeastRecentlyUsedKeys()
     {
-      if (this.recentKeys.size > this.maxRecentKeysSize) {
-        // Get the last N keys by doing a negative slice
-        var recentlyAccessed = (0, _toConsumableArray2.default)(this.recentKeys).slice(-this.maxRecentKeysSize);
-        var storageKeys = _underscore.default.keys(this.storageMap);
-        var keysToRemove = _underscore.default.difference(storageKeys, recentlyAccessed);
-
-        _underscore.default.each(keysToRemove, this.drop);
+      if (this.recentKeys.size <= this.maxRecentKeysSize) {
+        return;
       }
+
+      // Get the last N keys by doing a negative slice
+      var recentlyAccessed = (0, _toConsumableArray2.default)(this.recentKeys).slice(-this.maxRecentKeysSize);
+      var storageKeys = _underscore.default.keys(this.storageMap);
+      var keysToRemove = _underscore.default.difference(storageKeys, recentlyAccessed);
+
+      _underscore.default.each(keysToRemove, this.drop);
     }
 
     /**
@@ -1908,7 +1966,7 @@ var _react = _interopRequireDefault(__webpack_require__(/*! react */ "react"));
 var _underscore = _interopRequireDefault(__webpack_require__(/*! underscore */ "underscore"));
 var _propTypes = _interopRequireDefault(__webpack_require__(/*! prop-types */ "./node_modules/prop-types/index.js"));
 var _str = _interopRequireDefault(__webpack_require__(/*! expensify-common/lib/str */ "expensify-common/lib/str"));
-var _Onyx = _interopRequireDefault(__webpack_require__(/*! ./Onyx */ "./lib/Onyx.js"));var _jsxFileName = "/Users/andrew/Expensidev/react-native-onyx/lib/withOnyx.js";function _createSuper(Derived) {var hasNativeReflectConstruct = _isNativeReflectConstruct();return function _createSuperInternal() {var Super = (0, _getPrototypeOf2.default)(Derived),result;if (hasNativeReflectConstruct) {var NewTarget = (0, _getPrototypeOf2.default)(this).constructor;result = Reflect.construct(Super, arguments, NewTarget);} else {result = Super.apply(this, arguments);}return (0, _possibleConstructorReturn2.default)(this, result);};}function _isNativeReflectConstruct() {if (typeof Reflect === "undefined" || !Reflect.construct) return false;if (Reflect.construct.sham) return false;if (typeof Proxy === "function") return true;try {Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));return true;} catch (e) {return false;}}
+var _Onyx = _interopRequireDefault(__webpack_require__(/*! ./Onyx */ "./lib/Onyx.js"));var _jsxFileName = "/home/runner/work/react-native-onyx/react-native-onyx/lib/withOnyx.js";function _createSuper(Derived) {var hasNativeReflectConstruct = _isNativeReflectConstruct();return function _createSuperInternal() {var Super = (0, _getPrototypeOf2.default)(Derived),result;if (hasNativeReflectConstruct) {var NewTarget = (0, _getPrototypeOf2.default)(this).constructor;result = Reflect.construct(Super, arguments, NewTarget);} else {result = Super.apply(this, arguments);}return (0, _possibleConstructorReturn2.default)(this, result);};}function _isNativeReflectConstruct() {if (typeof Reflect === "undefined" || !Reflect.construct) return false;if (Reflect.construct.sham) return false;if (typeof Proxy === "function") return true;try {Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {}));return true;} catch (e) {return false;}}
 
 /**
  * Returns the display name of a component
@@ -2023,8 +2081,7 @@ function _default(mapOnyxToState) {var _this = this;
             var key = _str.default.result(mapping.key, _this7.props);
 
             if (!_Onyx.default.isSafeEvictionKey(key)) {
-              // eslint-disable-next-line max-len
-              throw new Error("canEvict cannot be used on key '" + key + "'. This key must explicitly be flagged as safe for removal by adding it to Onyx.init({safeEvictionKeys: []}).");
+              throw new Error("canEvict can't be used on key '" + key + "'. This key must explicitly be flagged as safe for removal by adding it to Onyx.init({safeEvictionKeys: []}).");
             }
 
             if (canEvict) {
@@ -2048,6 +2105,7 @@ function _default(mapOnyxToState) {var _this = this;
         mapping, statePropertyName) {
           var key = _str.default.result(mapping.key, this.props);
 
+          // eslint-disable-next-line rulesdir/prefer-onyx-connect-in-libs
           this.activeConnectionIDs[key] = _Onyx.default.connect((0, _extends2.default)({},
           mapping, {
             key: key,
@@ -3196,6 +3254,17 @@ module.exports = __WEBPACK_EXTERNAL_MODULE_localforage__;
 
 /***/ }),
 
+/***/ "lodash/get":
+/*!*****************************!*\
+  !*** external "lodash/get" ***!
+  \*****************************/
+/***/ ((module) => {
+
+"use strict";
+module.exports = __WEBPACK_EXTERNAL_MODULE_lodash_get__;
+
+/***/ }),
+
 /***/ "lodash/merge":
 /*!*******************************!*\
   !*** external "lodash/merge" ***!