Skip to content

Commit

Permalink
fix(types): useSuspenseQuery can be in error state (#6129)
Browse files Browse the repository at this point in the history
because we don't throw background errors to boundaries; still, it will always have data defined
  • Loading branch information
TkDodo authored Oct 10, 2023
1 parent 14059f6 commit cdc5061
Show file tree
Hide file tree
Showing 2 changed files with 148 additions and 4 deletions.
146 changes: 146 additions & 0 deletions packages/react-query/src/__tests__/suspense.types.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,146 @@
import { useSuspenseQuery } from '../useSuspenseQuery'
import { useSuspenseInfiniteQuery } from '../useSuspenseInfiniteQuery'
import { doNotExecute } from './utils'
import type { InfiniteData } from '@tanstack/query-core'
import type { Equal, Expect } from './utils'

describe('useSuspenseQuery', () => {
it('should always have data defined', () => {
doNotExecute(() => {
const { data } = useSuspenseQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
})

const result: Expect<Equal<typeof data, number>> = true
return result
})
})

it('should not have pending status', () => {
doNotExecute(() => {
const { status } = useSuspenseQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
})

const result: Expect<Equal<typeof status, 'error' | 'success'>> = true
return result
})
})

it('should not allow placeholderData, enabled or throwOnError props', () => {
doNotExecute(() => {
useSuspenseQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
// @ts-expect-error TS2345
placeholderData: 5,
enabled: true,
})

useSuspenseQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
// @ts-expect-error TS2345
enabled: true,
})

useSuspenseQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
// @ts-expect-error TS2345
throwOnError: true,
})
})
})

it('should not return isPlaceholderData', () => {
doNotExecute(() => {
const query = useSuspenseQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
})

// @ts-expect-error TS2339
void query.isPlaceholderData
})
})
})

describe('useSuspenseInfiniteQuery', () => {
it('should always have data defined', () => {
doNotExecute(() => {
const { data } = useSuspenseInfiniteQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
initialPageParam: 1,
getNextPageParam: () => 1,
})

const result: Expect<Equal<typeof data, InfiniteData<number, unknown>>> =
true
return result
})
})

it('should not have pending status', () => {
doNotExecute(() => {
const { status } = useSuspenseInfiniteQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
initialPageParam: 1,
getNextPageParam: () => 1,
})

const result: Expect<Equal<typeof status, 'error' | 'success'>> = true
return result
})
})

it('should not allow placeholderData, enabled or throwOnError props', () => {
doNotExecute(() => {
useSuspenseInfiniteQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
initialPageParam: 1,
getNextPageParam: () => 1,
// @ts-expect-error TS2345
placeholderData: 5,
enabled: true,
})

useSuspenseInfiniteQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
initialPageParam: 1,
getNextPageParam: () => 1,
// @ts-expect-error TS2345
enabled: true,
})

useSuspenseInfiniteQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
initialPageParam: 1,
getNextPageParam: () => 1,
// @ts-expect-error TS2345
throwOnError: true,
})
})
})

it('should not return isPlaceholderData', () => {
doNotExecute(() => {
const query = useSuspenseInfiniteQuery({
queryKey: ['key'],
queryFn: () => Promise.resolve(5),
initialPageParam: 1,
getNextPageParam: () => 1,
})

// @ts-expect-error TS2339
void query.isPlaceholderData
})
})
})
6 changes: 2 additions & 4 deletions packages/react-query/src/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,12 @@ import type {
DefinedQueryObserverResult,
InfiniteQueryObserverOptions,
InfiniteQueryObserverResult,
InfiniteQueryObserverSuccessResult,
MutateFunction,
MutationObserverOptions,
MutationObserverResult,
QueryKey,
QueryObserverOptions,
QueryObserverResult,
QueryObserverSuccessResult,
WithRequired,
} from '@tanstack/query-core'

Expand Down Expand Up @@ -105,7 +103,7 @@ export type UseQueryResult<
export type UseSuspenseQueryResult<
TData = unknown,
TError = DefaultError,
> = Omit<QueryObserverSuccessResult<TData, TError>, 'isPlaceholderData'>
> = Omit<DefinedQueryObserverResult<TData, TError>, 'isPlaceholderData'>

export type DefinedUseQueryResult<
TData = unknown,
Expand All @@ -125,7 +123,7 @@ export type DefinedUseInfiniteQueryResult<
export type UseSuspenseInfiniteQueryResult<
TData = unknown,
TError = DefaultError,
> = Omit<InfiniteQueryObserverSuccessResult<TData, TError>, 'isPlaceholderData'>
> = Omit<DefinedInfiniteQueryObserverResult<TData, TError>, 'isPlaceholderData'>

export interface UseMutationOptions<
TData = unknown,
Expand Down

0 comments on commit cdc5061

Please sign in to comment.