Fix react-query mutation typing for v5.90

changelog.md

@@ -55,3 +55,7 @@ A major release with breaking changes. Involves updating type signatures to matc
 ### 3.5.3
 
 - Fix for issue #48: Make context parameter required in onSuccess callback to match React Query's types
+
+### 3.5.4
+
+- Fix for @tanstack/query v5.89.0 onError, onSuccess and onSettled signature change referenced in issue 9660

spec/react-query/mutations.spec.ts

@@ -8,8 +8,8 @@ const expected = `type MutationConfigs = {
 };
 function makeMutations(requests: Requests, config?: Config["mutations"]) {
     return {
-        useCreatePet: (options?: Omit<UseMutationOptions<Response<"createPet">, unknown, Parameters<Requests["createPet"]>[0], unknown>, "mutationFn">) => useRapiniMutation<Response<"createPet">, unknown, Parameters<Requests["createPet"]>[0]>(payload => requests.createPet(payload), config?.useCreatePet, options),
-        useAddPetPhoto: (petId: string, options?: Omit<UseMutationOptions<Response<"addPetPhoto">, unknown, Parameters<Requests["addPetPhoto"]>[0], unknown>, "mutationFn">) => useRapiniMutation<Response<"addPetPhoto">, unknown, Parameters<Requests["addPetPhoto"]>[0]>(payload => requests.addPetPhoto(payload, petId), config?.useAddPetPhoto, options)
+        useCreatePet: (options?: Omit<UseMutationOptions<Response<"createPet">, unknown, Parameters<Requests["createPet"]>[0], unknown>, "mutationFn">) => useRapiniMutation<Response<"createPet">, unknown, Parameters<Requests["createPet"]>[0], unknown>(payload => requests.createPet(payload), config?.useCreatePet, options),
+        useAddPetPhoto: (petId: string, options?: Omit<UseMutationOptions<Response<"addPetPhoto">, unknown, Parameters<Requests["addPetPhoto"]>[0], unknown>, "mutationFn">) => useRapiniMutation<Response<"addPetPhoto">, unknown, Parameters<Requests["addPetPhoto"]>[0], unknown>(payload => requests.addPetPhoto(payload, petId), config?.useAddPetPhoto, options)
     } as const;
 }
 `;

spec/react-query/rapini-mutation.spec.ts

@@ -1,22 +1,22 @@
 import { makeRapiniMutation } from "../../src/react-query/rapini-mutation";
 import { compile } from "../test.utils";
 
-const expected = `function useRapiniMutation<TData = unknown, TError = unknown, TVariables = void, TContext = unknown>(mutationFn: MutationFunction<TData, TVariables>, config?: (queryClient: QueryClient) => Pick<UseMutationOptions<TData, TError, TVariables, TContext>, "onSuccess" | "onSettled" | "onError">, options?: Omit<UseMutationOptions<TData, TError, TVariables, TContext>, "mutationFn">): UseMutationResult<TData, TError, TVariables, TContext> {
+const expected = `function useRapiniMutation<TData = unknown, TError = unknown, TVariables = void, TOnMutateResult = unknown>(mutationFn: MutationFunction<TData, TVariables>, config?: (queryClient: QueryClient) => Pick<UseMutationOptions<TData, TError, TVariables, TOnMutateResult>, "onSuccess" | "onSettled" | "onError">, options?: Omit<UseMutationOptions<TData, TError, TVariables, TOnMutateResult>, "mutationFn">): UseMutationResult<TData, TError, TVariables, TOnMutateResult> {
     const { onSuccess, onError, onSettled, ...rest } = options ?? {};
     const queryClient = useQueryClient();
     const conf = config?.(queryClient);
     const mutationOptions: typeof options = {
-        onSuccess: (data: TData, variables: TVariables, context: TContext) => {
-            conf?.onSuccess?.(data, variables, context);
-            onSuccess?.(data, variables, context);
+        onSuccess: (...args) => {
+            conf?.onSuccess?.(...args);
+            onSuccess?.(...args);
         },
-        onError: (error: TError, variables: TVariables, context?: TContext) => {
-            conf?.onError?.(error, variables, context);
-            onError?.(error, variables, context);
+        onError: (...args) => {
+            conf?.onError?.(...args);
+            onError?.(...args);
         },
-        onSettled: (data: TData | undefined, error: TError | null, variables: TVariables, context?: TContext) => {
-            conf?.onSettled?.(data, error, variables, context);
-            onSettled?.(data, error, variables, context);
+        onSettled: (...args) => {
+            conf?.onSettled?.(...args);
+            onSettled?.(...args);
         },
         ...rest
     };

src/react-query/mutations.ts

@@ -232,6 +232,7 @@ function makeProperty(
             )
           )
         : ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
+      ts.factory.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword),
     ],
     /*args*/ [
       ts.factory.createArrowFunction(