react-form-action 2.5.2 → 2.6.0

package/dist/client.d.mts

@@ -1,8 +1,7 @@
-import * as React from 'react';
+import * as React$1 from 'react';
 import React__default, { PropsWithChildren, JSX } from 'react';
 import { F as FormAction, A as ActionState, I as InitialState, a as InvalidState, b as FailureState, S as SuccessState } from './createFormAction-DjhozgiG.mjs';
-import { ZodFormattedError } from 'zod';
-import { RenderProp, RP } from 'react-render-prop-type';
+import { $ZodErrorTree } from 'zod/v4/core';
 
 type ActionProps<Data, Error, ValidationError> = PropsWithChildren<{
     action: FormAction<Data, Error, ValidationError>;
@@ -44,45 +43,51 @@ type FormProps = Omit<JSX.IntrinsicElements["form"], "action"> & {
 declare function Form({ autoReset, ...props }: FormProps): JSX.Element;
 
 declare const SEPARATOR: ".";
-type Paths<Err> = {
-    [k in keyof Err]: k extends string ? Err[k] extends object ? `${k}${typeof SEPARATOR}${Paths<Err[k]>}` : k : never;
-}[keyof Err];
-type InferZodErrorPaths<Errors> = Errors extends ZodFormattedError<infer E> ? Paths<E> : never;
-type ZodFieldErrorProps<Errors extends ZodFormattedError<any>, Name extends "" | InferZodErrorPaths<Errors>> = {
+type Paths<Shape extends $ZodErrorTree<object>, Props = Required<NonNullable<Shape["properties"]>>> = {
+    [k in keyof Props]: k extends string ? NonNullable<Props[k]> extends $ZodErrorTree<object> ? "properties" extends keyof NonNullable<Props[k]> ? `${k}${typeof SEPARATOR}${Paths<NonNullable<Props[k]>>}` : k : k : never;
+}[keyof Props];
+type InferZodErrorPaths<T> = T extends $ZodErrorTree<object> ? Paths<T> : never;
+type ZodFieldErrorProps<Errors extends $ZodErrorTree<any>, Name extends "" | InferZodErrorPaths<Errors>> = {
     errors: Errors;
     name: Name;
-} & Partial<RenderProp<ZodFieldErrorChildrenProps<Name>>>;
+    children?: (props: ZodFieldErrorChildrenProps<Name>) => React__default.ReactNode;
+};
 type ZodFieldErrorChildrenProps<Name> = {
     name: Name;
     error?: string;
     errors: readonly string[];
 };
 declare const noError: Readonly<{
-    _errors: readonly string[];
+    errors: readonly string[];
 }>;
-declare function ZodFieldError<Errors extends ZodFormattedError<any>, Name extends "" | InferZodErrorPaths<Errors> = "">({ errors, name, children, }: ZodFieldErrorProps<Errors, Name>): React__default.ReactNode;
+declare function ZodFieldError<Errors extends $ZodErrorTree<object>, Name extends "" | InferZodErrorPaths<Errors> = "">({ errors, name, children, }: ZodFieldErrorProps<Errors, Name>): React__default.ReactNode;
 
 /**
  * Creates a typed components for actions created with the formAction builder.
  */
-declare function createComponents<Data, Error, ValidationError extends ZodFormattedError<any>>(action: FormAction<Data, Error, ValidationError>): {
+declare function createComponents<Data, Error, ValidationError extends $ZodErrorTree<any>>(action: FormAction<Data, Error, ValidationError>): {
     FieldError: <Name extends "" | InferZodErrorPaths<ValidationError>>({ name, children, }: {
         name: Name;
-    } & Partial<RenderProp<ZodFieldErrorChildrenProps<Name>>>) => React__default.JSX.Element;
-    Success: ({ children, }: PropsWithChildren | RP<{
-        isSuccess: false;
-        data: Data | null;
-    } | {
-        isSuccess: true;
-        data: Data;
-    }>) => React__default.ReactNode;
+        children?: (props: ZodFieldErrorChildrenProps<Name>) => React__default.ReactNode;
+    }) => React__default.JSX.Element;
+    Success: ({ children, }: PropsWithChildren | {
+        children?: (props: {
+            isSuccess: false;
+            data: Data | null;
+        } | {
+            isSuccess: true;
+            data: Data;
+        }) => React__default.ReactNode;
+    }) => React__default.ReactNode;
 };
 
 /**
  * Conditionally renders the children, when the form action is in the "pending" state.
  */
-declare function Pending({ children, }: PropsWithChildren | RP<{
-    isPending: boolean;
-}>): React.ReactNode;
+declare function Pending({ children, }: PropsWithChildren | {
+    children?: (props: {
+        isPending: boolean;
+    }) => React.ReactNode;
+}): React$1.ReactNode;
 
 export { Action, type ActionContextState, type ActionProps, Form, type FormProps, type InferZodErrorPaths, type Paths, Pending, ZodFieldError, type ZodFieldErrorChildrenProps, type ZodFieldErrorProps, createComponents, noError, useActionContext };

package/dist/client.mjs

@@ -1 +1 @@
-"use client";import{a as m}from"./chunk-LPB4R2UB.mjs";import y from"react";import{createContext as P,use as S}from"react";import{useActionState as F}from"react";var p={isInitial:!1,isInvalid:!1,isFailure:!1,isSuccess:!1},u=P(null);function a(o){let t=S(u);if(!t)throw new Error("ActionContext must be initialized before use. Is your useActionContext hook wrapped with an <Action> Component?");return t}function I({children:o,action:t,initialData:i,permalink:e}){let[r,n,s]=F(t,m(i),e),l=r.type==="initial"?{...r,...p,action:n,isPending:s,isInitial:!0}:r.type==="invalid"?{...r,...p,action:n,isPending:s,isInvalid:!0}:r.type==="failure"?{...r,...p,action:n,isPending:s,isFailure:!0}:{...r,...p,action:n,isPending:s,isSuccess:!0};return y.createElement(u,{value:l},o)}import A,{startTransition as C}from"react";function V({autoReset:o=!1,...t}){let{action:i}=a();return A.createElement("form",{...o?{action:i}:{onSubmit:r=>{r.preventDefault();let n=r.currentTarget;C(()=>{i(new FormData(n))})}},...t})}import c from"react";import f from"react";var h=".",d=Object.freeze({_errors:Object.freeze([])});function E({errors:o,name:t,children:i=({error:e})=>f.createElement(f.Fragment,null,e)}){if(t.length===0)return i({name:t,error:o._errors[0],errors:o._errors});let e=t.split(h),r=o;for(;e.length;){let n=e.shift();r=r[n]??d}return i({name:t,error:r._errors[0],errors:r._errors})}function $(o){function t({name:e,children:r}){let{isInvalid:n,validationError:s}=a(o);return c.createElement(E,{errors:s??d,name:e},r??(({error:x})=>n&&c.createElement(c.Fragment,null,x)))}function i({children:e}){let{isSuccess:r,data:n}=a(o);return typeof e=="function"?e(r?{isSuccess:r,data:n}:{isSuccess:r,data:n}):r&&e}return{FieldError:t,Success:i}}function X({children:o}){let{isPending:t}=a();return typeof o=="function"?o({isPending:t}):t&&o}export{I as Action,V as Form,X as Pending,E as ZodFieldError,$ as createComponents,d as noError,a as useActionContext};
+"use client";import{a as u}from"./chunk-LPB4R2UB.mjs";import S from"react";import{createContext as A,use as P}from"react";import{useActionState as y}from"react";var c={isInitial:!1,isInvalid:!1,isFailure:!1,isSuccess:!1},m=A(null);function a(o){let t=P(m);if(!t)throw new Error("ActionContext must be initialized before use. Is your useActionContext hook wrapped with an <Action> Component?");return t}function b({children:o,action:t,initialData:i,permalink:e}){let[r,n,s]=y(t,u(i),e),d=r.type==="initial"?{...r,...c,action:n,isPending:s,isInitial:!0}:r.type==="invalid"?{...r,...c,action:n,isPending:s,isInvalid:!0}:r.type==="failure"?{...r,...c,action:n,isPending:s,isFailure:!0}:{...r,...c,action:n,isPending:s,isSuccess:!0};return S.createElement(m,{value:d},o)}import h,{startTransition as F}from"react";function I({autoReset:o=!1,...t}){let{action:i}=a();return h.createElement("form",{...o?{action:i}:{onSubmit:r=>{r.preventDefault();let n=r.currentTarget;F(()=>{i(new FormData(n))})}},...t})}import p from"react";import f from"react";var C=".",l=Object.freeze({errors:Object.freeze([])});function E({errors:o,name:t,children:i=({error:e})=>f.createElement(f.Fragment,null,e)}){if(t.length===0)return i({name:t,error:o.errors[0],errors:o.errors});let e=t.split(C),r=o;for(;e.length;){let n=e.shift();if(!r.properties){r=l;break}r=r.properties[n]??l}return i({name:t,error:r.errors[0],errors:r.errors})}function J(o){function t({name:e,children:r}){let{isInvalid:n,validationError:s}=a(o);return p.createElement(E,{errors:s??l,name:e},r??(({error:x})=>n&&p.createElement(p.Fragment,null,x)))}function i({children:e}){let{isSuccess:r,data:n}=a(o);return typeof e=="function"?e(r?{isSuccess:r,data:n}:{isSuccess:r,data:n}):r&&e}return{FieldError:t,Success:i}}function q({children:o}){let{isPending:t}=a();return typeof o=="function"?o({isPending:t}):t&&o}export{b as Action,I as Form,q as Pending,E as ZodFieldError,J as createComponents,l as noError,a as useActionContext};

package/dist/index.d.mts

@@ -1,6 +1,7 @@
 import { A as ActionState, a as InvalidState, b as FailureState, S as SuccessState } from './createFormAction-DjhozgiG.mjs';
 export { F as FormAction, I as InitialState, c as createFormAction, i as initial } from './createFormAction-DjhozgiG.mjs';
-import { z, ZodTypeAny, AnyZodTuple, ZodTuple, ZodType, ZodObject, ZodRawShape, objectUtil, ZodSchema, ZodEffects } from 'zod';
+import { ZodType, ZodTuple, ZodObject, z } from 'zod/v4';
+import { $ZodShape, $ZodErrorTree } from 'zod/v4/core';
 
 declare const emptyInput: unique symbol;
 type EmptyInput = typeof emptyInput;
@@ -16,36 +17,35 @@ type InitialContext = Record<"formData", FormData>;
 /**
  * Action without schema has no input.
  */
-type Action<Data, Context, Args extends AnyZodTuple> = (params: {
+type Action<Data, Context, Args extends ZodTuple> = (params: {
     args: z.infer<Args>;
     ctx: Context;
 }) => Promise<Data>;
 /**
  * Action with schema will get parsed formData as the input.
  */
-type SchemaAction<Data, Context, Args extends AnyZodTuple, Schema extends ZodSchema> = (params: {
+type SchemaAction<Data, Context, Args extends ZodTuple, Schema extends ZodType> = (params: {
     args: z.infer<Args>;
     ctx: Context;
     input: z.infer<Schema>;
 }) => Promise<Data>;
-type AnyZodEffects = ZodEffects<any, any, any>;
-type FormActionBuilder<Schema extends ZodTypeAny | EmptyInput, TErr = unknown, Context = InitialContext, Args extends AnyZodTuple = ZodTuple<[], null>> = {
-    args: <T extends [ZodTypeAny, ...ZodTypeAny[]]>(args: T) => FormActionBuilder<Schema, TErr, Context, ZodTuple<T, null>>;
-    input: <T extends ZodTypeAny>(newInput: T extends ZodType<infer Out extends Record<string, unknown>> ? Schema extends AnyZodEffects ? "Extending schema with effect is not possible." : Schema extends EmptyInput ? T : Schema extends ZodTypeAny ? T extends AnyZodEffects ? "Your input contains effect which prevents merging it with the previous inputs." : T : T : "The schema output must be an object.") => FormActionBuilder<Schema extends ZodObject<infer O1 extends ZodRawShape> ? T extends ZodObject<infer O2 extends ZodRawShape> ? ZodObject<objectUtil.extendShape<O1, O2>> : never : T, TErr, Context, Args>;
+type FormActionBuilder<Schema extends ZodType | EmptyInput, TErr = unknown, Context = InitialContext, Args extends ZodTuple = ZodTuple<[], null>> = {
+    args: <T extends [ZodType, ...ZodType[]]>(args: T) => FormActionBuilder<Schema, TErr, Context, ZodTuple<T, null>>;
+    input: <T extends ZodObject>(newInput: T extends ZodObject ? T : "The schema output must be an object.") => FormActionBuilder<Schema extends ZodObject<infer O1 extends $ZodShape> ? T extends ZodObject<infer O2 extends $ZodShape> ? ZodObject<O1 & O2> : never : T, TErr, Context, Args>;
     /**
      * A finishing call on the builder completing your action.
      * @param action async function to execute. It will receive parsed formData as input, when the builder was initialized with a schema.
      * @returns runnable server action exportable from a module.
      */
-    run: Schema extends ZodTypeAny ? <Data>(action: SchemaAction<Data, Flatten<Context>, Args, Schema>) => (...args: [
+    run: Schema extends ZodType ? <Data>(action: SchemaAction<Data, Flatten<Context>, Args, Schema>) => (...args: [
         ...z.infer<Args>,
-        state: ActionState<Data, TErr, z.inferFormattedError<Schema> & z.inferFormattedError<Args>>,
+        state: ActionState<Data, TErr, $ZodErrorTree<z.output<Schema>> & $ZodErrorTree<z.output<Args>>>,
         payload: FormData
-    ]) => Promise<Flatten<InvalidState<z.inferFormattedError<Schema> & z.inferFormattedError<Args>> | FailureState<TErr> | SuccessState<Data>>> : <Data>(action: Action<Data, Flatten<Context>, Args>) => (...args: [
+    ]) => Promise<Flatten<InvalidState<$ZodErrorTree<z.output<Schema>> & $ZodErrorTree<z.output<Args>>> | FailureState<TErr> | SuccessState<Data>>> : <Data>(action: Action<Data, Flatten<Context>, Args>) => (...args: [
         ...z.infer<Args>,
-        state: ActionState<Data, TErr, z.inferFormattedError<Args>>,
+        state: ActionState<Data, TErr, $ZodErrorTree<z.output<Args>>>,
         payload: FormData
-    ]) => Promise<Flatten<InvalidState<z.inferFormattedError<Args>> | FailureState<TErr> | SuccessState<Data>>>;
+    ]) => Promise<Flatten<InvalidState<$ZodErrorTree<z.output<Args>>> | FailureState<TErr> | SuccessState<Data>>>;
     /**
      * A chainable context enhancing helper.
      * @param middleware A function which receives the current context, and returns an object which will be added to the context.

package/dist/index.mjs

@@ -1 +1 @@
-import{a as Z,b as y}from"./chunk-LPB4R2UB.mjs";import{z as g,ZodFirstPartyTypeKind as S}from"zod";import{zfd as h}from"zod-form-data";var x=Symbol();function c(e,s=[],o,a){async function A(t){let r={formData:t};for(let d of s){let i=await d({ctx:r});r={...r,...i}}return r}return{args(t){return c(e,s,o,g.tuple(t))},input(t){if(e===x)return c(t,s,o,a);if(e._def.effect)throw new Error("Previous input is not augmentable because it contains an effect.");if(t._def.effect)throw new Error("Your input contains effect which prevents merging it with the previous inputs.");if(e._def.typeName===S.ZodObject){let r=e.merge(t);return c(r,s)}else throw Error("Merging inputs works only for object schemas without effects.")},use(t){return c(e,[...s,t],o,a)},error(t){return c(e,s,t,a)},run:e===x?t=>y(({success:r,failure:d,invalid:i},...u)=>async(T,l)=>{let m=await A(l);if(a){let n=a.safeParse(u);if(!n.success)return i(n.error.format())}try{return r(await t({args:u,ctx:m}))}catch(n){if(o)return d(await o({error:n,ctx:m}));throw n}}):e===x?void 0:t=>y(({success:r,failure:d,invalid:i},...u)=>{let T=h.formData(e);return async(l,m)=>{let n=await A(m);if(a){let f=a.safeParse(u);if(!f.success)return i(f.error.format())}let p=T.safeParse(m);if(!p.success)return i(p.error.format());let E=p.data;try{return r(await t({args:u,input:E,ctx:n}))}catch(f){if(o)return d(await o({error:f,ctx:n}));throw f}}})}}var k=c(x);export{y as createFormAction,k as formAction,Z as initial};
+import{a as h,b as f}from"./chunk-LPB4R2UB.mjs";import{z as T}from"zod/v4";import{zfd as g}from"zod-form-data";var m=Symbol();function c(e,s=[],n,a){async function A(t){let r={formData:t};for(let i of s){let u=await i({ctx:r});r={...r,...u}}return r}return{args(t){return c(e,s,n,T.tuple(t))},input(t){if(e===m)return c(t,s,n,a);if(e._zod.def.checks)throw new Error("Previous input is not augmentable because it contains an effect.");if(t._zod.def.checks)throw new Error("Your input contains effect which prevents merging it with the previous inputs.");if(e._zod.def.type==="object"){let r=T.object({...e.shape,...t.shape});return c(r,s)}else throw Error("Merging inputs works only for object schemas without effects.")},use(t){return c(e,[...s,t],n,a)},error(t){return c(e,s,t,a)},run:e===m?t=>f(({success:r,failure:i,invalid:u},...d)=>async(E,y)=>{let p=await A(y);if(a){let o=a.safeParse(d);if(!o.success)return u(T.treeifyError(o.error))}try{return r(await t({args:d,ctx:p}))}catch(o){if(n)return i(await n({error:o,ctx:p}));throw o}}):e===m?void 0:t=>f(({success:r,failure:i,invalid:u},...d)=>{let E=g.formData(e);return async(y,p)=>{let o=await A(p);if(a){let x=a.safeParse(d);if(!x.success)return u(T.treeifyError(x.error))}let l=E.safeParse(p);if(!l.success)return u(T.treeifyError(l.error));let C=l.data;try{return r(await t({args:d,input:C,ctx:o}))}catch(x){if(n)return i(await n({error:x,ctx:o}));throw x}}})}}var j=c(m);export{f as createFormAction,j as formAction,h as initial};

package/package.json

@@ -1,74 +1,76 @@
-{
-  "name": "react-form-action",
-  "version": "2.5.2",
-  "description": "State management helpers for the react form actions.",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/MiroslavPetrik/react-form-action.git"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.mjs",
-  "files": [
-    "/dist"
-  ],
-  "scripts": {
-    "build": "tsup",
-    "test": "vitest",
-    "typecheck": "vitest --typecheck",
-    "format": "prettier . --write",
-    "format:check": "prettier . --check",
-    "ncu": "ncu --interactive --format group",
-    "pub:next": "npm publish --tag next"
-  },
-  "exports": {
-    ".": {
-      "import": "./dist/index.mjs",
-      "module": "./dist/index.mjs",
-      "types": "./dist/index.d.mts",
-      "default": "./dist/index.mjs"
-    },
-    "./client": {
-      "import": "./dist/client.mjs",
-      "module": "./dist/client.mjs",
-      "types": "./dist/client.d.mts",
-      "default": "./dist/client.mjs"
-    }
-  },
-  "keywords": [
-    "react",
-    "form-action",
-    "react-form-action",
-    "next",
-    "next-form-action",
-    "nextjs",
-    "server-action"
-  ],
-  "author": "Miroslav Petrik",
-  "license": "MIT",
-  "peerDependencies": {
-    "react": ">=19",
-    "react-dom": ">=19",
-    "zod": "^3",
-    "zod-form-data": "^2"
-  },
-  "devDependencies": {
-    "@testing-library/dom": "^10.4.0",
-    "@testing-library/jest-dom": "^6.6.3",
-    "@testing-library/react": "^16.1.0",
-    "@testing-library/user-event": "^14.5.2",
-    "@types/react": "^19.0.0",
-    "@types/react-dom": "^19.0.1",
-    "@vitejs/plugin-react": "^4.3.4",
-    "happy-dom": "^16.0.0",
-    "npm-check-updates": "^17.1.12",
-    "prettier": "^3.4.2",
-    "react": "^19.0.0",
-    "react-dom": "^19.0.0",
-    "react-render-prop-type": "^1.0.0",
-    "tsup": "^8.3.5",
-    "typescript": "^5.7.2",
-    "vitest": "^1.3.1",
-    "zod": "^3.23.8",
-    "zod-form-data": "^2.0.2"
-  }
-}
+{
+  "name": "react-form-action",
+  "version": "2.6.0",
+  "description": "State management helpers for the react form actions.",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/MiroslavPetrik/react-form-action.git"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.mjs",
+  "files": [
+    "/dist"
+  ],
+  "scripts": {
+    "build": "tsup",
+    "test": "vitest",
+    "typecheck": "vitest --typecheck",
+    "format": "prettier . --write",
+    "format:check": "prettier . --check",
+    "ncu": "ncu --interactive --format group",
+    "pub:next": "npm publish --tag next"
+  },
+  "exports": {
+    ".": {
+      "import": "./dist/index.mjs",
+      "module": "./dist/index.mjs",
+      "types": "./dist/index.d.mts",
+      "default": "./dist/index.mjs"
+    },
+    "./client": {
+      "import": "./dist/client.mjs",
+      "module": "./dist/client.mjs",
+      "types": "./dist/client.d.mts",
+      "default": "./dist/client.mjs"
+    }
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "keywords": [
+    "react",
+    "form-action",
+    "react-form-action",
+    "next",
+    "next-form-action",
+    "nextjs",
+    "server-action"
+  ],
+  "author": "Miroslav Petrik",
+  "license": "MIT",
+  "peerDependencies": {
+    "react": ">=19",
+    "react-dom": ">=19",
+    "zod": "^3.25.0 || ^4.0.0",
+    "zod-form-data": "^3.0.0"
+  },
+  "devDependencies": {
+    "@testing-library/dom": "^10.4.1",
+    "@testing-library/jest-dom": "^6.9.1",
+    "@testing-library/react": "^16.3.0",
+    "@testing-library/user-event": "^14.6.1",
+    "@types/react": "^19.2.2",
+    "@types/react-dom": "^19.2.2",
+    "@vitejs/plugin-react": "^5.1.0",
+    "happy-dom": "^20.0.8",
+    "npm-check-updates": "^19.1.1",
+    "prettier": "^3.6.2",
+    "react": "^19.2.0",
+    "react-dom": "^19.2.0",
+    "tsup": "^8.5.0",
+    "typescript": "^5.9.3",
+    "vitest": "^4.0.4",
+    "zod": "^3.25.0",
+    "zod-form-data": "^3.0.1"
+  }
+}