-
-
Notifications
You must be signed in to change notification settings - Fork 3.8k
feat(vue-query): add 'mutationOptions' #10381
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.
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
Merged
Changes from 9 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
30d4bbd
feat(vue-query): add 'mutationOptions'
sukvvon 7131058
ci: apply automated fixes
autofix-ci[bot] 1bbcdb6
chore(.changeset): add changeset for 'mutationOptions' in vue-query
sukvvon cb3d0c9
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon 6c26443
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon 6d6ebe0
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon e065e7d
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon 35c6782
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon 3f3f27c
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon 2286f4a
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon 5ca23d0
Merge branch 'main' into feat/vue-query-mutationOptions
sukvvon ce18db8
feat(vue-query/mutationOptions): add getter support and fix test desc…
sukvvon 25ea553
refactor(vue-query): rename 'VueMutationOptions' to 'MutationOptions'
sukvvon 9876ff7
docs(vue-query): add 'mutationOptions' reference page
sukvvon a330906
test(vue-query/mutationOptions): add runtime test for getter without …
sukvvon 0761b46
docs(vue-query): add 'mutationOptions' to config.json navigation
sukvvon File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| --- | ||
| '@tanstack/vue-query': minor | ||
| --- | ||
|
|
||
| feat(vue-query): add 'mutationOptions' |
220 changes: 220 additions & 0 deletions
220
packages/vue-query/src/__tests__/mutationOptions.test-d.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,220 @@ | ||
| import { assertType, describe, expectTypeOf, it } from 'vitest' | ||
| import { QueryClient } from '@tanstack/query-core' | ||
| import { useMutation } from '../useMutation' | ||
| import { useIsMutating, useMutationState } from '../useMutationState' | ||
| import { mutationOptions } from '../mutationOptions' | ||
| import type { | ||
| DefaultError, | ||
| MutationFunctionContext, | ||
| MutationState, | ||
| WithRequired, | ||
| } from '@tanstack/query-core' | ||
| import type { Ref } from 'vue-demi' | ||
| import type { VueMutationOptions } from '../types' | ||
|
|
||
| describe('mutationOptions', () => { | ||
| it('should not allow excess properties', () => { | ||
| // @ts-expect-error this is a good error, because onMutates does not exist! | ||
| mutationOptions({ | ||
| mutationFn: () => Promise.resolve(5), | ||
| mutationKey: ['key'], | ||
| onMutates: 1000, | ||
| onSuccess: (data) => { | ||
| expectTypeOf(data).toEqualTypeOf<number>() | ||
| }, | ||
| }) | ||
| }) | ||
|
|
||
| it('should infer types for callbacks', () => { | ||
| mutationOptions({ | ||
| mutationFn: () => Promise.resolve(5), | ||
| mutationKey: ['key'], | ||
| onSuccess: (data) => { | ||
| expectTypeOf(data).toEqualTypeOf<number>() | ||
| }, | ||
| }) | ||
| }) | ||
|
|
||
| it('should infer types for onError callback', () => { | ||
| mutationOptions({ | ||
| mutationFn: () => { | ||
| throw new Error('fail') | ||
| }, | ||
| mutationKey: ['key'], | ||
| onError: (error) => { | ||
| expectTypeOf(error).toEqualTypeOf<DefaultError>() | ||
| }, | ||
| }) | ||
| }) | ||
|
|
||
| it('should infer types for variables', () => { | ||
| mutationOptions<number, DefaultError, { id: string }>({ | ||
| mutationFn: (vars) => { | ||
| expectTypeOf(vars).toEqualTypeOf<{ id: string }>() | ||
| return Promise.resolve(5) | ||
| }, | ||
| mutationKey: ['with-vars'], | ||
| }) | ||
| }) | ||
|
|
||
| it('should infer result type correctly', () => { | ||
| mutationOptions<number, DefaultError, void, { name: string }>({ | ||
| mutationFn: () => Promise.resolve(5), | ||
| mutationKey: ['key'], | ||
| onMutate: () => { | ||
| return { name: 'onMutateResult' } | ||
| }, | ||
| onSuccess: (_data, _variables, onMutateResult) => { | ||
| expectTypeOf(onMutateResult).toEqualTypeOf<{ name: string }>() | ||
| }, | ||
| }) | ||
| }) | ||
|
|
||
| it('should infer context type correctly', () => { | ||
| mutationOptions<number>({ | ||
| mutationFn: (_variables, context) => { | ||
| expectTypeOf(context).toEqualTypeOf<MutationFunctionContext>() | ||
| return Promise.resolve(5) | ||
| }, | ||
| mutationKey: ['key'], | ||
| 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 error if mutationFn return type mismatches TData', () => { | ||
| assertType( | ||
| mutationOptions<number>({ | ||
| // @ts-expect-error this is a good error, because return type is string, not number | ||
| mutationFn: async () => Promise.resolve('wrong return'), | ||
| }), | ||
| ) | ||
| }) | ||
|
|
||
| it('should allow mutationKey to be omitted', () => { | ||
| return mutationOptions({ | ||
| mutationFn: () => Promise.resolve(123), | ||
| onSuccess: (data) => { | ||
| expectTypeOf(data).toEqualTypeOf<number>() | ||
| }, | ||
| }) | ||
| }) | ||
|
|
||
| it('should infer all types when not explicitly provided', () => { | ||
| expectTypeOf( | ||
| mutationOptions({ | ||
| mutationFn: (id: string) => Promise.resolve(id.length), | ||
| mutationKey: ['key'], | ||
| onSuccess: (data) => { | ||
| expectTypeOf(data).toEqualTypeOf<number>() | ||
| }, | ||
| }), | ||
| ).toEqualTypeOf< | ||
| WithRequired< | ||
| VueMutationOptions<number, DefaultError, string, unknown>, | ||
| 'mutationKey' | ||
| > | ||
| >() | ||
| expectTypeOf( | ||
| mutationOptions({ | ||
| mutationFn: (id: string) => Promise.resolve(id.length), | ||
| onSuccess: (data) => { | ||
| expectTypeOf(data).toEqualTypeOf<number>() | ||
| }, | ||
| }), | ||
| ).toEqualTypeOf< | ||
| Omit< | ||
| VueMutationOptions<number, DefaultError, string, unknown>, | ||
| 'mutationKey' | ||
| > | ||
| >() | ||
| }) | ||
|
|
||
| it('should work when used with useMutation', () => { | ||
| const mutation = useMutation( | ||
| mutationOptions({ | ||
| mutationKey: ['key'], | ||
| mutationFn: () => Promise.resolve('data'), | ||
| onSuccess: (data) => { | ||
| expectTypeOf(data).toEqualTypeOf<string>() | ||
| }, | ||
| }), | ||
| ) | ||
| expectTypeOf(mutation.data.value).toEqualTypeOf<string | undefined>() | ||
|
|
||
| // should allow when used with useMutation without mutationKey | ||
| useMutation( | ||
| mutationOptions({ | ||
| mutationFn: () => Promise.resolve('data'), | ||
| onSuccess: (data) => { | ||
| expectTypeOf(data).toEqualTypeOf<string>() | ||
| }, | ||
| }), | ||
| ) | ||
| }) | ||
|
|
||
| it('should work when used with useIsMutating', () => { | ||
| const isMutating = useIsMutating( | ||
| mutationOptions({ | ||
| mutationKey: ['key'], | ||
| mutationFn: () => Promise.resolve(5), | ||
| }), | ||
| ) | ||
| expectTypeOf(isMutating).toEqualTypeOf<Ref<number>>() | ||
|
|
||
| useIsMutating( | ||
| // @ts-expect-error filters should have mutationKey | ||
| mutationOptions({ | ||
| mutationFn: () => Promise.resolve(5), | ||
| }), | ||
| ) | ||
| }) | ||
|
|
||
| it('should work when used with queryClient.isMutating', () => { | ||
| const queryClient = new QueryClient() | ||
|
|
||
| const isMutating = queryClient.isMutating( | ||
| mutationOptions({ | ||
| mutationKey: ['key'], | ||
| mutationFn: () => Promise.resolve(5), | ||
| }), | ||
| ) | ||
| expectTypeOf(isMutating).toEqualTypeOf<number>() | ||
|
|
||
| queryClient.isMutating( | ||
| // @ts-expect-error filters should have mutationKey | ||
| mutationOptions({ | ||
| mutationFn: () => Promise.resolve(5), | ||
| }), | ||
| ) | ||
| }) | ||
|
|
||
| it('should work when used with useMutationState', () => { | ||
| const mutationState = useMutationState({ | ||
| filters: mutationOptions({ | ||
| mutationKey: ['key'], | ||
| mutationFn: () => Promise.resolve(5), | ||
| }), | ||
| }) | ||
| expectTypeOf(mutationState.value).toEqualTypeOf< | ||
| Array<MutationState<unknown, Error, unknown, unknown>> | ||
| >() | ||
|
|
||
| useMutationState({ | ||
| // @ts-expect-error filters should have mutationKey | ||
| filters: mutationOptions({ | ||
| mutationFn: () => Promise.resolve(5), | ||
| }), | ||
| }) | ||
| }) | ||
| }) | ||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🧩 Analysis chain
🏁 Script executed:
Repository: TanStack/query
Length of output: 150
🏁 Script executed:
Repository: TanStack/query
Length of output: 473
🏁 Script executed:
rg "@ts-expect-error" packages/vue-query/src/__tests__/mutationOptions.test-d.ts -nRepository: TanStack/query
Length of output: 423
🏁 Script executed:
Repository: TanStack/query
Length of output: 517
🏁 Script executed:
Repository: TanStack/query
Length of output: 335
🏁 Script executed:
Repository: TanStack/query
Length of output: 351
🏁 Script executed:
Repository: TanStack/query
Length of output: 319
@ts-expect-errordirective is on the wrong line.The directive on line 18 applies to line 19 (
mutationFn), but the intentional error is on line 21 (onMutates). Move the directive to line 21 to guard the correct property.Fix
mutationOptions({ - // `@ts-expect-error` this is a good error, because onMutates does not exist! mutationFn: () => Promise.resolve(5), mutationKey: ['key'], + // `@ts-expect-error` this is a good error, because onMutates does not exist! onMutates: 1000, onSuccess: (data) => { expectTypeOf(data).toEqualTypeOf<number>() }, })📝 Committable suggestion
🤖 Prompt for AI Agents