Explicitly type merge at use

Author: kraenhansen

packages/compass-connections/src/stores/connections-store-redux.ts

@@ -1,5 +1,5 @@
 import type AppRegistry from '@mongodb-js/compass-app-registry';
-import type { Reducer, AnyAction, Action } from 'redux';
+import type { Reducer, AnyAction, Action, DeepPartial } from 'redux';
 import { createStore, applyMiddleware } from 'redux';
 import type { ThunkAction } from 'redux-thunk';
 import thunk from 'redux-thunk';
@@ -1617,35 +1617,38 @@ const connectWithOptions = (
         const { connectionOptions, ...restOfTheConnectionInfo } =
           connectionInfo;
 
-        const adjustedConnectionInfoForConnection: ConnectionInfo = merge(
-          cloneDeep(restOfTheConnectionInfo),
-          {
-            connectionOptions: adjustConnectionOptionsBeforeConnect({
-              connectionOptions: merge(
-                cloneDeep(connectionOptions),
-                SecretsForConnection.get(connectionInfo.id) ?? {}
-              ),
-              connectionId: connectionInfo.id,
-              defaultAppName: appName,
-              preferences: {
-                forceConnectionOptions: forceConnectionOptions ?? [],
-                browserCommandForOIDCAuth,
-                telemetryAnonymousId,
-              },
-              notifyDeviceFlow: (deviceFlowInfo) => {
-                connectionProgress.openNotifyDeviceAuthModal(
-                  connectionInfo,
-                  deviceFlowInfo.verificationUrl,
-                  deviceFlowInfo.userCode,
-                  () => {
-                    void dispatch(disconnect(connectionInfo.id));
-                  },
-                  deviceAuthAbortController.signal
-                );
-              },
-            }),
-          }
-        );
+        const adjustedConnectionInfoForConnection: ConnectionInfo = merge<
+          Omit<ConnectionInfo, 'connectionOptions'>,
+          Pick<ConnectionInfo, 'connectionOptions'>
+        >(cloneDeep(restOfTheConnectionInfo), {
+          connectionOptions: adjustConnectionOptionsBeforeConnect({
+            connectionOptions: merge<
+              ConnectionOptions,
+              DeepPartial<ConnectionOptions>
+            >(
+              cloneDeep(connectionOptions),
+              SecretsForConnection.get(connectionInfo.id) ?? {}
+            ),
+            connectionId: connectionInfo.id,
+            defaultAppName: appName,
+            preferences: {
+              forceConnectionOptions: forceConnectionOptions ?? [],
+              browserCommandForOIDCAuth,
+              telemetryAnonymousId,
+            },
+            notifyDeviceFlow: (deviceFlowInfo) => {
+              connectionProgress.openNotifyDeviceAuthModal(
+                connectionInfo,
+                deviceFlowInfo.verificationUrl,
+                deviceFlowInfo.userCode,
+                () => {
+                  void dispatch(disconnect(connectionInfo.id));
+                },
+                deviceAuthAbortController.signal
+              );
+            },
+          }),
+        });
 
         // Temporarily disable Atlas Streams connections until https://jira.mongodb.org/browse/STREAMS-862
         // is done.
@@ -1765,7 +1768,10 @@ const connectWithOptions = (
               }
               void dispatch(
                 saveConnectionInfo(
-                  merge(cloneDeep(info), { connectionOptions: secrets })
+                  merge<ConnectionInfo, DeepPartial<ConnectionInfo>>(
+                    cloneDeep(info),
+                    { connectionOptions: secrets }
+                  )
                 )
               );
             },
@@ -1784,7 +1790,7 @@ const connectWithOptions = (
         try {
           await dispatch(
             saveConnectionInfo(
-              merge(
+              merge<ConnectionInfo | undefined, DeepPartial<ConnectionInfo>>(
                 cloneDeep(
                   // See `ConnectionAttemptStartAction` handler in the reducer:
                   // in case of existing connection from storage, we keep the