Skip to content

fix(reat-query): infer data type correctly when conditional skipToken is passed to useQueries #7037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 2 commits into from
Closed

fix(reat-query): infer data type correctly when conditional skipToken is passed to useQueries #7037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
14c83b2
fix(reat-query): infer data type correctly when conditional skipToken…
Jaaneek Mar 6, 2024
19dce13
Merge branch 'main' into main
TkDodo Mar 9, 2024
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
16 changes: 16 additions & 0 deletions packages/react-query/src/__tests__/useQueries.test-d.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { describe, expectTypeOf, it } from 'vitest'
import { queryOptions } from '../queryOptions'
import { useQueries } from '../useQueries'
import { skipToken } from '..'
import type { UseQueryOptions } from '../types'

describe('UseQueries config object overload', () => {
Expand Down Expand Up @@ -123,4 +124,19 @@ describe('UseQueries config object overload', () => {
expectTypeOf(data).toEqualTypeOf<Data | undefined>()
})
})

it('TData should have correct type when conditional skipToken is passed', () => {
const queryResults = useQueries({
queries: [
{
queryKey: ['withSkipToken'],
queryFn: Math.random() > 0.5 ? () => 3 : skipToken,
},
],
})

const data = queryResults[0].data

expectTypeOf(data).toEqualTypeOf<number | undefined>()
})
})
2 changes: 1 addition & 1 deletion packages/react-query/src/useQueries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ export type QueriesOptions<
[...TResult, GetOptions<Head>],
[...TDepth, 1]
>
: Array<unknown> extends T
: ReadonlyArray<unknown> extends T
? T
: // If T is *some* array but we couldn't assign unknown[] to it, then it must hold some known/homogenous type!
// use this to infer the param types in the case of Array.map() argument
Expand Down