Skip to content

Commit efa963d

Browse files
braden-wautofix-ci[bot]TkDodo
authored
refactor(types): remove unnecessary TQueryData generic in InfiniteQueryObserverOptions (#9224)
* refactor(core): remove unnecessary TQueryData in InfiniteQueryObserverOptions * refactor(react-query,solid-query,svelte-query,vue-query,angular-query): remove unnecessary TQueryData in InfiniteQueryObserverOptions * ci: apply automated fixes --------- Co-authored-by: autofix-ci[bot] <114827586+autofix-ci[bot]@users.noreply.github.com> Co-authored-by: Dominik Dorfmeister <[email protected]>
1 parent a2a23a8 commit efa963d

21 files changed

+10
-84
lines changed

‎packages/angular-query-experimental/src/infinite-query-options.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export type UndefinedInitialDataInfiniteOptions<
2020
TQueryFnData,
2121
TError,
2222
TData,
23-
TQueryFnData,
2423
TQueryKey,
2524
TPageParam
2625
> & {
@@ -43,7 +42,6 @@ export type UnusedSkipTokenInfiniteOptions<
4342
TQueryFnData,
4443
TError,
4544
TData,
46-
TQueryFnData,
4745
TQueryKey,
4846
TPageParam
4947
>,
@@ -54,7 +52,6 @@ export type UnusedSkipTokenInfiniteOptions<
5452
TQueryFnData,
5553
TError,
5654
TData,
57-
TQueryFnData,
5855
TQueryKey,
5956
TPageParam
6057
>['queryFn'],
@@ -72,7 +69,6 @@ export type DefinedInitialDataInfiniteOptions<
7269
TQueryFnData,
7370
TError,
7471
TData,
75-
TQueryFnData,
7672
TQueryKey,
7773
TPageParam
7874
> & {

‎packages/angular-query-experimental/src/inject-infinite-query.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,6 @@ export function injectInfiniteQuery<
100100
TQueryFnData,
101101
TError,
102102
TData,
103-
TQueryFnData,
104103
TQueryKey,
105104
TPageParam
106105
>,

‎packages/angular-query-experimental/src/types.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,15 +96,13 @@ export interface CreateInfiniteQueryOptions<
9696
TQueryFnData = unknown,
9797
TError = DefaultError,
9898
TData = TQueryFnData,
99-
TQueryData = TQueryFnData,
10099
TQueryKey extends QueryKey = QueryKey,
101100
TPageParam = unknown,
102101
> extends OmitKeyof<
103102
InfiniteQueryObserverOptions<
104103
TQueryFnData,
105104
TError,
106105
TData,
107-
TQueryData,
108106
TQueryKey,
109107
TPageParam
110108
>,

‎packages/query-core/src/__tests__/infiniteQueryBehavior.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,6 @@ describe('InfiniteQueryBehavior', () => {
366366
TestResponse,
367367
Error,
368368
InfiniteData<TestResponse>,
369-
TestResponse,
370369
typeof key,
371370
number
372371
>(queryClient, {

‎packages/query-core/src/__tests__/infiniteQueryObserver.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ describe('InfiniteQueryObserver', () => {
220220
number,
221221
Error,
222222
InfiniteData<number>,
223-
number,
224223
typeof key,
225224
number
226225
> = {

‎packages/query-core/src/infiniteQueryObserver.ts

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,13 @@ export class InfiniteQueryObserver<
2727
TQueryFnData = unknown,
2828
TError = DefaultError,
2929
TData = InfiniteData<TQueryFnData>,
30-
TQueryData = TQueryFnData,
3130
TQueryKey extends QueryKey = QueryKey,
3231
TPageParam = unknown,
3332
> extends QueryObserver<
3433
TQueryFnData,
3534
TError,
3635
TData,
37-
InfiniteData<TQueryData, TPageParam>,
36+
InfiniteData<TQueryFnData, TPageParam>,
3837
TQueryKey
3938
> {
4039
// Type override
@@ -48,7 +47,7 @@ export class InfiniteQueryObserver<
4847
TQueryFnData,
4948
TError,
5049
TData,
51-
InfiniteData<TQueryData, TPageParam>,
50+
InfiniteData<TQueryFnData, TPageParam>,
5251
TQueryKey
5352
>['getCurrentResult'],
5453
InfiniteQueryObserverResult<TData, TError>
@@ -60,7 +59,7 @@ export class InfiniteQueryObserver<
6059
TQueryFnData,
6160
TError,
6261
TData,
63-
InfiniteData<TQueryData, TPageParam>,
62+
InfiniteData<TQueryFnData, TPageParam>,
6463
TQueryKey
6564
>['fetch'],
6665
Promise<InfiniteQueryObserverResult<TData, TError>>
@@ -72,7 +71,6 @@ export class InfiniteQueryObserver<
7271
TQueryFnData,
7372
TError,
7473
TData,
75-
TQueryData,
7674
TQueryKey,
7775
TPageParam
7876
>,
@@ -91,7 +89,6 @@ export class InfiniteQueryObserver<
9189
TQueryFnData,
9290
TError,
9391
TData,
94-
TQueryData,
9592
TQueryKey,
9693
TPageParam
9794
>,
@@ -107,7 +104,6 @@ export class InfiniteQueryObserver<
107104
TQueryFnData,
108105
TError,
109106
TData,
110-
TQueryData,
111107
TQueryKey,
112108
TPageParam
113109
>,
@@ -145,14 +141,13 @@ export class InfiniteQueryObserver<
145141
query: Query<
146142
TQueryFnData,
147143
TError,
148-
InfiniteData<TQueryData, TPageParam>,
144+
InfiniteData<TQueryFnData, TPageParam>,
149145
TQueryKey
150146
>,
151147
options: InfiniteQueryObserverOptions<
152148
TQueryFnData,
153149
TError,
154150
TData,
155-
TQueryData,
156151
TQueryKey,
157152
TPageParam
158153
>,

‎packages/query-core/src/types.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -459,14 +459,13 @@ export interface InfiniteQueryObserverOptions<
459459
TQueryFnData = unknown,
460460
TError = DefaultError,
461461
TData = TQueryFnData,
462-
TQueryData = TQueryFnData,
463462
TQueryKey extends QueryKey = QueryKey,
464463
TPageParam = unknown,
465464
> extends QueryObserverOptions<
466465
TQueryFnData,
467466
TError,
468467
TData,
469-
InfiniteData<TQueryData, TPageParam>,
468+
InfiniteData<TQueryFnData, TPageParam>,
470469
TQueryKey,
471470
TPageParam
472471
>,
@@ -476,15 +475,13 @@ export type DefaultedInfiniteQueryObserverOptions<
476475
TQueryFnData = unknown,
477476
TError = DefaultError,
478477
TData = TQueryFnData,
479-
TQueryData = TQueryFnData,
480478
TQueryKey extends QueryKey = QueryKey,
481479
TPageParam = unknown,
482480
> = WithRequired<
483481
InfiniteQueryObserverOptions<
484482
TQueryFnData,
485483
TError,
486484
TData,
487-
TQueryData,
488485
TQueryKey,
489486
TPageParam
490487
>,

‎packages/react-query/src/__tests__/usePrefetchInfiniteQuery.test.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ describe('usePrefetchInfiniteQuery', () => {
5050
T,
5151
Error,
5252
InfiniteData<T>,
53-
any,
5453
Array<string>,
5554
any
5655
>

‎packages/react-query/src/infiniteQueryOptions.ts

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ export type UndefinedInitialDataInfiniteOptions<
2020
TQueryFnData,
2121
TError,
2222
TData,
23-
TQueryFnData,
2423
TQueryKey,
2524
TPageParam
2625
> & {
@@ -39,22 +38,14 @@ export type UnusedSkipTokenInfiniteOptions<
3938
TQueryKey extends QueryKey = QueryKey,
4039
TPageParam = unknown,
4140
> = OmitKeyof<
42-
UseInfiniteQueryOptions<
43-
TQueryFnData,
44-
TError,
45-
TData,
46-
TQueryFnData,
47-
TQueryKey,
48-
TPageParam
49-
>,
41+
UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>,
5042
'queryFn'
5143
> & {
5244
queryFn?: Exclude<
5345
UseInfiniteQueryOptions<
5446
TQueryFnData,
5547
TError,
5648
TData,
57-
TQueryFnData,
5849
TQueryKey,
5950
TPageParam
6051
>['queryFn'],
@@ -72,7 +63,6 @@ export type DefinedInitialDataInfiniteOptions<
7263
TQueryFnData,
7364
TError,
7465
TData,
75-
TQueryFnData,
7666
TQueryKey,
7767
TPageParam
7868
> & {

‎packages/react-query/src/types.ts

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -82,22 +82,19 @@ export type AnyUseInfiniteQueryOptions = UseInfiniteQueryOptions<
8282
any,
8383
any,
8484
any,
85-
any,
8685
any
8786
>
8887
export interface UseInfiniteQueryOptions<
8988
TQueryFnData = unknown,
9089
TError = DefaultError,
9190
TData = TQueryFnData,
92-
TQueryData = TQueryFnData,
9391
TQueryKey extends QueryKey = QueryKey,
9492
TPageParam = unknown,
9593
> extends OmitKeyof<
9694
InfiniteQueryObserverOptions<
9795
TQueryFnData,
9896
TError,
9997
TData,
100-
TQueryData,
10198
TQueryKey,
10299
TPageParam
103100
>,
@@ -111,31 +108,22 @@ export interface UseInfiniteQueryOptions<
111108
}
112109

113110
export type AnyUseSuspenseInfiniteQueryOptions =
114-
UseSuspenseInfiniteQueryOptions<any, any, any, any, any, any>
111+
UseSuspenseInfiniteQueryOptions<any, any, any, any, any>
115112
export interface UseSuspenseInfiniteQueryOptions<
116113
TQueryFnData = unknown,
117114
TError = DefaultError,
118115
TData = TQueryFnData,
119-
TQueryData = TQueryFnData,
120116
TQueryKey extends QueryKey = QueryKey,
121117
TPageParam = unknown,
122118
> extends OmitKeyof<
123-
UseInfiniteQueryOptions<
124-
TQueryFnData,
125-
TError,
126-
TData,
127-
TQueryData,
128-
TQueryKey,
129-
TPageParam
130-
>,
119+
UseInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>,
131120
'queryFn' | 'enabled' | 'throwOnError' | 'placeholderData'
132121
> {
133122
queryFn?: Exclude<
134123
UseInfiniteQueryOptions<
135124
TQueryFnData,
136125
TError,
137126
TData,
138-
TQueryData,
139127
TQueryKey,
140128
TPageParam
141129
>['queryFn'],

‎packages/react-query/src/useInfiniteQuery.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ export function useInfiniteQuery<
6363
TQueryFnData,
6464
TError,
6565
TData,
66-
TQueryFnData,
6766
TQueryKey,
6867
TPageParam
6968
>,

‎packages/react-query/src/useSuspenseInfiniteQuery.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ export function useSuspenseInfiniteQuery<
2626
TQueryFnData,
2727
TError,
2828
TData,
29-
TQueryFnData,
3029
TQueryKey,
3130
TPageParam
3231
>,

‎packages/solid-query/src/QueryClient.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,15 +43,13 @@ export interface InfiniteQueryObserverOptions<
4343
TQueryFnData = unknown,
4444
TError = DefaultError,
4545
TData = TQueryFnData,
46-
TQueryData = TQueryFnData,
4746
TQueryKey extends QueryKey = QueryKey,
4847
TPageParam = unknown,
4948
> extends OmitKeyof<
5049
QueryCoreInfiniteQueryObserverOptions<
5150
TQueryFnData,
5251
TError,
5352
TData,
54-
TQueryData,
5553
TQueryKey,
5654
TPageParam
5755
>,

‎packages/solid-query/src/infiniteQueryOptions.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ export type UndefinedInitialDataInfiniteOptions<
1919
TQueryFnData,
2020
TError,
2121
TData,
22-
TQueryFnData,
2322
TQueryKey,
2423
TPageParam
2524
> & {
@@ -39,7 +38,6 @@ export type DefinedInitialDataInfiniteOptions<
3938
TQueryFnData,
4039
TError,
4140
TData,
42-
TQueryFnData,
4341
TQueryKey,
4442
TPageParam
4543
> & {

‎packages/solid-query/src/types.ts

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -91,15 +91,13 @@ export interface SolidInfiniteQueryOptions<
9191
TQueryFnData = unknown,
9292
TError = DefaultError,
9393
TData = TQueryFnData,
94-
TQueryData = TQueryFnData,
9594
TQueryKey extends QueryKey = QueryKey,
9695
TPageParam = unknown,
9796
> extends OmitKeyof<
9897
InfiniteQueryObserverOptions<
9998
TQueryFnData,
10099
TError,
101100
TData,
102-
TQueryData,
103101
TQueryKey,
104102
TPageParam
105103
>,
@@ -128,14 +126,7 @@ export type UseInfiniteQueryOptions<
128126
TQueryKey extends QueryKey = QueryKey,
129127
TPageParam = unknown,
130128
> = Accessor<
131-
SolidInfiniteQueryOptions<
132-
TQueryFnData,
133-
TError,
134-
TData,
135-
TQueryFnData,
136-
TQueryKey,
137-
TPageParam
138-
>
129+
SolidInfiniteQueryOptions<TQueryFnData, TError, TData, TQueryKey, TPageParam>
139130
>
140131

141132
export type UseInfiniteQueryResult<

‎packages/svelte-query/src/createInfiniteQuery.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ export function createInfiniteQuery<
2525
TQueryFnData,
2626
TError,
2727
TData,
28-
TQueryFnData,
2928
TQueryKey,
3029
TPageParam
3130
>

‎packages/svelte-query/src/infiniteQueryOptions.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,13 @@ export function infiniteQueryOptions<
1212
TQueryFnData,
1313
TError,
1414
TData,
15-
TQueryFnData,
1615
TQueryKey,
1716
TPageParam
1817
>,
1918
): CreateInfiniteQueryOptions<
2019
TQueryFnData,
2120
TError,
2221
TData,
23-
TQueryFnData,
2422
TQueryKey,
2523
TPageParam
2624
> {

0 commit comments

Comments
 (0)