simplify typing using ApiModules instead of Omit<Api, keyof BaseApiMethods>

Author: EskiMojo14

packages/toolkit/src/query/core/buildInitiate.ts

@@ -14,8 +14,8 @@ import type {
 } from '@reduxjs/toolkit'
 import type { SubscriptionOptions, RootState } from './apiState'
 import type { InternalSerializeQueryArgs } from '../defaultSerializeQueryArgs'
-import type { Api, ApiContext, BaseApiMethods } from '../apiTypes'
-import type { ApiEndpointQuery } from './module'
+import type { ApiContext, ApiModules } from '../apiTypes'
+import type { ApiEndpointQuery, CoreModule } from './module'
 import type { BaseQueryError, QueryReturnValue } from '../baseQueryTypes'
 import type { QueryResultSelectorResult } from './buildSelectors'
 import type { Dispatch } from 'redux'
@@ -197,10 +197,7 @@ export function buildInitiate({
   serializeQueryArgs: InternalSerializeQueryArgs
   queryThunk: QueryThunk
   mutationThunk: MutationThunk
-  api: Omit<
-    Api<any, EndpointDefinitions, any, any>,
-    keyof BaseApiMethods<any, any, any, any>
-  >
+  api: ApiModules<any, EndpointDefinitions, any, any>[CoreModule]
   context: ApiContext<EndpointDefinitions>
 }) {
   const runningQueries: Map<

packages/toolkit/src/query/core/buildMiddleware/types.ts

@@ -7,7 +7,7 @@ import type {
   UnknownAction,
 } from '@reduxjs/toolkit'
 
-import type { Api, ApiContext, BaseApiMethods } from '../../apiTypes'
+import type { ApiContext, ApiModules } from '../../apiTypes'
 import type {
   AssertTagTypes,
   EndpointDefinitions,
@@ -24,6 +24,7 @@ import type {
   QueryThunkArg,
   ThunkResult,
 } from '../buildThunks'
+import type { CoreModule } from '../module'
 
 export type QueryStateMeta<T> = Record<string, undefined | T>
 export type TimeoutId = ReturnType<typeof setTimeout>
@@ -41,10 +42,7 @@ export interface BuildMiddlewareInput<
   context: ApiContext<Definitions>
   queryThunk: QueryThunk
   mutationThunk: MutationThunk
-  api: Omit<
-    Api<any, Definitions, ReducerPath, TagTypes>,
-    keyof BaseApiMethods<any, any, any, any>
-  >
+  api: ApiModules<any, EndpointDefinitions, ReducerPath, TagTypes>[CoreModule]
   assertTagType: AssertTagTypes
 }
 

packages/toolkit/src/query/react/ApiProvider.tsx

@@ -4,8 +4,9 @@ import { useEffect } from 'react'
 import React from 'react'
 import type { ReactReduxContextValue } from 'react-redux'
 import { Provider } from 'react-redux'
+import type { ApiModules } from '@reduxjs/toolkit/query'
 import { setupListeners } from '@reduxjs/toolkit/query'
-import type { Api, BaseApiMethods } from '@reduxjs/toolkit/dist/query/apiTypes'
+import type { CoreModule } from '../core/module'
 
 /**
  * Can be used as a `Provider` if you **do not already have a Redux store**.
@@ -33,7 +34,7 @@ import type { Api, BaseApiMethods } from '@reduxjs/toolkit/dist/query/apiTypes'
  */
 export function ApiProvider(props: {
   children: any
-  api: Omit<Api<any, {}, any, any>, keyof BaseApiMethods<any, {}, any, any>>
+  api: ApiModules<any, any, string, any>[CoreModule]
   setupListeners?: Parameters<typeof setupListeners>[1] | false
   context?: Context<ReactReduxContextValue>
 }) {

packages/toolkit/src/query/react/buildHooks.ts

@@ -15,6 +15,7 @@ import {
   useRef,
   useState,
 } from 'react'
+import type { ApiModules } from '@reduxjs/toolkit/query'
 import { QueryStatus, skipToken } from '@reduxjs/toolkit/query'
 import type {
   QuerySubState,
@@ -40,11 +41,7 @@ import type {
 } from '@reduxjs/toolkit/dist/query/core/buildInitiate'
 import type { SerializeQueryArgs } from '@reduxjs/toolkit/dist/query/defaultSerializeQueryArgs'
 import { shallowEqual } from 'react-redux'
-import type {
-  Api,
-  ApiContext,
-  BaseApiMethods,
-} from '@reduxjs/toolkit/dist/query/apiTypes'
+import type { ApiContext } from '@reduxjs/toolkit/dist/query/apiTypes'
 import type {
   Id,
   NoInfer,
@@ -595,10 +592,7 @@ export function buildHooks<Definitions extends EndpointDefinitions>({
   serializeQueryArgs,
   context,
 }: {
-  api: Omit<
-    Api<any, Definitions, any, any, CoreModule>,
-    keyof BaseApiMethods<any, any, any, any>
-  >
+  api: ApiModules<any, Definitions, any, any>[CoreModule]
   moduleOptions: Required<ReactHooksModuleOptions>
   serializeQueryArgs: SerializeQueryArgs<any>
   context: ApiContext<Definitions>