server-act 1.5.0 → 1.5.2

package/README.md

@@ -70,14 +70,15 @@ import { z } from "zod";
 
 export const sayHelloAction = serverAct
   .middleware(() => {
-    const userId = "...";
-    return { userId };
+    const t = i18n();
+    const userId = "..."
+    return { t, userId };
+  })
+  .input((ctx) => {
+    return z.object({
+      name: z.string().min(1, { message: ctx.t("form.name.required") }),
+    });
   })
-  .input(
-    z.object({
-      name: z.string(),
-    }),
-  )
   .action(async ({ ctx, input }) => {
     console.log("User ID", ctx.userId);
     return `Hello, ${input.name}`;
@@ -112,7 +113,7 @@ export const sayHelloAction = serverAct
   )
   .formAction(async ({ formData, input, formErrors, ctx }) => {
     if (formErrors) {
-      return { formData, formErrors: formErrors.formErrors.fieldErrors };
+      return { formData, formErrors: formErrors.fieldErrors };
     }
     return { message: `Hello, ${input.name}!` };
   });
@@ -126,7 +127,7 @@ import { useActionState } from "react";
 import { sayHelloAction } from "./action";
 
 export const ClientComponent = () => {
-  const [state, dispatch] = useFormState(sayHelloAction, undefined);
+  const [state, dispatch] = useActionState(sayHelloAction, undefined);
 
   return (
     <form action={dispatch}>

package/dist/index.d.mts

@@ -7,6 +7,7 @@ declare function getFormErrors(issues: ReadonlyArray<StandardSchemaV1.Issue>): {
 
 declare const unsetMarker: unique symbol;
 type UnsetMarker = typeof unsetMarker;
+type RemoveUnsetMarker<T> = T extends UnsetMarker ? undefined : T;
 type Equals<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 type Prettify<T> = {
     [P in keyof T]: T[P];
@@ -14,7 +15,7 @@ type Prettify<T> = {
 type SanitizeFunctionParam<T extends (param: any) => any> = T extends (param: infer P) => infer R ? Equals<P, undefined> extends true ? () => R : Equals<P, P | undefined> extends true ? (param?: P) => R : (param: P) => R : never;
 type InferParserType<T, TType extends "in" | "out"> = T extends StandardSchemaV1 ? TType extends "in" ? StandardSchemaV1.InferInput<T> : StandardSchemaV1.InferOutput<T> : never;
 type InferInputType<T, TType extends "in" | "out"> = T extends UnsetMarker ? undefined : InferParserType<T, TType>;
-type InferContextType<T> = T extends UnsetMarker ? undefined : T;
+type InferContextType<T> = RemoveUnsetMarker<T>;
 interface ActionParams<TInput = unknown, TContext = unknown> {
     _input: TInput;
     _context: TContext;
@@ -46,9 +47,9 @@ interface ActionBuilder<TParams extends ActionParams> {
     /**
      * Create an action for React `useActionState`
      */
-    formAction: <TState, TPrevState = undefined>(action: (params: Prettify<{
+    formAction: <TState, TPrevState = UnsetMarker>(action: (params: Prettify<{
         ctx: InferContextType<TParams["_context"]>;
-        prevState: any;
+        prevState: RemoveUnsetMarker<TPrevState>;
         formData: FormData;
     } & ({
         input: InferInputType<TParams["_input"], "out">;
@@ -56,7 +57,7 @@ interface ActionBuilder<TParams extends ActionParams> {
     } | {
         input?: undefined;
         formErrors: ReturnType<typeof getFormErrors>;
-    })>) => Promise<TState>) => (prevState: TState | TPrevState, formData: InferInputType<TParams["_input"], "in">) => Promise<TState | TPrevState>;
+    })>) => Promise<TState>) => (prevState: TState | RemoveUnsetMarker<TPrevState>, formData: InferInputType<TParams["_input"], "in">) => Promise<TState | RemoveUnsetMarker<TPrevState>>;
 }
 /**
  * Server action builder

package/dist/index.d.ts

@@ -7,6 +7,7 @@ declare function getFormErrors(issues: ReadonlyArray<StandardSchemaV1.Issue>): {
 
 declare const unsetMarker: unique symbol;
 type UnsetMarker = typeof unsetMarker;
+type RemoveUnsetMarker<T> = T extends UnsetMarker ? undefined : T;
 type Equals<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? true : false;
 type Prettify<T> = {
     [P in keyof T]: T[P];
@@ -14,7 +15,7 @@ type Prettify<T> = {
 type SanitizeFunctionParam<T extends (param: any) => any> = T extends (param: infer P) => infer R ? Equals<P, undefined> extends true ? () => R : Equals<P, P | undefined> extends true ? (param?: P) => R : (param: P) => R : never;
 type InferParserType<T, TType extends "in" | "out"> = T extends StandardSchemaV1 ? TType extends "in" ? StandardSchemaV1.InferInput<T> : StandardSchemaV1.InferOutput<T> : never;
 type InferInputType<T, TType extends "in" | "out"> = T extends UnsetMarker ? undefined : InferParserType<T, TType>;
-type InferContextType<T> = T extends UnsetMarker ? undefined : T;
+type InferContextType<T> = RemoveUnsetMarker<T>;
 interface ActionParams<TInput = unknown, TContext = unknown> {
     _input: TInput;
     _context: TContext;
@@ -46,9 +47,9 @@ interface ActionBuilder<TParams extends ActionParams> {
     /**
      * Create an action for React `useActionState`
      */
-    formAction: <TState, TPrevState = undefined>(action: (params: Prettify<{
+    formAction: <TState, TPrevState = UnsetMarker>(action: (params: Prettify<{
         ctx: InferContextType<TParams["_context"]>;
-        prevState: any;
+        prevState: RemoveUnsetMarker<TPrevState>;
         formData: FormData;
     } & ({
         input: InferInputType<TParams["_input"], "out">;
@@ -56,7 +57,7 @@ interface ActionBuilder<TParams extends ActionParams> {
     } | {
         input?: undefined;
         formErrors: ReturnType<typeof getFormErrors>;
-    })>) => Promise<TState>) => (prevState: TState | TPrevState, formData: InferInputType<TParams["_input"], "in">) => Promise<TState | TPrevState>;
+    })>) => Promise<TState>) => (prevState: TState | RemoveUnsetMarker<TPrevState>, formData: InferInputType<TParams["_input"], "in">) => Promise<TState | RemoveUnsetMarker<TPrevState>>;
 }
 /**
  * Server action builder

package/dist/index.js

@@ -159,14 +159,16 @@ function createServerActionBuilder(initDef = {}) {
                     if (result.issues) {
                         return yield action({
                             ctx,
-                            prevState,
+                            // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                            prevState: prevState,
                             formData,
                             formErrors: getFormErrors(result.issues)
                         });
                     }
                     return yield action({
                         ctx,
-                        prevState,
+                        // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                        prevState: prevState,
                         formData,
                         // biome-ignore lint/suspicious/noExplicitAny: It's fine
                         input: result.value
@@ -174,7 +176,8 @@ function createServerActionBuilder(initDef = {}) {
                 }
                 return yield action({
                     ctx,
-                    prevState,
+                    // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                    prevState: prevState,
                     formData,
                     input: undefined
                 });

package/dist/index.mjs

@@ -157,14 +157,16 @@ function createServerActionBuilder(initDef = {}) {
                     if (result.issues) {
                         return yield action({
                             ctx,
-                            prevState,
+                            // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                            prevState: prevState,
                             formData,
                             formErrors: getFormErrors(result.issues)
                         });
                     }
                     return yield action({
                         ctx,
-                        prevState,
+                        // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                        prevState: prevState,
                         formData,
                         // biome-ignore lint/suspicious/noExplicitAny: It's fine
                         input: result.value
@@ -172,7 +174,8 @@ function createServerActionBuilder(initDef = {}) {
                 }
                 return yield action({
                     ctx,
-                    prevState,
+                    // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                    prevState: prevState,
                     formData,
                     input: undefined
                 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server-act",
-  "version": "1.5.0",
+  "version": "1.5.2",
   "homepage": "https://github.com/chungweileong94/server-act#readme",
   "author": "chungweileong94",
   "license": "MIT",
@@ -50,7 +50,7 @@
   "peerDependencies": {
     "typescript": ">=5.0.0",
     "valibot": "^1.0.0",
-    "zod": "^3.24.0"
+    "zod": "^3.24.0 || ^4.0.0-beta.0"
   },
   "peerDependenciesMeta": {
     "typescript": {
@@ -68,7 +68,7 @@
     "typescript": "^5.6.3",
     "valibot": "1.0.0-rc.0",
     "zod": "^3.24.2",
-    "zod-form-data": "^2.0.2"
+    "zod-form-data": "^2.0.6"
   },
   "scripts": {
     "build": "bunchee",