server-act 1.4.0 → 1.5.1

package/README.md

@@ -2,7 +2,9 @@
 
 [![npm version](https://badge.fury.io/js/server-act.svg)](https://badge.fury.io/js/server-act)
 
-A simple React server action builder that provides input validation with zod.
+A simple React server action builder that provides input validation.
+
+You can use any validation library that supports [Standard Schema](https://standardschema.dev/).
 
 ## Installation
 
@@ -68,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}`;
@@ -110,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}!` };
   });

package/dist/index.d.mts

@@ -1,15 +1,21 @@
-import { z } from 'zod';
+import { StandardSchemaV1 } from '@standard-schema/spec';
+
+declare function getFormErrors(issues: ReadonlyArray<StandardSchemaV1.Issue>): {
+    messages: string[];
+    fieldErrors: Record<string, string[]>;
+};
 
 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];
 } & {};
 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", TUnwrapEffects extends true | false> = T extends z.ZodEffects<infer InnerType, infer Output, infer Input> ? TUnwrapEffects extends true ? InnerType[TType extends "in" ? "_input" : "_output"] : TType extends "in" ? Input : Output : T extends z.ZodType ? T[TType extends "in" ? "_input" : "_output"] : never;
-type InferInputType<T, TType extends "in" | "out", TUnwrapEffects extends true | false = true> = T extends UnsetMarker ? undefined : InferParserType<T, TType, TUnwrapEffects>;
-type InferContextType<T> = T extends UnsetMarker ? undefined : T;
+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> = RemoveUnsetMarker<T>;
 interface ActionParams<TInput = unknown, TContext = unknown> {
     _input: TInput;
     _context: TContext;
@@ -25,7 +31,7 @@ interface ActionBuilder<TParams extends ActionParams> {
     /**
      * Input validation for the action.
      */
-    input: <TParser extends z.ZodType>(input: ((params: {
+    input: <TParser extends StandardSchemaV1>(input: ((params: {
         ctx: InferContextType<TParams["_context"]>;
     }) => Promise<TParser> | TParser) | TParser) => Omit<ActionBuilder<{
         _input: TParser;
@@ -37,21 +43,21 @@ interface ActionBuilder<TParams extends ActionParams> {
     action: <TOutput>(action: (params: {
         ctx: InferContextType<TParams["_context"]>;
         input: InferInputType<TParams["_input"], "out">;
-    }) => Promise<TOutput>) => SanitizeFunctionParam<(input: InferInputType<TParams["_input"], "in"> | InferInputType<TParams["_input"], "in", false>) => Promise<TOutput>>;
+    }) => Promise<TOutput>) => SanitizeFunctionParam<(input: InferInputType<TParams["_input"], "in">) => Promise<TOutput>>;
     /**
      * 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">;
         formErrors?: undefined;
     } | {
         input?: undefined;
-        formErrors: z.ZodError<InferInputType<TParams["_input"], "in">>;
-    })>) => Promise<TState>) => (prevState: TState | TPrevState, formData: InferInputType<TParams["_input"], "in"> | InferInputType<TParams["_input"], "in", false>) => Promise<TState | TPrevState>;
+        formErrors: ReturnType<typeof getFormErrors>;
+    })>) => Promise<TState>) => (prevState: TState | RemoveUnsetMarker<TPrevState>, formData: InferInputType<TParams["_input"], "in">) => Promise<TState | RemoveUnsetMarker<TPrevState>>;
 }
 /**
  * Server action builder

package/dist/index.d.ts

@@ -1,15 +1,21 @@
-import { z } from 'zod';
+import { StandardSchemaV1 } from '@standard-schema/spec';
+
+declare function getFormErrors(issues: ReadonlyArray<StandardSchemaV1.Issue>): {
+    messages: string[];
+    fieldErrors: Record<string, string[]>;
+};
 
 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];
 } & {};
 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", TUnwrapEffects extends true | false> = T extends z.ZodEffects<infer InnerType, infer Output, infer Input> ? TUnwrapEffects extends true ? InnerType[TType extends "in" ? "_input" : "_output"] : TType extends "in" ? Input : Output : T extends z.ZodType ? T[TType extends "in" ? "_input" : "_output"] : never;
-type InferInputType<T, TType extends "in" | "out", TUnwrapEffects extends true | false = true> = T extends UnsetMarker ? undefined : InferParserType<T, TType, TUnwrapEffects>;
-type InferContextType<T> = T extends UnsetMarker ? undefined : T;
+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> = RemoveUnsetMarker<T>;
 interface ActionParams<TInput = unknown, TContext = unknown> {
     _input: TInput;
     _context: TContext;
@@ -25,7 +31,7 @@ interface ActionBuilder<TParams extends ActionParams> {
     /**
      * Input validation for the action.
      */
-    input: <TParser extends z.ZodType>(input: ((params: {
+    input: <TParser extends StandardSchemaV1>(input: ((params: {
         ctx: InferContextType<TParams["_context"]>;
     }) => Promise<TParser> | TParser) | TParser) => Omit<ActionBuilder<{
         _input: TParser;
@@ -37,21 +43,21 @@ interface ActionBuilder<TParams extends ActionParams> {
     action: <TOutput>(action: (params: {
         ctx: InferContextType<TParams["_context"]>;
         input: InferInputType<TParams["_input"], "out">;
-    }) => Promise<TOutput>) => SanitizeFunctionParam<(input: InferInputType<TParams["_input"], "in"> | InferInputType<TParams["_input"], "in", false>) => Promise<TOutput>>;
+    }) => Promise<TOutput>) => SanitizeFunctionParam<(input: InferInputType<TParams["_input"], "in">) => Promise<TOutput>>;
     /**
      * 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">;
         formErrors?: undefined;
     } | {
         input?: undefined;
-        formErrors: z.ZodError<InferInputType<TParams["_input"], "in">>;
-    })>) => Promise<TState>) => (prevState: TState | TPrevState, formData: InferInputType<TParams["_input"], "in"> | InferInputType<TParams["_input"], "in", false>) => Promise<TState | TPrevState>;
+        formErrors: ReturnType<typeof getFormErrors>;
+    })>) => Promise<TState>) => (prevState: TState | RemoveUnsetMarker<TPrevState>, formData: InferInputType<TParams["_input"], "in">) => Promise<TState | RemoveUnsetMarker<TPrevState>>;
 }
 /**
  * Server action builder

package/dist/index.js

@@ -1,5 +1,70 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var utils = require('@standard-schema/utils');
+
+function asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator$1(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function standardValidate(schema, input) {
+    return _standardValidate.apply(this, arguments);
+}
+function _standardValidate() {
+    _standardValidate = _async_to_generator$1(function*(schema, input) {
+        let result = schema["~standard"].validate(input);
+        if (result instanceof Promise) result = yield result;
+        return result;
+    });
+    return _standardValidate.apply(this, arguments);
+}
+function getFormErrors(issues) {
+    const messages = [];
+    const fieldErrors = {};
+    for (const issue of issues){
+        const dotPath = utils.getDotPath(issue);
+        if (dotPath) {
+            if (fieldErrors[dotPath]) {
+                fieldErrors[dotPath].push(issue.message);
+            } else {
+                fieldErrors[dotPath] = [
+                    issue.message
+                ];
+            }
+        } else {
+            messages.push(issue.message);
+        }
+    }
+    return {
+        messages,
+        fieldErrors
+    };
+}
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -66,14 +131,14 @@ function createServerActionBuilder(initDef = {}) {
                     const inputSchema = typeof _def.input === "function" ? yield _def.input({
                         ctx
                     }) : _def.input;
-                    const result = yield inputSchema.safeParseAsync(input);
-                    if (!result.success) {
-                        console.error("❌ Input validation error:", result.error.errors);
-                        throw new Error("Input validation error");
+                    const result = yield standardValidate(inputSchema, input);
+                    if (result.issues) {
+                        throw new utils.SchemaError(result.issues);
                     }
+                    // biome-ignore lint/suspicious/noExplicitAny: It's fine
                     return yield action({
                         ctx,
-                        input: result.data
+                        input: result.value
                     });
                 }
                 return yield action({
@@ -90,25 +155,29 @@ function createServerActionBuilder(initDef = {}) {
                     const inputSchema = typeof _def.input === "function" ? yield _def.input({
                         ctx
                     }) : _def.input;
-                    const result = yield inputSchema.safeParseAsync(formData);
-                    if (!result.success) {
+                    const result = yield standardValidate(inputSchema, formData);
+                    if (result.issues) {
                         return yield action({
                             ctx,
-                            prevState,
+                            // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                            prevState: prevState,
                             formData,
-                            formErrors: result.error
+                            formErrors: getFormErrors(result.issues)
                         });
                     }
                     return yield action({
                         ctx,
-                        prevState,
+                        // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                        prevState: prevState,
                         formData,
-                        input: result.data
+                        // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                        input: result.value
                     });
                 }
                 return yield action({
                     ctx,
-                    prevState,
+                    // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                    prevState: prevState,
                     formData,
                     input: undefined
                 });

package/dist/index.mjs

@@ -1,3 +1,68 @@
+import { getDotPath, SchemaError } from '@standard-schema/utils';
+
+function asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    } catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    } else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator$1(fn) {
+    return function() {
+        var self = this, args = arguments;
+        return new Promise(function(resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep$1(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function standardValidate(schema, input) {
+    return _standardValidate.apply(this, arguments);
+}
+function _standardValidate() {
+    _standardValidate = _async_to_generator$1(function*(schema, input) {
+        let result = schema["~standard"].validate(input);
+        if (result instanceof Promise) result = yield result;
+        return result;
+    });
+    return _standardValidate.apply(this, arguments);
+}
+function getFormErrors(issues) {
+    const messages = [];
+    const fieldErrors = {};
+    for (const issue of issues){
+        const dotPath = getDotPath(issue);
+        if (dotPath) {
+            if (fieldErrors[dotPath]) {
+                fieldErrors[dotPath].push(issue.message);
+            } else {
+                fieldErrors[dotPath] = [
+                    issue.message
+                ];
+            }
+        } else {
+            messages.push(issue.message);
+        }
+    }
+    return {
+        messages,
+        fieldErrors
+    };
+}
+
 function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
     try {
         var info = gen[key](arg);
@@ -64,14 +129,14 @@ function createServerActionBuilder(initDef = {}) {
                     const inputSchema = typeof _def.input === "function" ? yield _def.input({
                         ctx
                     }) : _def.input;
-                    const result = yield inputSchema.safeParseAsync(input);
-                    if (!result.success) {
-                        console.error("❌ Input validation error:", result.error.errors);
-                        throw new Error("Input validation error");
+                    const result = yield standardValidate(inputSchema, input);
+                    if (result.issues) {
+                        throw new SchemaError(result.issues);
                     }
+                    // biome-ignore lint/suspicious/noExplicitAny: It's fine
                     return yield action({
                         ctx,
-                        input: result.data
+                        input: result.value
                     });
                 }
                 return yield action({
@@ -88,25 +153,29 @@ function createServerActionBuilder(initDef = {}) {
                     const inputSchema = typeof _def.input === "function" ? yield _def.input({
                         ctx
                     }) : _def.input;
-                    const result = yield inputSchema.safeParseAsync(formData);
-                    if (!result.success) {
+                    const result = yield standardValidate(inputSchema, formData);
+                    if (result.issues) {
                         return yield action({
                             ctx,
-                            prevState,
+                            // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                            prevState: prevState,
                             formData,
-                            formErrors: result.error
+                            formErrors: getFormErrors(result.issues)
                         });
                     }
                     return yield action({
                         ctx,
-                        prevState,
+                        // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                        prevState: prevState,
                         formData,
-                        input: result.data
+                        // biome-ignore lint/suspicious/noExplicitAny: It's fine
+                        input: result.value
                     });
                 }
                 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.4.0",
+  "version": "1.5.1",
   "homepage": "https://github.com/chungweileong94/server-act#readme",
   "author": "chungweileong94",
   "license": "MIT",
@@ -43,21 +43,33 @@
     "server action",
     "action"
   ],
-  "devDependencies": {
-    "bunchee": "^5.6.0",
-    "typescript": "^5.6.3",
-    "zod": "^3.22.2",
-    "zod-form-data": "^2.0.2"
+  "dependencies": {
+    "@standard-schema/spec": "^1.0.0",
+    "@standard-schema/utils": "^0.3.0"
   },
   "peerDependencies": {
     "typescript": ">=5.0.0",
-    "zod": "^3.22.2"
+    "valibot": "^1.0.0",
+    "zod": "^3.24.0"
   },
   "peerDependenciesMeta": {
     "typescript": {
       "optional": true
+    },
+    "zod": {
+      "optional": true
+    },
+    "valibot": {
+      "optional": true
     }
   },
+  "devDependencies": {
+    "bunchee": "^6.2.0",
+    "typescript": "^5.6.3",
+    "valibot": "1.0.0-rc.0",
+    "zod": "^3.24.2",
+    "zod-form-data": "^2.0.2"
+  },
   "scripts": {
     "build": "bunchee",
     "dev": "bunchee -w",