Pass through infinite query options

Author: markerikson

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

@@ -143,13 +143,12 @@ export type CacheLifecycleQueryExtraOptions<
 }
 
 // copying QueryDefinition to get past initial build
-interface InfiniteQueryExtraOptions<
-  TagTypes extends string,
+export type CacheLifecycleInfiniteQueryExtraOptions<
   ResultType,
   QueryArg,
   BaseQuery extends BaseQueryFn,
   ReducerPath extends string = string,
-> {
+> = {
   onCacheEntryAdded?(
     arg: QueryArg,
     api: QueryCacheLifecycleApi<QueryArg, BaseQuery, ResultType, ReducerPath>,

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

@@ -117,13 +117,12 @@ export type QueryLifecycleQueryExtraOptions<
 }
 
 // temporarily cloned QueryOptions again to just get the definition to build for now
-interface InfiniteQueryExtraOptions<
-  TagTypes extends string,
+export type QueryLifecycleInfiniteQueryExtraOptions<
   ResultType,
   QueryArg,
   BaseQuery extends BaseQueryFn,
   ReducerPath extends string = string,
-> {
+> = {
   onQueryStarted?(
     arg: QueryArg,
     api: QueryLifecycleApi<QueryArg, BaseQuery, ResultType, ReducerPath>,

packages/toolkit/src/query/endpointDefinitions.ts

@@ -16,10 +16,12 @@ import type {
 } from './baseQueryTypes'
 import type { CacheCollectionQueryExtraOptions } from './core/buildMiddleware/cacheCollection'
 import type {
+  CacheLifecycleInfiniteQueryExtraOptions,
   CacheLifecycleMutationExtraOptions,
   CacheLifecycleQueryExtraOptions,
 } from './core/buildMiddleware/cacheLifecycle'
 import type {
+  QueryLifecycleInfiniteQueryExtraOptions,
   QueryLifecycleMutationExtraOptions,
   QueryLifecycleQueryExtraOptions,
 } from './core/buildMiddleware/queryLifecycle'
@@ -261,13 +263,15 @@ 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>
+    | InfiniteQueryDefinition<
+        QueryArg,
+        BaseQuery,
+        TagTypes,
+        ResultType,
+        ReducerPath
+      >
   TagTypes: TagTypes
   ReducerPath: ReducerPath
 }
@@ -569,7 +573,19 @@ export interface InfiniteQueryExtraOptions<
   QueryArg,
   BaseQuery extends BaseQueryFn,
   ReducerPath extends string = string,
-> {
+> extends CacheLifecycleInfiniteQueryExtraOptions<
+      ResultType,
+      QueryArg,
+      BaseQuery,
+      ReducerPath
+    >,
+    QueryLifecycleInfiniteQueryExtraOptions<
+      ResultType,
+      QueryArg,
+      BaseQuery,
+      ReducerPath
+    >,
+    CacheCollectionQueryExtraOptions {
   type: DefinitionType.infinitequery
 
   providesTags?: never
@@ -955,14 +971,20 @@ export type OverrideResultType<Definition, NewResultType> =
           ReducerPath
         >
       : Definition extends InfiniteQueryDefinition<
-        infer QueryArg,
-        infer BaseQuery,
-        infer TagTypes,
-        any,
-        infer ReducerPath
-      >
-      ? InfiniteQueryDefinition<QueryArg, BaseQuery, TagTypes, NewResultType, ReducerPath>
-      : never
+            infer QueryArg,
+            infer BaseQuery,
+            infer TagTypes,
+            any,
+            infer ReducerPath
+          >
+        ? InfiniteQueryDefinition<
+            QueryArg,
+            BaseQuery,
+            TagTypes,
+            NewResultType,
+            ReducerPath
+          >
+        : never
 
 export type UpdateDefinitions<
   Definitions extends EndpointDefinitions,
@@ -998,18 +1020,18 @@ export type UpdateDefinitions<
           ReducerPath
         >
       : Definitions[K] extends InfiniteQueryDefinition<
-        infer QueryArg,
-        infer BaseQuery,
-        any,
-        infer ResultType,
-        infer ReducerPath
-      >
-      ? InfiniteQueryDefinition<
-          QueryArg,
-          BaseQuery,
-          NewTagTypes,
-          TransformedResponse<NewDefinitions, K, ResultType>,
-          ReducerPath
-        >
+            infer QueryArg,
+            infer BaseQuery,
+            any,
+            infer ResultType,
+            infer ReducerPath
+          >
+        ? InfiniteQueryDefinition<
+            QueryArg,
+            BaseQuery,
+            NewTagTypes,
+            TransformedResponse<NewDefinitions, K, ResultType>,
+            ReducerPath
+          >
         : never
 }