suprform 1.1.0 → 1.1.1

package/dist/suprform.es.js

@@ -21,11 +21,11 @@ function U(t) {
     return t;
   return r;
 }
-var Ee = (t) => /^\w*$/.test(t), O = (t) => t === void 0, we = (t) => Array.isArray(t) ? t.filter(Boolean) : [], Ke = (t) => we(t.replace(/["|']|\]/g, "").split(/\.|\[/)), m = (t, r, e) => {
+var Ee = (t) => /^\w*$/.test(t), T = (t) => t === void 0, we = (t) => Array.isArray(t) ? t.filter(Boolean) : [], Ke = (t) => we(t.replace(/["|']|\]/g, "").split(/\.|\[/)), m = (t, r, e) => {
   if (!r || !P(t))
     return e;
   const s = (Ee(r) ? [r] : Ke(r)).reduce((u, i) => G(u) ? u : u[i], t);
-  return O(s) || s === t ? O(t[r]) ? e : t[r] : s;
+  return T(s) || s === t ? T(t[r]) ? e : t[r] : s;
 }, K = (t) => typeof t == "boolean", R = (t, r, e) => {
   let s = -1;
   const u = Ee(r) ? [r] : Ke(r), i = u.length, c = i - 1;
@@ -78,7 +78,7 @@ var St = (t, r, e, s = !0) => {
     });
   return u;
 };
-const ke = typeof window < "u" ? b.useLayoutEffect : b.useEffect;
+const Ce = typeof window < "u" ? b.useLayoutEffect : b.useEffect;
 function tr(t) {
   const r = Ve(), { control: e = r.control, disabled: s, name: u, exact: i } = t || {}, [c, l] = b.useState(e._formState), V = b.useRef({
     isDirty: !1,
@@ -90,7 +90,7 @@ function tr(t) {
     isValid: !1,
     errors: !1
   });
-  return ke(() => e._subscribe({
+  return Ce(() => e._subscribe({
     name: u,
     formState: V.current,
     exact: i,
@@ -147,7 +147,7 @@ function Je(t) {
         L(d);
     }
   }, [e._formValues, e._names, i, s]);
-  ke(() => ((g.current !== e || !te(F.current, s)) && (g.current = e, F.current = s, N()), e._subscribe({
+  Ce(() => ((g.current !== e || !te(F.current, s)) && (g.current = e, F.current = s, N()), e._subscribe({
     name: s,
     formState: {
       values: !0
@@ -242,7 +242,7 @@ function rr(t) {
     };
     if (p(e, !0), f) {
       const E = U(m(u._options.defaultValues, e, F.current.defaultValue));
-      R(u._defaultValues, e, E), O(m(u._formValues, e)) && R(u._formValues, e, E);
+      R(u._defaultValues, e, E), T(m(u._formValues, e)) && R(u._formValues, e, E);
     }
     return !V && u.register(e), $.current = e, () => {
       (V ? f && !u._state.action : f) ? u.unregister(e) : p(e, !1);
@@ -307,12 +307,12 @@ function ir(t, r) {
   const e = r.slice(0, -1).length;
   let s = 0;
   for (; s < e; )
-    t = O(t) ? s++ : t[r[s++]];
+    t = T(t) ? s++ : t[r[s++]];
   return t;
 }
 function ur(t) {
   for (const r in t)
-    if (t.hasOwnProperty(r) && !O(t[r]))
+    if (t.hasOwnProperty(r) && !T(t[r]))
       return !1;
   return !0;
 }
@@ -326,13 +326,13 @@ var or = (t) => {
       return !0;
   return !1;
 };
-function kt(t) {
+function Ct(t) {
   return Array.isArray(t) || P(t) && !or(t);
 }
 function je(t, r = {}) {
   for (const e in t) {
     const s = t[e];
-    kt(s) ? (r[e] = Array.isArray(s) ? [] : {}, je(s, r[e])) : O(s) || (r[e] = !0);
+    Ct(s) ? (r[e] = Array.isArray(s) ? [] : {}, je(s, r[e])) : T(s) || (r[e] = !0);
   }
   return r;
 }
@@ -340,8 +340,8 @@ function fe(t, r, e) {
   e || (e = je(r));
   for (const s in t) {
     const u = t[s];
-    if (kt(u))
-      O(r) || qe(e[s]) ? e[s] = je(u, Array.isArray(u) ? [] : {}) : fe(u, G(r) ? {} : r[s], e[s]);
+    if (Ct(u))
+      T(r) || qe(e[s]) ? e[s] = je(u, Array.isArray(u) ? [] : {}) : fe(u, G(r) ? {} : r[s], e[s]);
     else {
       const i = r[s];
       e[s] = !te(u, i);
@@ -353,7 +353,7 @@ const yt = {
   value: !1,
   isValid: !1
 }, mt = { value: !0, isValid: !0 };
-var Ct = (t) => {
+var kt = (t) => {
   if (Array.isArray(t)) {
     if (t.length > 1) {
       const r = t.filter((e) => e && e.checked && !e.disabled).map((e) => e.value);
@@ -361,11 +361,11 @@ var Ct = (t) => {
     }
     return t[0].checked && !t[0].disabled ? (
       // @ts-expect-error expected to work in the browser
-      t[0].attributes && !O(t[0].attributes.value) ? O(t[0].value) || t[0].value === "" ? mt : { value: t[0].value, isValid: !0 } : mt
+      t[0].attributes && !T(t[0].attributes.value) ? T(t[0].value) || t[0].value === "" ? mt : { value: t[0].value, isValid: !0 } : mt
     ) : yt;
   }
   return yt;
-}, Dt = (t, { valueAsNumber: r, valueAsDate: e, setValueAs: s }) => O(t) ? t : r ? t === "" ? NaN : t && +t : e && Y(t) ? new Date(t) : s ? s(t) : t;
+}, Dt = (t, { valueAsNumber: r, valueAsDate: e, setValueAs: s }) => T(t) ? t : r ? t === "" ? NaN : t && +t : e && Y(t) ? new Date(t) : s ? s(t) : t;
 const _t = {
   isValid: !1,
   value: null
@@ -376,7 +376,7 @@ var Rt = (t) => Array.isArray(t) ? t.reduce((r, e) => e && e.checked && !e.disab
 } : r, _t) : _t;
 function gt(t) {
   const r = t.ref;
-  return Xe(r) ? r.files : Ze(r) ? Rt(t.refs).value : wt(r) ? [...r.selectedOptions].map(({ value: e }) => e) : ve(r) ? Ct(t.refs).value : Dt(O(r.value) ? t.ref.value : r.value, t);
+  return Xe(r) ? r.files : Ze(r) ? Rt(t.refs).value : wt(r) ? [...r.selectedOptions].map(({ value: e }) => e) : ve(r) ? kt(t.refs).value : Dt(T(r.value) ? t.ref.value : r.value, t);
 }
 var lr = (t, r, e, s) => {
   const u = {};
@@ -390,7 +390,7 @@ var lr = (t, r, e, s) => {
     fields: u,
     shouldUseNativeValidation: s
   };
-}, Se = (t) => t instanceof RegExp, ge = (t) => O(t) ? t : Se(t) ? t.source : P(t) ? Se(t.value) ? t.value.source : t.value : t, ye = (t) => ({
+}, Se = (t) => t instanceof RegExp, ge = (t) => T(t) ? t : Se(t) ? t.source : P(t) ? Se(t.value) ? t.value.source : t.value : t, ye = (t) => ({
   isOnSubmit: !t || t === X.onSubmit,
   isOnBlur: t === X.onBlur,
   isOnChange: t === X.onChange,
@@ -448,7 +448,7 @@ var fr = (t, r, e, s) => {
   e(t);
   const { name: u, ...i } = t;
   return q(i) || Object.keys(i).length >= Object.keys(r).length || Object.keys(i).find((c) => r[c] === (!s || X.all));
-}, yr = (t, r, e) => !t || !r || t === r || z(t).some((s) => s && (e ? s === r : s.startsWith(r) || r.startsWith(s))), mr = (t, r, e, s, u) => u.isOnAll ? !1 : !e && u.isOnTouch ? !(r || t) : (e ? s.isOnBlur : u.isOnBlur) ? !t : (e ? s.isOnChange : u.isOnChange) ? t : !0, _r = (t, r) => !we(m(t, r)).length && B(t, r), Tt = (t, r, e) => {
+}, yr = (t, r, e) => !t || !r || t === r || z(t).some((s) => s && (e ? s === r : s.startsWith(r) || r.startsWith(s))), mr = (t, r, e, s, u) => u.isOnAll ? !1 : !e && u.isOnTouch ? !(r || t) : (e ? s.isOnBlur : u.isOnBlur) ? !t : (e ? s.isOnChange : u.isOnChange) ? t : !0, _r = (t, r) => !we(m(t, r)).length && B(t, r), Ot = (t, r, e) => {
   const s = z(m(t, e));
   return R(s, "root", r[e]), R(t, e, s), t;
 };
@@ -467,20 +467,20 @@ var de = (t) => P(t) && !Se(t) ? t : {
   const { ref: c, refs: l, required: V, maxLength: v, minLength: x, min: g, max: F, pattern: $, validate: L, name: w, valueAsNumber: N, mount: H } = t._f, S = m(e, w);
   if (!H || r.has(w))
     return {};
-  const M = l ? l[0] : c, f = (k) => {
-    u && M.reportValidity && (M.setCustomValidity(K(k) ? "" : k || ""), M.reportValidity());
-  }, d = {}, p = Ze(c), E = ve(c), Z = p || E, W = (N || Xe(c)) && O(c.value) && O(S) || xe(c) && c.value === "" || S === "" || Array.isArray(S) && !S.length, oe = ar.bind(null, w, s, d), se = (k, D, I, j = ne.maxLength, Q = ne.minLength) => {
-    const ae = k ? D : I;
+  const M = l ? l[0] : c, f = (C) => {
+    u && M.reportValidity && (M.setCustomValidity(K(C) ? "" : C || ""), M.reportValidity());
+  }, d = {}, p = Ze(c), E = ve(c), Z = p || E, W = (N || Xe(c)) && T(c.value) && T(S) || xe(c) && c.value === "" || S === "" || Array.isArray(S) && !S.length, oe = ar.bind(null, w, s, d), se = (C, D, I, j = ne.maxLength, Q = ne.minLength) => {
+    const ae = C ? D : I;
     d[w] = {
-      type: k ? j : Q,
+      type: C ? j : Q,
       message: ae,
       ref: c,
-      ...oe(k ? j : Q, ae)
+      ...oe(C ? j : Q, ae)
     };
   };
-  if (i ? !Array.isArray(S) || !S.length : V && (!Z && (W || G(S)) || K(S) && !S || E && !Ct(l).isValid || p && !Rt(l).isValid)) {
-    const { value: k, message: D } = Y(V) ? { value: !!V, message: V } : de(V);
-    if (k && (d[w] = {
+  if (i ? !Array.isArray(S) || !S.length : V && (!Z && (W || G(S)) || K(S) && !S || E && !kt(l).isValid || p && !Rt(l).isValid)) {
+    const { value: C, message: D } = Y(V) ? { value: !!V, message: V } : de(V);
+    if (C && (d[w] = {
       type: ne.required,
       message: D,
       ref: M,
@@ -489,26 +489,26 @@ var de = (t) => P(t) && !Se(t) ? t : {
       return f(D), d;
   }
   if (!W && (!G(g) || !G(F))) {
-    let k, D;
+    let C, D;
     const I = de(F), j = de(g);
     if (!G(S) && !isNaN(S)) {
       const Q = c.valueAsNumber || S && +S;
-      G(I.value) || (k = Q > I.value), G(j.value) || (D = Q < j.value);
+      G(I.value) || (C = Q > I.value), G(j.value) || (D = Q < j.value);
     } else {
       const Q = c.valueAsDate || new Date(S), ae = (Fe) => /* @__PURE__ */ new Date((/* @__PURE__ */ new Date()).toDateString() + " " + Fe), _e = c.type == "time", ce = c.type == "week";
-      Y(I.value) && S && (k = _e ? ae(S) > ae(I.value) : ce ? S > I.value : Q > new Date(I.value)), Y(j.value) && S && (D = _e ? ae(S) < ae(j.value) : ce ? S < j.value : Q < new Date(j.value));
+      Y(I.value) && S && (C = _e ? ae(S) > ae(I.value) : ce ? S > I.value : Q > new Date(I.value)), Y(j.value) && S && (D = _e ? ae(S) < ae(j.value) : ce ? S < j.value : Q < new Date(j.value));
     }
-    if ((k || D) && (se(!!k, I.message, j.message, ne.max, ne.min), !s))
+    if ((C || D) && (se(!!C, I.message, j.message, ne.max, ne.min), !s))
       return f(d[w].message), d;
   }
   if ((v || x) && !W && (Y(S) || i && Array.isArray(S))) {
-    const k = de(v), D = de(x), I = !G(k.value) && S.length > +k.value, j = !G(D.value) && S.length < +D.value;
-    if ((I || j) && (se(I, k.message, D.message), !s))
+    const C = de(v), D = de(x), I = !G(C.value) && S.length > +C.value, j = !G(D.value) && S.length < +D.value;
+    if ((I || j) && (se(I, C.message, D.message), !s))
       return f(d[w].message), d;
   }
   if ($ && !W && Y(S)) {
-    const { value: k, message: D } = de($);
-    if (Se(k) && !S.match(k) && (d[w] = {
+    const { value: C, message: D } = de($);
+    if (Se(C) && !S.match(C) && (d[w] = {
       type: ne.pattern,
       message: D,
       ref: c,
@@ -518,26 +518,26 @@ var de = (t) => P(t) && !Se(t) ? t : {
   }
   if (L) {
     if (re(L)) {
-      const k = await L(S, e), D = Vt(k, M);
+      const C = await L(S, e), D = Vt(C, M);
       if (D && (d[w] = {
         ...D,
         ...oe(ne.validate, D.message)
       }, !s))
         return f(D.message), d;
     } else if (P(L)) {
-      let k = {};
+      let C = {};
       for (const D in L) {
-        if (!q(k) && !s)
+        if (!q(C) && !s)
           break;
         const I = Vt(await L[D](S, e), M, D);
-        I && (k = {
+        I && (C = {
           ...I,
           ...oe(D, I.message)
-        }, f(I.message), s && (d[w] = k));
+        }, f(I.message), s && (d[w] = C));
       }
-      if (!q(k) && (d[w] = {
+      if (!q(C) && (d[w] = {
         ref: M,
-        ...k
+        ...C
       }, !s))
         return d;
     }
@@ -645,27 +645,27 @@ function hr(t = {}) {
   }, f = (a, n, o, h) => {
     const _ = m(s, a);
     if (_) {
-      const y = m(i, a, O(o) ? m(u, a) : o);
-      O(y) || h && h.defaultChecked || n ? R(i, a, n ? y : gt(_._f)) : I(a, y), c.mount && !c.action && w();
+      const y = m(i, a, T(o) ? m(u, a) : o);
+      T(y) || h && h.defaultChecked || n ? R(i, a, n ? y : gt(_._f)) : I(a, y), c.mount && !c.action && w();
     }
   }, d = (a, n, o, h, _) => {
     let y = !1, A = !1;
-    const C = {
+    const k = {
       name: a
     };
     if (!r.disabled) {
       if (!o || h) {
-        (x.isDirty || g.isDirty) && (A = e.isDirty, e.isDirty = C.isDirty = se(), y = A !== C.isDirty);
-        const T = te(m(u, a), n);
-        A = !!m(e.dirtyFields, a), T ? B(e.dirtyFields, a) : R(e.dirtyFields, a, !0), C.dirtyFields = e.dirtyFields, y = y || (x.dirtyFields || g.dirtyFields) && A !== !T;
+        (x.isDirty || g.isDirty) && (A = e.isDirty, e.isDirty = k.isDirty = se(), y = A !== k.isDirty);
+        const O = te(m(u, a), n);
+        A = !!m(e.dirtyFields, a), O ? B(e.dirtyFields, a) : R(e.dirtyFields, a, !0), k.dirtyFields = e.dirtyFields, y = y || (x.dirtyFields || g.dirtyFields) && A !== !O;
       }
       if (o) {
-        const T = m(e.touchedFields, a);
-        T || (R(e.touchedFields, a, o), C.touchedFields = e.touchedFields, y = y || (x.touchedFields || g.touchedFields) && T !== o);
+        const O = m(e.touchedFields, a);
+        O || (R(e.touchedFields, a, o), k.touchedFields = e.touchedFields, y = y || (x.touchedFields || g.touchedFields) && O !== o);
       }
-      y && _ && F.state.next(C);
+      y && _ && F.state.next(k);
     }
-    return y ? C : {};
+    return y ? k : {};
   }, p = (a, n, o, h) => {
     const _ = m(e.errors, a), y = (x.isValid || g.isValid) && K(n) && e.isValid !== n;
     if (r.delayError && o ? (V = L(() => S(a, o)), V(r.delayError)) : (clearTimeout(v), V = null, o ? R(e.errors, a, o) : B(e.errors, a)), (o ? !te(_, o) : _) || !q(h) || y) {
@@ -702,12 +702,12 @@ function hr(t = {}) {
       if (_) {
         const { _f: y, ...A } = _;
         if (y) {
-          const C = l.array.has(y.name), T = _._f && cr(_._f);
-          T && x.validatingFields && N([y.name], !0);
-          const J = await Ge(_, l.disabled, i, $, r.shouldUseNativeValidation && !n, C);
-          if (T && x.validatingFields && N([y.name]), J[y.name] && (o.valid = !1, n))
+          const k = l.array.has(y.name), O = _._f && cr(_._f);
+          O && x.validatingFields && N([y.name], !0);
+          const J = await Ge(_, l.disabled, i, $, r.shouldUseNativeValidation && !n, k);
+          if (O && x.validatingFields && N([y.name]), J[y.name] && (o.valid = !1, n))
             break;
-          !n && (m(J, y.name) ? C ? Tt(e.errors, J, y.name) : R(e.errors, y.name, J[y.name]) : B(e.errors, y.name));
+          !n && (m(J, y.name) ? k ? Ot(e.errors, J, y.name) : R(e.errors, y.name, J[y.name]) : B(e.errors, y.name));
         }
         !q(A) && await W(A, n, o);
       }
@@ -716,18 +716,18 @@ function hr(t = {}) {
   }, oe = () => {
     for (const a of l.unMount) {
       const n = m(s, a);
-      n && (n._f.refs ? n._f.refs.every((o) => !Ue(o)) : !Ue(n._f.ref)) && Ce(a);
+      n && (n._f.refs ? n._f.refs.every((o) => !Ue(o)) : !Ue(n._f.ref)) && ke(a);
     }
     l.unMount = /* @__PURE__ */ new Set();
-  }, se = (a, n) => !r.disabled && (a && n && R(i, a, n), !te(Fe(), u)), k = (a, n, o) => He(a, l, {
-    ...c.mount ? i : O(n) ? u : Y(a) ? { [a]: n } : n
+  }, se = (a, n) => !r.disabled && (a && n && R(i, a, n), !te(Fe(), u)), C = (a, n, o) => He(a, l, {
+    ...c.mount ? i : T(n) ? u : Y(a) ? { [a]: n } : n
   }, o, n), D = (a) => we(m(c.mount ? i : u, a, r.shouldUnregister ? m(u, a, []) : [])), I = (a, n, o = {}) => {
     const h = m(s, a);
     let _ = n;
     if (h) {
       const y = h._f;
       y && (!y.disabled && R(i, a, Dt(n, y)), _ = xe(y.ref) && G(n) ? "" : n, wt(y.ref) ? [...y.ref.options].forEach((A) => A.selected = _.includes(A.value)) : y.refs ? ve(y.ref) ? y.refs.forEach((A) => {
-        (!A.defaultChecked || !A.disabled) && (Array.isArray(_) ? A.checked = !!_.find((C) => C === A.value) : A.checked = _ === A.value || !!_);
+        (!A.defaultChecked || !A.disabled) && (Array.isArray(_) ? A.checked = !!_.find((k) => k === A.value) : A.checked = _ === A.value || !!_);
       }) : y.refs.forEach((A) => A.checked = A.value === _) : Xe(y.ref) ? y.ref.value = "" : (y.ref.value = _, y.ref.type || F.state.next({
         name: a,
         values: U(i)
@@ -758,29 +758,29 @@ function hr(t = {}) {
     c.mount = !0;
     const n = a.target;
     let o = n.name, h = !0;
-    const _ = m(s, o), y = (T) => {
-      h = Number.isNaN(T) || le(T) && isNaN(T.getTime()) || te(T, m(i, o, T));
-    }, A = ye(r.mode), C = ye(r.reValidateMode);
+    const _ = m(s, o), y = (O) => {
+      h = Number.isNaN(O) || le(O) && isNaN(O.getTime()) || te(O, m(i, o, O));
+    }, A = ye(r.mode), k = ye(r.reValidateMode);
     if (_) {
-      let T, J;
-      const be = n.type ? gt(_._f) : pt(a), ie = a.type === pe.BLUR || a.type === pe.FOCUS_OUT, Ht = !dr(_._f) && !r.resolver && !m(e.errors, o) && !_._f.deps || mr(ie, m(e.touchedFields, o), e.isSubmitted, C, A), Te = Qe(o, l, ie);
+      let O, J;
+      const be = n.type ? gt(_._f) : pt(a), ie = a.type === pe.BLUR || a.type === pe.FOCUS_OUT, Ht = !dr(_._f) && !r.resolver && !m(e.errors, o) && !_._f.deps || mr(ie, m(e.touchedFields, o), e.isSubmitted, k, A), Oe = Qe(o, l, ie);
       R(i, o, be), ie ? (!n || !n.readOnly) && (_._f.onBlur && _._f.onBlur(a), V && V(0)) : _._f.onChange && _._f.onChange(a);
-      const Oe = d(o, be, ie), qt = !q(Oe) || Te;
+      const Te = d(o, be, ie), qt = !q(Te) || Oe;
       if (!ie && F.state.next({
         name: o,
         type: a.type,
         values: U(i)
       }), Ht)
-        return (x.isValid || g.isValid) && (r.mode === "onBlur" ? ie && w() : ie || w()), qt && F.state.next({ name: o, ...Te ? {} : Oe });
-      if (!ie && Te && F.state.next({ ...e }), r.resolver) {
+        return (x.isValid || g.isValid) && (r.mode === "onBlur" ? ie && w() : ie || w()), qt && F.state.next({ name: o, ...Oe ? {} : Te });
+      if (!ie && Oe && F.state.next({ ...e }), r.resolver) {
         const { errors: lt } = await E([o]);
         if (y(be), h) {
           const jt = vt(e.errors, s, o), ct = vt(lt, s, jt.name || o);
-          T = ct.error, o = ct.name, J = q(lt);
+          O = ct.error, o = ct.name, J = q(lt);
         }
       } else
-        N([o], !0), T = (await Ge(_, l.disabled, i, $, r.shouldUseNativeValidation))[o], N([o]), y(be), h && (T ? J = !1 : (x.isValid || g.isValid) && (J = await W(s, !0)));
-      h && (_._f.deps && (!Array.isArray(_._f.deps) || _._f.deps.length > 0) && ce(_._f.deps), p(o, J, T, Oe));
+        N([o], !0), O = (await Ge(_, l.disabled, i, $, r.shouldUseNativeValidation))[o], N([o]), y(be), h && (O ? J = !1 : (x.isValid || g.isValid) && (J = await W(s, !0)));
+      h && (_._f.deps && (!Array.isArray(_._f.deps) || _._f.deps.length > 0) && ce(_._f.deps), p(o, J, O, Te));
     }
   }, _e = (a, n) => {
     if (m(e.errors, n) && a.focus)
@@ -789,7 +789,7 @@ function hr(t = {}) {
     let o, h;
     const _ = z(a);
     if (r.resolver) {
-      const y = await Z(O(a) ? a : _);
+      const y = await Z(T(a) ? a : _);
       o = q(y), h = a ? !_.some((A) => m(y, A)) : o;
     } else a ? (h = (await Promise.all(_.map(async (y) => {
       const A = m(s, y);
@@ -804,7 +804,7 @@ function hr(t = {}) {
     let o = {
       ...c.mount ? i : u
     };
-    return n && (o = Et(n.dirtyFields ? e.dirtyFields : e.touchedFields, o)), O(a) ? o : Y(a) ? m(o, a) : a.map((h) => m(o, h));
+    return n && (o = Et(n.dirtyFields ? e.dirtyFields : e.touchedFields, o)), T(a) ? o : Y(a) ? m(o, a) : a.map((h) => m(o, h));
   }, tt = (a, n) => ({
     invalid: !!m((n || e).errors, a),
     isDirty: !!m((n || e).dirtyFields, a),
@@ -816,9 +816,9 @@ function hr(t = {}) {
       errors: a ? e.errors : {}
     });
   }, rt = (a, n, o) => {
-    const h = (m(s, a, { _f: {} })._f || {}).ref, _ = m(e.errors, a) || {}, { ref: y, message: A, type: C, ...T } = _;
+    const h = (m(s, a, { _f: {} })._f || {}).ref, _ = m(e.errors, a) || {}, { ref: y, message: A, type: k, ...O } = _;
     R(e.errors, a, {
-      ...T,
+      ...O,
       ...n,
       ref: h
     }), F.state.next({
@@ -827,8 +827,8 @@ function hr(t = {}) {
       isValid: !1
     }), o && o.shouldFocus && h && h.focus && h.focus();
   }, Mt = (a, n) => re(a) ? F.state.subscribe({
-    next: (o) => "values" in o && a(k(void 0, n), o)
-  }) : k(a, n, !0), st = (a) => F.state.subscribe({
+    next: (o) => "values" in o && a(C(void 0, n), o)
+  }) : C(a, n, !0), st = (a) => F.state.subscribe({
     next: (n) => {
       yr(a.name, n.name, a.exact) && fr(n, a.formState || x, $t, a.reRenderRoot) && a.callback({
         values: { ...i },
@@ -843,7 +843,7 @@ function hr(t = {}) {
   }, st({
     ...a,
     formState: g
-  })), Ce = (a, n = {}) => {
+  })), ke = (a, n = {}) => {
     for (const o of a ? z(a) : l.mount)
       l.mount.delete(o), l.array.delete(o), n.keepValue || (B(s, o), B(i, o)), !n.keepError && B(e.errors, o), !n.keepDirty && B(e.dirtyFields, o), !n.keepTouched && B(e.touchedFields, o), !n.keepIsValidating && B(e.validatingFields, o), !r.shouldUnregister && !n.keepDefaultValue && B(u, o);
     F.state.next({
@@ -884,15 +884,15 @@ function hr(t = {}) {
       ref: (_) => {
         if (_) {
           De(a, n), o = m(s, a);
-          const y = O(_.value) && _.querySelectorAll && _.querySelectorAll("input,select,textarea")[0] || _, A = nr(y), C = o._f.refs || [];
-          if (A ? C.find((T) => T === y) : y === o._f.ref)
+          const y = T(_.value) && _.querySelectorAll && _.querySelectorAll("input,select,textarea")[0] || _, A = nr(y), k = o._f.refs || [];
+          if (A ? k.find((O) => O === y) : y === o._f.ref)
             return;
           R(s, a, {
             _f: {
               ...o._f,
               ...A ? {
                 refs: [
-                  ...C.filter(Ue),
+                  ...k.filter(Ue),
                   y,
                   ...Array.isArray(m(u, a)) ? [{}] : []
                 ],
@@ -945,7 +945,7 @@ function hr(t = {}) {
     }), h)
       throw h;
   }, Pt = (a, n = {}) => {
-    m(s, a) && (O(n.defaultValue) ? Q(a, U(m(u, a))) : (Q(a, n.defaultValue), R(u, a, U(n.defaultValue))), n.keepTouched || B(e.touchedFields, a), n.keepDirty || (B(e.dirtyFields, a), e.isDirty = n.defaultValue ? se(a, U(m(u, a))) : se()), n.keepError || (B(e.errors, a), x.isValid && w()), F.state.next({ ...e }));
+    m(s, a) && (T(n.defaultValue) ? Q(a, U(m(u, a))) : (Q(a, n.defaultValue), R(u, a, U(n.defaultValue))), n.keepTouched || B(e.touchedFields, a), n.keepDirty || (B(e.dirtyFields, a), e.isDirty = n.defaultValue ? se(a, U(m(u, a))) : se()), n.keepError || (B(e.errors, a), x.isValid && w()), F.state.next({ ...e }));
   }, it = (a, n = {}) => {
     const o = a ? U(a) : u, h = U(o), _ = q(a), y = _ ? u : h;
     if (n.keepDefaultValues || (u = o), !n.keepValues) {
@@ -954,16 +954,16 @@ function hr(t = {}) {
           ...l.mount,
           ...Object.keys(fe(u, i))
         ]);
-        for (const C of Array.from(A))
-          m(e.dirtyFields, C) ? R(y, C, m(i, C)) : Q(C, m(y, C));
+        for (const k of Array.from(A))
+          m(e.dirtyFields, k) ? R(y, k, m(i, k)) : Q(k, m(y, k));
       } else {
-        if (ze && O(a))
+        if (ze && T(a))
           for (const A of l.mount) {
-            const C = m(s, A);
-            if (C && C._f) {
-              const T = Array.isArray(C._f.refs) ? C._f.refs[0] : C._f.ref;
-              if (xe(T)) {
-                const J = T.closest("form");
+            const k = m(s, A);
+            if (k && k._f) {
+              const O = Array.isArray(k._f.refs) ? k._f.refs[0] : k._f.ref;
+              if (xe(O)) {
+                const J = O.closest("form");
                 if (J) {
                   J.reset();
                   break;
@@ -1016,14 +1016,14 @@ function hr(t = {}) {
   }, ot = {
     control: {
       register: De,
-      unregister: Ce,
+      unregister: ke,
       getFieldState: tt,
       handleSubmit: nt,
       setError: rt,
       _subscribe: st,
       _runSchema: E,
       _focusError: Re,
-      _getWatch: k,
+      _getWatch: C,
       _getDirty: se,
       _setValid: w,
       _setFieldArray: H,
@@ -1084,7 +1084,7 @@ function hr(t = {}) {
     reset: ut,
     resetField: Pt,
     clearErrors: Lt,
-    unregister: Ce,
+    unregister: ke,
     setError: rt,
     setFocus: Wt,
     getFieldState: tt
@@ -1102,7 +1102,7 @@ var ue = () => {
     const e = (Math.random() * 16 + t) % 16 | 0;
     return (r == "x" ? e : e & 3 | 8).toString(16);
   });
-}, Ne = (t, r, e = {}) => e.shouldFocus || O(e.shouldFocus) ? e.focusName || `${t}.${O(e.focusIndex) ? r : e.focusIndex}.` : "", Le = (t, r) => [
+}, Ne = (t, r, e = {}) => e.shouldFocus || T(e.shouldFocus) ? e.focusName || `${t}.${T(e.focusIndex) ? r : e.focusIndex}.` : "", Le = (t, r) => [
   ...t,
   ...z(r)
 ], Me = (t) => Array.isArray(t) ? t.map(() => {
@@ -1114,7 +1114,7 @@ function Ie(t, r, e) {
     ...t.slice(r)
   ];
 }
-var Be = (t, r, e) => Array.isArray(t) ? (O(t[e]) && (t[e] = void 0), t.splice(e, 0, t.splice(r, 1)[0]), t) : [], Pe = (t, r) => [
+var Be = (t, r, e) => Array.isArray(t) ? (T(t[e]) && (t[e] = void 0), t.splice(e, 0, t.splice(r, 1)[0]), t) : [], Pe = (t, r) => [
   ...z(r),
   ...z(t)
 ];
@@ -1125,12 +1125,12 @@ function vr(t, r) {
     s.splice(u - e, 1), e++;
   return we(s).length ? s : [];
 }
-var We = (t, r) => O(r) ? [] : vr(t, z(r).sort((e, s) => e - s)), $e = (t, r, e) => {
+var We = (t, r) => T(r) ? [] : vr(t, z(r).sort((e, s) => e - s)), $e = (t, r, e) => {
   [t[r], t[e]] = [t[e], t[r]];
 }, Ft = (t, r, e) => (t[r] = e, t);
 function Vr(t) {
   const r = Ve(), { control: e = r.control, name: s, keyName: u = "id", shouldUnregister: i, rules: c } = t, [l, V] = b.useState(e._getFieldArray(s)), v = b.useRef(e._getFieldArray(s).map(ue)), x = b.useRef(!1);
-  e._names.array.add(s), b.useMemo(() => c && l.length >= 0 && e.register(s, c), [e, s, l.length, c]), ke(() => e._subjects.array.subscribe({
+  e._names.array.add(s), b.useMemo(() => c && l.length >= 0 && e.register(s, c), [e, s, l.length, c]), Ce(() => e._subjects.array.subscribe({
     next: ({ values: f, name: d }) => {
       if (d === s || !d) {
         const p = m(f, s);
@@ -1197,7 +1197,7 @@ function Vr(t) {
       else {
         const f = m(e._fields, s);
         f && f._f && !(ye(e._options.reValidateMode).isOnSubmit && ye(e._options.mode).isOnSubmit) && Ge(f, e._names.disabled, e._formValues, e._options.criteriaMode === X.all, e._options.shouldUseNativeValidation, !0).then((d) => !q(d) && e._subjects.state.next({
-          errors: Tt(e._formState.errors, d, s)
+          errors: Ot(e._formState.errors, d, s)
         }));
       }
     e._subjects.state.next({
@@ -1260,7 +1260,7 @@ function Fr(t = {}) {
       };
     }
   const i = r.current.control;
-  return i._options = t, ke(() => {
+  return i._options = t, Ce(() => {
     const c = i._subscribe({
       formState: i._proxyFormState,
       callback: () => u({ ...i._formState }),
@@ -1295,8 +1295,8 @@ function Fr(t = {}) {
     i._state.mount || (i._setValid(), i._state.mount = !0), i._state.watch && (i._state.watch = !1, i._subjects.state.next({ ...i._formState })), i._removeUnmounted();
   }), r.current.formState = St(s, i), r.current;
 }
-const Ot = Gt(void 0), br = ({ showAsterisk: t, children: r }) => /* @__PURE__ */ ee(Ot.Provider, { value: { showAsterisk: t }, children: r }), Ar = () => {
-  const t = zt(Ot);
+const Tt = Gt(void 0), br = ({ showAsterisk: t, children: r }) => /* @__PURE__ */ ee(Tt.Provider, { value: { showAsterisk: t }, children: r }), Ar = () => {
+  const t = zt(Tt);
   if (!t)
     throw new Error("useSuprFormContext must be used within a SuprFormProvider");
   return t;
@@ -1329,7 +1329,7 @@ function Ut(t, r, e) {
         return !1;
     }
   });
-  return u === "AND" ? c.every(Boolean) : c.some(Boolean);
+  return console.log("Condition results:", c, "Operator:", u), u === "AND" ? c.every(Boolean) : c.some(Boolean);
 }
 const pr = ({
   children: t,