Fix infinite query type portability issues

markerikson · markerikson · commit c7c02acfc0dc · 2025-03-07T15:05:06.000-05:00
diff --git a/packages/toolkit/src/query/core/apiState.ts b/packages/toolkit/src/query/core/apiState.ts
@@ -60,7 +60,7 @@ export type InfiniteQueryConfigOptions<DataType, PageParam> = {
   maxPages?: number
 }
 
-export interface InfiniteData<DataType, PageParam> {
+export type InfiniteData<DataType, PageParam> = {
   pages: Array<DataType>
   pageParams: Array<PageParam>
 }
diff --git a/packages/toolkit/src/query/endpointDefinitions.ts b/packages/toolkit/src/query/endpointDefinitions.ts
@@ -544,14 +544,14 @@ export type QueryDefinition<
 > = BaseEndpointDefinition<QueryArg, BaseQuery, ResultType> &
   QueryExtraOptions<TagTypes, ResultType, QueryArg, BaseQuery, ReducerPath>
 
-export interface InfiniteQueryTypes<
+export type InfiniteQueryTypes<
   QueryArg,
   PageParam,
   BaseQuery extends BaseQueryFn,
   TagTypes extends string,
   ResultType,
   ReducerPath extends string = string,
-> extends BaseEndpointTypes<QueryArg, BaseQuery, ResultType> {
+> = BaseEndpointTypes<QueryArg, BaseQuery, ResultType> & {
   /**
    * The endpoint definition type. To be used with some internal generic types.
    * @example
diff --git a/packages/toolkit/src/query/react/buildHooks.ts b/packages/toolkit/src/query/react/buildHooks.ts
@@ -809,9 +809,9 @@ export type TypedLazyInfiniteQueryTrigger<
   >
 >
 
-interface UseInfiniteQuerySubscriptionOptions<
+export type UseInfiniteQuerySubscriptionOptions<
   D extends InfiniteQueryDefinition<any, any, any, any, any>,
-> extends SubscriptionOptions {
+> = SubscriptionOptions & {
   /**
    * Prevents a query from automatically running.
    *

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ export type InfiniteQueryConfigOptions<DataType, PageParam> = {`
`60`	`60`	`maxPages?: number`
`61`	`61`	`}`
`62`	`62`
`63`		`-export interface InfiniteData<DataType, PageParam> {`
	`63`	`+export type InfiniteData<DataType, PageParam> = {`
`64`	`64`	`pages: Array<DataType>`
`65`	`65`	`pageParams: Array<PageParam>`
`66`	`66`	`}`
Original file line number	Diff line number	Diff line change
`@@ -809,9 +809,9 @@ export type TypedLazyInfiniteQueryTrigger<`
`809`	`809`	`>`
`810`	`810`	`>`
`811`	`811`
`812`		`-interface UseInfiniteQuerySubscriptionOptions<`
	`812`	`+export type UseInfiniteQuerySubscriptionOptions<`
`813`	`813`	`D extends InfiniteQueryDefinition<any, any, any, any, any>,`
`814`		`-> extends SubscriptionOptions {`
	`814`	`+> = SubscriptionOptions & {`
`815`	`815`	`/**`
`816`	`816`	`* Prevents a query from automatically running.`
`817`	`817`	`*`