diff --git a/packages/query-core/src/types.ts b/packages/query-core/src/types.ts index ad8188e9f0..bca4c23605 100644 --- a/packages/query-core/src/types.ts +++ b/packages/query-core/src/types.ts @@ -425,11 +425,14 @@ export interface QueryObserverSuccessResult status: 'success' } +export type DefinedQueryObserverResult = + | QueryObserverRefetchErrorResult + | QueryObserverSuccessResult + export type QueryObserverResult = + | DefinedQueryObserverResult | QueryObserverLoadingErrorResult | QueryObserverLoadingResult - | QueryObserverRefetchErrorResult - | QueryObserverSuccessResult export interface InfiniteQueryObserverBaseResult< TData = unknown, diff --git a/packages/react-query/src/types.ts b/packages/react-query/src/types.ts index c83bb5b26a..cd626fc3e1 100644 --- a/packages/react-query/src/types.ts +++ b/packages/react-query/src/types.ts @@ -8,6 +8,7 @@ import { QueryKey, MutationObserverOptions, MutateFunction, + DefinedQueryObserverResult, } from '@tanstack/query-core' import type { QueryClient } from '@tanstack/query-core' @@ -65,10 +66,15 @@ export type UseQueryResult< TError = unknown, > = UseBaseQueryResult -export type DefinedUseQueryResult = Omit< - UseQueryResult, - 'data' -> & { data: TData } +export type DefinedUseBaseQueryResult< + TData = unknown, + TError = unknown, +> = DefinedQueryObserverResult + +export type DefinedUseQueryResult< + TData = unknown, + TError = unknown, +> = DefinedUseBaseQueryResult export type UseInfiniteQueryResult< TData = unknown,