server-act 1.1.1 → 1.1.3

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> server-act@1.1.1 build /home/runner/work/server-act/server-act/packages/server-act
+> server-act@1.1.3 build /home/runner/work/server-act/server-act/packages/server-act
 > tsup
 
 CLI Building entry: ./src/index.ts
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-CJS dist/index.js     6.18 KB
-CJS dist/index.js.map 12.14 KB
-CJS ⚡️ Build success in 22ms
-ESM dist/index.mjs     4.59 KB
-ESM dist/index.mjs.map 12.09 KB
-ESM ⚡️ Build success in 25ms
+ESM dist/index.mjs     1.56 KB
+ESM dist/index.mjs.map 5.50 KB
+ESM ⚡️ Build success in 12ms
+CJS dist/index.js     2.53 KB
+CJS dist/index.js.map 5.54 KB
+CJS ⚡️ Build success in 12ms
 DTS Build start
-DTS ⚡️ Build success in 1174ms
-DTS dist/index.d.mts 2.18 KB
-DTS dist/index.d.ts  2.18 KB
+DTS ⚡️ Build success in 999ms
+DTS dist/index.d.mts 2.17 KB
+DTS dist/index.d.ts  2.17 KB

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # server-act
 
+## 1.1.3
+
+### Patch Changes
+
+- [#14](https://github.com/chungweileong94/server-act/pull/14) [`8bb348e`](https://github.com/chungweileong94/server-act/commit/8bb348ee0ed7a60a2498a37cab86c7271c205752) Thanks [@chungweileong94](https://github.com/chungweileong94)! - Remove `zod-validation-error` dependency
+
+## 1.1.2
+
+### Patch Changes
+
+- a832b11: Improve form errors type infer
+
 ## 1.1.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -45,7 +45,7 @@ interface ActionBuilder<TParams extends ActionParams> {
         formErrors?: undefined;
     } | {
         input?: undefined;
-        formErrors: z.ZodError<FormData extends InferParserType<TParams['_input'], 'in'> ? InferParserType<TParams['_input'], 'out'> : InferParserType<TParams['_input'], 'in'>>;
+        formErrors: z.ZodError<TParams['_input'] extends z.ZodEffects<infer T, unknown, unknown> ? InferParserType<T, 'in'> : InferParserType<TParams['_input'], 'in'>>;
     })>) => Promise<TState>) => (prevState: TState, formData: FormData) => Promise<TState>;
 }
 /**

package/dist/index.d.ts

@@ -45,7 +45,7 @@ interface ActionBuilder<TParams extends ActionParams> {
         formErrors?: undefined;
     } | {
         input?: undefined;
-        formErrors: z.ZodError<FormData extends InferParserType<TParams['_input'], 'in'> ? InferParserType<TParams['_input'], 'out'> : InferParserType<TParams['_input'], 'in'>>;
+        formErrors: z.ZodError<TParams['_input'] extends z.ZodEffects<infer T, unknown, unknown> ? InferParserType<T, 'in'> : InferParserType<TParams['_input'], 'in'>>;
     })>) => Promise<TState>) => (prevState: TState, formData: FormData) => Promise<TState>;
 }
 /**

package/dist/index.js

@@ -1,9 +1,7 @@
 "use strict";
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -17,14 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // src/index.ts
@@ -33,98 +23,6 @@ __export(src_exports, {
   serverAct: () => serverAct
 });
 module.exports = __toCommonJS(src_exports);
-
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/ValidationError.js
-var zod = __toESM(require("zod"));
-
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/joinPath.js
-var identifierRegex = /[$_\p{ID_Start}][$\u200c\u200d\p{ID_Continue}]*/u;
-function joinPath(path) {
-  if (path.length === 1) {
-    return path[0].toString();
-  }
-  return path.reduce((acc, item) => {
-    if (typeof item === "number") {
-      return acc + "[" + item.toString() + "]";
-    }
-    if (item.includes('"')) {
-      return acc + '["' + escapeQuotes(item) + '"]';
-    }
-    if (!identifierRegex.test(item)) {
-      return acc + '["' + item + '"]';
-    }
-    const separator = acc.length === 0 ? "" : ".";
-    return acc + separator + item;
-  }, "");
-}
-function escapeQuotes(str) {
-  return str.replace(/"/g, '\\"');
-}
-
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/NonEmptyArray.js
-function isNonEmptyArray(value) {
-  return value.length !== 0;
-}
-
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/ValidationError.js
-var MAX_ISSUES_IN_MESSAGE = 99;
-var ISSUE_SEPARATOR = "; ";
-var UNION_SEPARATOR = ", or ";
-var PREFIX = "Validation error";
-var PREFIX_SEPARATOR = ": ";
-var ValidationError = class extends Error {
-  details;
-  name;
-  constructor(message, details = []) {
-    super(message);
-    this.details = details;
-    this.name = "ZodValidationError";
-  }
-  toString() {
-    return this.message;
-  }
-};
-function getMessageFromZodIssue(issue, issueSeparator, unionSeparator) {
-  if (issue.code === "invalid_union") {
-    return issue.unionErrors.reduce((acc, zodError) => {
-      const newIssues = zodError.issues.map((issue2) => getMessageFromZodIssue(issue2, issueSeparator, unionSeparator)).join(issueSeparator);
-      if (!acc.includes(newIssues)) {
-        acc.push(newIssues);
-      }
-      return acc;
-    }, []).join(unionSeparator);
-  }
-  if (isNonEmptyArray(issue.path)) {
-    if (issue.path.length === 1) {
-      const identifier = issue.path[0];
-      if (typeof identifier === "number") {
-        return `${issue.message} at index ${identifier}`;
-      }
-    }
-    return `${issue.message} at "${joinPath(issue.path)}"`;
-  }
-  return issue.message;
-}
-function conditionallyPrefixMessage(reason, prefix, prefixSeparator) {
-  if (prefix !== null) {
-    if (reason.length > 0) {
-      return [prefix, reason].join(prefixSeparator);
-    }
-    return prefix;
-  }
-  if (reason.length > 0) {
-    return reason;
-  }
-  return PREFIX;
-}
-function fromZodError(zodError, options = {}) {
-  const { maxIssuesInMessage = MAX_ISSUES_IN_MESSAGE, issueSeparator = ISSUE_SEPARATOR, unionSeparator = UNION_SEPARATOR, prefixSeparator = PREFIX_SEPARATOR, prefix = PREFIX } = options;
-  const reason = zodError.errors.slice(0, maxIssuesInMessage).map((issue) => getMessageFromZodIssue(issue, issueSeparator, unionSeparator)).join(issueSeparator);
-  const message = conditionallyPrefixMessage(reason, prefix, prefixSeparator);
-  return new ValidationError(message, zodError.errors);
-}
-
-// src/index.ts
 var unsetMarker = Symbol("unsetMarker");
 var createNewServerActionBuilder = (def) => {
   return createServerActionBuilder(def);
@@ -145,7 +43,8 @@ var createServerActionBuilder = (initDef = {}) => {
         if (_def.input) {
           const result = _def.input.safeParse(input);
           if (!result.success) {
-            throw fromZodError(result.error);
+            console.error("\u274C Input validation error:", result.error.errors);
+            throw new Error("Input validation error");
           }
         }
         return await action({ ctx, input });

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/ValidationError.js","../../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/joinPath.js","../../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/NonEmptyArray.js"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n/* eslint-disable @typescript-eslint/no-explicit-any */\nimport {type z} from 'zod';\nimport {fromZodError} from 'zod-validation-error';\n\ntype Prettify<T> = {\n  [P in keyof T]: T[P];\n  // eslint-disable-next-line @typescript-eslint/ban-types\n} & {};\n\nconst unsetMarker = Symbol('unsetMarker');\ntype UnsetMarker = typeof unsetMarker;\n\ntype OptionalizeUndefined<T> = undefined extends T ? [param?: T] : [param: T];\n\ntype InferParserType<TParser, TType extends 'in' | 'out'> = TParser extends UnsetMarker\n  ? undefined\n  : TParser extends z.ZodType\n  ? TParser[TType extends 'in' ? '_input' : '_output']\n  : never;\n\ntype InferContextType<T> = T extends UnsetMarker ? undefined : T;\n\ninterface ActionParams<TInput = unknown, TContext = unknown> {\n  _input: TInput;\n  _context: TContext;\n}\n\ninterface ActionBuilder<TParams extends ActionParams> {\n  /**\n   * Middleware allows you to run code before the action, its return value will pass as context to the action.\n   */\n  middleware: <TContext>(\n    middleware: () => Promise<TContext> | TContext,\n  ) => ActionBuilder<{_input: TParams['_input']; _context: TContext}>;\n  /**\n   * Input validation for the action.\n   */\n  input: <TParser extends z.ZodType>(input: TParser) => ActionBuilder<{_input: TParser; _context: TParams['_context']}>;\n  /**\n   * Create an action.\n   */\n  action: <TOutput>(\n    action: (params: {\n      ctx: InferContextType<TParams['_context']>;\n      input: InferParserType<TParams['_input'], 'out'>;\n    }) => Promise<TOutput>,\n  ) => (...[input]: OptionalizeUndefined<InferParserType<TParams['_input'], 'in'>>) => Promise<TOutput>;\n  /**\n   * Create an action for React `useFormState`\n   */\n  formAction: <TState>(\n    action: (\n      params: Prettify<\n        {\n          ctx: InferContextType<TParams['_context']>;\n          prevState: any; // FIXME: This supposes to be `TState`, but we can't, as it will break the type.\n        } & (\n          | {input: InferParserType<TParams['_input'], 'out'>; formErrors?: undefined}\n          | {\n              input?: undefined;\n              formErrors: z.ZodError<\n                // Infer the input out-type if the in-type is formData, else the zod error type is incorrect\n                FormData extends InferParserType<TParams['_input'], 'in'>\n                  ? InferParserType<TParams['_input'], 'out'>\n                  : InferParserType<TParams['_input'], 'in'>\n              >;\n            }\n        )\n      >,\n    ) => Promise<TState>,\n  ) => (prevState: TState, formData: FormData) => Promise<TState>;\n}\ntype AnyActionBuilder = ActionBuilder<any>;\n\ninterface ActionBuilderDef<TParams extends ActionParams<any>> {\n  input: TParams['_input'];\n  middleware: (() => Promise<TParams['_context']> | TParams['_context']) | undefined;\n}\ntype AnyActionBuilderDef = ActionBuilderDef<any>;\n\nconst createNewServerActionBuilder = (def: Partial<AnyActionBuilderDef>) => {\n  return createServerActionBuilder(def);\n};\n\nconst createServerActionBuilder = (\n  initDef: Partial<AnyActionBuilderDef> = {},\n): ActionBuilder<{\n  _input: UnsetMarker;\n  _context: UnsetMarker;\n}> => {\n  const _def: ActionBuilderDef<{_input: z.ZodType | undefined; _context: undefined}> = {\n    input: undefined,\n    middleware: undefined,\n    ...initDef,\n  };\n  return {\n    middleware: (middleware) => createServerActionBuilder({..._def, middleware}) as AnyActionBuilder,\n    input: (input) => createNewServerActionBuilder({..._def, input}) as AnyActionBuilder,\n    action: (action) => {\n      return async (input) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(input);\n          if (!result.success) {\n            throw fromZodError(result.error);\n          }\n        }\n        return await action({ctx, input});\n      };\n    },\n    formAction: (action) => {\n      return async (prevState, formData) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(formData);\n          if (!result.success) {\n            return await action({ctx, prevState, formErrors: result.error});\n          }\n          return await action({ctx, prevState, input: result.data});\n        }\n        return await action({ctx, prevState, input: undefined});\n      };\n    },\n  };\n};\n\n/**\n * Server action builder\n */\nexport const serverAct = createServerActionBuilder();\n","import * as zod from 'zod';\nimport { joinPath } from './utils/joinPath';\nimport { isNonEmptyArray } from './utils/NonEmptyArray';\nconst MAX_ISSUES_IN_MESSAGE = 99;\nconst ISSUE_SEPARATOR = '; ';\nconst UNION_SEPARATOR = ', or ';\nconst PREFIX = 'Validation error';\nconst PREFIX_SEPARATOR = ': ';\nexport class ValidationError extends Error {\n    details;\n    name;\n    constructor(message, details = []) {\n        super(message);\n        this.details = details;\n        this.name = 'ZodValidationError';\n    }\n    toString() {\n        return this.message;\n    }\n}\nfunction getMessageFromZodIssue(issue, issueSeparator, unionSeparator) {\n    if (issue.code === 'invalid_union') {\n        return issue.unionErrors\n            .reduce((acc, zodError) => {\n            const newIssues = zodError.issues\n                .map((issue) => getMessageFromZodIssue(issue, issueSeparator, unionSeparator))\n                .join(issueSeparator);\n            if (!acc.includes(newIssues)) {\n                acc.push(newIssues);\n            }\n            return acc;\n        }, [])\n            .join(unionSeparator);\n    }\n    if (isNonEmptyArray(issue.path)) {\n        if (issue.path.length === 1) {\n            const identifier = issue.path[0];\n            if (typeof identifier === 'number') {\n                return `${issue.message} at index ${identifier}`;\n            }\n        }\n        return `${issue.message} at \"${joinPath(issue.path)}\"`;\n    }\n    return issue.message;\n}\nfunction conditionallyPrefixMessage(reason, prefix, prefixSeparator) {\n    if (prefix !== null) {\n        if (reason.length > 0) {\n            return [prefix, reason].join(prefixSeparator);\n        }\n        return prefix;\n    }\n    if (reason.length > 0) {\n        return reason;\n    }\n    return PREFIX;\n}\nexport function fromZodIssue(issue, options = {}) {\n    const { issueSeparator = ISSUE_SEPARATOR, unionSeparator = UNION_SEPARATOR, prefixSeparator = PREFIX_SEPARATOR, prefix = PREFIX, } = options;\n    const reason = getMessageFromZodIssue(issue, issueSeparator, unionSeparator);\n    const message = conditionallyPrefixMessage(reason, prefix, prefixSeparator);\n    return new ValidationError(message, [issue]);\n}\nexport function fromZodError(zodError, options = {}) {\n    const { maxIssuesInMessage = MAX_ISSUES_IN_MESSAGE, issueSeparator = ISSUE_SEPARATOR, unionSeparator = UNION_SEPARATOR, prefixSeparator = PREFIX_SEPARATOR, prefix = PREFIX, } = options;\n    const reason = zodError.errors\n        .slice(0, maxIssuesInMessage)\n        .map((issue) => getMessageFromZodIssue(issue, issueSeparator, unionSeparator))\n        .join(issueSeparator);\n    const message = conditionallyPrefixMessage(reason, prefix, prefixSeparator);\n    return new ValidationError(message, zodError.errors);\n}\nexport const toValidationError = (options = {}) => (err) => {\n    if (err instanceof zod.ZodError) {\n        return fromZodError(err, options);\n    }\n    if (err instanceof Error) {\n        return err;\n    }\n    return new Error('Unknown error');\n};\nexport function isValidationError(err) {\n    return err instanceof ValidationError;\n}\nexport function isValidationErrorLike(err) {\n    return err instanceof Error && err.name === 'ZodValidationError';\n}\nexport const errorMap = (issue, ctx) => {\n    const error = fromZodIssue({\n        ...issue,\n        message: issue.message ?? ctx.defaultError,\n    });\n    return {\n        message: error.message,\n    };\n};\n","const identifierRegex = /[$_\\p{ID_Start}][$\\u200c\\u200d\\p{ID_Continue}]*/u;\nexport function joinPath(path) {\n    if (path.length === 1) {\n        return path[0].toString();\n    }\n    return path.reduce((acc, item) => {\n        if (typeof item === 'number') {\n            return acc + '[' + item.toString() + ']';\n        }\n        if (item.includes('\"')) {\n            return acc + '[\"' + escapeQuotes(item) + '\"]';\n        }\n        if (!identifierRegex.test(item)) {\n            return acc + '[\"' + item + '\"]';\n        }\n        const separator = acc.length === 0 ? '' : '.';\n        return acc + separator + item;\n    }, '');\n}\nfunction escapeQuotes(str) {\n    return str.replace(/\"/g, '\\\\\"');\n}\n","export function isNonEmptyArray(value) {\n    return value.length !== 0;\n}\n"],"mappings":"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","names":["issue"]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n/* eslint-disable @typescript-eslint/no-explicit-any */\nimport {type z} from 'zod';\n\ntype Prettify<T> = {\n  [P in keyof T]: T[P];\n  // eslint-disable-next-line @typescript-eslint/ban-types\n} & {};\n\nconst unsetMarker = Symbol('unsetMarker');\ntype UnsetMarker = typeof unsetMarker;\n\ntype OptionalizeUndefined<T> = undefined extends T ? [param?: T] : [param: T];\n\ntype InferParserType<TParser, TType extends 'in' | 'out'> = TParser extends UnsetMarker\n  ? undefined\n  : TParser extends z.ZodType\n  ? TParser[TType extends 'in' ? '_input' : '_output']\n  : never;\n\ntype InferContextType<T> = T extends UnsetMarker ? undefined : T;\n\ninterface ActionParams<TInput = unknown, TContext = unknown> {\n  _input: TInput;\n  _context: TContext;\n}\n\ninterface ActionBuilder<TParams extends ActionParams> {\n  /**\n   * Middleware allows you to run code before the action, its return value will pass as context to the action.\n   */\n  middleware: <TContext>(\n    middleware: () => Promise<TContext> | TContext,\n  ) => ActionBuilder<{_input: TParams['_input']; _context: TContext}>;\n  /**\n   * Input validation for the action.\n   */\n  input: <TParser extends z.ZodType>(input: TParser) => ActionBuilder<{_input: TParser; _context: TParams['_context']}>;\n  /**\n   * Create an action.\n   */\n  action: <TOutput>(\n    action: (params: {\n      ctx: InferContextType<TParams['_context']>;\n      input: InferParserType<TParams['_input'], 'out'>;\n    }) => Promise<TOutput>,\n  ) => (...[input]: OptionalizeUndefined<InferParserType<TParams['_input'], 'in'>>) => Promise<TOutput>;\n  /**\n   * Create an action for React `useFormState`\n   */\n  formAction: <TState>(\n    action: (\n      params: Prettify<\n        {\n          ctx: InferContextType<TParams['_context']>;\n          prevState: any; // FIXME: This supposes to be `TState`, but we can't, as it will break the type.\n        } & (\n          | {input: InferParserType<TParams['_input'], 'out'>; formErrors?: undefined}\n          | {\n              input?: undefined;\n              formErrors: z.ZodError<\n                TParams['_input'] extends z.ZodEffects<infer T, unknown, unknown>\n                  ? InferParserType<T, 'in'>\n                  : InferParserType<TParams['_input'], 'in'>\n              >;\n            }\n        )\n      >,\n    ) => Promise<TState>,\n  ) => (prevState: TState, formData: FormData) => Promise<TState>;\n}\ntype AnyActionBuilder = ActionBuilder<any>;\n\ninterface ActionBuilderDef<TParams extends ActionParams<any>> {\n  input: TParams['_input'];\n  middleware: (() => Promise<TParams['_context']> | TParams['_context']) | undefined;\n}\ntype AnyActionBuilderDef = ActionBuilderDef<any>;\n\nconst createNewServerActionBuilder = (def: Partial<AnyActionBuilderDef>) => {\n  return createServerActionBuilder(def);\n};\n\nconst createServerActionBuilder = (\n  initDef: Partial<AnyActionBuilderDef> = {},\n): ActionBuilder<{\n  _input: UnsetMarker;\n  _context: UnsetMarker;\n}> => {\n  const _def: ActionBuilderDef<{_input: z.ZodType | undefined; _context: undefined}> = {\n    input: undefined,\n    middleware: undefined,\n    ...initDef,\n  };\n  return {\n    middleware: (middleware) => createServerActionBuilder({..._def, middleware}) as AnyActionBuilder,\n    input: (input) => createNewServerActionBuilder({..._def, input}) as AnyActionBuilder,\n    action: (action) => {\n      return async (input) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(input);\n          if (!result.success) {\n            console.error('❌ Input validation error:', result.error.errors);\n            throw new Error('Input validation error');\n          }\n        }\n        return await action({ctx, input});\n      };\n    },\n    formAction: (action) => {\n      return async (prevState, formData) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(formData);\n          if (!result.success) {\n            return await action({ctx, prevState, formErrors: result.error});\n          }\n          return await action({ctx, prevState, input: result.data});\n        }\n        return await action({ctx, prevState, input: undefined});\n      };\n    },\n  };\n};\n\n/**\n * Server action builder\n */\nexport const serverAct = createServerActionBuilder();\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AASA,IAAM,cAAc,OAAO,aAAa;AAsExC,IAAM,+BAA+B,CAAC,QAAsC;AAC1E,SAAO,0BAA0B,GAAG;AACtC;AAEA,IAAM,4BAA4B,CAChC,UAAwC,CAAC,MAIrC;AACJ,QAAM,OAA+E;AAAA,IACnF,OAAO;AAAA,IACP,YAAY;AAAA,IACZ,GAAG;AAAA,EACL;AACA,SAAO;AAAA,IACL,YAAY,CAAC,eAAe,0BAA0B,EAAC,GAAG,MAAM,WAAU,CAAC;AAAA,IAC3E,OAAO,CAAC,UAAU,6BAA6B,EAAC,GAAG,MAAM,MAAK,CAAC;AAAA,IAC/D,QAAQ,CAAC,WAAW;AAClB,aAAO,OAAO,UAAU;AAlG9B;AAmGQ,cAAM,MAAM,QAAM,UAAK,eAAL;AAClB,YAAI,KAAK,OAAO;AACd,gBAAM,SAAS,KAAK,MAAM,UAAU,KAAK;AACzC,cAAI,CAAC,OAAO,SAAS;AACnB,oBAAQ,MAAM,kCAA6B,OAAO,MAAM,MAAM;AAC9D,kBAAM,IAAI,MAAM,wBAAwB;AAAA,UAC1C;AAAA,QACF;AACA,eAAO,MAAM,OAAO,EAAC,KAAK,MAAK,CAAC;AAAA,MAClC;AAAA,IACF;AAAA,IACA,YAAY,CAAC,WAAW;AACtB,aAAO,OAAO,WAAW,aAAa;AA/G5C;AAgHQ,cAAM,MAAM,QAAM,UAAK,eAAL;AAClB,YAAI,KAAK,OAAO;AACd,gBAAM,SAAS,KAAK,MAAM,UAAU,QAAQ;AAC5C,cAAI,CAAC,OAAO,SAAS;AACnB,mBAAO,MAAM,OAAO,EAAC,KAAK,WAAW,YAAY,OAAO,MAAK,CAAC;AAAA,UAChE;AACA,iBAAO,MAAM,OAAO,EAAC,KAAK,WAAW,OAAO,OAAO,KAAI,CAAC;AAAA,QAC1D;AACA,eAAO,MAAM,OAAO,EAAC,KAAK,WAAW,OAAO,OAAS,CAAC;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;AAKO,IAAM,YAAY,0BAA0B;","names":[]}

package/dist/index.mjs

@@ -1,93 +1,3 @@
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/ValidationError.js
-import * as zod from "zod";
-
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/joinPath.js
-var identifierRegex = /[$_\p{ID_Start}][$\u200c\u200d\p{ID_Continue}]*/u;
-function joinPath(path) {
-  if (path.length === 1) {
-    return path[0].toString();
-  }
-  return path.reduce((acc, item) => {
-    if (typeof item === "number") {
-      return acc + "[" + item.toString() + "]";
-    }
-    if (item.includes('"')) {
-      return acc + '["' + escapeQuotes(item) + '"]';
-    }
-    if (!identifierRegex.test(item)) {
-      return acc + '["' + item + '"]';
-    }
-    const separator = acc.length === 0 ? "" : ".";
-    return acc + separator + item;
-  }, "");
-}
-function escapeQuotes(str) {
-  return str.replace(/"/g, '\\"');
-}
-
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/NonEmptyArray.js
-function isNonEmptyArray(value) {
-  return value.length !== 0;
-}
-
-// ../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/ValidationError.js
-var MAX_ISSUES_IN_MESSAGE = 99;
-var ISSUE_SEPARATOR = "; ";
-var UNION_SEPARATOR = ", or ";
-var PREFIX = "Validation error";
-var PREFIX_SEPARATOR = ": ";
-var ValidationError = class extends Error {
-  details;
-  name;
-  constructor(message, details = []) {
-    super(message);
-    this.details = details;
-    this.name = "ZodValidationError";
-  }
-  toString() {
-    return this.message;
-  }
-};
-function getMessageFromZodIssue(issue, issueSeparator, unionSeparator) {
-  if (issue.code === "invalid_union") {
-    return issue.unionErrors.reduce((acc, zodError) => {
-      const newIssues = zodError.issues.map((issue2) => getMessageFromZodIssue(issue2, issueSeparator, unionSeparator)).join(issueSeparator);
-      if (!acc.includes(newIssues)) {
-        acc.push(newIssues);
-      }
-      return acc;
-    }, []).join(unionSeparator);
-  }
-  if (isNonEmptyArray(issue.path)) {
-    if (issue.path.length === 1) {
-      const identifier = issue.path[0];
-      if (typeof identifier === "number") {
-        return `${issue.message} at index ${identifier}`;
-      }
-    }
-    return `${issue.message} at "${joinPath(issue.path)}"`;
-  }
-  return issue.message;
-}
-function conditionallyPrefixMessage(reason, prefix, prefixSeparator) {
-  if (prefix !== null) {
-    if (reason.length > 0) {
-      return [prefix, reason].join(prefixSeparator);
-    }
-    return prefix;
-  }
-  if (reason.length > 0) {
-    return reason;
-  }
-  return PREFIX;
-}
-function fromZodError(zodError, options = {}) {
-  const { maxIssuesInMessage = MAX_ISSUES_IN_MESSAGE, issueSeparator = ISSUE_SEPARATOR, unionSeparator = UNION_SEPARATOR, prefixSeparator = PREFIX_SEPARATOR, prefix = PREFIX } = options;
-  const reason = zodError.errors.slice(0, maxIssuesInMessage).map((issue) => getMessageFromZodIssue(issue, issueSeparator, unionSeparator)).join(issueSeparator);
-  const message = conditionallyPrefixMessage(reason, prefix, prefixSeparator);
-  return new ValidationError(message, zodError.errors);
-}
-
 // src/index.ts
 var unsetMarker = Symbol("unsetMarker");
 var createNewServerActionBuilder = (def) => {
@@ -109,7 +19,8 @@ var createServerActionBuilder = (initDef = {}) => {
         if (_def.input) {
           const result = _def.input.safeParse(input);
           if (!result.success) {
-            throw fromZodError(result.error);
+            console.error("\u274C Input validation error:", result.error.errors);
+            throw new Error("Input validation error");
           }
         }
         return await action({ ctx, input });

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/ValidationError.js","../../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/joinPath.js","../../../node_modules/.pnpm/zod-validation-error@1.5.0_zod@3.22.2/node_modules/zod-validation-error/dist/esm/utils/NonEmptyArray.js","../src/index.ts"],"sourcesContent":["import * as zod from 'zod';\nimport { joinPath } from './utils/joinPath';\nimport { isNonEmptyArray } from './utils/NonEmptyArray';\nconst MAX_ISSUES_IN_MESSAGE = 99;\nconst ISSUE_SEPARATOR = '; ';\nconst UNION_SEPARATOR = ', or ';\nconst PREFIX = 'Validation error';\nconst PREFIX_SEPARATOR = ': ';\nexport class ValidationError extends Error {\n    details;\n    name;\n    constructor(message, details = []) {\n        super(message);\n        this.details = details;\n        this.name = 'ZodValidationError';\n    }\n    toString() {\n        return this.message;\n    }\n}\nfunction getMessageFromZodIssue(issue, issueSeparator, unionSeparator) {\n    if (issue.code === 'invalid_union') {\n        return issue.unionErrors\n            .reduce((acc, zodError) => {\n            const newIssues = zodError.issues\n                .map((issue) => getMessageFromZodIssue(issue, issueSeparator, unionSeparator))\n                .join(issueSeparator);\n            if (!acc.includes(newIssues)) {\n                acc.push(newIssues);\n            }\n            return acc;\n        }, [])\n            .join(unionSeparator);\n    }\n    if (isNonEmptyArray(issue.path)) {\n        if (issue.path.length === 1) {\n            const identifier = issue.path[0];\n            if (typeof identifier === 'number') {\n                return `${issue.message} at index ${identifier}`;\n            }\n        }\n        return `${issue.message} at \"${joinPath(issue.path)}\"`;\n    }\n    return issue.message;\n}\nfunction conditionallyPrefixMessage(reason, prefix, prefixSeparator) {\n    if (prefix !== null) {\n        if (reason.length > 0) {\n            return [prefix, reason].join(prefixSeparator);\n        }\n        return prefix;\n    }\n    if (reason.length > 0) {\n        return reason;\n    }\n    return PREFIX;\n}\nexport function fromZodIssue(issue, options = {}) {\n    const { issueSeparator = ISSUE_SEPARATOR, unionSeparator = UNION_SEPARATOR, prefixSeparator = PREFIX_SEPARATOR, prefix = PREFIX, } = options;\n    const reason = getMessageFromZodIssue(issue, issueSeparator, unionSeparator);\n    const message = conditionallyPrefixMessage(reason, prefix, prefixSeparator);\n    return new ValidationError(message, [issue]);\n}\nexport function fromZodError(zodError, options = {}) {\n    const { maxIssuesInMessage = MAX_ISSUES_IN_MESSAGE, issueSeparator = ISSUE_SEPARATOR, unionSeparator = UNION_SEPARATOR, prefixSeparator = PREFIX_SEPARATOR, prefix = PREFIX, } = options;\n    const reason = zodError.errors\n        .slice(0, maxIssuesInMessage)\n        .map((issue) => getMessageFromZodIssue(issue, issueSeparator, unionSeparator))\n        .join(issueSeparator);\n    const message = conditionallyPrefixMessage(reason, prefix, prefixSeparator);\n    return new ValidationError(message, zodError.errors);\n}\nexport const toValidationError = (options = {}) => (err) => {\n    if (err instanceof zod.ZodError) {\n        return fromZodError(err, options);\n    }\n    if (err instanceof Error) {\n        return err;\n    }\n    return new Error('Unknown error');\n};\nexport function isValidationError(err) {\n    return err instanceof ValidationError;\n}\nexport function isValidationErrorLike(err) {\n    return err instanceof Error && err.name === 'ZodValidationError';\n}\nexport const errorMap = (issue, ctx) => {\n    const error = fromZodIssue({\n        ...issue,\n        message: issue.message ?? ctx.defaultError,\n    });\n    return {\n        message: error.message,\n    };\n};\n","const identifierRegex = /[$_\\p{ID_Start}][$\\u200c\\u200d\\p{ID_Continue}]*/u;\nexport function joinPath(path) {\n    if (path.length === 1) {\n        return path[0].toString();\n    }\n    return path.reduce((acc, item) => {\n        if (typeof item === 'number') {\n            return acc + '[' + item.toString() + ']';\n        }\n        if (item.includes('\"')) {\n            return acc + '[\"' + escapeQuotes(item) + '\"]';\n        }\n        if (!identifierRegex.test(item)) {\n            return acc + '[\"' + item + '\"]';\n        }\n        const separator = acc.length === 0 ? '' : '.';\n        return acc + separator + item;\n    }, '');\n}\nfunction escapeQuotes(str) {\n    return str.replace(/\"/g, '\\\\\"');\n}\n","export function isNonEmptyArray(value) {\n    return value.length !== 0;\n}\n","/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n/* eslint-disable @typescript-eslint/no-explicit-any */\nimport {type z} from 'zod';\nimport {fromZodError} from 'zod-validation-error';\n\ntype Prettify<T> = {\n  [P in keyof T]: T[P];\n  // eslint-disable-next-line @typescript-eslint/ban-types\n} & {};\n\nconst unsetMarker = Symbol('unsetMarker');\ntype UnsetMarker = typeof unsetMarker;\n\ntype OptionalizeUndefined<T> = undefined extends T ? [param?: T] : [param: T];\n\ntype InferParserType<TParser, TType extends 'in' | 'out'> = TParser extends UnsetMarker\n  ? undefined\n  : TParser extends z.ZodType\n  ? TParser[TType extends 'in' ? '_input' : '_output']\n  : never;\n\ntype InferContextType<T> = T extends UnsetMarker ? undefined : T;\n\ninterface ActionParams<TInput = unknown, TContext = unknown> {\n  _input: TInput;\n  _context: TContext;\n}\n\ninterface ActionBuilder<TParams extends ActionParams> {\n  /**\n   * Middleware allows you to run code before the action, its return value will pass as context to the action.\n   */\n  middleware: <TContext>(\n    middleware: () => Promise<TContext> | TContext,\n  ) => ActionBuilder<{_input: TParams['_input']; _context: TContext}>;\n  /**\n   * Input validation for the action.\n   */\n  input: <TParser extends z.ZodType>(input: TParser) => ActionBuilder<{_input: TParser; _context: TParams['_context']}>;\n  /**\n   * Create an action.\n   */\n  action: <TOutput>(\n    action: (params: {\n      ctx: InferContextType<TParams['_context']>;\n      input: InferParserType<TParams['_input'], 'out'>;\n    }) => Promise<TOutput>,\n  ) => (...[input]: OptionalizeUndefined<InferParserType<TParams['_input'], 'in'>>) => Promise<TOutput>;\n  /**\n   * Create an action for React `useFormState`\n   */\n  formAction: <TState>(\n    action: (\n      params: Prettify<\n        {\n          ctx: InferContextType<TParams['_context']>;\n          prevState: any; // FIXME: This supposes to be `TState`, but we can't, as it will break the type.\n        } & (\n          | {input: InferParserType<TParams['_input'], 'out'>; formErrors?: undefined}\n          | {\n              input?: undefined;\n              formErrors: z.ZodError<\n                // Infer the input out-type if the in-type is formData, else the zod error type is incorrect\n                FormData extends InferParserType<TParams['_input'], 'in'>\n                  ? InferParserType<TParams['_input'], 'out'>\n                  : InferParserType<TParams['_input'], 'in'>\n              >;\n            }\n        )\n      >,\n    ) => Promise<TState>,\n  ) => (prevState: TState, formData: FormData) => Promise<TState>;\n}\ntype AnyActionBuilder = ActionBuilder<any>;\n\ninterface ActionBuilderDef<TParams extends ActionParams<any>> {\n  input: TParams['_input'];\n  middleware: (() => Promise<TParams['_context']> | TParams['_context']) | undefined;\n}\ntype AnyActionBuilderDef = ActionBuilderDef<any>;\n\nconst createNewServerActionBuilder = (def: Partial<AnyActionBuilderDef>) => {\n  return createServerActionBuilder(def);\n};\n\nconst createServerActionBuilder = (\n  initDef: Partial<AnyActionBuilderDef> = {},\n): ActionBuilder<{\n  _input: UnsetMarker;\n  _context: UnsetMarker;\n}> => {\n  const _def: ActionBuilderDef<{_input: z.ZodType | undefined; _context: undefined}> = {\n    input: undefined,\n    middleware: undefined,\n    ...initDef,\n  };\n  return {\n    middleware: (middleware) => createServerActionBuilder({..._def, middleware}) as AnyActionBuilder,\n    input: (input) => createNewServerActionBuilder({..._def, input}) as AnyActionBuilder,\n    action: (action) => {\n      return async (input) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(input);\n          if (!result.success) {\n            throw fromZodError(result.error);\n          }\n        }\n        return await action({ctx, input});\n      };\n    },\n    formAction: (action) => {\n      return async (prevState, formData) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(formData);\n          if (!result.success) {\n            return await action({ctx, prevState, formErrors: result.error});\n          }\n          return await action({ctx, prevState, input: result.data});\n        }\n        return await action({ctx, prevState, input: undefined});\n      };\n    },\n  };\n};\n\n/**\n * Server action builder\n */\nexport const serverAct = createServerActionBuilder();\n"],"mappings":"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","names":["issue"]}
+{"version":3,"sources":["../src/index.ts"],"sourcesContent":["/* eslint-disable @typescript-eslint/no-unsafe-assignment */\n/* eslint-disable @typescript-eslint/no-explicit-any */\nimport {type z} from 'zod';\n\ntype Prettify<T> = {\n  [P in keyof T]: T[P];\n  // eslint-disable-next-line @typescript-eslint/ban-types\n} & {};\n\nconst unsetMarker = Symbol('unsetMarker');\ntype UnsetMarker = typeof unsetMarker;\n\ntype OptionalizeUndefined<T> = undefined extends T ? [param?: T] : [param: T];\n\ntype InferParserType<TParser, TType extends 'in' | 'out'> = TParser extends UnsetMarker\n  ? undefined\n  : TParser extends z.ZodType\n  ? TParser[TType extends 'in' ? '_input' : '_output']\n  : never;\n\ntype InferContextType<T> = T extends UnsetMarker ? undefined : T;\n\ninterface ActionParams<TInput = unknown, TContext = unknown> {\n  _input: TInput;\n  _context: TContext;\n}\n\ninterface ActionBuilder<TParams extends ActionParams> {\n  /**\n   * Middleware allows you to run code before the action, its return value will pass as context to the action.\n   */\n  middleware: <TContext>(\n    middleware: () => Promise<TContext> | TContext,\n  ) => ActionBuilder<{_input: TParams['_input']; _context: TContext}>;\n  /**\n   * Input validation for the action.\n   */\n  input: <TParser extends z.ZodType>(input: TParser) => ActionBuilder<{_input: TParser; _context: TParams['_context']}>;\n  /**\n   * Create an action.\n   */\n  action: <TOutput>(\n    action: (params: {\n      ctx: InferContextType<TParams['_context']>;\n      input: InferParserType<TParams['_input'], 'out'>;\n    }) => Promise<TOutput>,\n  ) => (...[input]: OptionalizeUndefined<InferParserType<TParams['_input'], 'in'>>) => Promise<TOutput>;\n  /**\n   * Create an action for React `useFormState`\n   */\n  formAction: <TState>(\n    action: (\n      params: Prettify<\n        {\n          ctx: InferContextType<TParams['_context']>;\n          prevState: any; // FIXME: This supposes to be `TState`, but we can't, as it will break the type.\n        } & (\n          | {input: InferParserType<TParams['_input'], 'out'>; formErrors?: undefined}\n          | {\n              input?: undefined;\n              formErrors: z.ZodError<\n                TParams['_input'] extends z.ZodEffects<infer T, unknown, unknown>\n                  ? InferParserType<T, 'in'>\n                  : InferParserType<TParams['_input'], 'in'>\n              >;\n            }\n        )\n      >,\n    ) => Promise<TState>,\n  ) => (prevState: TState, formData: FormData) => Promise<TState>;\n}\ntype AnyActionBuilder = ActionBuilder<any>;\n\ninterface ActionBuilderDef<TParams extends ActionParams<any>> {\n  input: TParams['_input'];\n  middleware: (() => Promise<TParams['_context']> | TParams['_context']) | undefined;\n}\ntype AnyActionBuilderDef = ActionBuilderDef<any>;\n\nconst createNewServerActionBuilder = (def: Partial<AnyActionBuilderDef>) => {\n  return createServerActionBuilder(def);\n};\n\nconst createServerActionBuilder = (\n  initDef: Partial<AnyActionBuilderDef> = {},\n): ActionBuilder<{\n  _input: UnsetMarker;\n  _context: UnsetMarker;\n}> => {\n  const _def: ActionBuilderDef<{_input: z.ZodType | undefined; _context: undefined}> = {\n    input: undefined,\n    middleware: undefined,\n    ...initDef,\n  };\n  return {\n    middleware: (middleware) => createServerActionBuilder({..._def, middleware}) as AnyActionBuilder,\n    input: (input) => createNewServerActionBuilder({..._def, input}) as AnyActionBuilder,\n    action: (action) => {\n      return async (input) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(input);\n          if (!result.success) {\n            console.error('❌ Input validation error:', result.error.errors);\n            throw new Error('Input validation error');\n          }\n        }\n        return await action({ctx, input});\n      };\n    },\n    formAction: (action) => {\n      return async (prevState, formData) => {\n        const ctx = await _def.middleware?.();\n        if (_def.input) {\n          const result = _def.input.safeParse(formData);\n          if (!result.success) {\n            return await action({ctx, prevState, formErrors: result.error});\n          }\n          return await action({ctx, prevState, input: result.data});\n        }\n        return await action({ctx, prevState, input: undefined});\n      };\n    },\n  };\n};\n\n/**\n * Server action builder\n */\nexport const serverAct = createServerActionBuilder();\n"],"mappings":";AASA,IAAM,cAAc,OAAO,aAAa;AAsExC,IAAM,+BAA+B,CAAC,QAAsC;AAC1E,SAAO,0BAA0B,GAAG;AACtC;AAEA,IAAM,4BAA4B,CAChC,UAAwC,CAAC,MAIrC;AACJ,QAAM,OAA+E;AAAA,IACnF,OAAO;AAAA,IACP,YAAY;AAAA,IACZ,GAAG;AAAA,EACL;AACA,SAAO;AAAA,IACL,YAAY,CAAC,eAAe,0BAA0B,EAAC,GAAG,MAAM,WAAU,CAAC;AAAA,IAC3E,OAAO,CAAC,UAAU,6BAA6B,EAAC,GAAG,MAAM,MAAK,CAAC;AAAA,IAC/D,QAAQ,CAAC,WAAW;AAClB,aAAO,OAAO,UAAU;AAlG9B;AAmGQ,cAAM,MAAM,QAAM,UAAK,eAAL;AAClB,YAAI,KAAK,OAAO;AACd,gBAAM,SAAS,KAAK,MAAM,UAAU,KAAK;AACzC,cAAI,CAAC,OAAO,SAAS;AACnB,oBAAQ,MAAM,kCAA6B,OAAO,MAAM,MAAM;AAC9D,kBAAM,IAAI,MAAM,wBAAwB;AAAA,UAC1C;AAAA,QACF;AACA,eAAO,MAAM,OAAO,EAAC,KAAK,MAAK,CAAC;AAAA,MAClC;AAAA,IACF;AAAA,IACA,YAAY,CAAC,WAAW;AACtB,aAAO,OAAO,WAAW,aAAa;AA/G5C;AAgHQ,cAAM,MAAM,QAAM,UAAK,eAAL;AAClB,YAAI,KAAK,OAAO;AACd,gBAAM,SAAS,KAAK,MAAM,UAAU,QAAQ;AAC5C,cAAI,CAAC,OAAO,SAAS;AACnB,mBAAO,MAAM,OAAO,EAAC,KAAK,WAAW,YAAY,OAAO,MAAK,CAAC;AAAA,UAChE;AACA,iBAAO,MAAM,OAAO,EAAC,KAAK,WAAW,OAAO,OAAO,KAAI,CAAC;AAAA,QAC1D;AACA,eAAO,MAAM,OAAO,EAAC,KAAK,WAAW,OAAO,OAAS,CAAC;AAAA,MACxD;AAAA,IACF;AAAA,EACF;AACF;AAKO,IAAM,YAAY,0BAA0B;","names":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "server-act",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "homepage": "https://github.com/chungweileong94/server-act#readme",
   "repository": {
     "type": "git",
@@ -40,13 +40,17 @@
     "tsup": "^7.2.0",
     "typescript": "^5.2.2",
     "zod": "^3.22.2",
-    "zod-form-data": "^2.0.2",
-    "zod-validation-error": "^1.5.0"
+    "zod-form-data": "^2.0.2"
   },
   "peerDependencies": {
     "typescript": "^5.2.2",
     "zod": "^3.22.2"
   },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
   "scripts": {
     "build": "tsup",
     "test": "vitest run",

package/src/index.ts

@@ -1,7 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import {type z} from 'zod';
-import {fromZodError} from 'zod-validation-error';
 
 type Prettify<T> = {
   [P in keyof T]: T[P];
@@ -60,9 +59,8 @@ interface ActionBuilder<TParams extends ActionParams> {
           | {
               input?: undefined;
               formErrors: z.ZodError<
-                // Infer the input out-type if the in-type is formData, else the zod error type is incorrect
-                FormData extends InferParserType<TParams['_input'], 'in'>
-                  ? InferParserType<TParams['_input'], 'out'>
+                TParams['_input'] extends z.ZodEffects<infer T, unknown, unknown>
+                  ? InferParserType<T, 'in'>
                   : InferParserType<TParams['_input'], 'in'>
               >;
             }
@@ -103,7 +101,8 @@ const createServerActionBuilder = (
         if (_def.input) {
           const result = _def.input.safeParse(input);
           if (!result.success) {
-            throw fromZodError(result.error);
+            console.error('❌ Input validation error:', result.error.errors);
+            throw new Error('Input validation error');
           }
         }
         return await action({ctx, input});