[pull] main from TanStack:main

packages/svelte-query/tests/createMutation/createMutation.svelte.test.ts

@@ -6,7 +6,7 @@ import { sleep } from '@tanstack/query-test-utils'
 import { createMutation } from '../../src/index.js'
 import { withEffectRoot } from '../utils.svelte.js'
 import ResetExample from './ResetExample.svelte'
-import OnSuccessExample from './OnSuccessExample.svelte'
+import SuccessExample from './SuccessExample.svelte'
 import FailureExample from './FailureExample.svelte'
 
 describe('createMutation', () => {
@@ -42,7 +42,7 @@ describe('createMutation', () => {
     const onSuccessMock = vi.fn()
     const onSettledMock = vi.fn()
 
-    const rendered = render(OnSuccessExample, {
+    const rendered = render(SuccessExample, {
       props: {
         queryClient,
         onSuccessMock,

packages/vue-query/src/__tests__/mutationOptions.test-d.ts

@@ -243,4 +243,56 @@ describe('mutationOptions', () => {
     const resolved = options()
     expectTypeOf(resolved.mutationFn).not.toBeUndefined()
   })
+
+  it('should error if mutationFn return type mismatches TData (getter)', () => {
+    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 infer all types when not explicitly provided (getter)', () => {
+    expectTypeOf(
+      mutationOptions(() => ({
+        mutationFn: (id: string) => Promise.resolve(id.length),
+        mutationKey: ['key'],
+        onSuccess: (data) => {
+          expectTypeOf(data).toEqualTypeOf<number>()
+        },
+      })),
+    ).toEqualTypeOf<
+      () => WithRequired<
+        MutationOptions<number, DefaultError, string, unknown>,
+        'mutationKey'
+      >
+    >()
+    expectTypeOf(
+      mutationOptions(() => ({
+        mutationFn: (id: string) => Promise.resolve(id.length),
+        onSuccess: (data) => {
+          expectTypeOf(data).toEqualTypeOf<number>()
+        },
+      })),
+    ).toEqualTypeOf<
+      () => Omit<
+        MutationOptions<number, DefaultError, string, unknown>,
+        'mutationKey'
+      >
+    >()
+  })
+
+  it('should work when used with useMutation (getter)', () => {
+    const mutation = useMutation(
+      mutationOptions(() => ({
+        mutationKey: ['key'],
+        mutationFn: () => Promise.resolve('data'),
+        onSuccess: (data) => {
+          expectTypeOf(data).toEqualTypeOf<string>()
+        },
+      })),
+    )
+    expectTypeOf(mutation.data.value).toEqualTypeOf<string | undefined>()
+  })
 })