diff --git a/packages/angular-query-experimental/src/infinite-query-options.ts b/packages/angular-query-experimental/src/infinite-query-options.ts index 5b8844c78f..1245416539 100644 --- a/packages/angular-query-experimental/src/infinite-query-options.ts +++ b/packages/angular-query-experimental/src/infinite-query-options.ts @@ -3,6 +3,7 @@ import type { DefaultError, InfiniteData, InitialDataFunction, + NonUndefinedGuard, OmitKeyof, QueryKey, SkipToken, @@ -61,8 +62,6 @@ export type UnusedSkipTokenInfiniteOptions< > } -type NonUndefinedGuard = T extends undefined ? never : T - export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError = DefaultError, diff --git a/packages/angular-query-experimental/src/query-options.ts b/packages/angular-query-experimental/src/query-options.ts index 2c48f49711..e82540bee5 100644 --- a/packages/angular-query-experimental/src/query-options.ts +++ b/packages/angular-query-experimental/src/query-options.ts @@ -2,6 +2,7 @@ import type { DataTag, DefaultError, InitialDataFunction, + NonUndefinedGuard, OmitKeyof, QueryFunction, QueryKey, @@ -36,8 +37,6 @@ export type UnusedSkipTokenOptions< > } -type NonUndefinedGuard = T extends undefined ? never : T - export type DefinedInitialDataOptions< TQueryFnData = unknown, TError = DefaultError, diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index dfde4ef867..735b8ea263 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -9,6 +9,8 @@ import type { QueryFilters, QueryTypeFilter, SkipToken } from './utils' import type { QueryCache } from './queryCache' import type { MutationCache } from './mutationCache' +export type NonUndefinedGuard = T extends undefined ? never : T + export type DistributiveOmit< TObject, TKey extends keyof TObject, diff --git a/packages/react-query/src/infiniteQueryOptions.ts b/packages/react-query/src/infiniteQueryOptions.ts index d834bd5987..18d3d655b0 100644 --- a/packages/react-query/src/infiniteQueryOptions.ts +++ b/packages/react-query/src/infiniteQueryOptions.ts @@ -3,6 +3,7 @@ import type { DefaultError, InfiniteData, InitialDataFunction, + NonUndefinedGuard, OmitKeyof, QueryKey, SkipToken, @@ -61,8 +62,6 @@ export type UnusedSkipTokenInfiniteOptions< > } -type NonUndefinedGuard = T extends undefined ? never : T - export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError = DefaultError, diff --git a/packages/react-query/src/queryOptions.ts b/packages/react-query/src/queryOptions.ts index 1e7b4aa83a..644ac26788 100644 --- a/packages/react-query/src/queryOptions.ts +++ b/packages/react-query/src/queryOptions.ts @@ -2,6 +2,7 @@ import type { DataTag, DefaultError, InitialDataFunction, + NonUndefinedGuard, OmitKeyof, QueryFunction, QueryKey, @@ -36,8 +37,6 @@ export type UnusedSkipTokenOptions< > } -type NonUndefinedGuard = T extends undefined ? never : T - export type DefinedInitialDataOptions< TQueryFnData = unknown, TError = DefaultError, diff --git a/packages/solid-query/src/infiniteQueryOptions.ts b/packages/solid-query/src/infiniteQueryOptions.ts index 97bea33c13..2cb1fea1f5 100644 --- a/packages/solid-query/src/infiniteQueryOptions.ts +++ b/packages/solid-query/src/infiniteQueryOptions.ts @@ -2,6 +2,7 @@ import type { DataTag, DefaultError, InfiniteData, + NonUndefinedGuard, QueryKey, } from '@tanstack/query-core' import type { SolidInfiniteQueryOptions } from './types' @@ -26,8 +27,6 @@ export type UndefinedInitialDataInfiniteOptions< } > -type NonUndefinedGuard = T extends undefined ? never : T - export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError = DefaultError, diff --git a/packages/svelte-query/src/queryOptions.ts b/packages/svelte-query/src/queryOptions.ts index dc4beb2951..e1a44be631 100644 --- a/packages/svelte-query/src/queryOptions.ts +++ b/packages/svelte-query/src/queryOptions.ts @@ -2,6 +2,7 @@ import type { DataTag, DefaultError, InitialDataFunction, + NonUndefinedGuard, QueryKey, } from '@tanstack/query-core' import type { CreateQueryOptions } from './types.js' @@ -15,8 +16,6 @@ export type UndefinedInitialDataOptions< initialData?: undefined | InitialDataFunction> } -type NonUndefinedGuard = T extends undefined ? never : T - export type DefinedInitialDataOptions< TQueryFnData = unknown, TError = DefaultError, diff --git a/packages/vue-query/src/infiniteQueryOptions.ts b/packages/vue-query/src/infiniteQueryOptions.ts index dbe296e1af..220fd37563 100644 --- a/packages/vue-query/src/infiniteQueryOptions.ts +++ b/packages/vue-query/src/infiniteQueryOptions.ts @@ -2,6 +2,7 @@ import type { DataTag, DefaultError, InfiniteData, + NonUndefinedGuard, QueryKey, } from '@tanstack/query-core' import type { UseInfiniteQueryOptions } from './useInfiniteQuery' @@ -23,8 +24,6 @@ export type UndefinedInitialDataInfiniteOptions< initialData?: undefined } -type NonUndefinedGuard = T extends undefined ? never : T - export type DefinedInitialDataInfiniteOptions< TQueryFnData, TError = DefaultError, diff --git a/packages/vue-query/src/useQuery.ts b/packages/vue-query/src/useQuery.ts index fd60dee2ee..168eb36095 100644 --- a/packages/vue-query/src/useQuery.ts +++ b/packages/vue-query/src/useQuery.ts @@ -4,6 +4,7 @@ import type { DefaultError, DefinedQueryObserverResult, InitialDataFunction, + NonUndefinedGuard, QueryKey, QueryObserverOptions, } from '@tanstack/query-core' @@ -16,8 +17,6 @@ import type { } from './types' import type { QueryClient } from './queryClient' -type NonUndefinedGuard = T extends undefined ? never : T - export type UseQueryOptions< TQueryFnData = unknown, TError = DefaultError,