Skip to content

refactor: remove unnecessary TQueryData generic in InfiniteQueryObserverOptions #9224

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 2, 2025
Merged

refactor: remove unnecessary TQueryData generic in InfiniteQueryObserverOptions #9224

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
93fcdbd
refactor(core): remove unnecessary TQueryData in InfiniteQueryObserve…
braden-w May 30, 2025
e502ce0
refactor(react-query,solid-query,svelte-query,vue-query,angular-query…
braden-w May 30, 2025
b057113
ci: apply automated fixes
autofix-ci[bot] May 30, 2025
e368b11
Merge branch 'main' into refactor/remove-unnecessary-TQueryData-in-In…
TkDodo Jun 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions packages/angular-query-experimental/src/infinite-query-options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export type UndefinedInitialDataInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
> & {
Expand All @@ -43,7 +42,6 @@ export type UnusedSkipTokenInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>,
Expand All @@ -54,7 +52,6 @@ export type UnusedSkipTokenInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>['queryFn'],
Expand All @@ -72,7 +69,6 @@ export type DefinedInitialDataInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
> & {
Expand Down
1 change: 0 additions & 1 deletion packages/angular-query-experimental/src/inject-infinite-query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,6 @@ export function injectInfiniteQuery<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>,
Expand Down
2 changes: 0 additions & 2 deletions packages/angular-query-experimental/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,15 +96,13 @@ export interface CreateInfiniteQueryOptions<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> extends OmitKeyof<
InfiniteQueryObserverOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand Down
1 change: 0 additions & 1 deletion packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,6 @@ describe('InfiniteQueryBehavior', () => {
TestResponse,
Error,
InfiniteData<TestResponse>,
TestResponse,
typeof key,
number
>(queryClient, {
Expand Down
1 change: 0 additions & 1 deletion packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,7 +220,6 @@ describe('InfiniteQueryObserver', () => {
number,
Error,
InfiniteData<number>,
number,
typeof key,
number
> = {
Expand Down
13 changes: 4 additions & 9 deletions packages/query-core/src/infiniteQueryObserver.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,13 @@ export class InfiniteQueryObserver<
TQueryFnData = unknown,
TError = DefaultError,
TData = InfiniteData<TQueryFnData>,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> extends QueryObserver<
TQueryFnData,
TError,
TData,
InfiniteData<TQueryData, TPageParam>,
InfiniteData<TQueryFnData, TPageParam>,
TQueryKey
> {
// Type override
Expand All @@ -48,7 +47,7 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
InfiniteData<TQueryData, TPageParam>,
InfiniteData<TQueryFnData, TPageParam>,
TQueryKey
>['getCurrentResult'],
InfiniteQueryObserverResult<TData, TError>
Expand All @@ -60,7 +59,7 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
InfiniteData<TQueryData, TPageParam>,
InfiniteData<TQueryFnData, TPageParam>,
TQueryKey
>['fetch'],
Promise<InfiniteQueryObserverResult<TData, TError>>
Expand All @@ -72,7 +71,6 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand All @@ -91,7 +89,6 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand All @@ -107,7 +104,6 @@ export class InfiniteQueryObserver<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand Down Expand Up @@ -145,14 +141,13 @@ export class InfiniteQueryObserver<
query: Query<
TQueryFnData,
TError,
InfiniteData<TQueryData, TPageParam>,
InfiniteData<TQueryFnData, TPageParam>,
TQueryKey
>,
options: InfiniteQueryObserverOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand Down
5 changes: 1 addition & 4 deletions packages/query-core/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -459,14 +459,13 @@ export interface InfiniteQueryObserverOptions<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> extends QueryObserverOptions<
TQueryFnData,
TError,
TData,
InfiniteData<TQueryData, TPageParam>,
InfiniteData<TQueryFnData, TPageParam>,
TQueryKey,
TPageParam
>,
Expand All @@ -476,15 +475,13 @@ export type DefaultedInfiniteQueryObserverOptions<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> = WithRequired<
InfiniteQueryObserverOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand Down
1 change: 0 additions & 1 deletion packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ describe('usePrefetchInfiniteQuery', () => {
T,
Error,
InfiniteData<T>,
any,
Array<string>,
any
>
Expand Down
12 changes: 1 addition & 11 deletions packages/react-query/src/infiniteQueryOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ export type UndefinedInitialDataInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
> & {
Expand All @@ -39,22 +38,14 @@ export type UnusedSkipTokenInfiniteOptions<
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> = OmitKeyof<
UseInfiniteQueryOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>,
UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>,
'queryFn'
> & {
queryFn?: Exclude<
UseInfiniteQueryOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>['queryFn'],
Expand All @@ -72,7 +63,6 @@ export type DefinedInitialDataInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
> & {
Expand Down
16 changes: 2 additions & 14 deletions packages/react-query/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,22 +82,19 @@ export type AnyUseInfiniteQueryOptions = UseInfiniteQueryOptions<
any,
any,
any,
any,
any
>
export interface UseInfiniteQueryOptions<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> extends OmitKeyof<
InfiniteQueryObserverOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand All @@ -111,31 +108,22 @@ export interface UseInfiniteQueryOptions<
}

export type AnyUseSuspenseInfiniteQueryOptions =
UseSuspenseInfiniteQueryOptions<any, any, any, any, any, any>
UseSuspenseInfiniteQueryOptions<any, any, any, any, any>
export interface UseSuspenseInfiniteQueryOptions<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> extends OmitKeyof<
UseInfiniteQueryOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>,
'queryFn' | 'enabled' | 'throwOnError' | 'placeholderData'
> {
queryFn?: Exclude<
UseInfiniteQueryOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>['queryFn'],
Expand Down
1 change: 0 additions & 1 deletion packages/react-query/src/useInfiniteQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ export function useInfiniteQuery<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>,
Expand Down
1 change: 0 additions & 1 deletion packages/react-query/src/useSuspenseInfiniteQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ export function useSuspenseInfiniteQuery<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>,
Expand Down
2 changes: 0 additions & 2 deletions packages/solid-query/src/QueryClient.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,13 @@ export interface InfiniteQueryObserverOptions<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> extends OmitKeyof<
QueryCoreInfiniteQueryObserverOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand Down
2 changes: 0 additions & 2 deletions packages/solid-query/src/infiniteQueryOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ export type UndefinedInitialDataInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
> & {
Expand All @@ -39,7 +38,6 @@ export type DefinedInitialDataInfiniteOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
> & {
Expand Down
11 changes: 1 addition & 10 deletions packages/solid-query/src/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,15 +91,13 @@ export interface SolidInfiniteQueryOptions<
TQueryFnData = unknown,
TError = DefaultError,
TData = TQueryFnData,
TQueryData = TQueryFnData,
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> extends OmitKeyof<
InfiniteQueryObserverOptions<
TQueryFnData,
TError,
TData,
TQueryData,
TQueryKey,
TPageParam
>,
Expand Down Expand Up @@ -128,14 +126,7 @@ export type UseInfiniteQueryOptions<
TQueryKey extends QueryKey = QueryKey,
TPageParam = unknown,
> = Accessor<
SolidInfiniteQueryOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>
SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
>

export type UseInfiniteQueryResult<
Expand Down
1 change: 0 additions & 1 deletion packages/svelte-query/src/createInfiniteQuery.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export function createInfiniteQuery<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>
Expand Down
2 changes: 0 additions & 2 deletions packages/svelte-query/src/infiniteQueryOptions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,15 +12,13 @@ export function infiniteQueryOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
>,
): CreateInfiniteQueryOptions<
TQueryFnData,
TError,
TData,
TQueryFnData,
TQueryKey,
TPageParam
> {
Expand Down
Loading
Loading