Skip to content

Commit b2af568

Browse files
authored
refactor: centralize NonUndefinedGuard type definition (#9187)
Moved the NonUndefinedGuard type definition to the query-core package for better reusability across various query options files in angular, react, solid, svelte, and vue packages. Removed duplicate definitions from individual files.
1 parent 318ba4d commit b2af568

File tree

9 files changed

+10
-16
lines changed

9 files changed

+10
-16
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import type {
33
DefaultError,
44
InfiniteData,
55
InitialDataFunction,
6+
NonUndefinedGuard,
67
OmitKeyof,
78
QueryKey,
89
SkipToken,
@@ -61,8 +62,6 @@ export type UnusedSkipTokenInfiniteOptions<
6162
>
6263
}
6364

64-
type NonUndefinedGuard<T> = T extends undefined ? never : T
65-
6665
export type DefinedInitialDataInfiniteOptions<
6766
TQueryFnData,
6867
TError = DefaultError,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
DataTag,
33
DefaultError,
44
InitialDataFunction,
5+
NonUndefinedGuard,
56
OmitKeyof,
67
QueryFunction,
78
QueryKey,
@@ -36,8 +37,6 @@ export type UnusedSkipTokenOptions<
3637
>
3738
}
3839

39-
type NonUndefinedGuard<T> = T extends undefined ? never : T
40-
4140
export type DefinedInitialDataOptions<
4241
TQueryFnData = unknown,
4342
TError = DefaultError,

packages/query-core/src/types.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ import type { QueryFilters, QueryTypeFilter, SkipToken } from './utils'
99
import type { QueryCache } from './queryCache'
1010
import type { MutationCache } from './mutationCache'
1111

12+
export type NonUndefinedGuard<T> = T extends undefined ? never : T
13+
1214
export type DistributiveOmit<
1315
TObject,
1416
TKey extends keyof TObject,

packages/react-query/src/infiniteQueryOptions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import type {
33
DefaultError,
44
InfiniteData,
55
InitialDataFunction,
6+
NonUndefinedGuard,
67
OmitKeyof,
78
QueryKey,
89
SkipToken,
@@ -61,8 +62,6 @@ export type UnusedSkipTokenInfiniteOptions<
6162
>
6263
}
6364

64-
type NonUndefinedGuard<T> = T extends undefined ? never : T
65-
6665
export type DefinedInitialDataInfiniteOptions<
6766
TQueryFnData,
6867
TError = DefaultError,

packages/react-query/src/queryOptions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
DataTag,
33
DefaultError,
44
InitialDataFunction,
5+
NonUndefinedGuard,
56
OmitKeyof,
67
QueryFunction,
78
QueryKey,
@@ -36,8 +37,6 @@ export type UnusedSkipTokenOptions<
3637
>
3738
}
3839

39-
type NonUndefinedGuard<T> = T extends undefined ? never : T
40-
4140
export type DefinedInitialDataOptions<
4241
TQueryFnData = unknown,
4342
TError = DefaultError,

packages/solid-query/src/infiniteQueryOptions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
DataTag,
33
DefaultError,
44
InfiniteData,
5+
NonUndefinedGuard,
56
QueryKey,
67
} from '@tanstack/query-core'
78
import type { SolidInfiniteQueryOptions } from './types'
@@ -26,8 +27,6 @@ export type UndefinedInitialDataInfiniteOptions<
2627
}
2728
>
2829

29-
type NonUndefinedGuard<T> = T extends undefined ? never : T
30-
3130
export type DefinedInitialDataInfiniteOptions<
3231
TQueryFnData,
3332
TError = DefaultError,

packages/svelte-query/src/queryOptions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
DataTag,
33
DefaultError,
44
InitialDataFunction,
5+
NonUndefinedGuard,
56
QueryKey,
67
} from '@tanstack/query-core'
78
import type { CreateQueryOptions } from './types.js'
@@ -15,8 +16,6 @@ export type UndefinedInitialDataOptions<
1516
initialData?: undefined | InitialDataFunction<NonUndefinedGuard<TQueryFnData>>
1617
}
1718

18-
type NonUndefinedGuard<T> = T extends undefined ? never : T
19-
2019
export type DefinedInitialDataOptions<
2120
TQueryFnData = unknown,
2221
TError = DefaultError,

packages/vue-query/src/infiniteQueryOptions.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import type {
22
DataTag,
33
DefaultError,
44
InfiniteData,
5+
NonUndefinedGuard,
56
QueryKey,
67
} from '@tanstack/query-core'
78
import type { UseInfiniteQueryOptions } from './useInfiniteQuery'
@@ -23,8 +24,6 @@ export type UndefinedInitialDataInfiniteOptions<
2324
initialData?: undefined
2425
}
2526

26-
type NonUndefinedGuard<T> = T extends undefined ? never : T
27-
2827
export type DefinedInitialDataInfiniteOptions<
2928
TQueryFnData,
3029
TError = DefaultError,

packages/vue-query/src/useQuery.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import type {
44
DefaultError,
55
DefinedQueryObserverResult,
66
InitialDataFunction,
7+
NonUndefinedGuard,
78
QueryKey,
89
QueryObserverOptions,
910
} from '@tanstack/query-core'
@@ -16,8 +17,6 @@ import type {
1617
} from './types'
1718
import type { QueryClient } from './queryClient'
1819

19-
type NonUndefinedGuard<T> = T extends undefined ? never : T
20-
2120
export type UseQueryOptions<
2221
TQueryFnData = unknown,
2322
TError = DefaultError,

0 commit comments

Comments
 (0)