Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions packages/query-core/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -425,11 +425,14 @@ export interface QueryObserverSuccessResult<TData = unknown, TError = unknown>
status: 'success'
}

export type DefinedQueryObserverResult<TData = unknown, TError = unknown> =
| QueryObserverRefetchErrorResult<TData, TError>
| QueryObserverSuccessResult<TData, TError>

export type QueryObserverResult<TData = unknown, TError = unknown> =
| DefinedQueryObserverResult<TData, TError>
| QueryObserverLoadingErrorResult<TData, TError>
| QueryObserverLoadingResult<TData, TError>
| QueryObserverRefetchErrorResult<TData, TError>
| QueryObserverSuccessResult<TData, TError>

export interface InfiniteQueryObserverBaseResult<
TData = unknown,
Expand Down
14 changes: 10 additions & 4 deletions packages/react-query/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import {
QueryKey,
MutationObserverOptions,
MutateFunction,
DefinedQueryObserverResult,
} from '@tanstack/query-core'
import type { QueryClient } from '@tanstack/query-core'

Expand Down Expand Up @@ -65,10 +66,15 @@ export type UseQueryResult<
TError = unknown,
> = UseBaseQueryResult<TData, TError>

export type DefinedUseQueryResult<TData = unknown, TError = unknown> = Omit<
UseQueryResult<TData, TError>,
'data'
> & { data: TData }
export type DefinedUseBaseQueryResult<
TData = unknown,
TError = unknown,
> = DefinedQueryObserverResult<TData, TError>

export type DefinedUseQueryResult<
TData = unknown,
TError = unknown,
> = DefinedUseBaseQueryResult<TData, TError>

export type UseInfiniteQueryResult<
TData = unknown,
Expand Down