react-native-onyx 1.0.39 → 1.0.41

package/lib/Onyx.js

@@ -1100,6 +1100,7 @@ function clear(keysToPreserve = []) {
             const defaultKeyValuePairs = _.pairs(_.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));
         });
 }

package/lib/storage/__mocks__/index.js

@@ -0,0 +1,78 @@
+import _ from 'underscore';
+import fastMerge from '../../fastMerge';
+
+let storageMapInternal = {};
+
+const set = jest.fn((key, value) => {
+    // eslint-disable-next-line no-param-reassign
+    storageMapInternal[key] = value;
+    return Promise.resolve(storageMapInternal[key]);
+});
+
+const localForageMock = {
+    setItem(key, value) {
+        set(key, value);
+        return Promise.resolve();
+    },
+    multiSet(pairs) {
+        const setPromises = _.map(pairs, ([key, value]) => this.setItem(key, value));
+        return new Promise(resolve => Promise.all(setPromises).then(() => resolve(storageMapInternal)));
+    },
+    getItem(key) {
+        return Promise.resolve(storageMapInternal[key]);
+    },
+    multiGet(keys) {
+        const getPromises = _.map(keys, key => new Promise(resolve => this.getItem(key).then(value => resolve([key, value]))));
+        return Promise.all(getPromises);
+    },
+    multiMerge(pairs) {
+        _.forEach(pairs, ([key, value]) => {
+            const existingValue = storageMapInternal[key];
+            const newValue = _.isObject(existingValue)
+                ? fastMerge(existingValue, value) : value;
+
+            set(key, newValue);
+        });
+
+        return Promise.resolve(storageMapInternal);
+    },
+    removeItem(key) {
+        delete storageMapInternal[key];
+        return Promise.resolve();
+    },
+    removeItems(keys) {
+        _.each(keys, (key) => {
+            delete storageMapInternal[key];
+        });
+        return Promise.resolve();
+    },
+    clear() {
+        storageMapInternal = {};
+        return Promise.resolve();
+    },
+    getAllKeys() {
+        return Promise.resolve(_.keys(storageMapInternal));
+    },
+    config() {},
+};
+
+const localForageMockSpy = {
+    localForageSet: set,
+    setItem: jest.fn(localForageMock.setItem),
+    getItem: jest.fn(localForageMock.getItem),
+    removeItem: jest.fn(localForageMock.removeItem),
+    removeItems: jest.fn(localForageMock.removeItems),
+    clear: jest.fn(localForageMock.clear),
+    getAllKeys: jest.fn(localForageMock.getAllKeys),
+    config: jest.fn(localForageMock.config),
+    multiGet: jest.fn(localForageMock.multiGet),
+    multiSet: jest.fn(localForageMock.multiSet),
+    multiMerge: jest.fn(localForageMock.multiMerge),
+
+    getStorageMap: jest.fn(() => storageMapInternal),
+    setInitialMockData: jest.fn((data) => {
+        storageMapInternal = data;
+    }),
+};
+
+export default localForageMockSpy;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "1.0.39",
+  "version": "1.0.41",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",
@@ -48,7 +48,6 @@
     "@babel/core": "7.20.12",
     "@babel/preset-env": "^7.20.2",
     "@babel/preset-react": "^7.18.6",
-    "@react-native-async-storage/async-storage": "^1.17.11",
     "@react-native-community/eslint-config": "^2.0.0",
     "@testing-library/jest-native": "^3.4.2",
     "@testing-library/react-native": "^7.0.2",
@@ -76,7 +75,6 @@
     "webpack-merge": "^5.8.0"
   },
   "peerDependencies": {
-    "@react-native-async-storage/async-storage": "^1.17.11",
     "expensify-common": ">=1",
     "localforage": "^1.10.0",
     "localforage-removeitems": "^1.4.0",
@@ -88,9 +86,6 @@
     "react-native-performance": {
       "optional": true
     },
-    "@react-native-async-storage/async-storage": {
-      "optional": true
-    },
     "react-native-quick-sqlite": {
       "optional": true
     },

package/lib/storage/__mocks__/index.native.js

@@ -1,8 +0,0 @@
-/**
- * Because we're using the `react-native` preset of jest this file extension
- * is .native.js. Otherwise, since jest prefers index.native.js over index.js
- * it'll skip loading the mock
- */
-import WebStorage from '../WebStorage';
-
-export default WebStorage;

package/lib/storage/providers/AsyncStorage.js

@@ -1,90 +0,0 @@
-/**
- * The AsyncStorage provider stores everything in a key/value store by
- * converting the value to a JSON string
- */
-
-import _ from 'underscore';
-import AsyncStorage from '@react-native-async-storage/async-storage';
-
-const provider = {
-    /**
-     * Get the value of a given key or return `null` if it's not available in storage
-     * @param {String} key
-     * @return {Promise<*>}
-     */
-    getItem(key) {
-        return AsyncStorage.getItem(key)
-            .then((value) => {
-                const parsed = value && JSON.parse(value);
-                return parsed;
-            });
-    },
-
-    /**
-     * Get multiple key-value pairs for the give array of keys in a batch
-     * @param {String[]} keys
-     * @return {Promise<Array<[key, value]>>}
-     */
-    multiGet(keys) {
-        return AsyncStorage.multiGet(keys)
-            .then(pairs => _.map(pairs, ([key, value]) => [key, value && JSON.parse(value)]));
-    },
-
-    /**
-     * Sets the value for a given key. The only requirement is that the value should be serializable to JSON string
-     * @param {String} key
-     * @param {*} value
-     * @return {Promise<void>}
-     */
-    setItem(key, value) {
-        return AsyncStorage.setItem(key, JSON.stringify(value));
-    },
-
-    /**
-     * Stores multiple key-value pairs in a batch
-     * @param {Array<[key, value]>} pairs
-     * @return {Promise<void>}
-     */
-    multiSet(pairs) {
-        const stringPairs = _.map(pairs, ([key, value]) => [key, JSON.stringify(value)]);
-        return AsyncStorage.multiSet(stringPairs);
-    },
-
-    /**
-     * Multiple merging of existing and new values in a batch
-     * @param {Array<[key, value]>} pairs
-     * @return {Promise<void>}
-     */
-    multiMerge(pairs) {
-        const stringPairs = _.map(pairs, ([key, value]) => [key, JSON.stringify(value)]);
-        return AsyncStorage.multiMerge(stringPairs);
-    },
-
-    /**
-     * Returns all keys available in storage
-     * @returns {Promise<String[]>}
-     */
-    getAllKeys: AsyncStorage.getAllKeys,
-
-    /**
-     * Remove given key and it's value from storage
-     * @param {String} key
-     * @returns {Promise<void>}
-     */
-    removeItem: AsyncStorage.removeItem,
-
-    /**
-     * Remove given keys and their values from storage
-     * @param {Array} keys
-     * @returns {Promise}
-     */
-    removeItems: keys => Promise.all(_.map(keys, key => AsyncStorage.removeItem(key))),
-
-    /**
-     * Clear everything from storage
-     * @returns {Promise<void>}
-     */
-    clear: AsyncStorage.clear,
-};
-
-export default provider;

package/lib/storage/providers/__mocks__/SQLiteStorage.js

@@ -1,3 +0,0 @@
-import provider from '../AsyncStorage';
-
-export default provider;