@paragrav/rhf-utils 0.63.0 → 0.64.0

package/README.md

@@ -77,20 +77,22 @@ export const rhfUtilsClientConfig: RhfUtilsClientConfig = {
   // inject your own hooks and components
   // into all RhfUtilsZodForm instances
   FormChildren: (
-    // RhfUtilsFormComponentProps
+    // RhfUtilsFormInjectorProps
     {
+      Outlet, //          Form instance (RhfUtilsZodForm.Children) "outlet"
+
       formId, //          unique id string
       formRef, //         form element ref
       context, //         rhf UseFormReturn (without proxy `formState`)
       options, //         RhfUtilsFormOptions (with any custom props)
       Controller, //      rhf controller (SafeFieldValues-typed; no schema at this level)
       FormSubmitError, // error class (SafeFieldValues-typed; no schema at this level)
-      children, //        RhfUtilsZodForm's Children instance
     },
   ) => {
+    // hook injected across all instances
     useMyGlobalFormHook();
 
-    // form-level control of your own hooks/behaviors via custom option props
+    // hook injected across all instances with per-instance opt-in flag via custom option props
     // (see "Extend RhfUtilsFormOptions" section for more info)
     useMyOptionalFormHook({
       enabled: !!options.enableMyOptionalFormHook,
@@ -98,8 +100,8 @@ export const rhfUtilsClientConfig: RhfUtilsClientConfig = {
 
     return (
       <>
-        {/* RhfUtilsZodForm.Children "outlet" (see "Component Hierarchy" section) */}
-        {children}
+        {/* Form instance (RhfUtilsZodForm.Children) "outlet" (see "Component Hierarchy" section). */}
+        <Outlet />
 
         {/* root errors list */}
         <RootErrorsList />
@@ -190,7 +192,7 @@ Currently, only `zod` schemas are supported.
     {
       field: 'passwordConfirm', // type safe
       message: 'Passwords must match.',
-      valid: data.password === data.passwordConfirm,
+      validate: data.password === data.passwordConfirm,
     },
   ]}
   onBeforeSubmit={({ input, output, api }, context, event) => {

package/dist/dts/_exports/form.d.ts

@@ -2,6 +2,6 @@ export { useRhfUtilsContext } from '../form/context/utils/useRhfUtilsContext';
 export type { RhfUtilsFormOptions } from '../form/options/RhfUtilsFormOptionsType';
 export type { SafeFieldValues } from '../form/rhf/SafeFieldValuesType';
 export type { RHF_UseFormReturnWithoutProxies as UseFormReturnWithoutProxies } from '../form/RHF_UseFormReturnWithoutProxiesType';
-export type { RhfUtilsFormComponentProps } from '../form/RhfUtilsFormComponentPropsType';
+export type { RhfUtilsFormInjectorProps } from '../form/RhfUtilsFormInjectorProps';
 export type { UseRhfUtilsFormChildrenProps } from '../form/UseRhfUtilsFormChildrenPropsType';
 export { useFormRequestSubmit } from '../form/utils/useFormRequestSubmit';

package/dist/dts/client/config/RhfUtilsClientConfigType.d.ts

@@ -1,6 +1,6 @@
 import { FlatFieldErrorsOutputConfig } from '../../errors/flat/context/FlatFieldErrorsOutputConfig';
 import { UseRhfUtilsFormGlobalDefaults } from '../../form/defaults/UseRhfUtilsFormGlobalDefaults';
-import { RhfUtilsFormComponentProps } from '../../form/RhfUtilsFormComponentPropsType';
+import { RhfUtilsFormInjectorProps } from '../../form/RhfUtilsFormInjectorProps';
 import { FormSubmitFieldErrors } from '../../submit/error/FormSubmitFieldErrors';
 import { UseRhfUtilsFormOnSubmitContext } from '../../submit/UseRhfUtilsFormOnSubmitContextType';
 import { MaybePromise } from '../../utils/types';
@@ -26,8 +26,12 @@ export type RhfUtilsClientConfig = {
      * @description
      *
      * (NOTE: context params are not schema-typed as not possible at this level.)
+     *
+     * @example
+     *
+     * See README.
      */
-    FormChildren?: React.FC<React.PropsWithChildren<RhfUtilsFormComponentProps>>;
+    FormInjector?: React.FC<RhfUtilsFormInjectorProps>;
     /**
      * A hook that returns a callback that determines whether form can be cancelled at event-time.
      *

package/dist/dts/form/{RhfUtilsFormComponentPropsType.d.ts → RhfUtilsFormInjectorProps.d.ts}

@@ -1,13 +1,17 @@
 import { UseFormReturn } from 'react-hook-form';
 import { FormSubmitError } from '../submit/error/FormSubmitError';
+import { Merge } from '../utils/types';
 import { _Controller } from './_Controller';
 import { RhfUtilsContext } from './context/utils/RhfUtilsContextType';
 import { SafeFieldValues } from './rhf/SafeFieldValuesType';
 /**
  * RhfUtilsClientConfig's FormComponent props.
  */
-export type RhfUtilsFormComponentProps<TFieldValues extends SafeFieldValues = SafeFieldValues, TTransformedValues extends SafeFieldValues = TFieldValues> = RhfUtilsContext & {
+export type RhfUtilsFormInjectorProps<TFieldValues extends SafeFieldValues = SafeFieldValues, TTransformedValues extends SafeFieldValues = TFieldValues> = Merge<{
+    /** Form instance children (`RhfUtilsZodForm.Children`) to output amid globally-injected code. */
+    Outlet: React.FC;
+}, RhfUtilsContext, {
     rhf: UseFormReturn<TFieldValues, unknown, TTransformedValues>;
     Controller: typeof _Controller<TFieldValues>;
     FormSubmitError: typeof FormSubmitError<TFieldValues>;
-};
+}>;

package/dist/dts/form/with-handlers-and-children/RhfUtilsFormProps.d.ts

@@ -4,16 +4,8 @@ import { UseRhfUtilsFormOnSubmitContext, UseRhfUtilsFormOnSubmitErrorContext } f
 import { UseRhfUtilsFormInstanceFormProps } from '../defaults/form/UseRhfUtilsFormInstanceFormProps';
 import { SafeFieldValues } from '../rhf/SafeFieldValuesType';
 import { UseRhfUtilsFormChildrenProps } from '../UseRhfUtilsFormChildrenPropsType';
+import { RhfUtilsFormPropsOnBeforeSubmitInvariants } from './RhfUtilsFormPropsOnBeforeSubmitInvariants';
 export type RhfUtilsFormPropsGetApiValues<TTransformedValues extends SafeFieldValues, TApiValues> = (data: TTransformedValues) => TApiValues;
-export type RhfUtilsFormPropsonBeforeSubmitInvariants<TFieldValues extends SafeFieldValues, TTransformedValues extends SafeFieldValues, TApiValues extends undefined | SafeFieldValues> = (data: {
-    input: TFieldValues;
-    output: TTransformedValues;
-    api: TApiValues;
-}, context: UseRhfUtilsFormOnSubmitContext<TFieldValues, TTransformedValues, TApiValues>, event: React.BaseSyntheticEvent<SubmitEvent>) => MaybePromise<{
-    field: keyof TFieldValues | keyof TApiValues;
-    message: string;
-    valid: boolean | undefined | null;
-}[]>;
 export type RhfUtilsFormProps<TFieldValues extends SafeFieldValues, TTransformedValues extends SafeFieldValues, TGetApiValues extends undefined | RhfUtilsFormPropsGetApiValues<TTransformedValues, SafeFieldValues>, TOnSubmitReturnType, TApiValues extends undefined | SafeFieldValues = TGetApiValues extends RhfUtilsFormPropsGetApiValues<TTransformedValues, infer U> ? U : undefined> = {
     getApiData?: TGetApiValues;
     /** Cancellation handler -- channeled through {@link RhfUtilsClientConfig.useCanFormBeCancelled} before propagating to `Children` component. */
@@ -24,7 +16,7 @@ export type RhfUtilsFormProps<TFieldValues extends SafeFieldValues, TTransformed
      * List of invariants to run against input/output/api data.
      * For any and all false-y values, a {@link FormSubmitFieldErrors} will be thrown.
      */
-    onBeforeSubmitInvariants?: RhfUtilsFormPropsonBeforeSubmitInvariants<TFieldValues, TTransformedValues, TApiValues>;
+    onBeforeSubmitInvariants?: RhfUtilsFormPropsOnBeforeSubmitInvariants<TFieldValues, TTransformedValues, TApiValues>;
     onBeforeSubmit?: (data: {
         input: TFieldValues;
         output: TTransformedValues;

package/dist/dts/form/with-handlers-and-children/RhfUtilsFormPropsOnBeforeSubmitInvariants.d.ts

@@ -0,0 +1,12 @@
+import { UseRhfUtilsFormOnSubmitContext } from '../../submit/UseRhfUtilsFormOnSubmitContextType';
+import { MaybePromise } from '../../utils/types';
+import { SafeFieldValues } from '../rhf/SafeFieldValuesType';
+export type RhfUtilsFormPropsOnBeforeSubmitInvariants<TFieldValues extends SafeFieldValues, TTransformedValues extends SafeFieldValues, TApiValues extends undefined | SafeFieldValues> = (data: {
+    input: TFieldValues;
+    output: TTransformedValues;
+    api: TApiValues;
+}, context: UseRhfUtilsFormOnSubmitContext<TFieldValues, TTransformedValues, TApiValues>, event: React.BaseSyntheticEvent<SubmitEvent>) => MaybePromise<{
+    field: keyof TFieldValues | keyof TApiValues;
+    message: string;
+    validate: boolean | undefined | null;
+}[]>;

package/dist/dts/form/with-providers/RhfUtilsFormWithProvidersProps.d.ts

@@ -1,4 +1,8 @@
+import { Resolver } from 'react-hook-form';
+import { Merge } from '../../utils/types';
 import { RhfUtilsFormProvidersProps } from '../providers/RhfUtilsFormProvidersPropsType';
 import { SafeFieldValues } from '../rhf/SafeFieldValuesType';
 import { RhfUtilsFormProps, RhfUtilsFormPropsGetApiValues } from '../with-handlers-and-children/RhfUtilsFormProps';
-export type RhfUtilsFormWithProvidersProps<TFieldValues extends SafeFieldValues, TTransformedValues extends SafeFieldValues, TGetApiValues extends undefined | RhfUtilsFormPropsGetApiValues<TTransformedValues, SafeFieldValues>, TOnSubmitReturnType, TApiValues extends undefined | SafeFieldValues = TGetApiValues extends RhfUtilsFormPropsGetApiValues<TTransformedValues, infer U> ? U : undefined> = RhfUtilsFormProvidersProps<TFieldValues, TTransformedValues> & RhfUtilsFormProps<TFieldValues, TTransformedValues, TGetApiValues, TOnSubmitReturnType, TApiValues>;
+export type RhfUtilsFormWithProvidersProps<TFieldValues extends SafeFieldValues, TTransformedValues extends SafeFieldValues, TGetApiValues extends undefined | RhfUtilsFormPropsGetApiValues<TTransformedValues, SafeFieldValues>, TOnSubmitReturnType, TApiValues extends undefined | SafeFieldValues = TGetApiValues extends RhfUtilsFormPropsGetApiValues<TTransformedValues, infer U> ? U : undefined> = Merge<RhfUtilsFormProps<TFieldValues, TTransformedValues, TGetApiValues, TOnSubmitReturnType, TApiValues>, RhfUtilsFormProvidersProps<TFieldValues, TTransformedValues>, {
+    resolver?: Resolver<TFieldValues, unknown, TTransformedValues>;
+}>;

package/dist/dts/submit/error/FormSubmitFieldErrors.d.ts

@@ -9,6 +9,6 @@ import { SafeFieldValues } from '../../form/rhf/SafeFieldValuesType';
  * - simplified `ErrorOption` value.
  */
 export type FormSubmitFieldErrors<TFieldValues extends SafeFieldValues = SafeFieldValues> = Record<FieldPath<TFieldValues> | `root.${string}`, {
-    type?: string;
     message: string;
+    type?: string;
 }>;

package/dist/esm/index.mjs

@@ -13,15 +13,12 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 }, { Provider: y, useRequired: b } = o(), x = () => {
 	let e = b();
 	return s.useMemo(() => !e.hasErrors || !e.hasOrphans ? !1 : Object.keys(e.orphans).length === Object.keys(e.all).length, [e]);
-}, S = "data-rhfutils-nonfield-error-marker-path", C = ({ path: e }) => {
-	let t = { [S]: e };
-	return /* @__PURE__ */ c("div", {
-		role: "alert",
-		"aria-hidden": "true",
-		style: { display: "none" },
-		...t
-	});
-}, w = (e) => s.useCallback((t) => {
+}, S = "data-rhfutils-nonfield-error-marker-path", C = ({ path: e }) => /* @__PURE__ */ c("div", {
+	role: "alert",
+	"aria-hidden": "true",
+	style: { display: "none" },
+	[S]: e
+}), w = (e) => s.useCallback((t) => {
 	if (!e.current) throw Error();
 	ee(e.current, t);
 }, [e]), ee = (e, t) => {
@@ -35,39 +32,39 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 	if (!t) return null;
 	let n = typeof t == "object" ? t : void 0;
 	return /* @__PURE__ */ c(s.Suspense, { children: /* @__PURE__ */ c(O, { ...n }) });
-}, ne = () => /* @__PURE__ */ c(k, { config: r().options.devTool }), A = (e) => /* @__PURE__ */ c(u, { ...e }), j = () => {
+}, A = () => /* @__PURE__ */ c(k, { config: r().options.devTool }), j = (e) => /* @__PURE__ */ c(u, { ...e }), M = () => {
 	let e = s.useContext(_);
 	if (e === void 0) throw Error();
 	return e;
-}, re = () => ({
+}, ne = () => ({
 	utils: r(),
 	rhf: p(),
 	FormSubmitError: T
-}), ie = (e, t, n) => {
+}), re = (e, t, n) => {
 	let r = t?.();
 	return async () => {
 		if (e && await Promise.resolve(r?.(n)) !== !1) return Promise.resolve(e());
 	};
-}, ae = (e) => {
-	let { useCanFormBeCancelled: t } = j();
-	return ie(e, t, re());
-}, oe = ({ onCancel: e, Children: t }) => {
-	let n = p(), i = r(), a = ae(e);
+}, ie = (e) => {
+	let { useCanFormBeCancelled: t } = M();
+	return re(e, t, ne());
+}, ae = ({ onCancel: e, Children: t }) => {
+	let n = p(), i = r(), a = ie(e);
 	return /* @__PURE__ */ c(t, {
 		...i,
 		rhf: n,
 		onCancel: a,
-		Controller: A,
+		Controller: j,
 		FormSubmitError: T
 	});
-}, M = (e, t) => {
+}, N = (e, t) => {
 	Object.entries(t).forEach(([t, n]) => {
 		e.setError(t, {
 			type: "FormSubmitFieldError",
 			...n
 		});
 	});
-}, N = ({ children: e }) => e, P = (e, t, n) => ({
+}, P = (e, t, n) => ({
 	...e,
 	...t,
 	className: [
@@ -77,7 +74,7 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 	].filter(Boolean).join(" ").trim() || void 0
 }), F = (e, t, n) => ({
 	id: t,
-	...P(j().defaults?.form, e, n)
+	...P(M().defaults?.form, e, n)
 }), I = (e) => {
 	let t = E();
 	return async function(n) {
@@ -98,52 +95,50 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 			i?.();
 		});
 	};
-}, R = ({ getApiData: e, onSubmitInvalid: t, onBeforeSubmitInvariants: n, onBeforeSubmit: i, onSubmit: a, onSubmitSuccess: o, onSubmitError: s, onSubmitFinally: l, form: u, className: d, children: f }) => {
-	let m = p(), h = r(), g = j(), _ = F(u, h.formId, { className: d }), v = async (t, r) => {
+}, R = ({ getApiData: e, onSubmitInvalid: t, onBeforeSubmitInvariants: n, onBeforeSubmit: i, onSubmit: a, onSubmitSuccess: o, onSubmitError: l, onSubmitFinally: u, form: d, className: f, children: m }) => {
+	let h = p(), g = r(), _ = M(), v = F(d, g.formId, { className: f }), y = async (t, r) => {
 		let s = {
-			input: m.getValues(),
+			input: h.getValues(),
 			output: t,
 			api: e?.(t)
 		}, c = {
-			utils: h,
-			rhf: m,
+			utils: g,
+			rhf: h,
 			FormSubmitError: T
 		}, l = r;
 		n && await z(n, s, c, l), await Promise.resolve(i?.(s, c, l));
 		let u = await Promise.resolve(a?.(s, c, l));
-		h.lastSubmitStateRef.current = "success", await Promise.resolve(o?.(u, s, c, l));
+		g.lastSubmitStateRef.current = "success", await Promise.resolve(o?.(u, s, c, l));
 	};
-	function y(e, t) {
-		let n = e instanceof T ? e.errors : g.onSubmitErrorUnknown?.(e);
-		n && M(m, n), s?.(e, {
-			utils: h,
+	function b(e, t) {
+		let n = e instanceof T ? e.errors : _.onSubmitErrorUnknown?.(e);
+		n && N(h, n), l?.(e, {
+			utils: g,
 			errors: n,
-			rhf: m
+			rhf: h
 		}, t);
 	}
-	let b = L({
-		onValid: v,
+	let x = L({
+		onValid: y,
 		onInvalid: t,
-		onError: y,
-		onFinally: l
-	}), x = {
-		...h,
-		rhf: m,
-		Controller: A,
-		FormSubmitError: T
-	}, S = g.FormComponent ?? "form", C = g.FormChildren ?? N;
-	return /* @__PURE__ */ c(S, {
-		..._,
-		id: h.formId,
-		ref: h.formRef,
-		onSubmit: b,
-		children: /* @__PURE__ */ c(C, {
-			...x,
-			children: f
-		})
+		onError: b,
+		onFinally: u
+	}), S = s.useCallback(() => m, []), C = {
+		...g,
+		rhf: h,
+		Controller: j,
+		FormSubmitError: T,
+		Outlet: S
+	};
+	return /* @__PURE__ */ c(_.FormComponent ?? "form", {
+		...v,
+		id: g.formId,
+		ref: g.formRef,
+		onSubmit: x,
+		children: _.FormInjector ? /* @__PURE__ */ c(_.FormInjector, { ...C }) : m
 	});
 }, z = async (e, t, n, r) => {
-	let i = (await Promise.resolve(e(t, n, r))).filter(({ valid: e }) => !e).map(({ field: e, message: t }) => [e, { message: t }]);
+	let i = (await Promise.resolve(e(t, n, r))).filter(({ validate: e }) => !e).map(({ field: e, message: t }) => [e, { message: t }]);
 	if (i.length) throw new n.FormSubmitError(Object.fromEntries(i));
 }, B = ({ getApiData: e, onCancel: t, onSubmitInvalid: n, onBeforeSubmitInvariants: r, onBeforeSubmit: i, onSubmit: a, onSubmitSuccess: o, onSubmitError: s, onSubmitFinally: u, Children: d, form: f, className: p }) => /* @__PURE__ */ l(R, {
 	getApiData: e,
@@ -156,24 +151,24 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 	onSubmitFinally: u,
 	form: f,
 	className: p,
-	children: [/* @__PURE__ */ c(ne, {}), /* @__PURE__ */ c(oe, {
+	children: [/* @__PURE__ */ c(A, {}), /* @__PURE__ */ c(ae, {
 		onCancel: t,
 		Children: d
 	})]
-}), V = (e) => /* @__PURE__ */ c(B, { ...e }), H = (e) => (t) => Object.fromEntries(Object.entries(t).filter(e)), U = (e) => !!e.ref, W = H(([, e]) => U(e)), G = (e, t) => [["", ""], ...t?.excludeNested ? [] : [["^", "."]]].map(([t, n]) => K(S + t, e + n)).join(", "), K = (e, t) => `[role="alert"][${e}="${t}"]`, q = (e, t) => !!t.querySelector(G(e)), J = (e) => e === "root" || e.startsWith("root."), se = (e, t, n) => !U(t) && !J(e) && !q(e, n), ce = (e) => ([t, n]) => se(t, n, e), le = (e, t) => H(ce(t))(e), ue = H(([e]) => J(e)), de = ({ formRef: e, children: t }) => {
-	let { errors: r } = m(), a = i(r), o = e.current ? le(a, e.current) : {};
+}), V = (e) => /* @__PURE__ */ c(B, { ...e }), H = (e) => (t) => Object.fromEntries(Object.entries(t).filter(e)), U = (e) => !!e.ref, W = H(([, e]) => U(e)), G = (e, t) => [["", ""], ...t?.excludeNested ? [] : [["^", "."]]].map(([t, n]) => K(S + t, e + n)).join(", "), K = (e, t) => `[role="alert"][${e}="${t}"]`, q = (e, t) => !!t.querySelector(G(e)), J = (e) => e === "root" || e.startsWith("root."), oe = (e, t, n) => !U(t) && !J(e) && !q(e, n), se = (e) => ([t, n]) => oe(t, n, e), ce = (e, t) => H(se(t))(e), le = H(([e]) => J(e)), ue = ({ formRef: e, children: t }) => {
+	let { errors: r } = m(), a = i(r), o = e.current ? ce(a, e.current) : {};
 	return /* @__PURE__ */ c(y, {
 		value: {
 			all: a,
 			fields: W(a),
-			roots: ue(a),
+			roots: le(a),
 			orphans: o,
 			hasErrors: !n(r),
 			hasOrphans: !n(o)
 		},
 		children: t
 	});
-}, fe = ({ children: e }) => {
+}, de = ({ children: e }) => {
 	let [t, n] = s.useState(void 0);
 	return /* @__PURE__ */ c(te, {
 		value: {
@@ -190,35 +185,35 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 		},
 		children: e
 	});
-}, pe = (e, t, n, r = "debug") => {
+}, fe = (e, t, n, r = "debug") => {
 	console[r](e, {
 		values: t,
 		errors: n
 	});
-}, me = (e) => {
+}, pe = (e) => {
 	let t = p(), n = b();
 	s.useEffect(() => {
 		if (!n.hasErrors) return;
 		let r = e?.console?.(n);
-		r && pe(r.message ?? Y, t.getValues(), n, r.type);
+		r && fe(r.message ?? Y, t.getValues(), n, r.type);
 		let i = e?.throw?.(n);
 		if (i) throw Error(typeof i == "string" ? i : Y);
 	}, [n]);
-}, Y = "Form errors", he = (e) => {
+}, Y = "Form errors", me = (e) => {
 	let t = s.useRef(!1);
 	return s.useEffect(() => {
 		e && (t.current = !0);
 	}, [e]), [t, () => {
 		t.current = !1;
 	}];
-}, ge = (e, t) => {
-	let { isSubmitSuccessful: n, isSubmitting: r } = m(), [i, a] = he(r);
+}, he = (e, t) => {
+	let { isSubmitSuccessful: n, isSubmitting: r } = m(), [i, a] = me(r);
 	s.useEffect(() => {
 		e && (r || i.current && (a(), (t?.successful === void 0 || n === t.successful) && e(n)));
 	}, [r]);
-}, _e = (e) => {
+}, ge = (e) => {
 	let { getValues: t, reset: n } = p();
-	ge((r) => {
+	he((r) => {
 		if (!e) return;
 		let i = e[r ? "success" : "error"]?.values;
 		if (!i) return;
@@ -231,12 +226,12 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 			keepErrors: !0
 		});
 	});
-}, ve = () => {
+}, _e = () => {
 	let e = s.useRef(X);
 	return s.useEffect(() => (e.current &&= !X, () => {
 		e.current = X;
 	}), []), e;
-}, X = !0, ye = ({ onChange: e, delay: t }) => {
+}, X = !0, ve = ({ onChange: e, delay: t }) => {
 	let n = s.useRef(null), r = () => {
 		n.current &&= (e(n.current.value), null);
 	}, i = () => {
@@ -248,16 +243,16 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 			timer: setTimeout(r, t)
 		};
 	}];
-}, be = (e, t) => {
-	let n = w(e), [r] = ye({
+}, ye = (e, t) => {
+	let n = w(e), [r] = ve({
 		delay: t?.debounce ?? 0,
 		onChange: () => {
 			n();
 		}
 	});
 	return r;
-}, xe = (e, t) => {
-	let n = be(e, { debounce: t?.debounce }), r = h(), { isValid: i, isDirty: a, isValidating: o, isSubmitting: c } = m(), l = s.useMemo(() => JSON.stringify(r), [r]), u = ve();
+}, be = (e, t) => {
+	let n = ye(e, { debounce: t?.debounce }), r = h(), { isValid: i, isDirty: a, isValidating: o, isSubmitting: c } = m(), l = s.useMemo(() => JSON.stringify(r), [r]), u = _e();
 	s.useEffect(() => {
 		u.current || o || c || i && a && n(r);
 	}, [
@@ -266,9 +261,9 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 		l,
 		o
 	]);
-}, Se = ({ formId: t, formRef: n, options: r, children: i }) => {
+}, xe = ({ formId: t, formRef: n, options: r, children: i }) => {
 	let [a] = s.useState(r);
-	return me(j().fieldErrors?.output), (a.submitOnWatch ? xe : void 0)?.(n, a.submitOnWatch), _e(a.resetOnSubmitted), /* @__PURE__ */ c(e, {
+	return pe(M().fieldErrors?.output), (a.submitOnWatch ? be : void 0)?.(n, a.submitOnWatch), ge(a.resetOnSubmitted), /* @__PURE__ */ c(e, {
 		value: {
 			formId: t,
 			formRef: n,
@@ -277,48 +272,48 @@ var _ = s.createContext(void 0), v = ({ config: e, children: n }) => {
 		},
 		children: i
 	});
-}, Z = (e, t) => ({
+}, Se = (e, t) => ({
 	...e,
 	...t,
 	...(e?.resetOnSubmitted || t?.resetOnSubmitted) && { resetOnSubmitted: {
 		...e?.resetOnSubmitted,
 		...t?.resetOnSubmitted
 	} }
-}), Ce = (e, t) => s.useMemo(() => Z(e.defaults?.options, t), [JSON.stringify(t)]), we = (e, t) => ({
+}), Z = (e, t) => s.useMemo(() => Se(e.defaults?.options, t), [JSON.stringify(t)]), Ce = (e, t) => ({
 	...e,
 	...t
-}), Te = (e, t, n, r) => f({
-	...we(t.defaults?.rhf, e),
+}), we = (e, t, n, r) => f({
+	...Ce(t.defaults?.rhf, e),
 	resolver: r,
 	defaultValues: n
 });
 //#endregion
 //#region src/form/providers/RhfUtilsFormProviders.tsx
 function Q({ formId: e, rhf: t, resolver: n, defaultValues: r, options: i, relay: o, children: u }) {
-	let f = j(), p = s.useId(), m = e || p, h = s.useRef(null), g = Te(t, f, r, n), _ = Ce(f, i);
+	let f = M(), p = s.useId(), m = e || p, h = s.useRef(null), g = we(t, f, r, n), _ = Z(f, i);
 	return /* @__PURE__ */ c(d, {
 		...g,
-		children: /* @__PURE__ */ c(de, {
+		children: /* @__PURE__ */ c(ue, {
 			formRef: h,
-			children: /* @__PURE__ */ l(Se, {
+			children: /* @__PURE__ */ l(xe, {
 				formId: m,
 				formRef: h,
 				options: _,
-				children: [/* @__PURE__ */ c(a, { options: o }), /* @__PURE__ */ c(fe, { children: u })]
+				children: [/* @__PURE__ */ c(a, { options: o }), /* @__PURE__ */ c(de, { children: u })]
 			})
 		})
 	});
 }
 //#endregion
 //#region src/resolvers/zod/getZodResolver.ts
-var $ = (e) => g(e), Ee = ({ schema: e, children: t, ...n }) => /* @__PURE__ */ c(Q, {
+var $ = (e) => g(e), Te = ({ schema: e, children: t, ...n }) => /* @__PURE__ */ c(Q, {
 	...n,
 	resolver: $(e),
 	children: t
 });
 //#endregion
 //#region src/form/with-providers/RhfUtilsFormWithProviders.tsx
-function De({ getApiData: e, resolver: t, rhf: n, defaultValues: r, options: i, relay: a, onCancel: o, onSubmitInvalid: s, onBeforeSubmitInvariants: l, onBeforeSubmit: u, onSubmit: d, onSubmitSuccess: f, onSubmitError: p, onSubmitFinally: m, Children: h, form: g, formId: _, className: v }) {
+function Ee({ getApiData: e, resolver: t, rhf: n, defaultValues: r, options: i, relay: a, onCancel: o, onSubmitInvalid: s, onBeforeSubmitInvariants: l, onBeforeSubmit: u, onSubmit: d, onSubmitSuccess: f, onSubmitError: p, onSubmitFinally: m, Children: h, form: g, formId: _, className: v }) {
 	let y = {
 		formId: _,
 		resolver: t,
@@ -347,9 +342,9 @@ function De({ getApiData: e, resolver: t, rhf: n, defaultValues: r, options: i,
 }
 //#endregion
 //#region src/resolvers/zod/with-providers/RhfUtilsZodFormWithProviders.tsx
-var Oe = ({ schema: e, ...t }) => /* @__PURE__ */ c(De, {
+var De = ({ schema: e, ...t }) => /* @__PURE__ */ c(Ee, {
 	...t,
 	resolver: $(e)
 });
 //#endregion
-export { T as FormSubmitError, v as RhfUtilsClientConfigProvider, C as RhfUtilsNonFieldErrorMarker, V as RhfUtilsZodForm, Ee as RhfUtilsZodFormProviders, Oe as RhfUtilsZodFormWithProviders, b as useFlatFieldErrorsContext, x as useFlatFieldErrorsContextHasOnlyOrphans, w as useFormRequestSubmit, D as useLastSubmitError, r as useRhfUtilsContext };
+export { T as FormSubmitError, v as RhfUtilsClientConfigProvider, C as RhfUtilsNonFieldErrorMarker, V as RhfUtilsZodForm, Te as RhfUtilsZodFormProviders, De as RhfUtilsZodFormWithProviders, b as useFlatFieldErrorsContext, x as useFlatFieldErrorsContextHasOnlyOrphans, w as useFormRequestSubmit, D as useLastSubmitError, r as useRhfUtilsContext };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@paragrav/rhf-utils",
   "author": "paragrav.dev",
-  "version": "0.63.0",
+  "version": "0.64.0",
   "description": "Integration utilities for react-hook-form.",
   "type": "module",
   "sideEffects": false,
@@ -60,17 +60,17 @@
     }
   },
   "devDependencies": {
-    "@eslint/compat": "^2.0.3",
+    "@eslint/compat": "^2.0.5",
     "@eslint/eslintrc": "^3.3.5",
     "@eslint/js": "^9.39.4",
-    "@playwright/experimental-ct-react": "^1.58.2",
-    "@playwright/test": "^1.58.2",
+    "@playwright/experimental-ct-react": "^1.59.1",
+    "@playwright/test": "^1.59.1",
     "@rollup/plugin-typescript": "^12.3.0",
-    "@types/node": "^24.12.0",
-    "@typescript-eslint/eslint-plugin": "^8.57.2",
-    "@typescript-eslint/parser": "^8.57.2",
+    "@types/node": "^24.12.2",
+    "@typescript-eslint/eslint-plugin": "^8.59.0",
+    "@typescript-eslint/parser": "^8.59.0",
     "@vitejs/plugin-react": "^6.0.1",
-    "clean-publish": "^6.0.4",
+    "clean-publish": "^6.0.5",
     "cross-env": "^10.1.0",
     "eslint": "^9.39.4",
     "eslint-config-prettier": "^10.1.8",
@@ -80,22 +80,22 @@
     "eslint-plugin-jsx-a11y": "^6.10.2",
     "eslint-plugin-prettier": "^5.5.5",
     "eslint-plugin-react": "^7.37.5",
-    "eslint-plugin-react-hooks": "^7.0.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
     "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-simple-import-sort": "^12.1.1",
-    "globals": "^17.4.0",
-    "happy-dom": "^20.8.8",
+    "globals": "^17.5.0",
+    "happy-dom": "^20.9.0",
     "husky": "^9.1.7",
     "lint-staged": "^16.4.0",
-    "prettier": "^3.8.1",
-    "rollup": "^4.60.0",
+    "prettier": "^3.8.3",
+    "rollup": "^4.60.2",
     "safe-stable-stringify": "^2.5.0",
-    "terser": "^5.46.1",
-    "typescript": "^6.0.2",
-    "typescript-eslint": "^8.57.2",
-    "vite": "^8.0.2",
+    "terser": "^5.46.2",
+    "typescript": "^6.0.3",
+    "typescript-eslint": "^8.59.0",
+    "vite": "^8.0.10",
     "vite-plugin-dts": "^4.5.4",
-    "vitest": "^4.1.1"
+    "vitest": "^4.1.5"
   },
   "resolutions": {
     "eslint": "^9.39.4",