From 93fcdbdaf48a45af472bc22299c28d02d4930b1b Mon Sep 17 00:00:00 2001 From: Braden Wong <13159333+braden-w@users.noreply.github.com> Date: Fri, 30 May 2025 09:52:50 -0700 Subject: [PATCH 1/3] refactor(core): remove unnecessary TQueryData in InfiniteQueryObserverOptions --- .../src/__tests__/infiniteQueryBehavior.test.tsx | 1 - .../src/__tests__/infiniteQueryObserver.test.tsx | 1 - packages/query-core/src/infiniteQueryObserver.ts | 13 ++++--------- packages/query-core/src/types.ts | 5 +---- 4 files changed, 5 insertions(+), 15 deletions(-) diff --git a/packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx b/packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx index e382a307c9..523a30ca20 100644 --- a/packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx +++ b/packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx @@ -366,7 +366,6 @@ describe('InfiniteQueryBehavior', () => { TestResponse, Error, InfiniteData, - TestResponse, typeof key, number >(queryClient, { diff --git a/packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx b/packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx index b24993b8c1..36aa08c554 100644 --- a/packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx +++ b/packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx @@ -220,7 +220,6 @@ describe('InfiniteQueryObserver', () => { number, Error, InfiniteData, - number, typeof key, number > = { diff --git a/packages/query-core/src/infiniteQueryObserver.ts b/packages/query-core/src/infiniteQueryObserver.ts index 2e6acf0cdd..1499b13816 100644 --- a/packages/query-core/src/infiniteQueryObserver.ts +++ b/packages/query-core/src/infiniteQueryObserver.ts @@ -27,14 +27,13 @@ export class InfiniteQueryObserver< TQueryFnData = unknown, TError = DefaultError, TData = InfiniteData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > extends QueryObserver< TQueryFnData, TError, TData, - InfiniteData, + InfiniteData, TQueryKey > { // Type override @@ -48,7 +47,7 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - InfiniteData, + InfiniteData, TQueryKey >['getCurrentResult'], InfiniteQueryObserverResult @@ -60,7 +59,7 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - InfiniteData, + InfiniteData, TQueryKey >['fetch'], Promise> @@ -72,7 +71,6 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, @@ -91,7 +89,6 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, @@ -107,7 +104,6 @@ export class InfiniteQueryObserver< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, @@ -145,14 +141,13 @@ export class InfiniteQueryObserver< query: Query< TQueryFnData, TError, - InfiniteData, + InfiniteData, TQueryKey >, options: InfiniteQueryObserverOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index 3bf6e6c55f..e4ed081539 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -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, + InfiniteData, TQueryKey, TPageParam >, @@ -476,7 +475,6 @@ export type DefaultedInfiniteQueryObserverOptions< TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > = WithRequired< @@ -484,7 +482,6 @@ export type DefaultedInfiniteQueryObserverOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, From e502ce011a44dc2ea2b244da026f4f0180c33dab Mon Sep 17 00:00:00 2001 From: Braden Wong <13159333+braden-w@users.noreply.github.com> Date: Fri, 30 May 2025 10:01:34 -0700 Subject: [PATCH 2/3] refactor(react-query,solid-query,svelte-query,vue-query,angular-query): remove unnecessary TQueryData in InfiniteQueryObserverOptions --- .../src/infinite-query-options.ts | 4 ---- .../src/inject-infinite-query.ts | 1 - packages/angular-query-experimental/src/types.ts | 2 -- .../src/__tests__/usePrefetchInfiniteQuery.test.tsx | 1 - packages/react-query/src/infiniteQueryOptions.ts | 4 ---- packages/react-query/src/types.ts | 8 +------- packages/react-query/src/useInfiniteQuery.ts | 1 - packages/react-query/src/useSuspenseInfiniteQuery.ts | 1 - packages/solid-query/src/QueryClient.ts | 2 -- packages/solid-query/src/infiniteQueryOptions.ts | 2 -- packages/solid-query/src/types.ts | 3 --- packages/svelte-query/src/createInfiniteQuery.ts | 1 - packages/svelte-query/src/infiniteQueryOptions.ts | 2 -- packages/svelte-query/src/types.ts | 2 -- packages/vue-query/src/infiniteQueryOptions.ts | 2 -- packages/vue-query/src/useBaseQuery.ts | 1 - packages/vue-query/src/useInfiniteQuery.ts | 5 ----- 17 files changed, 1 insertion(+), 41 deletions(-) diff --git a/packages/angular-query-experimental/src/infinite-query-options.ts b/packages/angular-query-experimental/src/infinite-query-options.ts index 1245416539..fdc7396c99 100644 --- a/packages/angular-query-experimental/src/infinite-query-options.ts +++ b/packages/angular-query-experimental/src/infinite-query-options.ts @@ -20,7 +20,6 @@ export type UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { @@ -43,7 +42,6 @@ export type UnusedSkipTokenInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >, @@ -54,7 +52,6 @@ export type UnusedSkipTokenInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >['queryFn'], @@ -72,7 +69,6 @@ export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { diff --git a/packages/angular-query-experimental/src/inject-infinite-query.ts b/packages/angular-query-experimental/src/inject-infinite-query.ts index 6993a5bfcc..6df26a0bb5 100644 --- a/packages/angular-query-experimental/src/inject-infinite-query.ts +++ b/packages/angular-query-experimental/src/inject-infinite-query.ts @@ -100,7 +100,6 @@ export function injectInfiniteQuery< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >, diff --git a/packages/angular-query-experimental/src/types.ts b/packages/angular-query-experimental/src/types.ts index 8cdb820965..578eaa0864 100644 --- a/packages/angular-query-experimental/src/types.ts +++ b/packages/angular-query-experimental/src/types.ts @@ -96,7 +96,6 @@ export interface CreateInfiniteQueryOptions< TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > extends OmitKeyof< @@ -104,7 +103,6 @@ export interface CreateInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, diff --git a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx index 0ebd96c68e..fabb410842 100644 --- a/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx +++ b/packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx @@ -50,7 +50,6 @@ describe('usePrefetchInfiniteQuery', () => { T, Error, InfiniteData, - any, Array, any > diff --git a/packages/react-query/src/infiniteQueryOptions.ts b/packages/react-query/src/infiniteQueryOptions.ts index 18d3d655b0..ffabc60957 100644 --- a/packages/react-query/src/infiniteQueryOptions.ts +++ b/packages/react-query/src/infiniteQueryOptions.ts @@ -20,7 +20,6 @@ export type UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { @@ -43,7 +42,6 @@ export type UnusedSkipTokenInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >, @@ -54,7 +52,6 @@ export type UnusedSkipTokenInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >['queryFn'], @@ -72,7 +69,6 @@ export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts index 18f632d406..20bf0f7056 100644 --- a/packages/react-query/src/types.ts +++ b/packages/react-query/src/types.ts @@ -82,14 +82,12 @@ 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< @@ -97,7 +95,6 @@ export interface UseInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, @@ -111,12 +108,11 @@ export interface UseInfiniteQueryOptions< } export type AnyUseSuspenseInfiniteQueryOptions = - UseSuspenseInfiniteQueryOptions + UseSuspenseInfiniteQueryOptions export interface UseSuspenseInfiniteQueryOptions< TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > extends OmitKeyof< @@ -124,7 +120,6 @@ export interface UseSuspenseInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, @@ -135,7 +130,6 @@ export interface UseSuspenseInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >['queryFn'], diff --git a/packages/react-query/src/useInfiniteQuery.ts b/packages/react-query/src/useInfiniteQuery.ts index fd2ce11a7f..32ebfb7673 100644 --- a/packages/react-query/src/useInfiniteQuery.ts +++ b/packages/react-query/src/useInfiniteQuery.ts @@ -63,7 +63,6 @@ export function useInfiniteQuery< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >, diff --git a/packages/react-query/src/useSuspenseInfiniteQuery.ts b/packages/react-query/src/useSuspenseInfiniteQuery.ts index 916e89265a..3c2fdfdd72 100644 --- a/packages/react-query/src/useSuspenseInfiniteQuery.ts +++ b/packages/react-query/src/useSuspenseInfiniteQuery.ts @@ -26,7 +26,6 @@ export function useSuspenseInfiniteQuery< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >, diff --git a/packages/solid-query/src/QueryClient.ts b/packages/solid-query/src/QueryClient.ts index ddbe9927da..f453b99bca 100644 --- a/packages/solid-query/src/QueryClient.ts +++ b/packages/solid-query/src/QueryClient.ts @@ -43,7 +43,6 @@ export interface InfiniteQueryObserverOptions< TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > extends OmitKeyof< @@ -51,7 +50,6 @@ export interface InfiniteQueryObserverOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, diff --git a/packages/solid-query/src/infiniteQueryOptions.ts b/packages/solid-query/src/infiniteQueryOptions.ts index 2cb1fea1f5..de4991d0b7 100644 --- a/packages/solid-query/src/infiniteQueryOptions.ts +++ b/packages/solid-query/src/infiniteQueryOptions.ts @@ -19,7 +19,6 @@ export type UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { @@ -39,7 +38,6 @@ export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { diff --git a/packages/solid-query/src/types.ts b/packages/solid-query/src/types.ts index 758653a099..aceac52523 100644 --- a/packages/solid-query/src/types.ts +++ b/packages/solid-query/src/types.ts @@ -91,7 +91,6 @@ export interface SolidInfiniteQueryOptions< TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > extends OmitKeyof< @@ -99,7 +98,6 @@ export interface SolidInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >, @@ -132,7 +130,6 @@ export type UseInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > diff --git a/packages/svelte-query/src/createInfiniteQuery.ts b/packages/svelte-query/src/createInfiniteQuery.ts index 7137800298..5ebb82213a 100644 --- a/packages/svelte-query/src/createInfiniteQuery.ts +++ b/packages/svelte-query/src/createInfiniteQuery.ts @@ -25,7 +25,6 @@ export function createInfiniteQuery< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > diff --git a/packages/svelte-query/src/infiniteQueryOptions.ts b/packages/svelte-query/src/infiniteQueryOptions.ts index 6d71bd2f44..9702520ac2 100644 --- a/packages/svelte-query/src/infiniteQueryOptions.ts +++ b/packages/svelte-query/src/infiniteQueryOptions.ts @@ -12,7 +12,6 @@ export function infiniteQueryOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >, @@ -20,7 +19,6 @@ export function infiniteQueryOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > { diff --git a/packages/svelte-query/src/types.ts b/packages/svelte-query/src/types.ts index fb835c5e7b..ef7ba2e384 100644 --- a/packages/svelte-query/src/types.ts +++ b/packages/svelte-query/src/types.ts @@ -54,14 +54,12 @@ export type CreateInfiniteQueryOptions< TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > = InfiniteQueryObserverOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam > diff --git a/packages/vue-query/src/infiniteQueryOptions.ts b/packages/vue-query/src/infiniteQueryOptions.ts index 220fd37563..adab774aa1 100644 --- a/packages/vue-query/src/infiniteQueryOptions.ts +++ b/packages/vue-query/src/infiniteQueryOptions.ts @@ -17,7 +17,6 @@ export type UndefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { @@ -34,7 +33,6 @@ export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam > & { diff --git a/packages/vue-query/src/useBaseQuery.ts b/packages/vue-query/src/useBaseQuery.ts index ab3dd5b012..939c1e47ac 100644 --- a/packages/vue-query/src/useBaseQuery.ts +++ b/packages/vue-query/src/useBaseQuery.ts @@ -51,7 +51,6 @@ type UseQueryOptionsGeneric< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam > diff --git a/packages/vue-query/src/useInfiniteQuery.ts b/packages/vue-query/src/useInfiniteQuery.ts index 2ec30b25c8..f16eb80dff 100644 --- a/packages/vue-query/src/useInfiniteQuery.ts +++ b/packages/vue-query/src/useInfiniteQuery.ts @@ -27,7 +27,6 @@ export type UseInfiniteQueryOptions< TQueryFnData = unknown, TError = DefaultError, TData = TQueryFnData, - TQueryData = TQueryFnData, TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > = MaybeRef< @@ -36,7 +35,6 @@ export type UseInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, TQueryKey, TPageParam >]: Property extends 'enabled' @@ -45,7 +43,6 @@ export type UseInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, DeepUnwrapRef >[Property] > @@ -54,7 +51,6 @@ export type UseInfiniteQueryOptions< TQueryFnData, TError, TData, - TQueryData, DeepUnwrapRef, TPageParam >[Property] @@ -115,7 +111,6 @@ export function useInfiniteQuery< TQueryFnData, TError, TData, - TQueryFnData, TQueryKey, TPageParam >, From b0571137c89b17db1abd5771e6a0967f7846610b Mon Sep 17 00:00:00 2001 From: "autofix-ci[bot]" <114827586+autofix-ci[bot]@users.noreply.github.com> Date: Fri, 30 May 2025 17:10:50 +0000 Subject: [PATCH 3/3] ci: apply automated fixes --- packages/react-query/src/infiniteQueryOptions.ts | 8 +------- packages/react-query/src/types.ts | 8 +------- packages/solid-query/src/types.ts | 8 +------- packages/vue-query/src/useBaseQuery.ts | 8 +------- 4 files changed, 4 insertions(+), 28 deletions(-) diff --git a/packages/react-query/src/infiniteQueryOptions.ts b/packages/react-query/src/infiniteQueryOptions.ts index ffabc60957..5e8c371a59 100644 --- a/packages/react-query/src/infiniteQueryOptions.ts +++ b/packages/react-query/src/infiniteQueryOptions.ts @@ -38,13 +38,7 @@ export type UnusedSkipTokenInfiniteOptions< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > = OmitKeyof< - UseInfiniteQueryOptions< - TQueryFnData, - TError, - TData, - TQueryKey, - TPageParam - >, + UseInfiniteQueryOptions, 'queryFn' > & { queryFn?: Exclude< diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts index 20bf0f7056..3b295e8947 100644 --- a/packages/react-query/src/types.ts +++ b/packages/react-query/src/types.ts @@ -116,13 +116,7 @@ export interface UseSuspenseInfiniteQueryOptions< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > extends OmitKeyof< - UseInfiniteQueryOptions< - TQueryFnData, - TError, - TData, - TQueryKey, - TPageParam - >, + UseInfiniteQueryOptions, 'queryFn' | 'enabled' | 'throwOnError' | 'placeholderData' > { queryFn?: Exclude< diff --git a/packages/solid-query/src/types.ts b/packages/solid-query/src/types.ts index aceac52523..2d6876a677 100644 --- a/packages/solid-query/src/types.ts +++ b/packages/solid-query/src/types.ts @@ -126,13 +126,7 @@ export type UseInfiniteQueryOptions< TQueryKey extends QueryKey = QueryKey, TPageParam = unknown, > = Accessor< - SolidInfiniteQueryOptions< - TQueryFnData, - TError, - TData, - TQueryKey, - TPageParam - > + SolidInfiniteQueryOptions > export type UseInfiniteQueryResult< diff --git a/packages/vue-query/src/useBaseQuery.ts b/packages/vue-query/src/useBaseQuery.ts index 939c1e47ac..65a988ee03 100644 --- a/packages/vue-query/src/useBaseQuery.ts +++ b/packages/vue-query/src/useBaseQuery.ts @@ -47,13 +47,7 @@ type UseQueryOptionsGeneric< TPageParam = unknown, > = | UseQueryOptions - | UseInfiniteQueryOptions< - TQueryFnData, - TError, - TData, - TQueryKey, - TPageParam - > + | UseInfiniteQueryOptions export function useBaseQuery< TQueryFnData,