Force selector type for infinite query test

reduxjs · May 5, 2024 · 21d642f · 21d642f
1 parent 758c132
commit 21d642f
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/packages/toolkit/src/query/core/apiState.ts b/packages/toolkit/src/query/core/apiState.ts
@@ -226,10 +226,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'
 }

diff --git a/packages/toolkit/src/query/core/buildInitiate.ts b/packages/toolkit/src/query/core/buildInitiate.ts
@@ -284,6 +284,7 @@ export function buildInitiate({
       })
       return runningQueries.get(dispatch)?.[queryCacheKey] as
         | QueryActionCreatorResult<never>
+        | InfiniteQueryActionCreatorResult<never>
         | undefined
     }
   }

diff --git a/packages/toolkit/src/query/core/buildSelectors.ts b/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() {

diff --git a/packages/toolkit/src/query/core/module.ts b/packages/toolkit/src/query/core/module.ts
@@ -39,6 +39,7 @@ import { buildSelectors } from './buildSelectors'
 import type {
   MutationActionCreatorResult,
   QueryActionCreatorResult,
+  InfiniteQueryActionCreatorResult
 } from './buildInitiate'
 import { buildInitiate } from './buildInitiate'
 import { assertCast, safeAssign } from '../tsHelpers'
@@ -159,6 +160,7 @@ declare module '../apiTypes' {
           | QueryActionCreatorResult<
               Definitions[EndpointName] & { type: 'query' }
             >
+          | InfiniteQueryActionCreatorResult<Definitions[EndpointName] & {type: 'infinitequery'}>
           | undefined
         >
 
@@ -191,7 +193,7 @@ declare module '../apiTypes' {
          * See https://redux-toolkit.js.org/rtk-query/usage/server-side-rendering for details.
          */
         getRunningQueriesThunk(): ThunkWithReturnValue<
-          Array<QueryActionCreatorResult<any>>
+          Array<QueryActionCreatorResult<any> | InfiniteQueryActionCreatorResult<any>>
         >
 
         /**
@@ -561,6 +563,7 @@ export const coreModule = ({
       context,
       queryThunk,
       mutationThunk,
+      infiniteQueryThunk,
       api,
       assertTagType,
     })