@goodie-forms/core 1.2.6-alpha → 1.3.0

package/dist/index.js

@@ -1,107 +1,107 @@
 var h;
 ((t) => {
-  function e(f) {
-    const a = r(f);
+  function e(l) {
+    const o = r(l);
     let u = "";
-    for (const y of a)
-      typeof y == "number" ? u += `[${y}]` : (u.length > 0 && (u += "."), u += y.toString());
+    for (const _ of o)
+      typeof _ == "number" ? u += `[${_}]` : (u.length > 0 && (u += "."), u += _.toString());
     return u;
   }
   t.toStringPath = e;
-  function i(f) {
-    const a = [];
+  function i(l) {
+    const o = [];
     let u = 0;
-    for (; u < f.length; ) {
-      const y = f[u];
-      if (y === ".") {
+    for (; u < l.length; ) {
+      const _ = l[u];
+      if (_ === ".") {
         u++;
         continue;
       }
-      if (y === "[") {
+      if (_ === "[") {
         u++;
         let V = "";
-        for (; u < f.length && f[u] !== "]"; )
-          V += f[u], u++;
+        for (; u < l.length && l[u] !== "]"; )
+          V += l[u], u++;
         if (u++, !V || !/^\d+$/.test(V))
-          throw new Error(`Invalid array index in path: ${f}`);
-        a.push(Number(V));
+          throw new Error(`Invalid array index in path: ${l}`);
+        o.push(Number(V));
         continue;
       }
       let S = "";
-      for (; u < f.length && /[^\.\[]/.test(f[u]); )
-        S += f[u], u++;
-      S && a.push(S);
+      for (; u < l.length && /[^\.\[]/.test(l[u]); )
+        S += l[u], u++;
+      S && o.push(S);
     }
-    return a;
+    return o;
   }
   t.fromStringPath = i;
-  function r(f) {
-    return f?.map((a) => {
-      if (typeof a == "string" || typeof a == "number" || typeof a == "symbol") return a;
-      if (typeof a == "object" && "key" in a)
-        return typeof a == "string" || typeof a == "number" || typeof a == "symbol" ? a : a.key;
+  function r(l) {
+    return l?.map((o) => {
+      if (typeof o == "string" || typeof o == "number" || typeof o == "symbol") return o;
+      if (typeof o == "object" && "key" in o)
+        return typeof o == "string" || typeof o == "number" || typeof o == "symbol" ? o : o.key;
     });
   }
   t.normalize = r;
-  function n(f, a) {
-    if (f === a) return !0;
-    if (f == null || a == null || f.length !== a.length) return !1;
-    for (let u = 0; u < f.length; u++)
-      if (f[u] !== a[u]) return !1;
+  function n(l, o) {
+    if (l === o) return !0;
+    if (l == null || o == null || l.length !== o.length) return !1;
+    for (let u = 0; u < l.length; u++)
+      if (l[u] !== o[u]) return !1;
     return !0;
   }
   t.equals = n;
-  function s(f, a) {
-    if (f.length >= a.length) return !1;
-    for (let u = 0; u < f.length; u++)
-      if (f[u] !== a[u])
+  function s(l, o) {
+    if (l.length >= o.length) return !1;
+    for (let u = 0; u < l.length; u++)
+      if (l[u] !== o[u])
         return !1;
     return !0;
   }
   t.isDescendant = s;
-  function o(f, a, u) {
-    let y = f;
-    for (let V = 0; V < a.length - 1; V++) {
-      const Q = a[V], Ot = a[V + 1];
-      if (y[Q] == null) {
+  function a(l, o, u) {
+    let _ = l;
+    for (let V = 0; V < o.length - 1; V++) {
+      const Q = o[V], Ot = o[V + 1];
+      if (_[Q] == null) {
         if (u?.returnOnEmptyBranch) return { target: null, key: null };
-        y[Q] = typeof Ot == "number" ? [] : {};
+        _[Q] = typeof Ot == "number" ? [] : {};
       }
-      y = y[Q];
+      _ = _[Q];
     }
-    const S = a[a.length - 1];
+    const S = o[o.length - 1];
     return {
-      target: y,
+      target: _,
       key: S
     };
   }
-  t.walkPath = o;
-  function l(f, a) {
-    let u = f;
-    for (const y of a) {
+  t.walkPath = a;
+  function f(l, o) {
+    let u = l;
+    for (const _ of o) {
       if (u == null) return;
-      u = u[y];
+      u = u[_];
     }
     return u;
   }
-  t.getValue = l;
-  function d(f, a, u) {
-    const { target: y, key: S } = o(f, a);
-    y[S] = u;
+  t.getValue = f;
+  function d(l, o, u) {
+    const { target: _, key: S } = a(l, o);
+    _[S] = u;
   }
   t.setValue = d;
-  function c(f, a, u) {
-    const { target: y, key: S } = o(f, a);
-    u(y[S]);
+  function c(l, o, u) {
+    const { target: _, key: S } = a(l, o);
+    u(_[S]);
   }
   t.modifyValue = c;
-  function _(f, a) {
-    const { target: u, key: y } = o(f, a, {
+  function y(l, o) {
+    const { target: u, key: _ } = a(l, o, {
       returnOnEmptyBranch: !0
     });
-    y != null && delete u[y];
+    _ != null && delete u[_];
   }
-  t.deleteValue = _;
+  t.deleteValue = y;
 })(h || (h = {}));
 const dt = /* @__PURE__ */ Symbol("PathResolver");
 class R {
@@ -154,24 +154,24 @@ var v;
     }
     if (Object.getPrototypeOf(r) !== Object.getPrototypeOf(n))
       return !1;
-    const o = Object.keys(r), l = Object.keys(n);
-    if (o.length !== l.length) return !1;
-    for (const d of o)
+    const a = Object.keys(r), f = Object.keys(n);
+    if (a.length !== f.length) return !1;
+    for (const d of a)
       if (!Object.prototype.hasOwnProperty.call(n, d) || !e(r[d], n[d])) return !1;
     return !0;
   }
   t.deepEqual = e;
-  function i(r, n, s, o) {
-    const l = [], d = [], c = [];
-    for (const _ of n)
-      r.some((f) => s(f, _)) ? (o?.(_) ?? !0) && c.push(_) : (o?.(_) ?? !0) && l.push(_);
-    for (const _ of r)
-      n.some((f) => s(_, f)) || (o?.(_) ?? !0) && d.push(_);
-    return { added: l, removed: d, unchanged: c };
+  function i(r, n, s) {
+    const a = [], f = [], d = [], c = (l, o) => s?.equals ? s.equals(l, o) : l === o, y = (l) => s?.include ? s.include(l) : !0;
+    for (const l of n)
+      r.some((o) => c(o, l)) ? y(l) && d.push(l) : y(l) && a.push(l);
+    for (const l of r)
+      n.some((o) => c(l, o)) || y(l) && f.push(l);
+    return { added: a, removed: f, unchanged: d };
   }
   t.arrayDiff = i;
 })(v || (v = {}));
-var Vt = /* @__PURE__ */ Symbol.for("immer-nothing"), x = /* @__PURE__ */ Symbol.for("immer-draftable"), g = /* @__PURE__ */ Symbol.for("immer-state"), It = process.env.NODE_ENV !== "production" ? [
+var Vt = /* @__PURE__ */ Symbol.for("immer-nothing"), q = /* @__PURE__ */ Symbol.for("immer-draftable"), g = /* @__PURE__ */ Symbol.for("immer-state"), It = process.env.NODE_ENV !== "production" ? [
   // All error codes, starting by 0:
   function(t) {
     return `The plugin for '${t}' has not been loaded into Immer. To enable the plugin, import and call \`enable${t}()\` when initializing your application.`;
@@ -211,18 +211,18 @@ function m(t, ...e) {
     `[Immer] minified error nr: ${t}. Full error at: https://bit.ly/3cXEKWf`
   );
 }
-var p = Object, F = p.getPrototypeOf, U = "constructor", W = "prototype", et = "configurable", q = "enumerable", A = "writable", z = "value", w = (t) => !!t && !!t[g];
+var p = Object, b = p.getPrototypeOf, x = "constructor", W = "prototype", et = "configurable", U = "enumerable", A = "writable", z = "value", w = (t) => !!t && !!t[g];
 function P(t) {
-  return t ? Dt(t) || K(t) || !!t[x] || !!t[U]?.[x] || H(t) || Y(t) : !1;
+  return t ? Dt(t) || K(t) || !!t[q] || !!t[x]?.[q] || H(t) || Y(t) : !1;
 }
-var Tt = p[W][U].toString(), ht = /* @__PURE__ */ new WeakMap();
+var Tt = p[W][x].toString(), ht = /* @__PURE__ */ new WeakMap();
 function Dt(t) {
-  if (!t || !lt(t))
+  if (!t || !ut(t))
     return !1;
-  const e = F(t);
+  const e = b(t);
   if (e === null || e === p[W])
     return !0;
-  const i = p.hasOwnProperty.call(e, U) && e[U];
+  const i = p.hasOwnProperty.call(e, x) && e[x];
   if (i === Object)
     return !0;
   if (!E(i))
@@ -248,7 +248,7 @@ var _t = (t, e, i = I(t)) => i === 2 ? t.has(e) : p[W].hasOwnProperty.call(t, e)
 function At(t, e) {
   return t === e ? t !== 0 || 1 / t === 1 / e : t !== t && e !== e;
 }
-var K = Array.isArray, H = (t) => t instanceof Map, Y = (t) => t instanceof Set, lt = (t) => typeof t == "object", E = (t) => typeof t == "function", Z = (t) => typeof t == "boolean";
+var K = Array.isArray, H = (t) => t instanceof Map, Y = (t) => t instanceof Set, ut = (t) => typeof t == "object", E = (t) => typeof t == "function", Z = (t) => typeof t == "boolean";
 function Mt(t) {
   const e = +t;
   return Number.isInteger(e) && String(e) === t;
@@ -267,18 +267,18 @@ function rt(t, e) {
     delete r[g];
     let n = Reflect.ownKeys(r);
     for (let s = 0; s < n.length; s++) {
-      const o = n[s], l = r[o];
-      l[A] === !1 && (l[A] = !0, l[et] = !0), (l.get || l.set) && (r[o] = {
+      const a = n[s], f = r[a];
+      f[A] === !1 && (f[A] = !0, f[et] = !0), (f.get || f.set) && (r[a] = {
         [et]: !0,
         [A]: !0,
         // could live with !!desc.set as well here...
-        [q]: l[q],
-        [z]: t[o]
+        [U]: f[U],
+        [z]: t[a]
       });
     }
-    return p.create(F(t), r);
+    return p.create(b(t), r);
   } else {
-    const r = F(t);
+    const r = b(t);
     if (r !== null && i)
       return { ...t };
     const n = p.create(r);
@@ -306,7 +306,7 @@ var T = {
   [z]: Nt
 };
 function X(t) {
-  return t === null || !lt(t) ? !0 : p.isFrozen(t);
+  return t === null || !ut(t) ? !0 : p.isFrozen(t);
 }
 var j = "MapSet", nt = "Patches", yt = "ArrayMethods", Pt = {};
 function k(t) {
@@ -330,13 +330,13 @@ function mt(t, e) {
   e && (t.patchPlugin_ = k(nt), t.patches_ = [], t.inversePatches_ = [], t.patchListener_ = e);
 }
 function st(t) {
-  ot(t), t.drafts_.forEach(xt), t.drafts_ = null;
+  at(t), t.drafts_.forEach(qt), t.drafts_ = null;
 }
-function ot(t) {
+function at(t) {
   t === C && (C = t.parent_);
 }
 var pt = (t) => C = Rt(C, t);
-function xt(t) {
+function qt(t) {
   const e = t[g];
   e.type_ === 0 || e.type_ === 1 ? e.revoke_() : e.revoked_ = !0;
 }
@@ -353,7 +353,7 @@ function vt(t, e) {
     );
   } else
     t = St(e, i);
-  return Ut(e, t, !0), st(e), e.patches_ && e.patchListener_(e.patches_, e.inversePatches_), t !== Vt ? t : void 0;
+  return xt(e, t, !0), st(e), e.patches_ && e.patchListener_(e.patches_, e.inversePatches_), t !== Vt ? t : void 0;
 }
 function St(t, e) {
   if (X(e))
@@ -370,17 +370,17 @@ function St(t, e) {
     if (r)
       for (; r.length > 0; )
         r.pop()(t);
-    bt(i, t);
+    Ft(i, t);
   }
   return i.copy_;
 }
-function Ut(t, e, i = !1) {
+function xt(t, e, i = !1) {
   !t.parent_ && t.immer_.autoFreeze_ && t.canAutoFreeze_ && ct(e, i);
 }
 function Et(t) {
   t.finalized_ = !0, t.scope_.unfinalizedDrafts_--;
 }
-var J = (t, e) => t.scope_ === e, qt = [];
+var J = (t, e) => t.scope_ === e, Ut = [];
 function kt(t, e, i, r) {
   const n = D(t), s = t.type_;
   if (r !== void 0 && it(n, r, s) === e) {
@@ -388,17 +388,17 @@ function kt(t, e, i, r) {
     return;
   }
   if (!t.draftLocations_) {
-    const l = t.draftLocations_ = /* @__PURE__ */ new Map();
+    const f = t.draftLocations_ = /* @__PURE__ */ new Map();
     G(n, (d, c) => {
       if (w(c)) {
-        const _ = l.get(c) || [];
-        _.push(d), l.set(c, _);
+        const y = f.get(c) || [];
+        y.push(d), f.set(c, y);
       }
     });
   }
-  const o = t.draftLocations_.get(e) ?? qt;
-  for (const l of o)
-    B(n, l, i, s);
+  const a = t.draftLocations_.get(e) ?? Ut;
+  for (const f of a)
+    B(n, f, i, s);
 }
 function Bt(t, e, i) {
   t.callbacks_.push(function(n) {
@@ -406,11 +406,11 @@ function Bt(t, e, i) {
     if (!s || !J(s, n))
       return;
     n.mapSetPlugin_?.fixSetContents(s);
-    const o = ft(s);
-    kt(t, s.draft_ ?? s, o, i), bt(s, n);
+    const a = ft(s);
+    kt(t, s.draft_ ?? s, a, i), Ft(s, n);
   });
 }
-function bt(t, e) {
+function Ft(t, e) {
   if (t.modified_ && !t.finalized_ && (t.type_ === 3 || t.type_ === 1 && t.allIndicesReassigned_ || (t.assigned_?.size ?? 0) > 0)) {
     const { patchPlugin_: r } = e;
     if (r) {
@@ -426,8 +426,8 @@ function jt(t, e, i) {
     const n = i[g];
     J(n, r) && n.callbacks_.push(function() {
       M(t);
-      const o = ft(n);
-      kt(t, i, o, e);
+      const a = ft(n);
+      kt(t, i, a, e);
     });
   } else P(i) && t.callbacks_.push(function() {
     const s = D(t);
@@ -443,8 +443,8 @@ function $(t, e, i) {
     if (w(n)) {
       const s = n[g];
       if (J(s, i)) {
-        const o = ft(s);
-        B(t, r, o, t.type_), Et(s);
+        const a = ft(s);
+        B(t, r, a, t.type_), Et(s);
       }
     } else P(n) && $(n, e, i);
   })), t;
@@ -478,8 +478,8 @@ function $t(t, e) {
   };
   let n = r, s = L;
   i && (n = [r], s = O);
-  const { revoke: o, proxy: l } = Proxy.revocable(n, s);
-  return r.draft_ = l, r.revoke_ = o, [l, r];
+  const { revoke: a, proxy: f } = Proxy.revocable(n, s);
+  return r.draft_ = f, r.revoke_ = a, [f, r];
 }
 var L = {
   get(t, e) {
@@ -499,8 +499,8 @@ var L = {
       return s;
     if (s === tt(t.base_, e)) {
       M(t);
-      const o = t.type_ === 1 ? +e : e, l = ut(t.scope_, s, t, o);
-      return t.copy_[o] = l;
+      const a = t.type_ === 1 ? +e : e, f = lt(t.scope_, s, t, a);
+      return t.copy_[a] = f;
     }
     return s;
   },
@@ -511,7 +511,7 @@ var L = {
     return Reflect.ownKeys(D(t));
   },
   set(t, e, i) {
-    const r = Ft(D(t), e);
+    const r = bt(D(t), e);
     if (r?.set)
       return r.set.call(t.draft_, i), !0;
     if (!t.modified_) {
@@ -520,14 +520,14 @@ var L = {
         return t.copy_[e] = i, t.assigned_.set(e, !1), !0;
       if (At(i, n) && (i !== void 0 || _t(t.base_, e, t.type_)))
         return !0;
-      M(t), at(t);
+      M(t), ot(t);
     }
     return t.copy_[e] === i && // special case: handle new props with value 'undefined'
     (i !== void 0 || e in t.copy_) || // special case: NaN
     Number.isNaN(i) && Number.isNaN(t.copy_[e]) || (t.copy_[e] = i, t.assigned_.set(e, !0), jt(t, e, i)), !0;
   },
   deleteProperty(t, e) {
-    return M(t), tt(t.base_, e) !== void 0 || e in t.base_ ? (t.assigned_.set(e, !1), at(t)) : t.assigned_.delete(e), t.copy_ && delete t.copy_[e], !0;
+    return M(t), tt(t.base_, e) !== void 0 || e in t.base_ ? (t.assigned_.set(e, !1), ot(t)) : t.assigned_.delete(e), t.copy_ && delete t.copy_[e], !0;
   },
   // Note: We never coerce `desc.value` into an Immer draft, because we can't make
   // the same guarantee in ES5 mode.
@@ -536,7 +536,7 @@ var L = {
     return r && {
       [A]: !0,
       [et]: t.type_ !== 1 || e !== "length",
-      [q]: r[q],
+      [U]: r[U],
       [z]: i[e]
     };
   },
@@ -544,7 +544,7 @@ var L = {
     m(11);
   },
   getPrototypeOf(t) {
-    return F(t.base_);
+    return b(t.base_);
   },
   setPrototypeOf() {
     m(12);
@@ -568,26 +568,26 @@ function tt(t, e) {
   return (i ? D(i) : t)[e];
 }
 function Lt(t, e, i) {
-  const r = Ft(e, i);
+  const r = bt(e, i);
   return r ? z in r ? r[z] : (
     // This is a very special case, if the prop is a getter defined by the
     // prototype, we should invoke it with the draft as context!
     r.get?.call(t.draft_)
   ) : void 0;
 }
-function Ft(t, e) {
+function bt(t, e) {
   if (!(e in t))
     return;
-  let i = F(t);
+  let i = b(t);
   for (; i; ) {
     const r = Object.getOwnPropertyDescriptor(i, e);
     if (r)
       return r;
-    i = F(i);
+    i = b(i);
   }
 }
-function at(t) {
-  t.modified_ || (t.modified_ = !0, t.parent_ && at(t.parent_));
+function ot(t) {
+  t.modified_ || (t.modified_ = !0, t.parent_ && ot(t.parent_));
 }
 function M(t) {
   t.copy_ || (t.assigned_ = /* @__PURE__ */ new Map(), t.copy_ = rt(
@@ -601,46 +601,46 @@ var Wt = class {
       if (E(e) && !E(i)) {
         const s = i;
         i = e;
-        const o = this;
+        const a = this;
         return function(d = s, ...c) {
-          return o.produce(d, (_) => i.call(this, _, ...c));
+          return a.produce(d, (y) => i.call(this, y, ...c));
         };
       }
       E(i) || m(6), r !== void 0 && !E(r) && m(7);
       let n;
       if (P(e)) {
-        const s = pt(this), o = ut(s, e, void 0);
-        let l = !0;
+        const s = pt(this), a = lt(s, e, void 0);
+        let f = !0;
         try {
-          n = i(o), l = !1;
+          n = i(a), f = !1;
         } finally {
-          l ? st(s) : ot(s);
+          f ? st(s) : at(s);
         }
         return mt(s, r), vt(n, s);
-      } else if (!e || !lt(e)) {
+      } else if (!e || !ut(e)) {
         if (n = i(e), n === void 0 && (n = e), n === Vt && (n = void 0), this.autoFreeze_ && ct(n, !0), r) {
-          const s = [], o = [];
+          const s = [], a = [];
           k(nt).generateReplacementPatches_(e, n, {
             patches_: s,
-            inversePatches_: o
-          }), r(s, o);
+            inversePatches_: a
+          }), r(s, a);
         }
         return n;
       } else
         m(1, e);
     }, this.produceWithPatches = (e, i) => {
       if (E(e))
-        return (o, ...l) => this.produceWithPatches(o, (d) => e(d, ...l));
+        return (a, ...f) => this.produceWithPatches(a, (d) => e(d, ...f));
       let r, n;
-      return [this.produce(e, i, (o, l) => {
-        r = o, n = l;
+      return [this.produce(e, i, (a, f) => {
+        r = a, n = f;
       }), r, n];
     }, Z(t?.autoFreeze) && this.setAutoFreeze(t.autoFreeze), Z(t?.useStrictShallowCopy) && this.setUseStrictShallowCopy(t.useStrictShallowCopy), Z(t?.useStrictIteration) && this.setUseStrictIteration(t.useStrictIteration);
   }
   createDraft(t) {
     P(t) || m(8), w(t) && (t = Gt(t));
-    const e = pt(this), i = ut(e, t, void 0);
-    return i[g].isManual_ = !0, ot(e), i;
+    const e = pt(this), i = lt(e, t, void 0);
+    return i[g].isManual_ = !0, at(e), i;
   }
   finishDraft(t, e) {
     const i = t && t[g];
@@ -693,7 +693,7 @@ var Wt = class {
     );
   }
 };
-function ut(t, e, i, r) {
+function lt(t, e, i, r) {
   const [n, s] = H(e) ? k(j).proxyMap_(e, i) : Y(e) ? k(j).proxySet_(e, i) : $t(e, i);
   return (i?.scope_ ?? wt()).drafts_.push(n), s.callbacks_ = i?.callbacks_ ?? [], s.key_ = r, i && r !== void 0 ? Bt(i, s, r) : s.callbacks_.push(function(d) {
     d.mapSetPlugin_?.fixSetContents(s);
@@ -723,7 +723,7 @@ function zt(t) {
     r
   ), e && (e.finalized_ = !1), i;
 }
-var Kt = new Wt(), b = Kt.produce;
+var Kt = new Wt(), F = Kt.produce;
 let Ht = () => ({
   emit(t, ...e) {
     for (let i = this.events[t] || [], r = 0, n = i.length; r < n; r++)
@@ -744,7 +744,7 @@ function N(t) {
   const e = Object.getPrototypeOf(t);
   if (e === Object.prototype || e === null) return;
   const i = e.constructor;
-  typeof i == "function" && (t instanceof Date || t instanceof RegExp || t instanceof Map || t instanceof Set || t instanceof WeakMap || t instanceof WeakSet || ArrayBuffer.isView(t) || i[x] !== !0 && (i[x] = !0));
+  typeof i == "function" && (t instanceof Date || t instanceof RegExp || t instanceof Map || t instanceof Set || t instanceof WeakMap || t instanceof WeakSet || ArrayBuffer.isView(t) || i[q] !== !0 && (i[q] = !0));
 }
 let Yt = 0;
 function Xt() {
@@ -821,38 +821,40 @@ class Jt {
     const r = this.controller.getAscendantFields(this.path), n = r.map((c) => c?.initialValue);
     n.forEach((c) => N(c));
     const s = r.map((c) => c?.value);
-    s.forEach((c) => N(c)), this.controller._data = b(this.controller._data, e);
-    const o = r.map((c) => c?.value);
-    o.forEach((c) => N(c));
-    const l = (c, _) => {
-      if (typeof c != "object" || typeof _ != "object") return;
-      const f = c.constructor, a = _.constructor;
-      if (f === a)
-        return this.controller.equalityComparators?.get(f)?.(c, _);
+    s.forEach((c) => N(c)), this.controller._data = F(this.controller._data, e);
+    const a = r.map((c) => c?.value);
+    a.forEach((c) => N(c));
+    const f = (c, y) => {
+      if (typeof c != "object" || typeof y != "object") return;
+      const l = c.constructor, o = y.constructor;
+      if (l === o)
+        return this.controller.equalityComparators?.get(l)?.(c, y);
     };
     if (!v.deepEqual(
       s[s.length - 1],
-      o[o.length - 1],
-      l
+      a[a.length - 1],
+      f
     ))
       for (let c = r.length - 1; c >= 0; c--) {
-        const _ = r[c];
+        const y = r[c];
         this.controller.events.emit(
           "fieldValueChanged",
-          _.path,
-          o[c],
+          y.path,
+          a[c],
           s[c]
         );
       }
     if (i?.shouldMarkDirty == null || i?.shouldMarkDirty) {
       const c = !v.deepEqual(
         n[n.length - 1],
-        o[o.length - 1],
-        l
+        a[a.length - 1],
+        f
       );
       this._setDirty(c);
     }
   }
+  // TODO: impl
+  // private modifyInitialData() {}
   setValue(e, i) {
     return this.modifyData((r) => {
       h.setValue(r, this.path, e);
@@ -891,7 +893,7 @@ function Qt(t, e) {
 }
 class Zt {
   constructor(e) {
-    this._isValidating = !1, this._isSubmitting = !1, this._triedSubmitting = !1, this.pathBuilder = new R(), this._fields = /* @__PURE__ */ new Map(), this._issues = [], this.events = Ht(), this.validationSchema = e.validationSchema, this.equalityComparators = e.equalityComparators, this._initialData = e.initialData ?? {}, this._data = b(this._initialData, () => {
+    this._isValidating = !1, this._isSubmitting = !1, this._triedSubmitting = !1, this.pathBuilder = new R(), this._fields = /* @__PURE__ */ new Map(), this._issues = [], this.events = Ht(), this.validationSchema = e.validationSchema, this.equalityComparators = e.equalityComparators, this._initialData = e.initialData ?? {}, this._data = F(this._initialData, () => {
     });
   }
   get data() {
@@ -912,7 +914,7 @@ class Zt {
     return !1;
   }
   get isValid() {
-    return this._issues.length === 0;
+    return this.isValidating || this._issues.length === 0;
   }
   get isValidating() {
     return this._isValidating;
@@ -932,22 +934,22 @@ class Zt {
   registerField(e, i) {
     let r = h.getValue(this._data, e);
     if (r == null && i?.defaultValue != null) {
-      const l = Ct(i.defaultValue);
-      N(l), i?.overrideInitialValue === !0 && (this._initialData = b(this._initialData, (d) => {
-        h.setValue(d, e, l);
-      })), this._data = b(this._data, (d) => {
-        h.setValue(d, e, l);
+      const f = Ct(i.defaultValue);
+      N(f), i?.overrideInitialValue === !0 && (this._initialData = F(this._initialData, (d) => {
+        h.setValue(d, e, f);
+      })), this._data = F(this._data, (d) => {
+        h.setValue(d, e, f);
       }), r = h.getValue(this._data, e);
     }
-    const n = h.getValue(this._initialData, e), s = !v.deepEqual(r, n), o = new Jt(this, e, i?.defaultValue, {
+    const n = h.getValue(this._initialData, e), s = !v.deepEqual(r, n), a = new Jt(this, e, i?.defaultValue, {
       isDirty: s
     });
-    return this._fields.set(o.stringPath, o), this.events.emit("fieldRegistered", o.path), s && this.events.emit(
+    return this._fields.set(a.stringPath, a), this.events.emit("fieldRegistered", a.path), s && this.events.emit(
       "fieldValueChanged",
-      o.path,
+      a.path,
       r,
       n
-    ), o;
+    ), a;
   }
   unregisterField(e) {
     const i = h.toStringPath(e);
@@ -956,13 +958,13 @@ class Zt {
   reset(e) {
     const i = e ?? this._initialData, r = [];
     for (const n of this._fields.values()) {
-      const s = h.getValue(this._data, n.path), o = h.getValue(i, n.path);
-      v.deepEqual(s, o) || r.push([n.path, o, s]), n.reset();
+      const s = h.getValue(this._data, n.path), a = h.getValue(i, n.path);
+      v.deepEqual(s, a) || r.push([n.path, a, s]), n.reset();
     }
-    e != null && (this._initialData = b(e, () => {
-    })), this._data = b(i, () => {
-    }), this._issues = [], this._triedSubmitting = !1, r.forEach(([n, s, o]) => {
-      this.events.emit("fieldValueChanged", n, s, o);
+    e != null && (this._initialData = F(e, () => {
+    })), this._data = F(i, () => {
+    }), this._issues = [], this._triedSubmitting = !1, r.forEach(([n, s, a]) => {
+      this.events.emit("fieldValueChanged", n, s, a);
     });
   }
   // TODO: resetGracefully(newInitialData?: DeepPartial<TOutput>)
@@ -981,16 +983,14 @@ class Zt {
     this._issues = this._issues.filter((i) => !h.equals(h.normalize(i.path), e));
   }
   async applyValidation(e, i) {
-    const r = v.arrayDiff(
-      this._issues,
-      e.issues ?? [],
-      v.deepEqual,
-      (n) => {
+    const r = v.arrayDiff(this._issues, e.issues ?? [], {
+      equals: v.deepEqual,
+      include: (n) => {
         if (n.path == null) return !1;
         const s = h.normalize(n.path);
         return h.equals(s, i) || h.isDescendant(i, s);
       }
-    );
+    });
     Qt(this._issues, (n) => r.removed.includes(n)), r.added.forEach((n) => this._issues.push(n)), (r.added.length !== 0 || r.removed.length !== 0) && this.events.emit("fieldIssuesUpdated", i);
   }
   async validateForm() {
@@ -1003,11 +1003,9 @@ class Zt {
       const n = h.fromStringPath(r);
       this.events.emit("fieldValidationTriggered", n), this.applyValidation(e, n);
     }
-    v.arrayDiff(
-      this._issues,
-      e.issues ?? [],
-      v.deepEqual
-    ).added.forEach((r) => this._issues.push(r)), this.setValidating(!1);
+    v.arrayDiff(this._issues, e.issues ?? [], {
+      equals: v.deepEqual
+    }).added.forEach((r) => this._issues.push(r)), this.setValidating(!1);
   }
   async validateField(e) {
     if (this._isValidating || this.validationSchema == null) return;
@@ -1026,9 +1024,9 @@ class Zt {
         }
         for (const n of this._issues) {
           if (n.path == null) continue;
-          const s = h.normalize(n.path), o = this.getField(s);
-          if (o != null && o.boundElement != null) {
-            o.focus();
+          const s = h.normalize(n.path), a = this.getField(s);
+          if (a != null && a.boundElement != null) {
+            a.focus();
             break;
           }
         }