fix(typescript): resolve a bunch of instances of TS2742: The inferred type cannot be named without internal reference

Author: gribnoysup

configs/testing-library-compass/src/index.tsx

@@ -283,7 +283,9 @@ function createWrapper(
   const wrapperState = {
     globalAppRegistry: new AppRegistry(),
     localAppRegistry: new AppRegistry(),
-    preferences: new InMemoryPreferencesAccess(options.preferences),
+    preferences: new InMemoryPreferencesAccess(
+      options.preferences
+    ) as PreferencesAccess,
     track: Sinon.stub(),
     logger: createNoopLogger(),
     connectionStorage:
@@ -585,6 +587,12 @@ function createPluginWrapper<
   return { ref, Wrapper: ComponentWithProvider };
 }
 
+export type RenderPluginWithConnectionsResult<
+  T extends CompassPluginComponent<any, any, any>
+> = RenderWithConnectionsResult & {
+  plugin: ReturnType<T['useActivate']>;
+};
+
 function createPluginTestHelpers<
   Props,
   ServiceLocators extends Record<string, () => unknown>,

packages/compass-aggregations/test/configure-store.ts

@@ -3,6 +3,7 @@ import type {
   ConfigureStoreOptions,
 } from '../src/stores/store';
 import { mockDataService } from './mocks/data-service';
+import type { RenderPluginWithConnectionsResult } from '@mongodb-js/testing-library-compass';
 import { createPluginTestHelpers } from '@mongodb-js/testing-library-compass';
 import { CompassAggregationsPlugin } from '../src/index';
 import type { DataService } from '@mongodb-js/compass-connections/provider';
@@ -86,7 +87,9 @@ export default function configureStore(
 export function renderWithStore(
   ui: React.ReactElement,
   ...args: Parameters<typeof configureStore>
-) {
+): Promise<
+  RenderPluginWithConnectionsResult<typeof CompassAggregationsPlugin.provider>
+> {
   ui = args[2]?.pipelineStorage
     ? React.createElement(PipelineStorageProvider, {
         value: args[2].pipelineStorage,

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

@@ -38,6 +38,7 @@ import {
   getLatestEndOfLifeServerVersion,
   isEndOfLifeVersion,
 } from '../utils/end-of-life-server';
+import type { ImportConnectionOptions } from '@mongodb-js/connection-storage/provider';
 
 export type ConnectionsEventMap = {
   connected: (
@@ -2183,11 +2184,11 @@ export const showEndOfLifeMongoDBWarningModal = (
   };
 };
 
-type ImportConnectionsFn = Required<ConnectionStorage>['importConnections'];
-
-export const importConnections = (
-  ...args: Parameters<ImportConnectionsFn>
-): ConnectionsThunkAction<
+export const importConnections = (options: {
+  content: string;
+  options?: ImportConnectionOptions;
+  signal?: AbortSignal;
+}): ConnectionsThunkAction<
   Promise<void>,
   ConnectionsImportStartAction | ConnectionsImportFinishAction
 > => {
@@ -2197,7 +2198,7 @@ export const importConnections = (
     let error;
     try {
       if (connectionStorage.importConnections) {
-        await connectionStorage.importConnections(...args);
+        await connectionStorage.importConnections(options);
         connections = await connectionStorage.loadAll();
       }
     } catch (err) {

packages/compass-connections/src/stores/store-context.tsx

@@ -41,6 +41,7 @@ import {
 } from '@mongodb-js/connection-info';
 import { createServiceLocator } from '@mongodb-js/compass-app-registry';
 import { isEqual } from 'lodash';
+import type { ImportConnectionOptions } from '@mongodb-js/connection-storage/provider';
 
 type ConnectionsStore = ReturnType<typeof configureStore> extends Store<
   infer S,
@@ -130,8 +131,12 @@ function getConnectionsActions(dispatch: ConnectionsStore['dispatch']) {
     showNonGenuineMongoDBWarningModal: (connectionId: ConnectionId) => {
       return dispatch(showNonGenuineMongoDBWarningModal(connectionId));
     },
-    importConnections: (...args: Parameters<typeof importConnections>) => {
-      return dispatch(importConnections(...args));
+    importConnections: (options: {
+      content: string;
+      options?: ImportConnectionOptions;
+      signal?: AbortSignal;
+    }) => {
+      return dispatch(importConnections(options));
     },
     refreshConnections: () => {
       return dispatch(refreshConnections());

packages/compass-data-modeling/test/setup-store.tsx

@@ -1,4 +1,5 @@
 import React from 'react';
+import type { RenderWithConnectionsResult } from '@mongodb-js/testing-library-compass';
 import { renderWithConnections } from '@mongodb-js/testing-library-compass';
 import { createActivateHelpers } from '@mongodb-js/compass-app-registry';
 import { createNoopTrack } from '@mongodb-js/compass-telemetry/provider';
@@ -180,6 +181,7 @@ export const setupStore = (
     createActivateHelpers()
   ).store;
 };
+
 export const renderWithStore = (
   component: JSX.Element,
   {
@@ -189,7 +191,8 @@ export const renderWithStore = (
     services?: Partial<DataModelingStoreServices>;
     connections?: ConnectionInfoWithMockData[];
   } = {}
-) => {
+): RenderWithConnectionsResult & { store: DataModelingStore } => {
+  // TODO: use createPluginTestHelpers instead of most of the code in this file
   const store = setupStore(services, connections);
   const renderResult = renderWithConnections(
     <Provider store={store}>{component}</Provider>,

packages/compass-field-store/src/stores/field-store-service.ts

@@ -37,13 +37,11 @@ function createFieldStoreService(
 /**
  * @internal exported for test purposes only
  */
-export function useFieldStoreService() {
+export function useFieldStoreService(): FieldStoreService {
   const dispatch = useDispatch();
   const connectionInfoRef = useConnectionInfoRef();
   return createFieldStoreService(dispatch, connectionInfoRef);
 }
 
-export const fieldStoreServiceLocator = createServiceLocator(
-  useFieldStoreService,
-  'fieldStoreServiceLocator'
-);
+export const fieldStoreServiceLocator: () => FieldStoreService =
+  createServiceLocator(useFieldStoreService, 'fieldStoreServiceLocator');

packages/compass-indexes/src/components/search-indexes-modals/base-search-index-modal.tsx

@@ -197,7 +197,16 @@ export const BaseSearchIndexModal: React.FunctionComponent<
     (track: TrackFunction) => {
       if (isModalOpen) {
         const connectionInfo = connectionInfoRef.current;
-        track('Screen', { name: `${mode}_search_index_modal` }, connectionInfo);
+        track(
+          'Screen',
+          {
+            name:
+              mode === 'create'
+                ? 'create_search_index_modal'
+                : 'update_search_index_modal',
+          },
+          connectionInfo
+        );
         if (mode === 'create') {
           track(
             'Index Create Opened',

packages/compass-preferences-model/src/index.ts

@@ -39,3 +39,5 @@ export function createSandboxFromDefaultPreferences(): Promise<PreferencesAccess
   return defaultPreferencesInstance.createSandbox();
 }
 export type { DevtoolsProxyOptions } from '@mongodb-js/devtools-proxy-support';
+export type * from './feature-flags';
+export type * from './preferences-schema';

packages/compass-preferences-model/src/provider.ts

@@ -10,6 +10,7 @@ export {
 } from './utils';
 export { capMaxTimeMSAtPreferenceLimit } from './maxtimems';
 export { featureFlags } from './feature-flags';
+export type * from './feature-flags';
 export { getSettingDescription, SORT_ORDER_VALUES } from './preferences-schema';
-export type { AllPreferences, SORT_ORDERS } from './preferences-schema';
+export type * from './preferences-schema';
 export type { DevtoolsProxyOptions } from '@mongodb-js/devtools-proxy-support';

packages/compass-schema/src/modules/schema-analysis.ts

@@ -10,9 +10,9 @@ import type {
   PrimitiveSchemaType,
   SchemaParseOptions,
 } from 'mongodb-schema';
-import type { DataService } from '../stores/store';
-import type { Logger } from '@mongodb-js/compass-logging';
-import type { PreferencesAccess } from 'compass-preferences-model';
+import type { DataService } from '@mongodb-js/compass-connections/provider';
+import type { Logger } from '@mongodb-js/compass-logging/provider';
+import type { PreferencesAccess } from 'compass-preferences-model/provider';
 
 export const DISTINCT_FIELDS_ABORT_THRESHOLD = 1000;
 
@@ -31,7 +31,7 @@ function promoteMongoErrorCode(err?: Error & { code?: unknown }) {
 }
 
 export const analyzeSchema = async (
-  dataService: DataService,
+  dataService: Pick<DataService, 'sampleCursor'>,
   abortSignal: AbortSignal,
   ns: string,
   query: