Forced into the thunk working InfQuery handling for api proof of concept

Author: riqts

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

@@ -53,6 +53,7 @@ import { HandledError } from '../HandledError'
 
 import type { ApiEndpointQuery, PrefetchOptions } from './module'
 import type { UnwrapPromise } from '../tsHelpers'
+import type { InfiniteQueryDefinition } from '@internal/query/endpointDefinitions'
 
 declare module './module' {
   export interface ApiEndpointQuery<
@@ -61,6 +62,12 @@ declare module './module' {
     Definitions extends EndpointDefinitions,
   > extends Matchers<QueryThunk, Definition> {}
 
+  export interface ApiEndpointInfiniteQuery<
+    Definition extends InfiniteQueryDefinition<any, any, any, any, any>,
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
+    Definitions extends EndpointDefinitions,
+  > extends Matchers<QueryThunk, Definition> {}
+
   export interface ApiEndpointMutation<
     Definition extends MutationDefinition<any, any, any, any, any>,
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
@@ -433,8 +440,6 @@ export function buildThunks<
       } else if (endpointDefinition.query) {
 
 
-        //TODO: these will come from the hook/initiate/middleware?
-        let pages: number
         const oldPages: any[] = []
         const oldPageParams: any[] = []
 
@@ -452,7 +457,7 @@ export function buildThunks<
 
 
           const page = await baseQuery(
-            endpointDefinition.query(arg.originalArgs),
+            endpointDefinition.query(param),
             baseQueryApi,
             endpointDefinition.extraOptions as any
           )
@@ -469,7 +474,7 @@ export function buildThunks<
         }
 
         if ('infiniteQueryOptions' in endpointDefinition) {
-          if (arg.direction && arg.data.pages.length) {
+          if ('direction' in arg && arg.direction && arg.data.pages.length) {
 
             const previous = arg.direction === 'backwards'
             const pageParamFn = previous ? getPreviousPageParam : getNextPageParam
@@ -490,6 +495,7 @@ export function buildThunks<
 
             // Fetch remaining pages
             for (let i = 1; i < remainingPages; i++) {
+              // @ts-ignore
               const param = getNextPageParam(arg.infiniteQueryOptions, result.data as InfiniteData<unknown>)
               result = await fetchPage(result.data as InfiniteData<unknown>, param)
             }
@@ -720,8 +726,8 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".`
     InfiniteQueryThunkArg,
     ThunkApiMetaConfig & { state: RootState<any, string, ReducerPath> }
   >(`${reducerPath}/executeQuery`, executeEndpoint, {
-    getPendingMeta() {
-      return { startedTimeStamp: Date.now(), [SHOULD_AUTOBATCH]: true }
+    getPendingMeta(queryThunkArgs) {
+      return { startedTimeStamp: Date.now(), [SHOULD_AUTOBATCH]: true, direction: queryThunkArgs.arg.direction, data: queryThunkArgs.arg.data}
     },
     condition(queryThunkArgs, { getState }) {
       const state = getState()
@@ -733,6 +739,7 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".`
       const previousArg = requestState?.originalArgs
       const endpointDefinition =
         endpointDefinitions[queryThunkArgs.endpointName]
+      const direction = queryThunkArgs.direction
 
       // Order of these checks matters.
       // In order for `upsertQueryData` to successfully run while an existing request is in flight,
@@ -764,7 +771,7 @@ In the case of an unhandled error, no tags will be "provided" or "invalidated".`
       }
 
       // Pull from the cache unless we explicitly force refetch or qualify based on time
-      if (fulfilledVal) {
+      if (fulfilledVal && !direction) {
         // Value is cached and we didn't specify to refresh, skip it.
         return false
       }