fix: return proper results when handling framework navigation functions

Author: TheEdoRan

packages/next-safe-action/src/hooks.ts

@@ -102,7 +102,7 @@ const useActionCallbacks = <
 					await Promise.resolve(onExecute?.({ input }));
 					break;
 				case "hasSucceeded":
-					await Promise.resolve(onSuccess?.({ data: result.data!, input }));
+					await Promise.resolve(onSuccess?.({ data: result?.data, input }));
 					await Promise.resolve(onSettled?.({ result, input }));
 					break;
 				case "hasErrored":
@@ -155,6 +155,7 @@ export const useAction = <
 					.then((res) => setResult(res ?? EMPTY_HOOK_RESULT))
 					.catch((e) => {
 						if (isRedirectError(e) || isNotFoundError(e)) {
+							setResult(EMPTY_HOOK_RESULT);
 							throw e;
 						}
 
@@ -183,6 +184,7 @@ export const useAction = <
 						})
 						.catch((e) => {
 							if (isRedirectError(e) || isNotFoundError(e)) {
+								setResult(EMPTY_HOOK_RESULT);
 								throw e;
 							}
 
@@ -205,7 +207,7 @@ export const useAction = <
 	};
 
 	useActionCallbacks({
-		result,
+		result: result ?? EMPTY_HOOK_RESULT,
 		input: clientInput as S extends Schema ? InferIn<S> : undefined,
 		status,
 		cb: utils,
@@ -268,6 +270,7 @@ export const useOptimisticAction = <
 					.then((res) => setResult(res ?? EMPTY_HOOK_RESULT))
 					.catch((e) => {
 						if (isRedirectError(e) || isNotFoundError(e)) {
+							setResult(EMPTY_HOOK_RESULT);
 							throw e;
 						}
 
@@ -297,6 +300,7 @@ export const useOptimisticAction = <
 						})
 						.catch((e) => {
 							if (isRedirectError(e) || isNotFoundError(e)) {
+								setResult(EMPTY_HOOK_RESULT);
 								throw e;
 							}
 
@@ -319,7 +323,7 @@ export const useOptimisticAction = <
 	};
 
 	useActionCallbacks({
-		result,
+		result: result ?? EMPTY_HOOK_RESULT,
 		input: clientInput as S extends Schema ? InferIn<S> : undefined,
 		status,
 		cb: {
@@ -384,7 +388,7 @@ export const useStateAction = <
 	);
 
 	useActionCallbacks({
-		result,
+		result: result ?? EMPTY_HOOK_RESULT,
 		input: clientInput as S extends Schema ? InferIn<S> : undefined,
 		status,
 		cb: {

packages/next-safe-action/src/hooks.types.ts

@@ -1,6 +1,6 @@
 import type { InferIn, Schema } from "@typeschema/main";
 import type { SafeActionResult } from "./index.types";
-import type { MaybePromise } from "./utils";
+import type { MaybePromise, Prettify } from "./utils";
 
 /**
  * Type of `result` object returned by `useAction`, `useOptimisticAction` and `useStateAction` hooks.
@@ -29,13 +29,13 @@ export type HookCallbacks<
 	Data,
 > = {
 	onExecute?: (args: { input: S extends Schema ? InferIn<S> : undefined }) => MaybePromise<void>;
-	onSuccess?: (args: { data: Data; input: S extends Schema ? InferIn<S> : undefined }) => MaybePromise<void>;
+	onSuccess?: (args: { data?: Data; input: S extends Schema ? InferIn<S> : undefined }) => MaybePromise<void>;
 	onError?: (args: {
-		error: Omit<HookResult<ServerError, S, BAS, CVE, CBAVE, Data>, "data">;
+		error: Prettify<Omit<HookResult<ServerError, S, BAS, CVE, CBAVE, Data>, "data">>;
 		input: S extends Schema ? InferIn<S> : undefined;
 	}) => MaybePromise<void>;
 	onSettled?: (args: {
-		result: HookResult<ServerError, S, BAS, CVE, CBAVE, Data>;
+		result: Prettify<HookResult<ServerError, S, BAS, CVE, CBAVE, Data>>;
 		input: S extends Schema ? InferIn<S> : undefined;
 	}) => MaybePromise<void>;
 };

packages/next-safe-action/src/index.types.ts

@@ -136,19 +136,19 @@ export type SafeActionCallbacks<
 	Data,
 > = {
 	onSuccess?: (args: {
-		data: Data;
+		data?: Data;
 		clientInput: S extends Schema ? InferIn<S> : undefined;
 		bindArgsClientInputs: InferInArray<BAS>;
 		parsedInput: S extends Schema ? Infer<S> : undefined;
 		bindArgsParsedInputs: InferArray<BAS>;
 	}) => MaybePromise<void>;
 	onError?: (args: {
-		error: Omit<SafeActionResult<ServerError, S, BAS, CVE, CBAVE, Data>, "data">;
+		error: Prettify<Omit<SafeActionResult<ServerError, S, BAS, CVE, CBAVE, Data>, "data">>;
 		clientInput: S extends Schema ? InferIn<S> : undefined;
 		bindArgsClientInputs: InferInArray<BAS>;
 	}) => MaybePromise<void>;
 	onSettled?: (args: {
-		result: SafeActionResult<ServerError, S, BAS, CVE, CBAVE, Data>;
+		result: Prettify<SafeActionResult<ServerError, S, BAS, CVE, CBAVE, Data>>;
 		clientInput: S extends Schema ? InferIn<S> : undefined;
 		bindArgsClientInputs: InferInArray<BAS>;
 	}) => MaybePromise<void>;

website/docs/types.md

@@ -183,7 +183,7 @@ export type SafeActionCallbacks<
 	Data,
 > = {
 	onSuccess?: (args: {
-		data: Data;
+		data?: Data;
 		clientInput: S extends Schema ? InferIn<S> : undefined;
 		bindArgsClientInputs: InferInArray<BAS>;
 		parsedInput: S extends Schema ? Infer<S> : undefined;