Force selector type for infinite query test

Author: riqts

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

@@ -229,10 +229,11 @@ export type QuerySubState<D extends BaseEndpointDefinition<any, any, any>> = Id<
 >
 
 export type InfiniteQuerySubState<D extends BaseEndpointDefinition<any, any, any>> = QuerySubState<D> & {
-  hasNextPage: boolean
-  hasPreviousPage: boolean
-  isFetchingNextPage: boolean
-  isFetchingPreviousPage: boolean
+  // TODO: These shouldn't be optional
+  hasNextPage?: boolean
+  hasPreviousPage?: boolean
+  isFetchingNextPage?: boolean
+  isFetchingPreviousPage?: boolean
   param?: QueryArgFrom<D>
   direction?: 'forward' | 'backwards'
 }

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

@@ -301,6 +301,7 @@ export function buildInitiate({
       })
       return runningQueries.get(dispatch)?.[queryCacheKey] as
         | QueryActionCreatorResult<never>
+        | InfiniteQueryActionCreatorResult<never>
         | undefined
     }
   }

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

@@ -230,7 +230,7 @@ export function buildSelectors<
         queryArgs === skipToken ? selectSkippedQuery : selectQuerySubstate
 
       return createSelector(finalSelectQuerySubState, withRequestFlags)
-    }) as QueryResultSelectorFactory<any, RootState>
+    }) as InfiniteQueryResultSelectorFactory<any, RootState>
   }
 
   function buildMutationSelector() {

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

@@ -39,6 +39,7 @@ import type {
   BuildInitiateApiEndpointQuery,
   MutationActionCreatorResult,
   QueryActionCreatorResult,
+  InfiniteQueryActionCreatorResult,
 } from './buildInitiate'
 import { buildInitiate } from './buildInitiate'
 import type {
@@ -170,6 +171,9 @@ export interface ApiModules<
         | QueryActionCreatorResult<
             Definitions[EndpointName] & { type: 'query' }
           >
+        | InfiniteQueryActionCreatorResult<
+            Definitions[EndpointName] & { type: 'infinitequery' }
+          >
         | undefined
       >
 
@@ -202,7 +206,9 @@ export interface ApiModules<
        * See https://redux-toolkit.js.org/rtk-query/usage/server-side-rendering for details.
        */
       getRunningQueriesThunk(): ThunkWithReturnValue<
-        Array<QueryActionCreatorResult<any>>
+        Array<
+          QueryActionCreatorResult<any> | InfiniteQueryActionCreatorResult<any>
+        >
       >
 
       /**
@@ -581,6 +587,7 @@ export const coreModule = ({
       context,
       queryThunk,
       mutationThunk,
+      infiniteQueryThunk,
       api,
       assertTagType,
     })