fix: invalid param for sendActionToDevTools

Author: chrispader

lib/Onyx.ts

@@ -34,7 +34,7 @@ import type {Connection} from './OnyxConnectionManager';
 import connectionManager from './OnyxConnectionManager';
 import * as GlobalSettings from './GlobalSettings';
 import decorateWithMetrics from './metrics';
-import OnyxMerge from './OnyxMerge.native';
+import OnyxMerge from './OnyxMerge/index.native';
 
 /** Initialize the store with actions and listening for storage events */
 function init({
@@ -325,7 +325,10 @@ function merge<TKey extends OnyxKey>(key: TKey, changes: OnyxMergeInput<TKey>):
                 return Promise.resolve();
             }
 
-            return OnyxMerge.applyMerge(key, existingValue, validChanges);
+            return OnyxMerge.applyMerge(key, existingValue, validChanges).then(({mergedValue, updatePromise}) => {
+                OnyxUtils.sendActionToDevTools(OnyxUtils.METHOD.MERGE, key, changes, mergedValue);
+                return updatePromise;
+            });
         } catch (error) {
             Logger.logAlert(`An error occurred while applying merge for key: ${key}, Error: ${error}`);
             return Promise.resolve();

lib/OnyxMerge.native.ts lib/OnyxMerge/index.native.tslib/OnyxMerge.native.ts renamed to lib/OnyxMerge/index.native.ts

@@ -1,11 +1,12 @@
 import _ from 'underscore';
-import * as Logger from './Logger';
-import OnyxUtils from './OnyxUtils';
-import type {OnyxKey, OnyxValue} from './types';
-import cache from './OnyxCache';
-import Storage from './storage';
-
-function applyMerge<TKey extends OnyxKey>(key: TKey, existingValue: OnyxValue<TKey>, validChanges: unknown[]): Promise<void> {
+import * as Logger from '../Logger';
+import OnyxUtils from '../OnyxUtils';
+import type {OnyxKey, OnyxValue} from '../types';
+import cache from '../OnyxCache';
+import Storage from '../storage';
+import type {ApplyMerge, ApplyMergeResult} from './types';
+
+const applyMerge: ApplyMerge = <TKey extends OnyxKey>(key: TKey, existingValue: OnyxValue<TKey>, validChanges: unknown[]): Promise<ApplyMergeResult> => {
     // If any of the changes is null, we need to discard the existing value.
     const baseValue = validChanges.includes(null) ? undefined : existingValue;
 
@@ -27,14 +28,14 @@ function applyMerge<TKey extends OnyxKey>(key: TKey, existingValue: OnyxValue<TK
 
     // If the value has not changed, calling Storage.setItem() would be redundant and a waste of performance, so return early instead.
     if (!hasChanged) {
-        return updatePromise;
+        return Promise.resolve({mergedValue, updatePromise});
     }
 
-    return Storage.mergeItem(key, batchedChanges as OnyxValue<TKey>, replaceNullPatches).then(() => {
-        OnyxUtils.sendActionToDevTools(OnyxUtils.METHOD.MERGE, key, validChanges, mergedValue);
-        return updatePromise;
-    });
-}
+    return Storage.mergeItem(key, batchedChanges as OnyxValue<TKey>, replaceNullPatches).then(() => ({
+        mergedValue,
+        updatePromise,
+    }));
+};
 
 const OnyxMerge = {
     applyMerge,

lib/OnyxMerge.ts lib/OnyxMerge/index.tslib/OnyxMerge.ts renamed to lib/OnyxMerge/index.ts

@@ -1,11 +1,12 @@
 import _ from 'underscore';
-import * as Logger from './Logger';
-import OnyxUtils from './OnyxUtils';
-import type {OnyxKey, OnyxValue} from './types';
-import cache from './OnyxCache';
-import Storage from './storage';
-
-function applyMerge<TKey extends OnyxKey>(key: TKey, existingValue: OnyxValue<TKey>, validChanges: unknown[]): Promise<void> {
+import * as Logger from '../Logger';
+import OnyxUtils from '../OnyxUtils';
+import type {OnyxKey, OnyxValue} from '../types';
+import cache from '../OnyxCache';
+import Storage from '../storage';
+import type {ApplyMerge, ApplyMergeResult} from './types';
+
+const applyMerge: ApplyMerge = <TKey extends OnyxKey>(key: TKey, existingValue: OnyxValue<TKey>, validChanges: unknown[]): Promise<ApplyMergeResult> => {
     const {result: mergedValue} = OnyxUtils.mergeChanges(validChanges, existingValue);
 
     // In cache, we don't want to remove the key if it's null to improve performance and speed up the next merge.
@@ -19,14 +20,14 @@ function applyMerge<TKey extends OnyxKey>(key: TKey, existingValue: OnyxValue<TK
 
     // If the value has not changed, calling Storage.setItem() would be redundant and a waste of performance, so return early instead.
     if (!hasChanged) {
-        return updatePromise;
+        return Promise.resolve({mergedValue, updatePromise});
     }
 
-    return Storage.setItem(key, mergedValue as OnyxValue<TKey>).then(() => {
-        OnyxUtils.sendActionToDevTools(OnyxUtils.METHOD.MERGE, key, validChanges, mergedValue);
-        return updatePromise;
-    });
-}
+    return Storage.setItem(key, mergedValue as OnyxValue<TKey>).then(() => ({
+        mergedValue,
+        updatePromise,
+    }));
+};
 
 const OnyxMerge = {
     applyMerge,

lib/OnyxMerge/types.ts

@@ -0,0 +1,10 @@
+import type {OnyxKey, OnyxValue} from '../types';
+
+type ApplyMergeResult = {
+    mergedValue: OnyxValue<OnyxKey>;
+    updatePromise: Promise<void>;
+};
+
+type ApplyMerge = <TKey extends OnyxKey>(key: TKey, existingValue: OnyxValue<TKey>, validChanges: unknown[]) => Promise<ApplyMergeResult>;
+
+export type {ApplyMerge, ApplyMergeResult};