Skip to content

Avoid rest destructuring React Query result #1925

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

Merged
david-crespo merged 1 commit into from
Jan 31, 2024
Merged

Avoid rest destructuring React Query result #1925

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions libs/api/hooks.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import {
type UseMutationOptions,
type UseQueryOptions,
} from '@tanstack/react-query'
import { type SetNonNullable } from 'type-fest'

import { invariant } from '@oxide/util'

Expand Down Expand Up @@ -138,7 +139,7 @@ export const getUsePrefetchedApiQuery =
options: UseQueryOtherOptions<Result<A[M]>, ApiError> = {}
) => {
const queryKey = [method, params]
const { data, ...rest } = useQuery({
const result = useQuery({
queryKey,
// no catch, let unexpected errors bubble up
queryFn: ({ signal }) => api[method](params, { signal }).then(handleResult(method)),
Expand All @@ -149,8 +150,13 @@ export const getUsePrefetchedApiQuery =
throwOnError: (err) => err.statusCode === 404,
...options,
})
invariant(data, `Expected query to be prefetched. Key: ${JSON.stringify(queryKey)}`)
return { data, ...rest }
invariant(
result.data,
`Expected query to be prefetched. Key: ${JSON.stringify(queryKey)}`
)
// TS infers non-nullable on a freestanding variable, but doesn't like to do
// it on a property. So we give it a hint
return result as SetNonNullable<typeof result, 'data'>
}

const ERRORS_ALLOWED = 'errors-allowed'
Expand Down