@navios/react-query 0.5.2 → 0.6.1

package/src/mutation/make-hook.mts

@@ -5,14 +5,13 @@ import type {
   UrlHasParams,
   UrlParams,
 } from '@navios/builder'
-import type { UseMutationResult } from '@tanstack/react-query'
+import type {
+  MutationFunctionContext,
+  UseMutationResult,
+} from '@tanstack/react-query'
 import type { z } from 'zod/v4'
 
-import {
-  useIsMutating,
-  useMutation,
-  useQueryClient,
-} from '@tanstack/react-query'
+import { useIsMutating, useMutation } from '@tanstack/react-query'
 
 import type { MutationParams } from './types.mjs'
 
@@ -33,6 +32,7 @@ export function makeMutation<
   TData = unknown,
   TVariables extends NaviosZodRequest<Config> = NaviosZodRequest<Config>,
   TResponse = z.output<Config['responseSchema']>,
+  TOnMutateResult = unknown,
   TContext = unknown,
   UseKey extends boolean = false,
 >(
@@ -42,6 +42,7 @@ export function makeMutation<
     TData,
     TVariables,
     TResponse,
+    TOnMutateResult,
     TContext,
     UseKey
   >,
@@ -58,57 +59,110 @@ export function makeMutation<
         ? UrlParams<Config['url']>
         : never
       : never,
-  ): UseMutationResult<TData, Error, NaviosZodRequest<Config>> => {
-    const queryClient = useQueryClient()
+  ): UseMutationResult<
+    TData,
+    Error,
+    NaviosZodRequest<Config>,
+    TOnMutateResult
+  > => {
     const {
       useKey,
       useContext,
+      onMutate,
       onError,
       onSuccess,
+      onSettled,
       keyPrefix: _keyPrefix,
       keySuffix: _keySuffix,
       processResponse,
       ...rest
     } = options
 
-    const context = useContext?.() as TContext
+    const ownContext = (useContext?.() as TContext) ?? {}
 
     // @ts-expect-error The types match
-    return useMutation(
-      {
-        ...rest,
-        mutationKey: useKey
-          ? mutationKey({
-              urlParams: keyParams,
-            })
-          : undefined,
-        scope: useKey
-          ? {
-              id: JSON.stringify(
-                mutationKey({
-                  urlParams: keyParams,
-                }),
-              ),
-            }
-          : undefined,
-        async mutationFn(params: TVariables) {
-          const response = await endpoint(params)
+    return useMutation({
+      ...rest,
+      mutationKey: useKey
+        ? mutationKey({
+            urlParams: keyParams,
+          })
+        : undefined,
+      scope: useKey
+        ? {
+            id: JSON.stringify(
+              mutationKey({
+                urlParams: keyParams,
+              }),
+            ),
+          }
+        : undefined,
+      async mutationFn(params: TVariables) {
+        const response = await endpoint(params)
 
-          return (processResponse ? processResponse(response) : response) as TData
-        },
-        onSuccess: onSuccess
-          ? (data: TData, variables: TVariables) => {
-              return onSuccess?.(queryClient, data, variables, context)
-            }
-          : undefined,
-        onError: onError
-          ? (err: Error, variables: TVariables) => {
-              return onError?.(queryClient, err, variables, context)
-            }
-          : undefined,
+        return (processResponse ? processResponse(response) : response) as TData
       },
-      queryClient,
-    )
+      onSuccess: onSuccess
+        ? (
+            data: TData,
+            variables: TVariables,
+            onMutateResult: TOnMutateResult | undefined,
+            context: MutationFunctionContext,
+          ) => {
+            return onSuccess?.(data, variables, {
+              ...ownContext,
+              ...context,
+              onMutateResult,
+            } as TContext &
+              MutationFunctionContext & {
+                onMutateResult: TOnMutateResult | undefined
+              })
+          }
+        : undefined,
+      onError: onError
+        ? (
+            err: Error,
+            variables: TVariables,
+            onMutateResult: TOnMutateResult | undefined,
+            context: MutationFunctionContext,
+          ) => {
+            return onError?.(err, variables, {
+              onMutateResult,
+              ...ownContext,
+              ...context,
+            } as TContext &
+              MutationFunctionContext & {
+                onMutateResult: TOnMutateResult | undefined
+              })
+          }
+        : undefined,
+      onMutate: onMutate
+        ? (variables: TVariables, context: MutationFunctionContext) => {
+            return onMutate(variables, {
+              ...ownContext,
+              ...context,
+            } as TContext & MutationFunctionContext)
+          }
+        : undefined,
+      onSettled: onSettled
+        ? (
+            data: TData | undefined,
+            error: Error | null,
+            variables: TVariables,
+            onMutateResult: TOnMutateResult | undefined,
+            context: MutationFunctionContext,
+          ) => {
+            return onSettled(data, error, variables, {
+              ...ownContext,
+              ...context,
+              onMutateResult,
+            } as TContext &
+              MutationFunctionContext & {
+                onMutateResult: TOnMutateResult | undefined
+              })
+          }
+        : undefined,
+    })
   }
   result.useIsMutating = (
     keyParams: UseKey extends true

package/src/mutation/types.mts

@@ -4,7 +4,11 @@ import type {
   UrlHasParams,
   UrlParams,
 } from '@navios/builder'
-import type { DataTag, QueryClient, UseMutationOptions } from '@tanstack/react-query'
+import type {
+  DataTag,
+  MutationFunctionContext,
+  UseMutationOptions,
+} from '@tanstack/react-query'
 import type { z, ZodObject } from 'zod/v4'
 
 import type { ProcessResponseFunction } from '../common/types.mjs'
@@ -42,11 +46,18 @@ export interface MutationParams<
   TData = unknown,
   TVariables = NaviosZodRequest<Config>,
   TResponse = z.output<Config['responseSchema']>,
+  TOnMutateResult = unknown,
   TContext = unknown,
   UseKey extends boolean = false,
 > extends Omit<
     UseMutationOptions<TData, Error, TVariables>,
-    'mutationKey' | 'mutationFn' | 'onSuccess' | 'onError' | 'scope'
+    | 'mutationKey'
+    | 'mutationFn'
+    | 'onMutate'
+    | 'onSuccess'
+    | 'onError'
+    | 'onSettled'
+    | 'scope'
   > {
   processResponse?: ProcessResponseFunction<TData, TResponse>
   /**
@@ -55,16 +66,27 @@ export interface MutationParams<
    */
   useContext?: () => TContext
   onSuccess?: (
-    queryClient: QueryClient,
     data: TData,
     variables: TVariables,
-    context: TContext,
+    context: TContext &
+      MutationFunctionContext & { onMutateResult: TOnMutateResult | undefined },
   ) => void | Promise<void>
   onError?: (
-    queryClient: QueryClient,
     err: unknown,
     variables: TVariables,
-    context: TContext,
+    context: TContext &
+      MutationFunctionContext & { onMutateResult: TOnMutateResult | undefined },
+  ) => void | Promise<void>
+  onMutate?: (
+    variables: TVariables,
+    context: TContext & MutationFunctionContext,
+  ) => TOnMutateResult | Promise<TOnMutateResult>
+  onSettled?: (
+    data: TData | undefined,
+    error: Error | null,
+    variables: TVariables,
+    context: TContext &
+      MutationFunctionContext & { onMutateResult: TOnMutateResult | undefined },
   ) => void | Promise<void>
 
   /**