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
58 changes: 57 additions & 1 deletion packages/preact-query/src/__tests__/useMutation.test-d.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { describe, expectTypeOf, it } from 'vitest'
import { QueryClient } from '@tanstack/query-core'
import { useMutation } from '../useMutation'
import type { DefaultError } from '@tanstack/query-core'
import type {
DefaultError,
MutationFunctionContext,
MutationKey,
} from '@tanstack/query-core'
import type { UseMutationResult } from '../types'

describe('useMutation', () => {
Expand Down Expand Up @@ -144,4 +148,56 @@ describe('useMutation', () => {

expectTypeOf(mutation.data).toEqualTypeOf<string | undefined>()
})

it('should type context as the last argument for mutationFn and every hook-level callback', () => {
useMutation({
mutationFn: (_vars: string, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
expectTypeOf(context.client).toEqualTypeOf<QueryClient>()
return Promise.resolve('data')
},
onMutate: (_variables, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onSuccess: (_data, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onError: (_error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onSettled: (_data, _error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
})
})

it('should type context as the last argument for every per-call mutate option', () => {
const mutation = useMutation({
mutationFn: () => Promise.resolve('data'),
})

mutation.mutate(undefined, {
onSuccess: (_data, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onError: (_error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onSettled: (_data, _error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
})
})

it('should type context.mutationKey as MutationKey', () => {
useMutation({
mutationKey: ['todos', 'add'] as const,
mutationFn: () => Promise.resolve('data'),
onSuccess: (_data, _variables, _onMutateResult, context) => {
expectTypeOf(context.mutationKey).toEqualTypeOf<
MutationKey | undefined
>()
},
})
})
})
101 changes: 101 additions & 0 deletions packages/preact-query/src/__tests__/useMutation.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2476,4 +2476,105 @@ describe('useMutation', () => {
),
).toBeInTheDocument()
})

it('should pass a non-undefined onMutateResult alongside context to onSuccess', async () => {
const onSuccess = vi.fn()

function Page() {
const { mutate } = useMutation({
mutationFn: (text: string) => sleep(10).then(() => text.toUpperCase()),
onMutate: (text: string) => ({ startedWith: text }),
onSuccess,
})

return <button onClick={() => mutate('todo')}>mutate</button>
}

const rendered = renderWithClient(queryClient, <Page />)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(10)

expect(onSuccess).toHaveBeenCalledTimes(1)
const [data, variables, onMutateResult, context] = onSuccess.mock.calls[0]!
expect(data).toBe('TODO')
expect(variables).toBe('todo')
expect(onMutateResult).toEqual({ startedWith: 'todo' })
expect(context.client).toBe(queryClient)
expect(context.meta).toBeUndefined()
expect(context.mutationKey).toBeUndefined()
})

it('should give mutationFn the same QueryClient instance via context', async () => {
const key = queryKey()
queryClient.setQueryData(key, 'tag-from-this-client')

function Page() {
const { mutate, data } = useMutation({
mutationFn: (_text: string, context) =>
sleep(10).then(() => context.client.getQueryData(key)),
})

return (
<div>
<div>data: {String(data)}</div>
<button onClick={() => mutate('todo')}>mutate</button>
</div>
)
}

const rendered = renderWithClient(queryClient, <Page />)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(11)

expect(rendered.getByText('data: tag-from-this-client')).toBeInTheDocument()
})

it('should include mutationKey in the context passed to hook-level callbacks', async () => {
const onSuccess = vi.fn()

function Page() {
const { mutate } = useMutation({
mutationKey: ['todos', 'add'],
mutationFn: (text: string) => sleep(10).then(() => text),
onSuccess,
})

return <button onClick={() => mutate('todo')}>mutate</button>
}

const rendered = renderWithClient(queryClient, <Page />)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(10)

expect(onSuccess).toHaveBeenCalledTimes(1)
expect(onSuccess.mock.calls[0]?.[3].mutationKey).toEqual(['todos', 'add'])
})

it('should let onSuccess invalidate queries via context.client without a useQueryClient() closure', async () => {
const key = queryKey()
queryClient.setQueryData(key, 'data')

function Page() {
const { mutate } = useMutation({
mutationFn: () => sleep(10).then(() => 'mutated'),
onSuccess: (_data, _variables, _onMutateResult, context) => {
context.client.invalidateQueries({ queryKey: key })
},
})

return <button onClick={() => mutate()}>mutate</button>
}

const rendered = renderWithClient(queryClient, <Page />)

expect(queryClient.getQueryState(key)?.isInvalidated).toBe(false)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(10)

expect(queryClient.getQueryState(key)?.isInvalidated).toBe(true)
})
})
58 changes: 57 additions & 1 deletion packages/react-query/src/__tests__/useMutation.test-d.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
import { describe, expectTypeOf, it } from 'vitest'
import { QueryClient } from '@tanstack/query-core'
import { useMutation } from '../useMutation'
import type { DefaultError } from '@tanstack/query-core'
import type {
DefaultError,
MutationFunctionContext,
MutationKey,
} from '@tanstack/query-core'
import type { UseMutationResult } from '../types'

describe('useMutation', () => {
Expand Down Expand Up @@ -144,4 +148,56 @@ describe('useMutation', () => {

expectTypeOf(mutation.data).toEqualTypeOf<string | undefined>()
})

it('should type context as the last argument for mutationFn and every hook-level callback', () => {
useMutation({
mutationFn: (_vars: string, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
expectTypeOf(context.client).toEqualTypeOf<QueryClient>()
return Promise.resolve('data')
},
onMutate: (_variables, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onSuccess: (_data, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onError: (_error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onSettled: (_data, _error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
})
})

it('should type context as the last argument for every per-call mutate option', () => {
const mutation = useMutation({
mutationFn: () => Promise.resolve('data'),
})

mutation.mutate(undefined, {
onSuccess: (_data, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onError: (_error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
onSettled: (_data, _error, _variables, _onMutateResult, context) => {
expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>()
},
})
})

it('should type context.mutationKey as MutationKey', () => {
useMutation({
mutationKey: ['todos', 'add'] as const,
mutationFn: () => Promise.resolve('data'),
onSuccess: (_data, _variables, _onMutateResult, context) => {
expectTypeOf(context.mutationKey).toEqualTypeOf<
MutationKey | undefined
>()
},
})
})
})
101 changes: 101 additions & 0 deletions packages/react-query/src/__tests__/useMutation.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2475,4 +2475,105 @@ describe('useMutation', () => {
),
).toBeInTheDocument()
})

it('should pass a non-undefined onMutateResult alongside context to onSuccess', async () => {
const onSuccess = vi.fn()

function Page() {
const { mutate } = useMutation({
mutationFn: (text: string) => sleep(10).then(() => text.toUpperCase()),
onMutate: (text: string) => ({ startedWith: text }),
onSuccess,
})

return <button onClick={() => mutate('todo')}>mutate</button>
}

const rendered = renderWithClient(queryClient, <Page />)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(10)

expect(onSuccess).toHaveBeenCalledTimes(1)
const [data, variables, onMutateResult, context] = onSuccess.mock.calls[0]!
expect(data).toBe('TODO')
expect(variables).toBe('todo')
expect(onMutateResult).toEqual({ startedWith: 'todo' })
expect(context.client).toBe(queryClient)
expect(context.meta).toBeUndefined()
expect(context.mutationKey).toBeUndefined()
})

it('should give mutationFn the same QueryClient instance via context', async () => {
const key = queryKey()
queryClient.setQueryData(key, 'tag-from-this-client')

function Page() {
const { mutate, data } = useMutation({
mutationFn: (_text: string, context) =>
sleep(10).then(() => context.client.getQueryData(key)),
})

return (
<div>
<div>data: {String(data)}</div>
<button onClick={() => mutate('todo')}>mutate</button>
</div>
)
}

const rendered = renderWithClient(queryClient, <Page />)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(11)

expect(rendered.getByText('data: tag-from-this-client')).toBeInTheDocument()
})

it('should include mutationKey in the context passed to hook-level callbacks', async () => {
const onSuccess = vi.fn()

function Page() {
const { mutate } = useMutation({
mutationKey: ['todos', 'add'],
mutationFn: (text: string) => sleep(10).then(() => text),
onSuccess,
})

return <button onClick={() => mutate('todo')}>mutate</button>
}

const rendered = renderWithClient(queryClient, <Page />)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(10)

expect(onSuccess).toHaveBeenCalledTimes(1)
expect(onSuccess.mock.calls[0]?.[3].mutationKey).toEqual(['todos', 'add'])
})

it('should let onSuccess invalidate queries via context.client without a useQueryClient() closure', async () => {
const key = queryKey()
queryClient.setQueryData(key, 'data')

function Page() {
const { mutate } = useMutation({
mutationFn: () => sleep(10).then(() => 'mutated'),
onSuccess: (_data, _variables, _onMutateResult, context) => {
context.client.invalidateQueries({ queryKey: key })
},
})

return <button onClick={() => mutate()}>mutate</button>
}

const rendered = renderWithClient(queryClient, <Page />)

expect(queryClient.getQueryState(key)?.isInvalidated).toBe(false)

fireEvent.click(rendered.getByRole('button', { name: /mutate/i }))
await vi.advanceTimersByTimeAsync(10)

expect(queryClient.getQueryState(key)?.isInvalidated).toBe(true)
})
})
Loading