refactor: remove return values from storage providers

Author: chrispader

lib/storage/providers/IDBKeyValProvider.ts

@@ -55,7 +55,7 @@ const provider: StorageProvider = {
                     }).result;
                     return promisifyRequest(store.put(newValue, key));
                 });
-                return Promise.all(upsertMany);
+                return Promise.all(upsertMany).then(() => undefined);
             });
         }),
     mergeItem(key, change) {

lib/storage/providers/MemoryOnlyProvider.ts

@@ -94,7 +94,7 @@ const provider: StorageProvider = {
             set(key, newValue);
         });
 
-        return Promise.resolve([]);
+        return Promise.resolve();
     },
 
     /**

lib/storage/providers/NoopProvider.ts

@@ -54,7 +54,7 @@ const provider: StorageProvider = {
      * This function also removes all nested null values from an object.
      */
     multiMerge() {
-        return Promise.resolve([]);
+        return Promise.resolve();
     },
 
     /**

lib/storage/providers/SQLiteProvider.ts

@@ -65,14 +65,14 @@ const provider: StorageProvider = {
         });
     },
     setItem(key, value) {
-        return db.executeAsync('REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, ?);', [key, JSON.stringify(value)]);
+        return db.executeAsync('REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, ?);', [key, JSON.stringify(value)]).then(() => undefined);
     },
     multiSet(pairs) {
         const stringifiedPairs = pairs.map((pair) => [pair[0], JSON.stringify(pair[1] === undefined ? null : pair[1])]);
         if (utils.isEmptyObject(stringifiedPairs)) {
             return Promise.resolve();
         }
-        return db.executeBatchAsync([['REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, json(?));', stringifiedPairs]]);
+        return db.executeBatchAsync([['REPLACE INTO keyvaluepairs (record_key, valueJSON) VALUES (?, json(?));', stringifiedPairs]]).then(() => undefined);
     },
     multiMerge(pairs, mergeReplaceNullPatches) {
         const commands: SQLBatchTuple[] = [];
@@ -112,7 +112,7 @@ const provider: StorageProvider = {
             commands.push([replaceQuery, replaceQueryArguments]);
         }
 
-        return db.executeBatchAsync(commands);
+        return db.executeBatchAsync(commands).then(() => undefined);
     },
     mergeItem(key, change) {
         // Since Onyx already merged the existing value with the changes, we can just set the value directly.
@@ -124,13 +124,13 @@ const provider: StorageProvider = {
             const result = rows?._array.map((row) => row.record_key);
             return (result ?? []) as KeyList;
         }),
-    removeItem: (key) => db.executeAsync('DELETE FROM keyvaluepairs WHERE record_key = ?;', [key]),
+    removeItem: (key) => db.executeAsync('DELETE FROM keyvaluepairs WHERE record_key = ?;', [key]).then(() => undefined),
     removeItems: (keys) => {
         const placeholders = keys.map(() => '?').join(',');
         const query = `DELETE FROM keyvaluepairs WHERE record_key IN (${placeholders});`;
-        return db.executeAsync(query, keys);
+        return db.executeAsync(query, keys).then(() => undefined);
     },
-    clear: () => db.executeAsync('DELETE FROM keyvaluepairs;', []),
+    clear: () => db.executeAsync('DELETE FROM keyvaluepairs;', []).then(() => undefined),
     getDatabaseSize() {
         return Promise.all([db.executeAsync('PRAGMA page_size;'), db.executeAsync('PRAGMA page_count;'), getFreeDiskStorage()]).then(([pageSizeResult, pageCountResult, bytesRemaining]) => {
             const pageSize: number = pageSizeResult.rows?.item(0).page_size;

lib/storage/providers/types.ts

@@ -1,10 +1,14 @@
-import type {BatchQueryResult, QueryResult} from 'react-native-quick-sqlite';
 import type {MixedOperationsQueue, OnyxKey, OnyxValue} from '../../types';
 
 type KeyValuePair = [OnyxKey, OnyxValue<OnyxKey>];
 type KeyList = OnyxKey[];
 type KeyValuePairList = KeyValuePair[];
 
+type DatabaseSize = {
+    bytesUsed: number;
+    bytesRemaining: number;
+};
+
 type OnStorageKeyChanged = <TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>) => void;
 
 type StorageProvider = {
@@ -29,23 +33,23 @@ type StorageProvider = {
     /**
      * Sets the value for a given key. The only requirement is that the value should be serializable to JSON string
      */
-    setItem: <TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>) => Promise<QueryResult | void>;
+    setItem: <TKey extends OnyxKey>(key: TKey, value: OnyxValue<TKey>) => Promise<void>;
 
     /**
      * Stores multiple key-value pairs in a batch
      */
-    multiSet: (pairs: KeyValuePairList) => Promise<BatchQueryResult | void>;
+    multiSet: (pairs: KeyValuePairList) => Promise<void>;
 
     /**
      * Multiple merging of existing and new values in a batch
      */
-    multiMerge: (pairs: KeyValuePairList, mergeReplaceNullPatches?: MixedOperationsQueue['mergeReplaceNullPatches']) => Promise<BatchQueryResult | IDBValidKey[] | void>;
+    multiMerge: (pairs: KeyValuePairList, mergeReplaceNullPatches?: MixedOperationsQueue['mergeReplaceNullPatches']) => Promise<void>;
 
     /**
      * Merges an existing value with a new one
      * @param change - the change to merge with the existing value
      */
-    mergeItem: <TKey extends OnyxKey>(key: TKey, change: OnyxValue<TKey>) => Promise<BatchQueryResult | void>;
+    mergeItem: <TKey extends OnyxKey>(key: TKey, change: OnyxValue<TKey>) => Promise<void>;
 
     /**
      * Returns all keys available in storage
@@ -55,22 +59,22 @@ type StorageProvider = {
     /**
      * Removes given key and its value from storage
      */
-    removeItem: (key: OnyxKey) => Promise<QueryResult | void>;
+    removeItem: (key: OnyxKey) => Promise<void>;
 
     /**
      * Removes given keys and their values from storage
      */
-    removeItems: (keys: KeyList) => Promise<QueryResult | void>;
+    removeItems: (keys: KeyList) => Promise<void>;
 
     /**
      * Clears absolutely everything from storage
      */
-    clear: () => Promise<QueryResult | void>;
+    clear: () => Promise<void>;
 
     /**
      * Gets the total bytes of the database file
      */
-    getDatabaseSize: () => Promise<{bytesUsed: number; bytesRemaining: number}>;
+    getDatabaseSize: () => Promise<DatabaseSize>;
 
     /**
      * @param onStorageKeyChanged Storage synchronization mechanism keeping all opened tabs in sync