cogsbox-state 0.5.263 → 0.5.265

package/dist/CogsState.jsx

@@ -1,13 +1,13 @@
 "use client";
 import { jsx as me } from "react/jsx-runtime";
-import { useState as K, useRef as Z, useEffect as ne, useLayoutEffect as de, useMemo as Ee, createElement as ae, useSyncExternalStore as xe, startTransition as Ve, useCallback as ye } from "react";
-import { transformStateFunc as ke, isDeepEqual as L, isFunction as z, getNestedValue as B, getDifferences as ue, debounce as Ne } from "./utility.js";
+import { useState as K, useRef as Z, useEffect as ne, useLayoutEffect as de, useMemo as Te, createElement as ae, useSyncExternalStore as xe, startTransition as Ve, useCallback as ye } from "react";
+import { transformStateFunc as ke, isDeepEqual as L, isFunction as z, getNestedValue as H, getDifferences as ue, debounce as Ne } from "./utility.js";
 import { pushFunc as le, updateFn as Q, cutFunc as te, ValidationWrapper as be, FormControlComponent as Ce } from "./Functions.jsx";
 import Pe from "superjson";
 import { v4 as ge } from "uuid";
 import "zod";
 import { getGlobalStore as r, formRefStore as ve } from "./store.js";
-import { useCogsConfig as Te } from "./CogsStateClient.jsx";
+import { useCogsConfig as Ee } from "./CogsStateClient.jsx";
 import { applyPatch as _e } from "fast-json-patch";
 function he(e, s) {
   const h = r.getState().getInitialOptions, g = r.getState().setInitialStateOptions, y = h(e) || {};
@@ -51,7 +51,7 @@ const et = (e, s) => {
       options: i,
       initialOptionsPart: y
     });
-    const o = r.getState().cogsStateStore[p] || g[p], S = i?.modifyState ? i.modifyState(o) : o, [D, O] = De(
+    const o = r.getState().cogsStateStore[p] || g[p], S = i?.modifyState ? i.modifyState(o) : o, [W, R] = De(
       S,
       {
         stateKey: p,
@@ -67,7 +67,7 @@ const et = (e, s) => {
         serverState: i?.serverState
       }
     );
-    return O;
+    return R;
   };
   function T(p, i) {
     Ie({ stateKey: p, options: i, initialOptionsPart: y }), i.localStorage && Fe(p, i), se(p);
@@ -82,7 +82,7 @@ const et = (e, s) => {
   setStateLog: Oe,
   updateInitialStateGlobal: fe,
   addValidationError: Re,
-  removeValidationError: q,
+  removeValidationError: B,
   setServerSyncActions: je
 } = r.getState(), pe = (e, s, h, g, y) => {
   h?.log && console.log(
@@ -118,7 +118,7 @@ const et = (e, s) => {
     return console.error("Error loading from localStorage:", s), null;
   }
 }, Fe = (e, s) => {
-  const h = r.getState().cogsStateStore[e], { sessionId: g } = Te(), y = z(s?.localStorage?.key) ? s.localStorage.key(h) : s?.localStorage?.key;
+  const h = r.getState().cogsStateStore[e], { sessionId: g } = Ee(), y = z(s?.localStorage?.key) ? s.localStorage.key(h) : s?.localStorage?.key;
   if (y && g) {
     const A = ie(
       `${g}-${e}-${y}`
@@ -160,18 +160,18 @@ const et = (e, s) => {
   switch (e) {
     case "update":
       return {
-        oldValue: B(s, g),
-        newValue: B(h, g)
+        oldValue: H(s, g),
+        newValue: H(h, g)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: B(h, g)
+        newValue: H(h, g)
       };
     case "cut":
       return {
-        oldValue: B(s, g),
+        oldValue: H(s, g),
         newValue: null
         // or undefined
       };
@@ -192,12 +192,12 @@ function De(e, {
   dependencies: o,
   serverState: S
 } = {}) {
-  const [D, O] = K({}), { sessionId: R } = Te();
-  let W = !s;
-  const [m] = K(s ?? ge()), l = r.getState().stateLog[m], ee = Z(/* @__PURE__ */ new Set()), H = Z(p ?? ge()), P = Z(
+  const [W, R] = K({}), { sessionId: j } = Ee();
+  let G = !s;
+  const [m] = K(s ?? ge()), l = r.getState().stateLog[m], ee = Z(/* @__PURE__ */ new Set()), q = Z(p ?? ge()), M = Z(
     null
   );
-  P.current = Y(m) ?? null, ne(() => {
+  M.current = Y(m) ?? null, ne(() => {
     if (v && v.stateKey === m && v.path?.[0]) {
       J(m, (n) => ({
         ...n,
@@ -214,22 +214,22 @@ function De(e, {
       he(m, {
         initialState: i
       });
-      const t = P.current, a = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = r.getState().initialStateGlobal[m];
+      const t = M.current, a = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = r.getState().initialStateGlobal[m];
       if (!(c && !L(c, i) || !c) && !a)
         return;
       let d = null;
       const V = z(t?.localStorage?.key) ? t?.localStorage?.key(i) : t?.localStorage?.key;
-      V && R && (d = ie(`${R}-${m}-${V}`));
+      V && j && (d = ie(`${j}-${m}-${V}`));
       let w = i, $ = !1;
-      const x = a ? Date.now() : 0, N = d?.lastUpdated || 0, _ = d?.lastSyncedWithServer || 0;
-      a && x > N ? (w = t.serverState.data, $ = !0) : d && N > _ && (w = d.state, t?.localStorage?.onChange && t?.localStorage?.onChange(w)), Ae(
+      const x = a ? Date.now() : 0, N = d?.lastUpdated || 0, O = d?.lastSyncedWithServer || 0;
+      a && x > N ? (w = t.serverState.data, $ = !0) : d && N > O && (w = d.state, t?.localStorage?.onChange && t?.localStorage?.onChange(w)), Ae(
         m,
         i,
         w,
         X,
-        H.current,
-        R
-      ), $ && V && R && pe(w, m, t, R, Date.now()), se(m), (Array.isArray(T) ? T : [T || "component"]).includes("none") || O({});
+        q.current,
+        j
+      ), $ && V && j && pe(w, m, t, j, Date.now()), se(m), (Array.isArray(T) ? T : [T || "component"]).includes("none") || R({});
     }
   }, [
     i,
@@ -237,24 +237,24 @@ function De(e, {
     S?.data,
     ...o || []
   ]), de(() => {
-    W && he(m, {
+    G && he(m, {
       serverSync: h,
       formElements: y,
       initialState: i,
       localStorage: g,
-      middleware: P.current?.middleware
+      middleware: M.current?.middleware
     });
-    const t = `${m}////${H.current}`, n = r.getState().stateComponents.get(m) || {
+    const t = `${m}////${q.current}`, n = r.getState().stateComponents.get(m) || {
       components: /* @__PURE__ */ new Map()
     };
     return n.components.set(t, {
-      forceUpdate: () => O({}),
+      forceUpdate: () => R({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: A || void 0,
       reactiveType: T ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(m, n), O({}), () => {
-      const a = `${m}////${H.current}`;
+    }), r.getState().stateComponents.set(m, n), R({}), () => {
+      const a = `${m}////${q.current}`;
       n && (n.components.delete(a), n.components.size === 0 && r.getState().stateComponents.delete(m));
     };
   }, []);
@@ -266,135 +266,135 @@ function De(e, {
     J(m, (f) => {
       const d = z(t) ? t(f) : t, V = `${m}-${n.join(".")}`;
       if (V) {
-        let C = !1, I = r.getState().signalDomElements.get(V);
+        let _ = !1, I = r.getState().signalDomElements.get(V);
         if ((!I || I.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
-          const k = n.slice(0, -1), b = B(d, k);
-          if (Array.isArray(b)) {
-            C = !0;
+          const k = n.slice(0, -1), C = H(d, k);
+          if (Array.isArray(C)) {
+            _ = !0;
             const E = `${m}-${k.join(".")}`;
             I = r.getState().signalDomElements.get(E);
           }
         }
         if (I) {
-          const k = C ? B(d, n.slice(0, -1)) : B(d, n);
-          I.forEach(({ parentId: b, position: E, effect: j }) => {
-            const M = document.querySelector(
-              `[data-parent-id="${b}"]`
+          const k = _ ? H(d, n.slice(0, -1)) : H(d, n);
+          I.forEach(({ parentId: C, position: E, effect: b }) => {
+            const P = document.querySelector(
+              `[data-parent-id="${C}"]`
             );
-            if (M) {
-              const G = Array.from(M.childNodes);
-              if (G[E]) {
-                const U = j ? new Function("state", `return (${j})(state)`)(k) : k;
-                G[E].textContent = String(U);
+            if (P) {
+              const D = Array.from(P.childNodes);
+              if (D[E]) {
+                const F = b ? new Function("state", `return (${b})(state)`)(k) : k;
+                D[E].textContent = String(F);
               }
             }
           });
         }
       }
-      a.updateType === "update" && (c || P.current?.validation?.key) && n && q(
-        (c || P.current?.validation?.key) + "." + n.join(".")
+      a.updateType === "update" && (c || M.current?.validation?.key) && n && B(
+        (c || M.current?.validation?.key) + "." + n.join(".")
       );
       const w = n.slice(0, n.length - 1);
-      a.updateType === "cut" && P.current?.validation?.key && q(
-        P.current?.validation?.key + "." + w.join(".")
-      ), a.updateType === "insert" && P.current?.validation?.key && Me(
-        P.current?.validation?.key + "." + w.join(".")
+      a.updateType === "cut" && M.current?.validation?.key && B(
+        M.current?.validation?.key + "." + w.join(".")
+      ), a.updateType === "insert" && M.current?.validation?.key && Me(
+        M.current?.validation?.key + "." + w.join(".")
       ).filter(([I, k]) => {
-        let b = I?.split(".").length;
-        if (I == w.join(".") && b == w.length - 1) {
+        let C = I?.split(".").length;
+        if (I == w.join(".") && C == w.length - 1) {
           let E = I + "." + w;
-          q(I), Re(E, k);
+          B(I), Re(E, k);
         }
       });
       const $ = r.getState().stateComponents.get(m);
       if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", $), $) {
-        const C = ue(f, d), I = new Set(C), k = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
+        const _ = ue(f, d), I = new Set(_), k = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
         for (const [
-          b,
+          C,
           E
         ] of $.components.entries()) {
-          let j = !1;
-          const M = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
-          if (console.log("component", E), !M.includes("none")) {
-            if (M.includes("all")) {
+          let b = !1;
+          const P = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
+          if (console.log("component", E), !P.includes("none")) {
+            if (P.includes("all")) {
               E.forceUpdate();
               continue;
             }
-            if (M.includes("component") && ((E.paths.has(k) || E.paths.has("")) && (j = !0), !j))
-              for (const G of I) {
-                let U = G;
+            if (P.includes("component") && ((E.paths.has(k) || E.paths.has("")) && (b = !0), !b))
+              for (const D of I) {
+                let F = D;
                 for (; ; ) {
-                  if (E.paths.has(U)) {
-                    j = !0;
+                  if (E.paths.has(F)) {
+                    b = !0;
                     break;
                   }
-                  const ce = U.lastIndexOf(".");
+                  const ce = F.lastIndexOf(".");
                   if (ce !== -1) {
-                    const Se = U.substring(
+                    const Se = F.substring(
                       0,
                       ce
                     );
                     if (!isNaN(
-                      Number(U.substring(ce + 1))
+                      Number(F.substring(ce + 1))
                     ) && E.paths.has(Se)) {
-                      j = !0;
+                      b = !0;
                       break;
                     }
-                    U = Se;
+                    F = Se;
                   } else
-                    U = "";
-                  if (U === "")
+                    F = "";
+                  if (F === "")
                     break;
                 }
-                if (j) break;
+                if (b) break;
               }
-            if (!j && M.includes("deps") && E.depsFunction) {
-              const G = E.depsFunction(d);
-              let U = !1;
-              typeof G == "boolean" ? G && (U = !0) : L(E.deps, G) || (E.deps = G, U = !0), U && (j = !0);
+            if (!b && P.includes("deps") && E.depsFunction) {
+              const D = E.depsFunction(d);
+              let F = !1;
+              typeof D == "boolean" ? D && (F = !0) : L(E.deps, D) || (E.deps = D, F = !0), F && (b = !0);
             }
-            j && E.forceUpdate();
+            b && E.forceUpdate();
           }
         }
       }
       const x = Date.now();
-      n = n.map((C, I) => {
-        const k = n.slice(0, -1), b = B(d, k);
-        return I === n.length - 1 && ["insert", "cut"].includes(a.updateType) ? (b.length - 1).toString() : C;
+      n = n.map((_, I) => {
+        const k = n.slice(0, -1), C = H(d, k);
+        return I === n.length - 1 && ["insert", "cut"].includes(a.updateType) ? (C.length - 1).toString() : _;
       });
-      const { oldValue: N, newValue: _ } = Ue(
+      const { oldValue: N, newValue: O } = Ue(
         a.updateType,
         f,
         d,
         n
-      ), F = {
+      ), U = {
         timeStamp: x,
         stateKey: m,
         path: n,
         updateType: a.updateType,
         status: "new",
         oldValue: N,
-        newValue: _
+        newValue: O
       };
-      if (Oe(m, (C) => {
-        const k = [...C ?? [], F].reduce((b, E) => {
-          const j = `${E.stateKey}:${JSON.stringify(E.path)}`, M = b.get(j);
-          return M ? (M.timeStamp = Math.max(M.timeStamp, E.timeStamp), M.newValue = E.newValue, M.oldValue = M.oldValue ?? E.oldValue, M.updateType = E.updateType) : b.set(j, { ...E }), b;
+      if (Oe(m, (_) => {
+        const k = [..._ ?? [], U].reduce((C, E) => {
+          const b = `${E.stateKey}:${JSON.stringify(E.path)}`, P = C.get(b);
+          return P ? (P.timeStamp = Math.max(P.timeStamp, E.timeStamp), P.newValue = E.newValue, P.oldValue = P.oldValue ?? E.oldValue, P.updateType = E.updateType) : C.set(b, { ...E }), C;
         }, /* @__PURE__ */ new Map());
         return Array.from(k.values());
       }), pe(
         d,
         m,
-        P.current,
-        R
-      ), P.current?.middleware && P.current.middleware({
+        M.current,
+        j
+      ), M.current?.middleware && M.current.middleware({
         updateLog: l,
-        update: F
-      }), P.current?.serverSync) {
-        const C = r.getState().serverState[m], I = P.current?.serverSync;
+        update: U
+      }), M.current?.serverSync) {
+        const _ = r.getState().serverState[m], I = M.current?.serverSync;
         je(m, {
           syncKey: typeof I.syncKey == "string" ? I.syncKey : I.syncKey({ state: d }),
-          rollBackState: C,
+          rollBackState: _,
           actionTimeStamp: Date.now() + (I.debounce ?? 3e3),
           status: "waiting"
         });
@@ -407,16 +407,16 @@ function De(e, {
     oe(
       m,
       X,
-      H.current,
-      R
+      q.current,
+      j
     )
   ), r.getState().cogsStateStore[m] || J(m, e), r.getState().initialStateGlobal[m] || fe(m, e));
-  const u = Ee(() => oe(
+  const u = Te(() => oe(
     m,
     X,
-    H.current,
-    R
-  ), [m, R]);
+    q.current,
+    j
+  ), [m, j]);
   return [$e(m), u];
 }
 function oe(e, s, h, g) {
@@ -429,15 +429,15 @@ function oe(e, s, h, g) {
     A++;
   }, p = {
     removeValidation: (v) => {
-      v?.validationKey && q(v.validationKey);
+      v?.validationKey && B(v.validationKey);
     },
     revertToInitialState: (v) => {
       const o = r.getState().getInitialOptions(e)?.validation;
-      o?.key && q(o?.key), v?.validationKey && q(v.validationKey);
+      o?.key && B(o?.key), v?.validationKey && B(v.validationKey);
       const S = r.getState().initialStateGlobal[e];
       r.getState().clearSelectedIndexesForState(e), y.clear(), A++;
-      const D = i(S, []), O = Y(e), R = z(O?.localStorage?.key) ? O?.localStorage?.key(S) : O?.localStorage?.key, W = `${g}-${e}-${R}`;
-      W && localStorage.removeItem(W), re(e, D), J(e, S);
+      const W = i(S, []), R = Y(e), j = z(R?.localStorage?.key) ? R?.localStorage?.key(S) : R?.localStorage?.key, G = `${g}-${e}-${j}`;
+      G && localStorage.removeItem(G), re(e, W), J(e, S);
       const m = r.getState().stateComponents.get(e);
       return m && m.components.forEach((l) => {
         l.forceUpdate();
@@ -450,15 +450,15 @@ function oe(e, s, h, g) {
         s,
         h,
         g
-      ), S = r.getState().initialStateGlobal[e], D = Y(e), O = z(D?.localStorage?.key) ? D?.localStorage?.key(S) : D?.localStorage?.key, R = `${g}-${e}-${O}`;
-      return localStorage.getItem(R) && localStorage.removeItem(R), Ve(() => {
+      ), S = r.getState().initialStateGlobal[e], W = Y(e), R = z(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, j = `${g}-${e}-${R}`;
+      return localStorage.getItem(j) && localStorage.removeItem(j), Ve(() => {
         fe(e, v), re(e, o), J(e, v);
-        const W = r.getState().stateComponents.get(e);
-        W && W.components.forEach((m) => {
+        const G = r.getState().stateComponents.get(e);
+        G && G.components.forEach((m) => {
           m.forceUpdate();
         });
       }), {
-        fetchId: (W) => o.get()[W]
+        fetchId: (G) => o.get()[G]
       };
     },
     _initialState: r.getState().initialStateGlobal[e],
@@ -470,15 +470,15 @@ function oe(e, s, h, g) {
     }
   };
   function i(v, o = [], S) {
-    const D = o.map(String).join(".");
-    y.get(D);
-    const O = function() {
+    const W = o.map(String).join(".");
+    y.get(W);
+    const R = function() {
       return r().getNestedState(e, o);
     };
     Object.keys(p).forEach((m) => {
-      O[m] = p[m];
+      R[m] = p[m];
     });
-    const R = {
+    const j = {
       apply(m, l, ee) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${e}, path=${o.join(".")}`
@@ -554,7 +554,7 @@ function oe(e, s, h, g) {
             }
           };
         if (l === "_status") {
-          const u = r.getState().getNestedState(e, o), t = r.getState().initialStateGlobal[e], n = B(t, o);
+          const u = r.getState().getNestedState(e, o), t = r.getState().initialStateGlobal[e], n = H(t, o);
           return L(u, n) ? "fresh" : "stale";
         }
         if (l === "getStatus")
@@ -562,7 +562,7 @@ function oe(e, s, h, g) {
             const u = r().getNestedState(
               e,
               o
-            ), t = r.getState().initialStateGlobal[e], n = B(t, o);
+            ), t = r.getState().initialStateGlobal[e], n = H(t, o);
             return L(u, n) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
@@ -618,11 +618,11 @@ function oe(e, s, h, g) {
               }), w = Z(!0), $ = r().getNestedState(
                 e,
                 o
-              ), x = $.length, N = Ee(() => {
+              ), x = $.length, N = Te(() => {
                 const I = Array.from(
                   { length: d.endIndex - d.startIndex },
-                  (b, E) => d.startIndex + E
-                ).filter((b) => b < x), k = I.map((b) => $[b]);
+                  (C, E) => d.startIndex + E
+                ).filter((C) => C < x), k = I.map((C) => $[C]);
                 return i(k, o, {
                   ...S,
                   validIndices: I
@@ -631,46 +631,53 @@ function oe(e, s, h, g) {
               de(() => {
                 const I = f.current;
                 if (!I) return;
-                const k = () => {
-                  const { scrollTop: E, clientHeight: j } = I, M = Math.max(
+                let k;
+                const C = () => {
+                  const { scrollTop: b, clientHeight: P } = I, D = Math.max(
                     0,
-                    Math.floor(E / n) - a
-                  ), G = Math.min(
+                    Math.floor(b / n) - a
+                  ), F = Math.min(
                     x,
-                    Math.ceil((E + j) / n) + a
+                    Math.ceil((b + P) / n) + a
                   );
-                  V({ startIndex: M, endIndex: G });
-                }, b = () => {
-                  k();
+                  V({ startIndex: D, endIndex: F });
+                }, E = () => {
+                  const { scrollTop: b, scrollHeight: P, clientHeight: D } = I;
+                  w.current = P - b - D < 5, clearTimeout(k), k = setTimeout(C, 10);
                 };
-                if (I.addEventListener("scroll", b, {
+                if (I.addEventListener("scroll", E, {
                   passive: !0
-                }), w.current && c && x > 0) {
-                  w.current = !1;
-                  const E = Math.max(
+                }), c && x > 0) {
+                  const b = Math.max(
                     0,
                     x - Math.ceil(I.clientHeight / n) - a
                   );
-                  V({ startIndex: E, endIndex: x }), setTimeout(() => {
-                    I.scrollTop = I.scrollHeight;
-                  }, 0);
+                  V({ startIndex: b, endIndex: x }), requestAnimationFrame(() => {
+                    I.scrollTop = I.scrollHeight, w.current = !0;
+                  });
                 } else
-                  k();
+                  C();
                 return () => {
-                  I.removeEventListener("scroll", b);
+                  clearTimeout(k), I.removeEventListener("scroll", E);
                 };
-              }, [x, n, a]), ne(() => {
-                if (c && f.current && !w.current) {
+              }, [x, n, a, c]), ne(() => {
+                if (c && f.current && w.current) {
                   const I = f.current;
-                  I.scrollHeight - I.scrollTop - I.clientHeight < 100 && (I.scrollTop = I.scrollHeight);
+                  I.scrollTo({
+                    top: I.scrollHeight,
+                    behavior: "smooth"
+                  });
                 }
-              }, [x]);
-              const _ = ye(
+              }, [x, c]);
+              const O = ye(
                 (I = "smooth") => {
-                  f.current && (f.current.scrollTop = f.current.scrollHeight);
+                  f.current && f.current.scrollTo({
+                    top: f.current.scrollHeight,
+                    behavior: I
+                  });
                 },
                 []
-              ), F = ye(
+              ), U = ye(
                 (I, k = "smooth") => {
                   f.current && f.current.scrollTo({
                     top: I * n,
@@ -678,7 +685,7 @@ function oe(e, s, h, g) {
                   });
                 },
                 [n]
-              ), C = {
+              ), _ = {
                 outer: {
                   ref: f,
                   style: {
@@ -701,9 +708,9 @@ function oe(e, s, h, g) {
               };
               return {
                 virtualState: N,
-                virtualizerProps: C,
-                scrollToBottom: _,
-                scrollToIndex: F
+                virtualizerProps: _,
+                scrollToBottom: O,
+                scrollToIndex: U
               };
             };
           if (l === "stateSort")
@@ -739,15 +746,15 @@ function oe(e, s, h, g) {
                   register: () => {
                     const [, x] = K({}), N = `${h}-${o.join(".")}-${c}`;
                     de(() => {
-                      const _ = `${e}////${N}`, F = r.getState().stateComponents.get(e) || {
+                      const O = `${e}////${N}`, U = r.getState().stateComponents.get(e) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return F.components.set(_, {
+                      return U.components.set(O, {
                         forceUpdate: () => x({}),
                         paths: /* @__PURE__ */ new Set([V.join(".")])
-                      }), r.getState().stateComponents.set(e, F), () => {
-                        const C = r.getState().stateComponents.get(e);
-                        C && C.components.delete(_);
+                      }), r.getState().stateComponents.set(e, U), () => {
+                        const _ = r.getState().stateComponents.get(e);
+                        _ && _.components.delete(O);
                       };
                     }, [e, N]);
                   },
@@ -871,15 +878,15 @@ function oe(e, s, h, g) {
               return i(c.item, f, S);
             };
         }
-        const H = o[o.length - 1];
-        if (!isNaN(Number(H))) {
+        const q = o[o.length - 1];
+        if (!isNaN(Number(q))) {
           const u = o.slice(0, -1), t = r.getState().getNestedState(e, u);
           if (Array.isArray(t) && l === "cut")
             return () => te(
               s,
               u,
               e,
-              Number(H)
+              Number(q)
             );
         }
         if (l === "get")
@@ -961,20 +968,20 @@ function oe(e, s, h, g) {
                           $ = !0;
                           break;
                         }
-                        let _ = N.lastIndexOf(".");
-                        for (; _ !== -1; ) {
-                          const F = N.substring(0, _);
-                          if (w.paths.has(F)) {
+                        let O = N.lastIndexOf(".");
+                        for (; O !== -1; ) {
+                          const U = N.substring(0, O);
+                          if (w.paths.has(U)) {
                             $ = !0;
                             break;
                           }
-                          const C = N.substring(
-                            _ + 1
+                          const _ = N.substring(
+                            O + 1
                           );
-                          if (!isNaN(Number(C))) {
-                            const I = F.lastIndexOf(".");
+                          if (!isNaN(Number(_))) {
+                            const I = U.lastIndexOf(".");
                             if (I !== -1) {
-                              const k = F.substring(
+                              const k = U.substring(
                                 0,
                                 I
                               );
@@ -984,14 +991,14 @@ function oe(e, s, h, g) {
                               }
                             }
                           }
-                          _ = F.lastIndexOf(".");
+                          O = U.lastIndexOf(".");
                         }
                         if ($) break;
                       }
                     if (!$ && x.includes("deps") && w.depsFunction) {
                       const N = w.depsFunction(a);
-                      let _ = !1;
-                      typeof N == "boolean" ? N && (_ = !0) : L(w.deps, N) || (w.deps = N, _ = !0), _ && ($ = !0);
+                      let O = !1;
+                      typeof N == "boolean" ? N && (O = !0) : L(w.deps, N) || (w.deps = N, O = !0), O && ($ = !0);
                     }
                     $ && w.forceUpdate();
                   }
@@ -1005,12 +1012,12 @@ function oe(e, s, h, g) {
                 throw new Error("Zod schema not found");
               if (!u?.key)
                 throw new Error("Validation key not found");
-              q(u.key);
+              B(u.key);
               const n = r.getState().cogsStateStore[e];
               try {
                 const a = r.getState().getValidationErrors(u.key);
                 a && a.length > 0 && a.forEach(([f]) => {
-                  f && f.startsWith(u.key) && q(f);
+                  f && f.startsWith(u.key) && B(f);
                 });
                 const c = u.zodSchema.safeParse(n);
                 return c.success ? !0 : (c.error.errors.forEach((d) => {
@@ -1083,14 +1090,14 @@ function oe(e, s, h, g) {
               formOpts: t
             }
           );
-        const P = [...o, l], X = r.getState().getNestedState(e, P);
-        return i(X, P, S);
+        const M = [...o, l], X = r.getState().getNestedState(e, M);
+        return i(X, M, S);
       }
-    }, W = new Proxy(O, R);
-    return y.set(D, {
-      proxy: W,
+    }, G = new Proxy(R, j);
+    return y.set(W, {
+      proxy: G,
       stateVersion: A
-    }), W;
+    }), G;
   }
   return i(
     r.getState().getNestedState(e, [])
@@ -1136,14 +1143,14 @@ function Ge({
           "state",
           `return (${e._effect})(state)`
         )(o);
-      } catch (O) {
-        console.error("Error evaluating effect function during mount:", O), S = o;
+      } catch (R) {
+        console.error("Error evaluating effect function during mount:", R), S = o;
       }
     else
       S = o;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const D = document.createTextNode(String(S));
-    g.replaceWith(D);
+    const W = document.createTextNode(String(S));
+    g.replaceWith(W);
   }, [e._stateKey, e._path.join("."), e._effect]), ae("span", {
     ref: s,
     style: { display: "none" },