Fix remaining TS issues

Author: markerikson

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

@@ -43,10 +43,8 @@ export type BuildInitiateApiEndpointQuery<
   initiate: StartQueryActionCreator<Definition>
 }
 
-export type BuildApiEndpointInfiniteQuery<
+export type BuildInitiateApiEndpointInfiniteQuery<
   Definition extends InfiniteQueryDefinition<any, any, any, any, any>,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  Definitions extends EndpointDefinitions,
 > = {
   initiate: StartInfiniteQueryActionCreator<Definition>
 }

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

@@ -65,7 +65,7 @@ export type BuildSelectorsApiEndpointQuery<
   >
 }
 
-export type ApiEndpointInfiniteQuery<
+export type BuildSelectorsApiEndpointInfiniteQuery<
   Definition extends InfiniteQueryDefinition<any, any, any, any, any>,
   Definitions extends EndpointDefinitions,
 > = {

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

@@ -57,10 +57,8 @@ export type BuildThunksApiEndpointQuery<
   Definition extends QueryDefinition<any, any, any, any, any>,
 > = Matchers<QueryThunk, Definition>
 
-export type ApiEndpointInfiniteQuery<
+export type BuildThunksApiEndpointInfiniteQuery<
   Definition extends InfiniteQueryDefinition<any, any, any, any, any>,
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  Definitions extends EndpointDefinitions,
 > = Matchers<QueryThunk, Definition>
 
 export type BuildThunksApiEndpointMutation<
@@ -481,7 +479,7 @@ export function buildThunks<
             for (let i = 1; i < remainingPages; i++) {
               // @ts-ignore
               const param = getNextPageParam(
-                arg.infiniteQueryOptions,
+                endpointDefinition.infiniteQueryOptions,
                 result.data as InfiniteData<unknown>,
               )
               result = await fetchPage(

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

@@ -40,6 +40,7 @@ import type {
   MutationActionCreatorResult,
   QueryActionCreatorResult,
   InfiniteQueryActionCreatorResult,
+  BuildInitiateApiEndpointInfiniteQuery,
 } from './buildInitiate'
 import { buildInitiate } from './buildInitiate'
 import type {
@@ -49,13 +50,15 @@ import type {
 } from './buildMiddleware'
 import { buildMiddleware } from './buildMiddleware'
 import type {
+  BuildSelectorsApiEndpointInfiniteQuery,
   BuildSelectorsApiEndpointMutation,
   BuildSelectorsApiEndpointQuery,
 } from './buildSelectors'
 import { buildSelectors } from './buildSelectors'
 import type { SliceActions, UpsertEntries } from './buildSlice'
 import { buildSlice } from './buildSlice'
 import type {
+  BuildThunksApiEndpointInfiniteQuery,
   BuildThunksApiEndpointMutation,
   BuildThunksApiEndpointQuery,
   PatchQueryDataThunk,
@@ -436,7 +439,9 @@ export interface ApiEndpointInfiniteQuery<
   Definition extends InfiniteQueryDefinition<any, any, any, any, any>,
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   Definitions extends EndpointDefinitions,
-> {
+> extends BuildThunksApiEndpointInfiniteQuery<Definition>,
+    BuildInitiateApiEndpointInfiniteQuery<Definition>,
+    BuildSelectorsApiEndpointInfiniteQuery<Definition, Definitions> {
   name: string
   /**
    * All of these are `undefined` at runtime, purely to be used in TypeScript declarations!

packages/toolkit/src/query/endpointDefinitions.ts

@@ -267,15 +267,13 @@ type QueryTypes<
    * const useMyWrappedHook: UseQuery<typeof api.endpoints.query.Types.QueryDefinition> = ...
    * ```
    */
-  QueryDefinition:
-    | QueryDefinition<QueryArg, BaseQuery, TagTypes, ResultType, ReducerPath>
-    | InfiniteQueryDefinition<
-        QueryArg,
-        BaseQuery,
-        TagTypes,
-        ResultType,
-        ReducerPath
-      >
+  QueryDefinition: QueryDefinition<
+    QueryArg,
+    BaseQuery,
+    TagTypes,
+    ResultType,
+    ReducerPath
+  >
   TagTypes: TagTypes
   ReducerPath: ReducerPath
 }

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

@@ -57,6 +57,7 @@ import type {
   InfiniteData,
   InfiniteQueryConfigOptions,
 } from '@internal/query/core/apiState'
+import type { InfiniteQueryResultSelectorResult } from '../core/buildSelectors'
 
 // Copy-pasted from React-Redux
 const canUseDOM = () =>