react-form-action 2.4.1 → 2.5.0

package/dist/{chunk-22TNX3DL.mjs → chunk-MQGUMLBX.mjs}

@@ -1 +1 @@
-function d(a){return{type:"initial",data:a,error:null,validationError:null}}function u(a){function t(r){return{type:"success",data:r,error:null,validationError:null}}function o(r){return{type:"failure",data:null,error:r,validationError:null}}function e(r){return{type:"invalid",data:null,error:null,validationError:r}}return(...r)=>{let[n,i,...l]=r.reverse();return a({success:t,failure:o,invalid:e},...l)(i,n)}}export{d as a,u as b};
+function d(a){return{type:"initial",data:a,error:null,validationError:null}}function u(a){function t(r){return{type:"success",data:r,error:null,validationError:null}}function e(r){return{type:"failure",data:null,error:r,validationError:null}}function o(r){return{type:"invalid",data:null,error:null,validationError:r}}return(...r)=>{let[n,i,...l]=r.reverse();return a({success:t,failure:e,invalid:o},...l)(i,n)}}export{d as a,u as b};

package/dist/client.d.mts

@@ -1,6 +1,6 @@
 import * as React 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 { F as FormAction, A as ActionState, I as InitialState, a as InvalidState, b as FailureState, S as SuccessState } from './createFormAction-DkNsdAwU.mjs';
 import { ZodFormattedError } from 'zod';
 import { RenderProp, RP } from 'react-render-prop-type';
 

package/dist/client.mjs

@@ -1 +1 @@
-"use client";import{a as m}from"./chunk-22TNX3DL.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 m}from"./chunk-MQGUMLBX.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};

package/dist/{createFormAction-DjhozgiG.d.mts → createFormAction-DkNsdAwU.d.mts}

@@ -22,7 +22,11 @@ type SuccessState<T> = {
     error: null;
     validationError: null;
 };
-type ActionState<Data, Error, ValidationError = Record<string, never>> = InitialState<Data> | InvalidState<ValidationError> | FailureState<Error> | SuccessState<Data>;
+type Flatten<T> = Identity<{
+    [K in keyof T]: T[K];
+}>;
+type Identity<T> = T;
+type ActionState<Data, Error, ValidationError = Record<string, never>> = Flatten<InitialState<Data> | InvalidState<ValidationError> | FailureState<Error> | SuccessState<Data>>;
 type FormAction<Data, Error = Data, ValidationError = Record<string, never>, Payload = FormData, Arguments extends unknown[] = []> = (...args: [
     ...Arguments,
     state: ActionState<Data, Error, ValidationError>,

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-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 { ZodTypeAny, ZodType, ZodObject, ZodRawShape, objectUtil, z, ZodSchema, ZodEffects } from 'zod';
+import { A as ActionState, a as InvalidState, b as FailureState, S as SuccessState } from './createFormAction-DkNsdAwU.mjs';
+export { F as FormAction, I as InitialState, c as createFormAction, i as initial } from './createFormAction-DkNsdAwU.mjs';
+import { z, ZodTypeAny, AnyZodTuple, ZodTuple, ZodType, ZodObject, ZodRawShape, objectUtil, ZodSchema, ZodEffects } from 'zod';
 
 declare const emptyInput: unique symbol;
 type EmptyInput = typeof emptyInput;
@@ -16,25 +16,36 @@ type InitialContext = Record<"formData", FormData>;
 /**
  * Action without schema has no input.
  */
-type Action<Data, Context> = (params: {
+type Action<Data, Context, Args extends AnyZodTuple> = (params: {
+    args: z.infer<Args>;
     ctx: Context;
 }) => Promise<Data>;
 /**
  * Action with schema will get parsed formData as the input.
  */
-type SchemaAction<Data, Context, Schema extends ZodSchema> = (params: {
+type SchemaAction<Data, Context, Args extends AnyZodTuple, Schema extends ZodSchema> = (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, Err = Error, Context = InitialContext> = {
-    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, Err, Context>;
+type FormActionBuilder<Schema extends ZodTypeAny | EmptyInput, Err = Error, Context = InitialContext, Args extends AnyZodTuple = ZodTuple<[], null>> = {
+    args: <T extends [ZodTypeAny, ...ZodTypeAny[]]>(args: T) => FormActionBuilder<Schema, Err, 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, Err, 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, Context, Schema>) => (state: ActionState<Data, Err, z.inferFormattedError<Schema>>, payload: FormData) => Promise<Flatten<InvalidState<z.inferFormattedError<Schema>> | FailureState<Err> | SuccessState<Data>>> : <Data>(action: Action<Data, Context>) => (state: ActionState<Data, Err>, payload: FormData) => Promise<Flatten<FailureState<Err> | SuccessState<Data>>>;
+    run: Schema extends ZodTypeAny ? <Data>(action: SchemaAction<Data, Flatten<Context>, Args, Schema>) => (...args: [
+        ...z.infer<Args>,
+        state: ActionState<Data, Error, z.inferFormattedError<Schema> | z.inferFormattedError<Args>>,
+        payload: FormData
+    ]) => Promise<Flatten<InvalidState<z.inferFormattedError<Schema> | z.inferFormattedError<Args>> | FailureState<Err> | SuccessState<Data>>> : <Data>(action: Action<Data, Flatten<Context>, Args>) => (...args: [
+        ...z.infer<Args>,
+        state: ActionState<Data, Error, z.inferFormattedError<Args>>,
+        payload: FormData
+    ]) => Promise<Flatten<InvalidState<z.inferFormattedError<Args>> | FailureState<Err> | 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.
@@ -42,15 +53,15 @@ type FormActionBuilder<Schema extends ZodTypeAny | EmptyInput, Err = Error, Cont
      */
     use: <NewContext extends Record<string, unknown>>(middleware: ({ ctx }: {
         ctx: Context;
-    }) => Promise<NewContext>) => FormActionBuilder<Schema, Err, Context & NewContext>;
+    }) => Promise<NewContext>) => FormActionBuilder<Schema, Err, Context & NewContext, Args>;
     /**
      * A chainable error handler to handle errors thrown while running the action passed to .run().
      * It does not receive errors thrown from the context/middleware.
      * @param processError A function which receives action's errors.
      * @returns FormActionBuilder
      */
-    error: <Err>(processError: ErrorHandler<Context, Err>) => FormActionBuilder<Schema, Err, Context>;
+    error: <Err>(processError: ErrorHandler<Context, Err>) => FormActionBuilder<Schema, Err, Context, Args>;
 };
-declare const formAction: FormActionBuilder<typeof emptyInput, Error, InitialContext>;
+declare const formAction: FormActionBuilder<typeof emptyInput, Error, InitialContext, z.ZodTuple<[], null>>;
 
 export { ActionState, FailureState, InvalidState, SuccessState, formAction };

package/dist/index.mjs

@@ -1 +1 @@
-import{a as A,b as p}from"./chunk-22TNX3DL.mjs";import{ZodFirstPartyTypeKind as C}from"zod";import{zfd as E}from"zod-form-data";var d=Symbol();function i(n,o=[],r){async function f(t){let e={formData:t};for(let a of o){let s=await a({ctx:e});e={...e,...s}}return e}return{input(t){if(n===d)return i(t,o,r);if(n._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(n._def.typeName===C.ZodObject){let e=n.merge(t);return i(e,o)}else throw Error("Merging inputs works only for object schemas without effects.")},use(t){return i(n,[...o,t],r)},error(t){return i(n,o,t)},run:n===d?t=>p(({success:e,failure:a})=>async(s,x)=>{let m=await f(x);try{return e(await t({ctx:m}))}catch(c){if(r)return a(await r({error:c,ctx:m}));throw c}}):n===d?void 0:t=>p(({success:e,failure:a,invalid:s})=>{let x=E.formData(n);return async(m,c)=>{let y=await f(c),u=x.safeParse(c);if(!u.success)return s(u.error.format());let h=u.data;try{return e(await t({input:h,ctx:y}))}catch(S){if(r)return a(await r({error:S,ctx:y}));throw S}}})}}var N=i(d);export{p as createFormAction,N as formAction,A as initial};
+import{a as w,b as y}from"./chunk-MQGUMLBX.mjs";import{z as S,ZodFirstPartyTypeKind as h}from"zod";import{zfd as C}from"zod-form-data";var p=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,S.tuple(t))},input(t){if(e===p)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===h.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===p?t=>y(({success:r,failure:d,invalid:i},...u)=>async(l,E)=>{let f=await A(E);if(a){let n=a.safeParse(u);if(!n.success){let x=n.error.flatten();return i(x.fieldErrors)}}try{return r(await t({args:u,ctx:f}))}catch(n){if(o)return d(await o({error:n,ctx:f}));throw n}}):e===p?void 0:t=>y(({success:r,failure:d,invalid:i},...u)=>{let l=C.formData(e);return async(E,f)=>{let n=await A(f);if(a){let m=a.safeParse(u);if(!m.success)return i(m.error.format())}let x=l.safeParse(f);if(!x.success)return i(x.error.format());let g=x.data;try{return r(await t({args:u,input:g,ctx:n}))}catch(m){if(o)return d(await o({error:m,ctx:n}));throw m}}})}}var N=c(p);export{y as createFormAction,N as formAction,w as initial};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-form-action",
-  "version": "2.4.1",
+  "version": "2.5.0",
   "description": "State management helpers for the react form actions.",
   "repository": {
     "type": "git",
@@ -17,7 +17,8 @@
     "typecheck": "vitest --typecheck",
     "format": "prettier . --write",
     "format:check": "prettier . --check",
-    "ncu": "ncu --interactive --format group"
+    "ncu": "ncu --interactive --format group",
+    "pub:next": "npm publish --tag next"
   },
   "exports": {
     ".": {