react-native-onyx 3.0.26 → 3.0.28

package/dist/OnyxUtils.js

@@ -699,7 +699,7 @@ function addKeyToRecentlyAccessedIfNeeded(key) {
 function getCollectionDataAndSendAsObject(matchingKeys, mapping) {
     multiGet(matchingKeys).then((dataMap) => {
         const data = Object.fromEntries(dataMap.entries());
-        sendDataToConnection(mapping, data, undefined);
+        sendDataToConnection(mapping, data, mapping.key);
     });
 }
 /**
@@ -961,9 +961,10 @@ function subscribeToKey(connectOptions) {
             if (mapping.key) {
                 OnyxCache_1.default.addNullishStorageKey(mapping.key);
             }
+            const matchedKey = isCollectionKey(mapping.key) && mapping.waitForCollectionCallback ? mapping.key : undefined;
             // Here we cannot use batching because the nullish value is expected to be set immediately for default props
             // or they will be undefined.
-            sendDataToConnection(mapping, null, undefined);
+            sendDataToConnection(mapping, null, matchedKey);
             return;
         }
         // When using a callback subscriber we will either trigger the provided callback for each key we find or combine all values

package/dist/storage/InstanceSync/index.web.d.ts

@@ -17,7 +17,7 @@ declare const InstanceSync: {
     /**
      * @param {Function} onStorageKeyChanged Storage synchronization mechanism keeping all opened tabs in sync
      */
-    init: (onStorageKeyChanged: OnStorageKeyChanged, store: StorageProvider) => void;
+    init: (onStorageKeyChanged: OnStorageKeyChanged, store: StorageProvider<unknown>) => void;
     setItem: typeof raiseStorageSyncEvent;
     removeItem: typeof raiseStorageSyncEvent;
     removeItems: typeof raiseStorageSyncManyKeysEvent;

package/dist/storage/__mocks__/index.d.ts

@@ -15,7 +15,6 @@ declare const StorageMock: {
         bytesRemaining: number;
     }>, [], any>;
     keepInstancesSync: jest.Mock<any, any, any>;
-    mockSet: (key: import("../..").OnyxKey, value: import("../..").OnyxValue<import("../..").OnyxKey>) => Promise<unknown>;
     getMockStore: jest.Mock<{
         [x: string]: unknown;
     }, [], any>;

package/dist/storage/__mocks__/index.js

@@ -50,7 +50,6 @@ const StorageMock = {
     getAllKeys: jest.fn(MemoryOnlyProvider_1.default.getAllKeys),
     getDatabaseSize: jest.fn(MemoryOnlyProvider_1.default.getDatabaseSize),
     keepInstancesSync: jest.fn(),
-    mockSet: MemoryOnlyProvider_1.mockSet,
     getMockStore: jest.fn(() => MemoryOnlyProvider_1.mockStore),
     setMockStore: jest.fn((data) => (0, MemoryOnlyProvider_1.setMockStore)(data)),
 };

package/dist/storage/index.d.ts

@@ -1,6 +1,6 @@
 import type StorageProvider from './providers/types';
 type Storage = {
-    getStorageProvider: () => StorageProvider;
-} & Omit<StorageProvider, 'name'>;
+    getStorageProvider: () => StorageProvider<unknown>;
+} & Omit<StorageProvider<unknown>, 'name' | 'store'>;
 declare const storage: Storage;
 export default storage;

package/dist/storage/providers/IDBKeyValProvider/createStore.js

@@ -1,6 +1,39 @@
 "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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
-const idb_keyval_1 = require("idb-keyval");
+const IDB = __importStar(require("idb-keyval"));
 const Logger_1 = require("../../../Logger");
 // This is a copy of the createStore function from idb-keyval, we need a custom implementation
 // because we need to create the database manually in order to ensure that the store exists before we use it.
@@ -13,7 +46,7 @@ function createStore(dbName, storeName) {
             return dbp;
         const request = indexedDB.open(dbName);
         request.onupgradeneeded = () => request.result.createObjectStore(storeName);
-        dbp = (0, idb_keyval_1.promisifyRequest)(request);
+        dbp = IDB.promisifyRequest(request);
         dbp.then((db) => {
             // It seems like Safari sometimes likes to just close the connection.
             // It's supposed to fire this event when that happens. Let's hope it does!
@@ -42,7 +75,7 @@ function createStore(dbName, storeName) {
             (0, Logger_1.logInfo)(`Creating store ${storeName} in database ${dbName}.`);
             updatedDatabase.createObjectStore(storeName);
         };
-        dbp = (0, idb_keyval_1.promisifyRequest)(request);
+        dbp = IDB.promisifyRequest(request);
         return dbp;
     };
     return (txMode, callback) => getDB()

package/dist/storage/providers/IDBKeyValProvider/index.d.ts

@@ -1,3 +1,4 @@
+import type { UseStore } from 'idb-keyval';
 import type StorageProvider from '../types';
-declare const provider: StorageProvider;
+declare const provider: StorageProvider<UseStore | undefined>;
 export default provider;

package/dist/storage/providers/IDBKeyValProvider/index.js

@@ -1,17 +1,50 @@
 "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 () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __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 });
-const idb_keyval_1 = require("idb-keyval");
+const IDB = __importStar(require("idb-keyval"));
 const utils_1 = __importDefault(require("../../../utils"));
 const createStore_1 = __importDefault(require("./createStore"));
-// We don't want to initialize the store while the JS bundle loads as idb-keyval will try to use global.indexedDB
-// which might not be available in certain environments that load the bundle (e.g. electron main process).
-let idbKeyValStore;
 const DB_NAME = 'OnyxDB';
 const STORE_NAME = 'keyvaluepairs';
 const provider = {
+    // We don't want to initialize the store while the JS bundle loads as idb-keyval will try to use global.indexedDB
+    // which might not be available in certain environments that load the bundle (e.g. electron main process).
+    store: undefined,
     /**
      * The name of the provider that can be printed to the logs
      */
@@ -24,60 +57,104 @@ const provider = {
         if (newIdbKeyValStore == null) {
             throw Error('IDBKeyVal store could not be created');
         }
-        idbKeyValStore = newIdbKeyValStore;
+        provider.store = newIdbKeyValStore;
     },
-    setItem: (key, value) => {
+    setItem(key, value) {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
         if (value === null) {
-            provider.removeItem(key);
+            return provider.removeItem(key);
         }
-        return (0, idb_keyval_1.set)(key, value, idbKeyValStore);
+        return IDB.set(key, value, provider.store);
     },
-    multiGet: (keysParam) => (0, idb_keyval_1.getMany)(keysParam, idbKeyValStore).then((values) => values.map((value, index) => [keysParam[index], value])),
-    multiMerge: (pairs) => idbKeyValStore('readwrite', (store) => {
-        // Note: we are using the manual store transaction here, to fit the read and update
-        // of the items in one transaction to achieve best performance.
-        const getValues = Promise.all(pairs.map(([key]) => (0, idb_keyval_1.promisifyRequest)(store.get(key))));
-        return getValues.then((values) => {
-            const pairsWithoutNull = pairs.filter(([key, value]) => {
-                if (value === null) {
-                    provider.removeItem(key);
-                    return false;
+    multiGet(keysParam) {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return IDB.getMany(keysParam, provider.store).then((values) => values.map((value, index) => [keysParam[index], value]));
+    },
+    multiMerge(pairs) {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return provider.store('readwrite', (store) => {
+            // Note: we are using the manual store transaction here, to fit the read and update
+            // of the items in one transaction to achieve best performance.
+            const getValues = Promise.all(pairs.map(([key]) => IDB.promisifyRequest(store.get(key))));
+            return getValues.then((values) => {
+                for (const [index, [key, value]] of pairs.entries()) {
+                    if (value === null) {
+                        store.delete(key);
+                    }
+                    else {
+                        const newValue = utils_1.default.fastMerge(values[index], value, {
+                            shouldRemoveNestedNulls: true,
+                            objectRemovalMode: 'replace',
+                        }).result;
+                        store.put(newValue, key);
+                    }
                 }
-                return true;
-            });
-            const upsertMany = pairsWithoutNull.map(([key, value], index) => {
-                const prev = values[index];
-                const newValue = utils_1.default.fastMerge(prev, value, {
-                    shouldRemoveNestedNulls: true,
-                    objectRemovalMode: 'replace',
-                }).result;
-                return (0, idb_keyval_1.promisifyRequest)(store.put(newValue, key));
+                return IDB.promisifyRequest(store.transaction);
             });
-            return Promise.all(upsertMany);
         });
-    }).then(() => undefined),
+    },
     mergeItem(key, change) {
         // Since Onyx already merged the existing value with the changes, we can just set the value directly.
         return provider.multiMerge([[key, change]]);
     },
-    multiSet: (pairs) => {
-        const pairsWithoutNull = pairs.filter(([key, value]) => {
-            if (value === null) {
-                provider.removeItem(key);
-                return false;
+    multiSet(pairs) {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return provider.store('readwrite', (store) => {
+            for (const [key, value] of pairs) {
+                if (value === null) {
+                    store.delete(key);
+                }
+                else {
+                    store.put(value, key);
+                }
             }
-            return true;
+            return IDB.promisifyRequest(store.transaction);
         });
-        return (0, idb_keyval_1.setMany)(pairsWithoutNull, idbKeyValStore);
     },
-    clear: () => (0, idb_keyval_1.clear)(idbKeyValStore),
-    getAllKeys: () => (0, idb_keyval_1.keys)(idbKeyValStore),
-    getItem: (key) => (0, idb_keyval_1.get)(key, idbKeyValStore)
-        // idb-keyval returns undefined for missing items, but this needs to return null so that idb-keyval does the same thing as SQLiteStorage.
-        .then((val) => (val === undefined ? null : val)),
-    removeItem: (key) => (0, idb_keyval_1.del)(key, idbKeyValStore),
-    removeItems: (keysParam) => (0, idb_keyval_1.delMany)(keysParam, idbKeyValStore),
+    clear() {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return IDB.clear(provider.store);
+    },
+    getAllKeys() {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return IDB.keys(provider.store);
+    },
+    getItem(key) {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return (IDB.get(key, provider.store)
+            // idb-keyval returns undefined for missing items, but this needs to return null so that idb-keyval does the same thing as SQLiteStorage.
+            .then((val) => (val === undefined ? null : val)));
+    },
+    removeItem(key) {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return IDB.del(key, provider.store);
+    },
+    removeItems(keysParam) {
+        if (!provider.store) {
+            throw new Error('Store not initialized!');
+        }
+        return IDB.delMany(keysParam, provider.store);
+    },
     getDatabaseSize() {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
         if (!window.navigator || !window.navigator.storage) {
             throw new Error('StorageManager browser API unavailable');
         }

package/dist/storage/providers/MemoryOnlyProvider.d.ts

@@ -1,9 +1,9 @@
-import type StorageProvider from './types';
 import type { OnyxKey, OnyxValue } from '../../types';
+import type StorageProvider from './types';
 type Store = Record<OnyxKey, OnyxValue<OnyxKey>>;
-declare let store: Store;
+declare const storeInternal: Store;
 declare const set: (key: OnyxKey, value: OnyxValue<OnyxKey>) => Promise<unknown>;
-declare const provider: StorageProvider;
+declare const provider: StorageProvider<Store>;
 declare const setMockStore: (data: Store) => void;
 export default provider;
-export { store as mockStore, set as mockSet, setMockStore };
+export { set as mockSet, storeInternal as mockStore, setMockStore };

package/dist/storage/providers/MemoryOnlyProvider.js

@@ -3,20 +3,21 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setMockStore = exports.mockSet = exports.mockStore = void 0;
+exports.setMockStore = exports.mockStore = exports.mockSet = void 0;
 const underscore_1 = __importDefault(require("underscore"));
 const utils_1 = __importDefault(require("../../utils"));
 // eslint-disable-next-line import/no-mutable-exports
-let store = {};
-exports.mockStore = store;
+const storeInternal = {};
+exports.mockStore = storeInternal;
 const setInternal = (key, value) => {
-    store[key] = value;
+    storeInternal[key] = value;
     return Promise.resolve(value);
 };
 const isJestRunning = typeof jest !== 'undefined';
 const set = isJestRunning ? jest.fn(setInternal) : setInternal;
 exports.mockSet = set;
 const provider = {
+    store: storeInternal,
     /**
      * The name of the provider that can be printed to the logs
      */
@@ -31,7 +32,7 @@ const provider = {
      * Get the value of a given key or return `null` if it's not available in memory
      */
     getItem(key) {
-        const value = store[key];
+        const value = provider.store[key];
         return Promise.resolve(value === undefined ? null : value);
     },
     /**
@@ -39,7 +40,7 @@ const provider = {
      */
     multiGet(keys) {
         const getPromises = underscore_1.default.map(keys, (key) => new Promise((resolve) => {
-            this.getItem(key).then((value) => resolve([key, value]));
+            provider.getItem(key).then((value) => resolve([key, value]));
         }));
         return Promise.all(getPromises);
     },
@@ -54,7 +55,7 @@ const provider = {
      * Stores multiple key-value pairs in a batch
      */
     multiSet(pairs) {
-        const setPromises = underscore_1.default.map(pairs, ([key, value]) => this.setItem(key, value));
+        const setPromises = underscore_1.default.map(pairs, ([key, value]) => provider.setItem(key, value));
         return Promise.all(setPromises).then(() => undefined);
     },
     /**
@@ -62,7 +63,7 @@ const provider = {
      */
     mergeItem(key, change) {
         // Since Onyx already merged the existing value with the changes, we can just set the value directly.
-        return this.multiMerge([[key, change]]);
+        return provider.multiMerge([[key, change]]);
     },
     /**
      * Multiple merging of existing and new values in a batch
@@ -70,7 +71,7 @@ const provider = {
      */
     multiMerge(pairs) {
         underscore_1.default.forEach(pairs, ([key, value]) => {
-            const existingValue = store[key];
+            const existingValue = provider.store[key];
             const newValue = utils_1.default.fastMerge(existingValue, value, {
                 shouldRemoveNestedNulls: true,
                 objectRemovalMode: 'replace',
@@ -83,7 +84,7 @@ const provider = {
      * Remove given key and it's value from memory
      */
     removeItem(key) {
-        delete store[key];
+        delete provider.store[key];
         return Promise.resolve();
     },
     /**
@@ -91,7 +92,7 @@ const provider = {
      */
     removeItems(keys) {
         underscore_1.default.each(keys, (key) => {
-            delete store[key];
+            delete provider.store[key];
         });
         return Promise.resolve();
     },
@@ -99,14 +100,17 @@ const provider = {
      * Clear everything from memory
      */
     clear() {
-        exports.mockStore = store = {};
+        // Remove all keys without changing the root object reference.
+        for (const key of Object.keys(provider.store)) {
+            delete provider.store[key];
+        }
         return Promise.resolve();
     },
     /**
      * Returns all keys available in memory
      */
     getAllKeys() {
-        return Promise.resolve(underscore_1.default.keys(store));
+        return Promise.resolve(underscore_1.default.keys(provider.store));
     },
     /**
      * Gets the total bytes of the store.
@@ -117,7 +121,11 @@ const provider = {
     },
 };
 const setMockStore = (data) => {
-    exports.mockStore = store = data;
+    // Replace keys without changing the root object reference.
+    for (const key of Object.keys(storeInternal)) {
+        delete storeInternal[key];
+    }
+    Object.assign(storeInternal, data);
 };
 exports.setMockStore = setMockStore;
 exports.default = provider;

package/dist/storage/providers/NoopProvider.d.ts

@@ -1,3 +1,3 @@
 import type StorageProvider from './types';
-declare const provider: StorageProvider;
+declare const provider: StorageProvider<unknown>;
 export default provider;

package/dist/storage/providers/NoopProvider.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const provider = {
+    store: undefined,
     /**
      * The name of the provider that can be printed to the logs
      */

package/dist/storage/providers/SQLiteProvider.d.ts

@@ -1,3 +1,8 @@
+/**
+ * The SQLiteStorage provider stores everything in a key/value store by
+ * converting the value to a JSON string
+ */
+import type { NitroSQLiteConnection } from 'react-native-nitro-sqlite';
 import type StorageProvider from './types';
 /**
  * The type of the key-value pair stored in the SQLite database
@@ -8,6 +13,6 @@ type OnyxSQLiteKeyValuePair = {
     record_key: string;
     valueJSON: string;
 };
-declare const provider: StorageProvider;
+declare const provider: StorageProvider<NitroSQLiteConnection | undefined>;
 export default provider;
 export type { OnyxSQLiteKeyValuePair };

package/dist/storage/providers/SQLiteProvider.js

@@ -13,7 +13,6 @@ const utils_1 = __importDefault(require("../../utils"));
 // https://github.com/margelo/react-native-nitro-sqlite#sending-and-receiving-nullish-values
 (0, react_native_nitro_sqlite_1.enableSimpleNullHandling)();
 const DB_NAME = 'OnyxDB';
-let db;
 /**
  * Prevents the stringifying of the object markers.
  */
@@ -33,6 +32,7 @@ function generateJSONReplaceSQLQueries(key, patches) {
     return queries;
 }
 const provider = {
+    store: undefined,
     /**
      * The name of the provider that can be printed to the logs
      */
@@ -41,16 +41,19 @@ const provider = {
      * Initializes the storage provider
      */
     init() {
-        db = (0, react_native_nitro_sqlite_1.open)({ name: DB_NAME });
-        db.execute('CREATE TABLE IF NOT EXISTS keyvaluepairs (record_key TEXT NOT NULL PRIMARY KEY , valueJSON JSON NOT NULL) WITHOUT ROWID;');
+        provider.store = (0, react_native_nitro_sqlite_1.open)({ name: DB_NAME });
+        provider.store.execute('CREATE TABLE IF NOT EXISTS keyvaluepairs (record_key TEXT NOT NULL PRIMARY KEY , valueJSON JSON NOT NULL) WITHOUT ROWID;');
         // All of the 3 pragmas below were suggested by SQLite team.
         // You can find more info about them here: https://www.sqlite.org/pragma.html
-        db.execute('PRAGMA CACHE_SIZE=-20000;');
-        db.execute('PRAGMA synchronous=NORMAL;');
-        db.execute('PRAGMA journal_mode=WAL;');
+        provider.store.execute('PRAGMA CACHE_SIZE=-20000;');
+        provider.store.execute('PRAGMA synchronous=NORMAL;');
+        provider.store.execute('PRAGMA journal_mode=WAL;');
     },
     getItem(key) {
-        return db.executeAsync('SELECT record_key, valueJSON FROM keyvaluepairs WHERE record_key = ?;', [key]).then(({ rows }) => {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
+        return provider.store.executeAsync('SELECT record_key, valueJSON FROM keyvaluepairs WHERE record_key = ?;', [key]).then(({ rows }) => {
             if (!rows || (rows === null || rows === void 0 ? void 0 : rows.length) === 0) {
                 return null;
             }
@@ -62,26 +65,38 @@ const provider = {
         });
     },
     multiGet(keys) {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
         const placeholders = keys.map(() => '?').join(',');
         const command = `SELECT record_key, valueJSON FROM keyvaluepairs WHERE record_key IN (${placeholders});`;
-        return db.executeAsync(command, keys).then(({ rows }) => {
+        return provider.store.executeAsync(command, keys).then(({ rows }) => {
             // eslint-disable-next-line no-underscore-dangle
             const result = rows === null || rows === void 0 ? void 0 : rows._array.map((row) => [row.record_key, JSON.parse(row.valueJSON)]);
             return (result !== null && result !== void 0 ? result : []);
         });
     },
     setItem(key, value) {
-        return db.executeAsync('REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, ?);', [key, JSON.stringify(value)]).then(() => undefined);
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
+        return provider.store.executeAsync('REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, ?);', [key, JSON.stringify(value)]).then(() => undefined);
     },
     multiSet(pairs) {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
         const query = 'REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, json(?));';
         const params = pairs.map((pair) => [pair[0], JSON.stringify(pair[1] === undefined ? null : pair[1])]);
         if (utils_1.default.isEmptyObject(params)) {
             return Promise.resolve();
         }
-        return db.executeBatchAsync([{ query, params }]).then(() => undefined);
+        return provider.store.executeBatchAsync([{ query, params }]).then(() => undefined);
     },
     multiMerge(pairs) {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
         const commands = [];
         // Query to merge the change into the DB value.
         const patchQuery = `INSERT INTO keyvaluepairs (record_key, valueJSON)
@@ -112,26 +127,47 @@ const provider = {
         if (replaceQueryArguments.length > 0) {
             commands.push({ query: replaceQuery, params: replaceQueryArguments });
         }
-        return db.executeBatchAsync(commands).then(() => undefined);
+        return provider.store.executeBatchAsync(commands).then(() => undefined);
     },
     mergeItem(key, change, replaceNullPatches) {
         // Since Onyx already merged the existing value with the changes, we can just set the value directly.
-        return this.multiMerge([[key, change, replaceNullPatches]]);
+        return provider.multiMerge([[key, change, replaceNullPatches]]);
+    },
+    getAllKeys() {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
+        return provider.store.executeAsync('SELECT record_key FROM keyvaluepairs;').then(({ rows }) => {
+            // eslint-disable-next-line no-underscore-dangle
+            const result = rows === null || rows === void 0 ? void 0 : rows._array.map((row) => row.record_key);
+            return (result !== null && result !== void 0 ? result : []);
+        });
+    },
+    removeItem(key) {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
+        return provider.store.executeAsync('DELETE FROM keyvaluepairs WHERE record_key = ?;', [key]).then(() => undefined);
     },
-    getAllKeys: () => db.executeAsync('SELECT record_key FROM keyvaluepairs;').then(({ rows }) => {
-        // eslint-disable-next-line no-underscore-dangle
-        const result = rows === null || rows === void 0 ? void 0 : rows._array.map((row) => row.record_key);
-        return (result !== null && result !== void 0 ? result : []);
-    }),
-    removeItem: (key) => db.executeAsync('DELETE FROM keyvaluepairs WHERE record_key = ?;', [key]).then(() => undefined),
-    removeItems: (keys) => {
+    removeItems(keys) {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
         const placeholders = keys.map(() => '?').join(',');
         const query = `DELETE FROM keyvaluepairs WHERE record_key IN (${placeholders});`;
-        return db.executeAsync(query, keys).then(() => undefined);
+        return provider.store.executeAsync(query, keys).then(() => undefined);
+    },
+    clear() {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
+        return provider.store.executeAsync('DELETE FROM keyvaluepairs;', []).then(() => undefined);
     },
-    clear: () => db.executeAsync('DELETE FROM keyvaluepairs;', []).then(() => undefined),
     getDatabaseSize() {
-        return Promise.all([db.executeAsync('PRAGMA page_size;'), db.executeAsync('PRAGMA page_count;'), (0, react_native_device_info_1.getFreeDiskStorage)()]).then(([pageSizeResult, pageCountResult, bytesRemaining]) => {
+        if (!provider.store) {
+            throw new Error('Store is not initialized!');
+        }
+        return Promise.all([provider.store.executeAsync('PRAGMA page_size;'), provider.store.executeAsync('PRAGMA page_count;'), (0, react_native_device_info_1.getFreeDiskStorage)()]).then(([pageSizeResult, pageCountResult, bytesRemaining]) => {
             var _a, _b, _c, _d, _e, _f;
             const pageSize = (_c = (_b = (_a = pageSizeResult.rows) === null || _a === void 0 ? void 0 : _a.item(0)) === null || _b === void 0 ? void 0 : _b.page_size) !== null && _c !== void 0 ? _c : 0;
             const pageCount = (_f = (_e = (_d = pageCountResult.rows) === null || _d === void 0 ? void 0 : _d.item(0)) === null || _e === void 0 ? void 0 : _e.page_count) !== null && _f !== void 0 ? _f : 0;

package/dist/storage/providers/types.d.ts

@@ -7,7 +7,8 @@ type DatabaseSize = {
     bytesRemaining: number;
 };
 type OnStorageKeyChanged = <TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>) => void;
-type StorageProvider = {
+type StorageProvider<TStore> = {
+    store: TStore;
     /**
      * The name of the provider that can be printed to the logs
      */

package/dist/utils.js

@@ -14,10 +14,10 @@ function fastMerge(target, source, options, metadata, basePath = []) {
             replaceNullPatches: [],
         };
     }
-    // We have to ignore arrays and nullish values here,
+    // We have to ignore arrays, primitives and nullish values here,
     // otherwise "mergeObject" will throw an error,
     // because it expects an object as "source"
-    if (Array.isArray(source) || source === null || source === undefined) {
+    if (!isMergeableObject(source)) {
         return { result: source, replaceNullPatches: metadata.replaceNullPatches };
     }
     const optionsWithDefaults = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-onyx",
-  "version": "3.0.26",
+  "version": "3.0.28",
   "author": "Expensify, Inc.",
   "homepage": "https://expensify.com",
   "description": "State management for React Native",
@@ -78,6 +78,7 @@
     "eslint-plugin-import": "^2.29.1",
     "eslint-plugin-jsx-a11y": "^6.8.0",
     "eslint-plugin-react": "^7.31.10",
+    "fake-indexeddb": "^6.2.5",
     "idb-keyval": "^6.2.1",
     "jest": "^29.7.0",
     "jest-cli": "^29.7.0",