cogsbox-state 0.5.316 → 0.5.318

package/dist/CogsState.jsx

@@ -1,34 +1,34 @@
 "use client";
-import { jsx as yt } from "react/jsx-runtime";
-import { useState as tt, useRef as Z, useEffect as it, useLayoutEffect as ut, useMemo as It, createElement as ct, useSyncExternalStore as _t, startTransition as Mt, useCallback as Tt } from "react";
-import { transformStateFunc as Rt, isDeepEqual as q, isFunction as Q, getNestedValue as J, getDifferences as pt, debounce as jt } from "./utility.js";
-import { pushFunc as vt, updateFn as st, cutFunc as dt, ValidationWrapper as Ot, FormControlComponent as Ut } from "./Functions.jsx";
+import { jsx as It } from "react/jsx-runtime";
+import { useState as et, useRef as X, useEffect as st, useLayoutEffect as gt, useMemo as pt, createElement as it, useSyncExternalStore as _t, startTransition as Mt, useCallback as Et } from "react";
+import { transformStateFunc as Rt, isDeepEqual as Y, isFunction as K, getNestedValue as Z, getDifferences as wt, debounce as jt } from "./utility.js";
+import { pushFunc as yt, updateFn as at, cutFunc as ut, ValidationWrapper as Ot, FormControlComponent as Ut } from "./Functions.jsx";
 import Ft from "superjson";
-import { v4 as wt } from "uuid";
+import { v4 as $t } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as Et } from "./store.js";
-import { useCogsConfig as Ct } from "./CogsStateClient.jsx";
+import { getGlobalStore as o, formRefStore as Vt } from "./store.js";
+import { useCogsConfig as xt } from "./CogsStateClient.jsx";
 import { applyPatch as Dt } from "fast-json-patch";
 import Wt from "react-use-measure";
-function At(t, c) {
+function bt(t, c) {
   const m = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, y = m(t) || {};
   f(t, {
     ...y,
     ...c
   });
 }
-function Vt({
+function At({
   stateKey: t,
   options: c,
   initialOptionsPart: m
 }) {
-  const f = rt(t) || {}, y = m[t] || {}, b = o.getState().setInitialStateOptions, p = { ...y, ...f };
+  const f = rt(t) || {}, y = m[t] || {}, k = o.getState().setInitialStateOptions, p = { ...y, ...f };
   let I = !1;
   if (c)
     for (const a in c)
       p.hasOwnProperty(a) ? (a == "localStorage" && c[a] && p[a].key !== c[a]?.key && (I = !0, p[a] = c[a]), a == "initialState" && c[a] && p[a] !== c[a] && // Different references
-      !q(p[a], c[a]) && (I = !0, p[a] = c[a])) : (I = !0, p[a] = c[a]);
-  I && b(t, p);
+      !Y(p[a], c[a]) && (I = !0, p[a] = c[a])) : (I = !0, p[a] = c[a]);
+  I && k(t, p);
 }
 function le(t, { formElements: c, validation: m }) {
   return { initialState: t, formElements: c, validation: m };
@@ -45,14 +45,14 @@ const de = (t, c) => {
       // State-specific overrides
     }, rt(I) || o.getState().setInitialStateOptions(I, y[I]);
   }), o.getState().setInitialStates(f), o.getState().setCreatedState(f);
-  const b = (I, a) => {
-    const [v] = tt(a?.componentId ?? wt());
-    Vt({
+  const k = (I, a) => {
+    const [v] = et(a?.componentId ?? $t());
+    At({
       stateKey: I,
       options: a,
       initialOptionsPart: y
     });
-    const n = o.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [G, O] = Jt(
+    const n = o.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [z, j] = Jt(
       S,
       {
         stateKey: I,
@@ -68,22 +68,22 @@ const de = (t, c) => {
         serverState: a?.serverState
       }
     );
-    return O;
+    return j;
   };
   function p(I, a) {
-    Vt({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Bt(I, a), mt(I);
+    At({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Bt(I, a), ht(I);
   }
-  return { useCogsState: b, setCogsOptions: p };
+  return { useCogsState: k, setCogsOptions: p };
 }, {
-  setUpdaterState: gt,
-  setState: et,
+  setUpdaterState: ft,
+  setState: nt,
   getInitialOptions: rt,
   getKeyState: Nt,
   getValidationErrors: Lt,
   setStateLog: Gt,
-  updateInitialStateGlobal: $t,
+  updateInitialStateGlobal: Tt,
   addValidationError: Ht,
-  removeValidationError: X,
+  removeValidationError: Q,
   setServerSyncActions: zt
 } = o.getState(), kt = (t, c, m, f, y) => {
   m?.log && console.log(
@@ -92,12 +92,12 @@ const de = (t, c) => {
     m.localStorage?.key,
     f
   );
-  const b = Q(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (b && f) {
-    const p = `${f}-${c}-${b}`;
+  const k = K(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
+  if (k && f) {
+    const p = `${f}-${c}-${k}`;
     let I;
     try {
-      I = St(p)?.lastSyncedWithServer;
+      I = mt(p)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
@@ -110,7 +110,7 @@ const de = (t, c) => {
       JSON.stringify(v.json)
     );
   }
-}, St = (t) => {
+}, mt = (t) => {
   if (!t) return null;
   try {
     const c = window.localStorage.getItem(t);
@@ -119,28 +119,28 @@ const de = (t, c) => {
     return console.error("Error loading from localStorage:", c), null;
   }
 }, Bt = (t, c) => {
-  const m = o.getState().cogsStateStore[t], { sessionId: f } = Ct(), y = Q(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
+  const m = o.getState().cogsStateStore[t], { sessionId: f } = xt(), y = K(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
   if (y && f) {
-    const b = St(
+    const k = mt(
       `${f}-${t}-${y}`
     );
-    if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
-      return et(t, b.state), mt(t), !0;
+    if (k && k.lastUpdated > (k.lastSyncedWithServer || 0))
+      return nt(t, k.state), ht(t), !0;
   }
   return !1;
-}, xt = (t, c, m, f, y, b) => {
+}, Pt = (t, c, m, f, y, k) => {
   const p = {
     initialState: c,
-    updaterState: ft(
+    updaterState: St(
       t,
       f,
       y,
-      b
+      k
     ),
     state: m
   };
-  $t(t, p.initialState), gt(t, p.updaterState), et(t, p.state);
-}, mt = (t) => {
+  Tt(t, p.initialState), ft(t, p.updaterState), nt(t, p.state);
+}, ht = (t) => {
   const c = o.getState().stateComponents.get(t);
   if (!c) return;
   const m = /* @__PURE__ */ new Set();
@@ -161,18 +161,18 @@ const de = (t, c) => {
   switch (t) {
     case "update":
       return {
-        oldValue: J(c, f),
-        newValue: J(m, f)
+        oldValue: Z(c, f),
+        newValue: Z(m, f)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: J(m, f)
+        newValue: Z(m, f)
       };
     case "cut":
       return {
-        oldValue: J(c, f),
+        oldValue: Z(c, f),
         newValue: null
         // or undefined
       };
@@ -185,7 +185,7 @@ function Jt(t, {
   serverSync: m,
   localStorage: f,
   formElements: y,
-  reactiveDeps: b,
+  reactiveDeps: k,
   reactiveType: p,
   componentId: I,
   initialState: a,
@@ -193,14 +193,14 @@ function Jt(t, {
   dependencies: n,
   serverState: S
 } = {}) {
-  const [G, O] = tt({}), { sessionId: U } = Ct();
-  let H = !c;
-  const [h] = tt(c ?? wt()), l = o.getState().stateLog[h], lt = Z(/* @__PURE__ */ new Set()), K = Z(I ?? wt()), R = Z(
+  const [z, j] = et({}), { sessionId: O } = xt();
+  let B = !c;
+  const [h] = et(c ?? $t()), l = o.getState().stateLog[h], ct = X(/* @__PURE__ */ new Set()), tt = X(I ?? $t()), M = X(
     null
   );
-  R.current = rt(h) ?? null, it(() => {
+  M.current = rt(h) ?? null, st(() => {
     if (v && v.stateKey === h && v.path?.[0]) {
-      et(h, (r) => ({
+      nt(h, (r) => ({
         ...r,
         [v.path[0]]: v.newValue
       }));
@@ -210,165 +210,165 @@ function Jt(t, {
         userId: v.userId
       });
     }
-  }, [v]), it(() => {
+  }, [v]), st(() => {
     if (a) {
-      At(h, {
+      bt(h, {
         initialState: a
       });
-      const e = R.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
-      if (!(i && !q(i, a) || !i) && !s)
+      const e = M.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
+      if (!(i && !Y(i, a) || !i) && !s)
         return;
-      let u = null;
-      const T = Q(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      T && U && (u = St(`${U}-${h}-${T}`));
-      let w = a, V = !1;
-      const x = s ? Date.now() : 0, C = u?.lastUpdated || 0, P = u?.lastSyncedWithServer || 0;
-      s && x > C ? (w = e.serverState.data, V = !0) : u && C > P && (w = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), o.getState().initializeShadowState(h, a), xt(
+      let d = null;
+      const T = K(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
+      T && O && (d = mt(`${O}-${h}-${T}`));
+      let w = a, b = !1;
+      const N = s ? Date.now() : 0, C = d?.lastUpdated || 0, P = d?.lastSyncedWithServer || 0;
+      s && N > C ? (w = e.serverState.data, b = !0) : d && C > P && (w = d.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), o.getState().initializeShadowState(h, a), Pt(
         h,
         a,
         w,
         ot,
-        K.current,
-        U
-      ), V && T && U && kt(w, h, e, U, Date.now()), mt(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || O({});
+        tt.current,
+        O
+      ), b && T && O && kt(w, h, e, O, Date.now()), ht(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || j({});
     }
   }, [
     a,
     S?.status,
     S?.data,
     ...n || []
-  ]), ut(() => {
-    H && At(h, {
+  ]), gt(() => {
+    B && bt(h, {
       serverSync: m,
       formElements: y,
       initialState: a,
       localStorage: f,
-      middleware: R.current?.middleware
+      middleware: M.current?.middleware
     });
-    const e = `${h}////${K.current}`, r = o.getState().stateComponents.get(h) || {
+    const e = `${h}////${tt.current}`, r = o.getState().stateComponents.get(h) || {
       components: /* @__PURE__ */ new Map()
     };
     return r.components.set(e, {
-      forceUpdate: () => O({}),
+      forceUpdate: () => j({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: b || void 0,
+      depsFunction: k || void 0,
       reactiveType: p ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(h, r), O({}), () => {
+    }), o.getState().stateComponents.set(h, r), j({}), () => {
       r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(h));
     };
   }, []);
   const ot = (e, r, s, i) => {
     if (Array.isArray(r)) {
-      const u = `${h}-${r.join(".")}`;
-      lt.current.add(u);
+      const d = `${h}-${r.join(".")}`;
+      ct.current.add(d);
     }
     const g = o.getState();
-    et(h, (u) => {
-      const T = Q(e) ? e(u) : e, w = `${h}-${r.join(".")}`;
+    nt(h, (d) => {
+      const T = K(e) ? e(d) : e, w = `${h}-${r.join(".")}`;
       if (w) {
         let _ = !1, E = g.signalDomElements.get(w);
         if ((!E || E.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const M = r.slice(0, -1), W = J(T, M);
+          const U = r.slice(0, -1), W = Z(T, U);
           if (Array.isArray(W)) {
             _ = !0;
-            const A = `${h}-${M.join(".")}`;
-            E = g.signalDomElements.get(A);
+            const V = `${h}-${U.join(".")}`;
+            E = g.signalDomElements.get(V);
           }
         }
         if (E) {
-          const M = _ ? J(T, r.slice(0, -1)) : J(T, r);
-          E.forEach(({ parentId: W, position: A, effect: F }) => {
-            const j = document.querySelector(
+          const U = _ ? Z(T, r.slice(0, -1)) : Z(T, r);
+          E.forEach(({ parentId: W, position: V, effect: F }) => {
+            const R = document.querySelector(
               `[data-parent-id="${W}"]`
             );
-            if (j) {
-              const $ = Array.from(j.childNodes);
-              if ($[A]) {
-                const k = F ? new Function("state", `return (${F})(state)`)(M) : M;
-                $[A].textContent = String(k);
+            if (R) {
+              const $ = Array.from(R.childNodes);
+              if ($[V]) {
+                const A = F ? new Function("state", `return (${F})(state)`)(U) : U;
+                $[V].textContent = String(A);
               }
             }
           });
         }
       }
-      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (i || R.current?.validation?.key) && r && X(
-        (i || R.current?.validation?.key) + "." + r.join(".")
+      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (i || M.current?.validation?.key) && r && Q(
+        (i || M.current?.validation?.key) + "." + r.join(".")
       );
-      const V = r.slice(0, r.length - 1);
-      s.updateType === "cut" && R.current?.validation?.key && X(
-        R.current?.validation?.key + "." + V.join(".")
-      ), s.updateType === "insert" && R.current?.validation?.key && Lt(
-        R.current?.validation?.key + "." + V.join(".")
-      ).filter(([E, M]) => {
+      const b = r.slice(0, r.length - 1);
+      s.updateType === "cut" && M.current?.validation?.key && Q(
+        M.current?.validation?.key + "." + b.join(".")
+      ), s.updateType === "insert" && M.current?.validation?.key && Lt(
+        M.current?.validation?.key + "." + b.join(".")
+      ).filter(([E, U]) => {
         let W = E?.split(".").length;
-        if (E == V.join(".") && W == V.length - 1) {
-          let A = E + "." + V;
-          X(E), Ht(A, M);
+        if (E == b.join(".") && W == b.length - 1) {
+          let V = E + "." + b;
+          Q(E), Ht(V, U);
         }
       });
-      const x = g.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", x), x) {
-        const _ = pt(u, T), E = new Set(_), M = s.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
+      const N = g.stateComponents.get(h);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", N), N) {
+        const _ = wt(d, T), E = new Set(_), U = s.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
         for (const [
           W,
-          A
-        ] of x.components.entries()) {
+          V
+        ] of N.components.entries()) {
           let F = !1;
-          const j = Array.isArray(A.reactiveType) ? A.reactiveType : [A.reactiveType || "component"];
-          if (console.log("component", A), !j.includes("none")) {
-            if (j.includes("all")) {
-              A.forceUpdate();
+          const R = Array.isArray(V.reactiveType) ? V.reactiveType : [V.reactiveType || "component"];
+          if (console.log("component", V), !R.includes("none")) {
+            if (R.includes("all")) {
+              V.forceUpdate();
               continue;
             }
-            if (j.includes("component") && ((A.paths.has(M) || A.paths.has("")) && (F = !0), !F))
+            if (R.includes("component") && ((V.paths.has(U) || V.paths.has("")) && (F = !0), !F))
               for (const $ of E) {
-                let k = $;
+                let A = $;
                 for (; ; ) {
-                  if (A.paths.has(k)) {
+                  if (V.paths.has(A)) {
                     F = !0;
                     break;
                   }
-                  const L = k.lastIndexOf(".");
+                  const L = A.lastIndexOf(".");
                   if (L !== -1) {
-                    const z = k.substring(
+                    const q = A.substring(
                       0,
                       L
                     );
                     if (!isNaN(
-                      Number(k.substring(L + 1))
-                    ) && A.paths.has(z)) {
+                      Number(A.substring(L + 1))
+                    ) && V.paths.has(q)) {
                       F = !0;
                       break;
                     }
-                    k = z;
+                    A = q;
                   } else
-                    k = "";
-                  if (k === "")
+                    A = "";
+                  if (A === "")
                     break;
                 }
                 if (F) break;
               }
-            if (!F && j.includes("deps") && A.depsFunction) {
-              const $ = A.depsFunction(T);
-              let k = !1;
-              typeof $ == "boolean" ? $ && (k = !0) : q(A.deps, $) || (A.deps = $, k = !0), k && (F = !0);
+            if (!F && R.includes("deps") && V.depsFunction) {
+              const $ = V.depsFunction(T);
+              let A = !1;
+              typeof $ == "boolean" ? $ && (A = !0) : Y(V.deps, $) || (V.deps = $, A = !0), A && (F = !0);
             }
-            F && A.forceUpdate();
+            F && V.forceUpdate();
           }
         }
       }
       const C = Date.now();
       r = r.map((_, E) => {
-        const M = r.slice(0, -1), W = J(T, M);
+        const U = r.slice(0, -1), W = Z(T, U);
         return E === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (W.length - 1).toString() : _;
       });
       const { oldValue: P, newValue: D } = qt(
         s.updateType,
-        u,
+        d,
         T,
         r
-      ), N = {
+      ), x = {
         timeStamp: C,
         stateKey: h,
         path: r,
@@ -386,26 +386,26 @@ function Jt(t, {
           g.insertShadowArrayElement(h, _, D);
           break;
         case "cut":
-          const E = r.slice(0, -1), M = parseInt(r[r.length - 1]);
-          g.removeShadowArrayElement(h, E, M);
+          const E = r.slice(0, -1), U = parseInt(r[r.length - 1]);
+          g.removeShadowArrayElement(h, E, U);
           break;
       }
       if (Gt(h, (_) => {
-        const M = [..._ ?? [], N].reduce((W, A) => {
-          const F = `${A.stateKey}:${JSON.stringify(A.path)}`, j = W.get(F);
-          return j ? (j.timeStamp = Math.max(j.timeStamp, A.timeStamp), j.newValue = A.newValue, j.oldValue = j.oldValue ?? A.oldValue, j.updateType = A.updateType) : W.set(F, { ...A }), W;
+        const U = [..._ ?? [], x].reduce((W, V) => {
+          const F = `${V.stateKey}:${JSON.stringify(V.path)}`, R = W.get(F);
+          return R ? (R.timeStamp = Math.max(R.timeStamp, V.timeStamp), R.newValue = V.newValue, R.oldValue = R.oldValue ?? V.oldValue, R.updateType = V.updateType) : W.set(F, { ...V }), W;
         }, /* @__PURE__ */ new Map());
-        return Array.from(M.values());
+        return Array.from(U.values());
       }), kt(
         T,
         h,
-        R.current,
-        U
-      ), R.current?.middleware && R.current.middleware({
+        M.current,
+        O
+      ), M.current?.middleware && M.current.middleware({
         updateLog: l,
-        update: N
-      }), R.current?.serverSync) {
-        const _ = g.serverState[h], E = R.current?.serverSync;
+        update: x
+      }), M.current?.serverSync) {
+        const _ = g.serverState[h], E = M.current?.serverSync;
         zt(h, {
           syncKey: typeof E.syncKey == "string" ? E.syncKey : E.syncKey({ state: T }),
           rollBackState: _,
@@ -416,63 +416,63 @@ function Jt(t, {
       return T;
     });
   };
-  o.getState().updaterState[h] || (gt(
+  o.getState().updaterState[h] || (ft(
     h,
-    ft(
+    St(
       h,
       ot,
-      K.current,
-      U
+      tt.current,
+      O
     )
-  ), o.getState().cogsStateStore[h] || et(h, t), o.getState().initialStateGlobal[h] || $t(h, t));
-  const d = It(() => ft(
+  ), o.getState().cogsStateStore[h] || nt(h, t), o.getState().initialStateGlobal[h] || Tt(h, t));
+  const u = pt(() => St(
     h,
     ot,
-    K.current,
-    U
-  ), [h, U]);
-  return [Nt(h), d];
+    tt.current,
+    O
+  ), [h, O]);
+  return [Nt(h), u];
 }
-function ft(t, c, m, f) {
+function St(t, c, m, f) {
   const y = /* @__PURE__ */ new Map();
-  let b = 0;
+  let k = 0;
   const p = (v) => {
     const n = v.join(".");
     for (const [S] of y)
       (S === n || S.startsWith(n + ".")) && y.delete(S);
-    b++;
+    k++;
   }, I = {
     removeValidation: (v) => {
-      v?.validationKey && X(v.validationKey);
+      v?.validationKey && Q(v.validationKey);
     },
     revertToInitialState: (v) => {
       const n = o.getState().getInitialOptions(t)?.validation;
-      n?.key && X(n?.key), v?.validationKey && X(v.validationKey);
+      n?.key && Q(n?.key), v?.validationKey && Q(v.validationKey);
       const S = o.getState().initialStateGlobal[t];
-      o.getState().clearSelectedIndexesForState(t), y.clear(), b++;
-      const G = a(S, []), O = rt(t), U = Q(O?.localStorage?.key) ? O?.localStorage?.key(S) : O?.localStorage?.key, H = `${f}-${t}-${U}`;
-      H && localStorage.removeItem(H), gt(t, G), et(t, S);
+      o.getState().clearSelectedIndexesForState(t), y.clear(), k++;
+      const z = a(S, []), j = rt(t), O = K(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, B = `${f}-${t}-${O}`;
+      B && localStorage.removeItem(B), ft(t, z), nt(t, S);
       const h = o.getState().stateComponents.get(t);
       return h && h.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
     updateInitialState: (v) => {
-      y.clear(), b++;
-      const n = ft(
+      y.clear(), k++;
+      const n = St(
         t,
         c,
         m,
         f
-      ), S = o.getState().initialStateGlobal[t], G = rt(t), O = Q(G?.localStorage?.key) ? G?.localStorage?.key(S) : G?.localStorage?.key, U = `${f}-${t}-${O}`;
-      return localStorage.getItem(U) && localStorage.removeItem(U), Mt(() => {
-        $t(t, v), o.getState().initializeShadowState(t, v), gt(t, n), et(t, v);
-        const H = o.getState().stateComponents.get(t);
-        H && H.components.forEach((h) => {
+      ), S = o.getState().initialStateGlobal[t], z = rt(t), j = K(z?.localStorage?.key) ? z?.localStorage?.key(S) : z?.localStorage?.key, O = `${f}-${t}-${j}`;
+      return localStorage.getItem(O) && localStorage.removeItem(O), Mt(() => {
+        Tt(t, v), o.getState().initializeShadowState(t, v), ft(t, n), nt(t, v);
+        const B = o.getState().stateComponents.get(t);
+        B && B.components.forEach((h) => {
           h.forceUpdate();
         });
       }), {
-        fetchId: (H) => n.get()[H]
+        fetchId: (B) => n.get()[B]
       };
     },
     _initialState: o.getState().initialStateGlobal[t],
@@ -480,27 +480,27 @@ function ft(t, c, m, f) {
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
       const v = o.getState().serverState[t];
-      return !!(v && q(v, Nt(t)));
+      return !!(v && Y(v, Nt(t)));
     }
   };
   function a(v, n = [], S) {
-    const G = n.map(String).join(".");
-    y.get(G);
-    const O = function() {
+    const z = n.map(String).join(".");
+    y.get(z);
+    const j = function() {
       return o().getNestedState(t, n);
     };
     Object.keys(I).forEach((h) => {
-      O[h] = I[h];
+      j[h] = I[h];
     });
-    const U = {
-      apply(h, l, lt) {
+    const O = {
+      apply(h, l, ct) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), o().getNestedState(t, n);
       },
       get(h, l) {
         S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
-        const lt = /* @__PURE__ */ new Set([
+        const ct = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,10 +523,10 @@ function ft(t, c, m, f) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !lt.has(l)) {
-          const d = `${t}////${m}`, e = o.getState().stateComponents.get(t);
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !ct.has(l)) {
+          const u = `${t}////${m}`, e = o.getState().stateComponents.get(t);
           if (e) {
-            const r = e.components.get(d);
+            const r = e.components.get(u);
             if (r && !r.paths.has("")) {
               const s = n.join(".");
               let i = !0;
@@ -540,26 +540,26 @@ function ft(t, c, m, f) {
           }
         }
         if (l === "getDifferences")
-          return () => pt(
+          return () => wt(
             o.getState().cogsStateStore[t],
             o.getState().initialStateGlobal[t]
           );
         if (l === "sync" && n.length === 0)
           return async function() {
-            const d = o.getState().getInitialOptions(t), e = d?.sync;
+            const u = o.getState().getInitialOptions(t), e = u?.sync;
             if (!e)
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
-            const r = o.getState().getNestedState(t, []), s = d?.validation?.key;
+            const r = o.getState().getNestedState(t, []), s = u?.validation?.key;
             try {
               const i = await e.action(r);
               if (i && !i.success && i.errors && s) {
-                o.getState().removeValidationError(s), i.errors.forEach((u) => {
-                  const T = [s, ...u.path].join(".");
-                  o.getState().addValidationError(T, u.message);
+                o.getState().removeValidationError(s), i.errors.forEach((d) => {
+                  const T = [s, ...d.path].join(".");
+                  o.getState().addValidationError(T, d.message);
                 });
                 const g = o.getState().stateComponents.get(t);
-                g && g.components.forEach((u) => {
-                  u.forceUpdate();
+                g && g.components.forEach((d) => {
+                  d.forceUpdate();
                 });
               }
               return i?.success && e.onSuccess ? e.onSuccess(i.data) : !i?.success && e.onError && e.onError(i.error), i;
@@ -568,31 +568,31 @@ function ft(t, c, m, f) {
             }
           };
         if (l === "_status") {
-          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = J(e, n);
-          return q(d, r) ? "fresh" : "stale";
+          const u = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = Z(e, n);
+          return Y(u, r) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
-            const d = o().getNestedState(
+            const u = o().getNestedState(
               t,
               n
-            ), e = o.getState().initialStateGlobal[t], r = J(e, n);
-            return q(d, r) ? "fresh" : "stale";
+            ), e = o.getState().initialStateGlobal[t], r = Z(e, n);
+            return Y(u, r) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = o.getState().initialStateGlobal[t], e = rt(t), r = Q(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${r}`;
+            const u = o.getState().initialStateGlobal[t], e = rt(t), r = K(e?.localStorage?.key) ? e?.localStorage?.key(u) : e?.localStorage?.key, s = `${f}-${t}-${r}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
           return () => {
-            const d = o.getState().getInitialOptions(t)?.validation;
-            if (!d?.key)
+            const u = o.getState().getInitialOptions(t)?.validation;
+            if (!u?.key)
               throw new Error("Validation key not found");
-            return o.getState().getValidationErrors(d.key + "." + n.join("."));
+            return o.getState().getValidationErrors(u.key + "." + n.join("."));
           };
         if (Array.isArray(v)) {
-          const d = () => S?.validIndices ? v.map((r, s) => ({
+          const u = () => S?.validIndices ? v.map((r, s) => ({
             item: r,
             originalIndex: S.validIndices[s]
           })) : o.getState().getNestedState(t, n).map((r, s) => ({
@@ -621,95 +621,118 @@ function ft(t, c, m, f) {
                 itemHeight: r = 50,
                 overscan: s = 5,
                 stickToBottom: i = !1
-              } = e, g = Z(null), [u, T] = tt({
+              } = e, g = X(null), [d, T] = et({
                 startIndex: 0,
                 endIndex: 10
-              }), w = Z(i), [V, x] = tt(0), C = Z(!1), P = Z(0);
-              it(() => {
+              }), w = X(i), [b, N] = et(0), C = X(!1), P = X(0);
+              st(() => {
                 let $ = 0;
                 return o.getState().subscribeToShadowState(t, () => {
                   $++, $ <= 5 && console.log(
                     `[VirtualView] Shadow update #${$}`
-                  ), x((L) => L + 1);
+                  ), N((L) => L + 1);
                 });
               }, [t]);
               const D = o().getNestedState(
                 t,
                 n
-              ), N = D.length;
+              ), x = D.length;
               console.log(
-                `[VirtualView] Initial setup - totalCount: ${N}, itemHeight: ${r}, stickToBottom: ${i}`
-              ), N !== P.current && (console.log(
-                `[VirtualView] Array size changed from ${P.current} to ${N}`
-              ), C.current = !1, P.current = N);
-              const { totalHeight: _, positions: E, allMeasured: M } = It(() => {
+                `[VirtualView] Initial setup - totalCount: ${x}, itemHeight: ${r}, stickToBottom: ${i}`
+              ), x !== P.current && (console.log(
+                `[VirtualView] Array size changed from ${P.current} to ${x}`
+              ), C.current = !1, P.current = x);
+              const { totalHeight: _, positions: E, visibleMeasured: U } = pt(() => {
                 const $ = o.getState().getShadowMetadata(t, n) || [];
-                let k = 0;
+                let A = 0;
                 const L = [];
-                let z = 0;
-                for (let B = 0; B < N; B++) {
-                  L[B] = k;
-                  const at = $[B]?.virtualizer?.itemHeight;
-                  at && z++, k += at || r;
+                let q = 0, J = 0;
+                for (let H = 0; H < x; H++) {
+                  L[H] = A;
+                  const dt = $[H]?.virtualizer?.itemHeight;
+                  dt && (q++, H >= d.startIndex && H < d.endIndex && J++), A += dt || r;
                 }
-                const Y = z === N && N > 0;
+                const G = d.endIndex - d.startIndex, lt = J === G && G > 0;
                 return console.log(
-                  `[VirtualView] Heights calc - measured: ${z}/${N}, allMeasured: ${Y}, totalHeight: ${k}`
-                ), { totalHeight: k, positions: L, allMeasured: Y };
+                  `[VirtualView] Heights calc - measured: ${q}/${x}, visible measured: ${J}/${G}, totalHeight: ${A}`
+                ), {
+                  totalHeight: A,
+                  positions: L,
+                  visibleMeasured: lt
+                };
               }, [
-                N,
+                x,
                 t,
                 n.join("."),
                 r,
-                V
-              ]), W = It(() => {
-                const $ = Math.max(0, u.startIndex), k = Math.min(N, u.endIndex);
+                b,
+                d
+                // Add range dependency
+              ]), W = pt(() => {
+                const $ = Math.max(0, d.startIndex), A = Math.min(x, d.endIndex);
                 console.log(
-                  `[VirtualView] Creating virtual slice - range: ${$}-${k} (${k - $} items)`
+                  `[VirtualView] Creating virtual slice - range: ${$}-${A} (${A - $} items)`
                 );
                 const L = Array.from(
-                  { length: k - $ },
-                  (Y, B) => $ + B
-                ), z = L.map((Y) => D[Y]);
-                return a(z, n, {
+                  { length: A - $ },
+                  (J, G) => $ + G
+                ), q = L.map((J) => D[J]);
+                return a(q, n, {
                   ...S,
                   validIndices: L
                 });
-              }, [u.startIndex, u.endIndex, D, N]);
-              ut(() => {
+              }, [d.startIndex, d.endIndex, D, x]);
+              gt(() => {
                 const $ = g.current;
                 if (!$) return;
-                const k = () => {
+                const A = () => {
                   if (!$) return;
-                  const { scrollTop: z } = $;
-                  let Y = 0, B = N - 1;
-                  for (; Y <= B; ) {
-                    const ht = Math.floor((Y + B) / 2);
-                    E[ht] < z ? Y = ht + 1 : B = ht - 1;
+                  const { scrollTop: q } = $;
+                  let J = 0, G = x - 1;
+                  for (; J <= G; ) {
+                    const vt = Math.floor((J + G) / 2);
+                    E[vt] < q ? J = vt + 1 : G = vt - 1;
                   }
-                  const at = Math.max(0, B - s);
-                  let nt = at;
-                  const Pt = z + $.clientHeight;
-                  for (; nt < N && E[nt] < Pt; )
-                    nt++;
-                  nt = Math.min(N, nt + s), T({ startIndex: at, endIndex: nt });
+                  const lt = Math.max(0, G - s);
+                  let H = lt;
+                  const dt = q + $.clientHeight;
+                  for (; H < x && E[H] < dt; )
+                    H++;
+                  H = Math.min(x, H + s), T({ startIndex: lt, endIndex: H });
                 }, L = () => {
-                  w.current = $.scrollHeight - $.scrollTop - $.clientHeight < 1, k();
+                  w.current = $.scrollHeight - $.scrollTop - $.clientHeight < 1, A();
                 };
-                return $.addEventListener("scroll", L, {
+                if ($.addEventListener("scroll", L, {
                   passive: !0
-                }), i && !C.current && N > 0 && (M ? (console.log(
-                  "[VirtualView] All items measured, scrolling to bottom"
-                ), C.current = !0, $.scrollTo({
-                  top: $.scrollHeight,
-                  behavior: "auto"
-                })) : console.log(
-                  "[VirtualView] Waiting for all measurements before scroll"
-                )), k(), () => {
+                }), i && !C.current && x > 0)
+                  if (d.endIndex >= x - 5)
+                    console.log(
+                      "[VirtualView] At end of list, scrolling to bottom"
+                    ), C.current = !0, setTimeout(() => {
+                      const G = $.scrollHeight + 1e3;
+                      $.scrollTo({
+                        top: G,
+                        behavior: "auto"
+                      }), w.current = !0;
+                    }, 50);
+                  else {
+                    console.log(
+                      "[VirtualView] Jumping near bottom to trigger measurements"
+                    );
+                    const G = Math.max(
+                      0,
+                      (x - 20) * r
+                    );
+                    $.scrollTo({
+                      top: G,
+                      behavior: "auto"
+                    });
+                  }
+                return A(), () => {
                   $.removeEventListener("scroll", L);
                 };
-              }, [N, E, i, M]);
-              const A = Tt(
+              }, [x, E, i]);
+              const V = Et(
                 ($ = "smooth") => {
                   g.current && (w.current = !0, g.current.scrollTo({
                     top: g.current.scrollHeight,
@@ -717,15 +740,15 @@ function ft(t, c, m, f) {
                   }));
                 },
                 []
-              ), F = Tt(
-                ($, k = "smooth") => {
+              ), F = Et(
+                ($, A = "smooth") => {
                   g.current && E[$] !== void 0 && (w.current = !1, g.current.scrollTo({
                     top: E[$],
-                    behavior: k
+                    behavior: A
                   }));
                 },
                 [E]
-              ), j = {
+              ), R = {
                 outer: {
                   ref: g,
                   style: { overflowY: "auto", height: "100%" }
@@ -738,37 +761,37 @@ function ft(t, c, m, f) {
                 },
                 list: {
                   style: {
-                    transform: `translateY(${E[u.startIndex] || 0}px)`
+                    transform: `translateY(${E[d.startIndex] || 0}px)`
                   }
                 }
               };
               return {
                 virtualState: W,
-                virtualizerProps: j,
-                scrollToBottom: A,
+                virtualizerProps: R,
+                scrollToBottom: V,
                 scrollToIndex: F
               };
             };
           if (l === "stateSort")
             return (e) => {
-              const s = [...d()].sort(
-                (u, T) => e(u.item, T.item)
-              ), i = s.map(({ item: u }) => u), g = {
+              const s = [...u()].sort(
+                (d, T) => e(d.item, T.item)
+              ), i = s.map(({ item: d }) => d), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: u }) => u
+                  ({ originalIndex: d }) => d
                 )
               };
               return a(i, n, g);
             };
           if (l === "stateFilter")
             return (e) => {
-              const s = d().filter(
-                ({ item: u }, T) => e(u, T)
-              ), i = s.map(({ item: u }) => u), g = {
+              const s = u().filter(
+                ({ item: d }, T) => e(d, T)
+              ), i = s.map(({ item: d }) => d), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: u }) => u
+                  ({ originalIndex: d }) => d
                 )
               };
               return a(i, n, g);
@@ -777,20 +800,20 @@ function ft(t, c, m, f) {
             return (e) => {
               const r = o.getState().getNestedState(t, n);
               return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, g) => g)).map((i, g) => {
-                const u = r[i], T = [...n, i.toString()], w = a(u, T, S);
-                return e(u, w, {
+                const d = r[i], T = [...n, i.toString()], w = a(d, T, S);
+                return e(d, w, {
                   register: () => {
-                    const [, x] = tt({}), C = `${m}-${n.join(".")}-${i}`;
-                    ut(() => {
+                    const [, N] = et({}), C = `${m}-${n.join(".")}-${i}`;
+                    gt(() => {
                       const P = `${t}////${C}`, D = o.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
                       return D.components.set(P, {
-                        forceUpdate: () => x({}),
+                        forceUpdate: () => N({}),
                         paths: /* @__PURE__ */ new Set([T.join(".")])
                       }), o.getState().stateComponents.set(t, D), () => {
-                        const N = o.getState().stateComponents.get(t);
-                        N && N.components.delete(P);
+                        const x = o.getState().stateComponents.get(t);
+                        x && x.components.delete(P);
                       };
                     }, [t, C]);
                   },
@@ -806,7 +829,7 @@ function ft(t, c, m, f) {
             return (e) => v.map((s, i) => {
               let g;
               S?.validIndices && S.validIndices[i] !== void 0 ? g = S.validIndices[i] : g = i;
-              const u = [...n, g.toString()], T = a(s, u, S);
+              const d = [...n, g.toString()], T = a(s, d, S);
               return e(
                 s,
                 T,
@@ -816,7 +839,7 @@ function ft(t, c, m, f) {
               );
             });
           if (l === "$stateMap")
-            return (e) => ct(Yt, {
+            return (e) => it(Yt, {
               proxy: {
                 _stateKey: t,
                 _path: n,
@@ -829,14 +852,14 @@ function ft(t, c, m, f) {
             return (e) => {
               const r = o.getState().getNestedState(t, n);
               return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, g) => g)).map((i, g) => {
-                const u = r[i], T = [...n, i.toString()], w = a(u, T, S), V = `${m}-${n.join(".")}-${i}`;
-                return ct(Xt, {
+                const d = r[i], T = [...n, i.toString()], w = a(d, T, S), b = `${m}-${n.join(".")}-${i}`;
+                return it(Xt, {
                   key: i,
                   stateKey: t,
-                  itemComponentId: V,
+                  itemComponentId: b,
                   itemPath: T,
                   children: e(
-                    u,
+                    d,
                     w,
                     g,
                     r,
@@ -850,7 +873,7 @@ function ft(t, c, m, f) {
           if (l === "stateFlattenOn")
             return (e) => {
               const r = v;
-              y.clear(), b++;
+              y.clear(), k++;
               const s = r.flatMap(
                 (i) => i[e] ?? []
               );
@@ -873,36 +896,36 @@ function ft(t, c, m, f) {
               return a(s, i);
             };
           if (l === "insert")
-            return (e) => (p(n), vt(c, e, n, t), a(
+            return (e) => (p(n), yt(c, e, n, t), a(
               o.getState().getNestedState(t, n),
               n
             ));
           if (l === "uniqueInsert")
             return (e, r, s) => {
-              const i = o.getState().getNestedState(t, n), g = Q(e) ? e(i) : e;
-              let u = null;
+              const i = o.getState().getNestedState(t, n), g = K(e) ? e(i) : e;
+              let d = null;
               if (!i.some((w) => {
                 if (r) {
-                  const x = r.every(
-                    (C) => q(w[C], g[C])
+                  const N = r.every(
+                    (C) => Y(w[C], g[C])
                   );
-                  return x && (u = w), x;
+                  return N && (d = w), N;
                 }
-                const V = q(w, g);
-                return V && (u = w), V;
+                const b = Y(w, g);
+                return b && (d = w), b;
               }))
-                p(n), vt(c, g, n, t);
-              else if (s && u) {
-                const w = s(u), V = i.map(
-                  (x) => q(x, u) ? w : x
+                p(n), yt(c, g, n, t);
+              else if (s && d) {
+                const w = s(d), b = i.map(
+                  (N) => Y(N, d) ? w : N
                 );
-                p(n), st(c, V, n);
+                p(n), at(c, b, n);
               }
             };
           if (l === "cut")
             return (e, r) => {
               if (!r?.waitForSync)
-                return p(n), dt(c, n, t, e), a(
+                return p(n), ut(c, n, t, e), a(
                   o.getState().getNestedState(t, n),
                   n
                 );
@@ -910,17 +933,17 @@ function ft(t, c, m, f) {
           if (l === "cutByValue")
             return (e) => {
               for (let r = 0; r < v.length; r++)
-                v[r] === e && dt(c, n, t, r);
+                v[r] === e && ut(c, n, t, r);
             };
           if (l === "toggleByValue")
             return (e) => {
               const r = v.findIndex((s) => s === e);
-              r > -1 ? dt(c, n, t, r) : vt(c, e, n, t);
+              r > -1 ? ut(c, n, t, r) : yt(c, e, n, t);
             };
           if (l === "stateFind")
             return (e) => {
-              const s = d().find(
-                ({ item: g }, u) => e(g, u)
+              const s = u().find(
+                ({ item: g }, d) => e(g, d)
               );
               if (!s) return;
               const i = [...n, s.originalIndex.toString()];
@@ -928,77 +951,77 @@ function ft(t, c, m, f) {
             };
           if (l === "findWith")
             return (e, r) => {
-              const i = d().find(
-                ({ item: u }) => u[e] === r
+              const i = u().find(
+                ({ item: d }) => d[e] === r
               );
               if (!i) return;
               const g = [...n, i.originalIndex.toString()];
               return a(i.item, g, S);
             };
         }
-        const K = n[n.length - 1];
-        if (!isNaN(Number(K))) {
-          const d = n.slice(0, -1), e = o.getState().getNestedState(t, d);
+        const tt = n[n.length - 1];
+        if (!isNaN(Number(tt))) {
+          const u = n.slice(0, -1), e = o.getState().getNestedState(t, u);
           if (Array.isArray(e) && l === "cut")
-            return () => dt(
+            return () => ut(
               c,
-              d,
+              u,
               t,
-              Number(K)
+              Number(tt)
             );
         }
         if (l === "get")
           return () => {
             if (S?.validIndices && Array.isArray(v)) {
-              const d = o.getState().getNestedState(t, n);
-              return S.validIndices.map((e) => d[e]);
+              const u = o.getState().getNestedState(t, n);
+              return S.validIndices.map((e) => u[e]);
             }
             return o.getState().getNestedState(t, n);
           };
         if (l === "$derive")
-          return (d) => bt({
+          return (u) => Ct({
             _stateKey: t,
             _path: n,
-            _effect: d.toString()
+            _effect: u.toString()
           });
         if (l === "$get")
-          return () => bt({
+          return () => Ct({
             _stateKey: t,
             _path: n
           });
         if (l === "lastSynced") {
-          const d = `${t}:${n.join(".")}`;
-          return o.getState().getSyncInfo(d);
+          const u = `${t}:${n.join(".")}`;
+          return o.getState().getSyncInfo(u);
         }
         if (l == "getLocalStorage")
-          return (d) => St(f + "-" + t + "-" + d);
+          return (u) => mt(f + "-" + t + "-" + u);
         if (l === "_selected") {
-          const d = n.slice(0, -1), e = d.join("."), r = o.getState().getNestedState(t, d);
+          const u = n.slice(0, -1), e = u.join("."), r = o.getState().getNestedState(t, u);
           return Array.isArray(r) ? Number(n[n.length - 1]) === o.getState().getSelectedIndex(t, e) : void 0;
         }
         if (l === "setSelected")
-          return (d) => {
+          return (u) => {
             const e = n.slice(0, -1), r = Number(n[n.length - 1]), s = e.join(".");
-            d ? o.getState().setSelectedIndex(t, s, r) : o.getState().setSelectedIndex(t, s, void 0);
+            u ? o.getState().setSelectedIndex(t, s, r) : o.getState().setSelectedIndex(t, s, void 0);
             const i = o.getState().getNestedState(t, [...e]);
-            st(c, i, e), p(e);
+            at(c, i, e), p(e);
           };
         if (l === "toggleSelected")
           return () => {
-            const d = n.slice(0, -1), e = Number(n[n.length - 1]), r = d.join("."), s = o.getState().getSelectedIndex(t, r);
+            const u = n.slice(0, -1), e = Number(n[n.length - 1]), r = u.join("."), s = o.getState().getSelectedIndex(t, r);
             o.getState().setSelectedIndex(
               t,
               r,
               s === e ? void 0 : e
             );
-            const i = o.getState().getNestedState(t, [...d]);
-            st(c, i, d), p(d);
+            const i = o.getState().getNestedState(t, [...u]);
+            at(c, i, u), p(u);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
-            return (d) => {
-              const e = o.getState().cogsStateStore[t], s = Dt(e, d).newDocument;
-              xt(
+            return (u) => {
+              const e = o.getState().cogsStateStore[t], s = Dt(e, u).newDocument;
+              Pt(
                 t,
                 o.getState().initialStateGlobal[t],
                 s,
@@ -1008,35 +1031,35 @@ function ft(t, c, m, f) {
               );
               const i = o.getState().stateComponents.get(t);
               if (i) {
-                const g = pt(e, s), u = new Set(g);
+                const g = wt(e, s), d = new Set(g);
                 for (const [
                   T,
                   w
                 ] of i.components.entries()) {
-                  let V = !1;
-                  const x = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
-                  if (!x.includes("none")) {
-                    if (x.includes("all")) {
+                  let b = !1;
+                  const N = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
+                  if (!N.includes("none")) {
+                    if (N.includes("all")) {
                       w.forceUpdate();
                       continue;
                     }
-                    if (x.includes("component") && (w.paths.has("") && (V = !0), !V))
-                      for (const C of u) {
+                    if (N.includes("component") && (w.paths.has("") && (b = !0), !b))
+                      for (const C of d) {
                         if (w.paths.has(C)) {
-                          V = !0;
+                          b = !0;
                           break;
                         }
                         let P = C.lastIndexOf(".");
                         for (; P !== -1; ) {
                           const D = C.substring(0, P);
                           if (w.paths.has(D)) {
-                            V = !0;
+                            b = !0;
                             break;
                           }
-                          const N = C.substring(
+                          const x = C.substring(
                             P + 1
                           );
-                          if (!isNaN(Number(N))) {
+                          if (!isNaN(Number(x))) {
                             const _ = D.lastIndexOf(".");
                             if (_ !== -1) {
                               const E = D.substring(
@@ -1044,44 +1067,44 @@ function ft(t, c, m, f) {
                                 _
                               );
                               if (w.paths.has(E)) {
-                                V = !0;
+                                b = !0;
                                 break;
                               }
                             }
                           }
                           P = D.lastIndexOf(".");
                         }
-                        if (V) break;
+                        if (b) break;
                       }
-                    if (!V && x.includes("deps") && w.depsFunction) {
+                    if (!b && N.includes("deps") && w.depsFunction) {
                       const C = w.depsFunction(s);
                       let P = !1;
-                      typeof C == "boolean" ? C && (P = !0) : q(w.deps, C) || (w.deps = C, P = !0), P && (V = !0);
+                      typeof C == "boolean" ? C && (P = !0) : Y(w.deps, C) || (w.deps = C, P = !0), P && (b = !0);
                     }
-                    V && w.forceUpdate();
+                    b && w.forceUpdate();
                   }
                 }
               }
             };
           if (l === "validateZodSchema")
             return () => {
-              const d = o.getState().getInitialOptions(t)?.validation, e = o.getState().addValidationError;
-              if (!d?.zodSchema)
+              const u = o.getState().getInitialOptions(t)?.validation, e = o.getState().addValidationError;
+              if (!u?.zodSchema)
                 throw new Error("Zod schema not found");
-              if (!d?.key)
+              if (!u?.key)
                 throw new Error("Validation key not found");
-              X(d.key);
+              Q(u.key);
               const r = o.getState().cogsStateStore[t];
               try {
-                const s = o.getState().getValidationErrors(d.key);
+                const s = o.getState().getValidationErrors(u.key);
                 s && s.length > 0 && s.forEach(([g]) => {
-                  g && g.startsWith(d.key) && X(g);
+                  g && g.startsWith(u.key) && Q(g);
                 });
-                const i = d.zodSchema.safeParse(r);
-                return i.success ? !0 : (i.error.errors.forEach((u) => {
-                  const T = u.path, w = u.message, V = [d.key, ...T].join(".");
-                  e(V, w);
-                }), mt(t), !1);
+                const i = u.zodSchema.safeParse(r);
+                return i.success ? !0 : (i.error.errors.forEach((d) => {
+                  const T = d.path, w = d.message, b = [u.key, ...T].join(".");
+                  e(b, w);
+                }), ht(t), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
@@ -1090,7 +1113,7 @@ function ft(t, c, m, f) {
           if (l === "getComponents")
             return () => o().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => Et.getState().getFormRefsByStateKey(t);
+            return () => Vt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return o.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1103,12 +1126,12 @@ function ft(t, c, m, f) {
           if (l === "removeValidation") return I.removeValidation;
         }
         if (l === "getFormRef")
-          return () => Et.getState().getFormRef(t + "." + n.join("."));
+          return () => Vt.getState().getFormRef(t + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
-            children: d,
+            children: u,
             hideMessage: e
-          }) => /* @__PURE__ */ yt(
+          }) => /* @__PURE__ */ It(
             Ot,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
@@ -1116,53 +1139,53 @@ function ft(t, c, m, f) {
               validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
               validIndices: S?.validIndices,
-              children: d
+              children: u
             }
           );
         if (l === "_stateKey") return t;
         if (l === "_path") return n;
         if (l === "_isServerSynced") return I._isServerSynced;
         if (l === "update")
-          return (d, e) => {
+          return (u, e) => {
             if (e?.debounce)
               jt(() => {
-                st(c, d, n, "");
+                at(c, u, n, "");
                 const r = o.getState().getNestedState(t, n);
                 e?.afterUpdate && e.afterUpdate(r);
               }, e.debounce);
             else {
-              st(c, d, n, "");
+              at(c, u, n, "");
               const r = o.getState().getNestedState(t, n);
               e?.afterUpdate && e.afterUpdate(r);
             }
             p(n);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ yt(
+          return (u, e) => /* @__PURE__ */ It(
             Ut,
             {
               setState: c,
               stateKey: t,
               path: n,
-              child: d,
+              child: u,
               formOpts: e
             }
           );
-        const R = [...n, l], ot = o.getState().getNestedState(t, R);
-        return a(ot, R, S);
+        const M = [...n, l], ot = o.getState().getNestedState(t, M);
+        return a(ot, M, S);
       }
-    }, H = new Proxy(O, U);
-    return y.set(G, {
-      proxy: H,
-      stateVersion: b
-    }), H;
+    }, B = new Proxy(j, O);
+    return y.set(z, {
+      proxy: B,
+      stateVersion: k
+    }), B;
   }
   return a(
     o.getState().getNestedState(t, [])
   );
 }
-function bt(t) {
-  return ct(Zt, { proxy: t });
+function Ct(t) {
+  return it(Zt, { proxy: t });
 }
 function Yt({
   proxy: t,
@@ -1173,14 +1196,14 @@ function Yt({
     m,
     t._path
   ).stateMapNoRender(
-    (y, b, p, I, a) => t._mapFn(y, b, p, I, a)
+    (y, k, p, I, a) => t._mapFn(y, k, p, I, a)
   ) : null;
 }
 function Zt({
   proxy: t
 }) {
-  const c = Z(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return it(() => {
+  const c = X(null), m = `${t._stateKey}-${t._path.join(".")}`;
+  return st(() => {
     const f = c.current;
     if (!f || !f.parentElement) return;
     const y = f.parentElement, p = Array.from(y.childNodes).indexOf(f);
@@ -1201,15 +1224,15 @@ function Zt({
           "state",
           `return (${t._effect})(state)`
         )(n);
-      } catch (O) {
-        console.error("Error evaluating effect function during mount:", O), S = n;
+      } catch (j) {
+        console.error("Error evaluating effect function during mount:", j), S = n;
       }
     else
       S = n;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const G = document.createTextNode(String(S));
-    f.replaceWith(G);
-  }, [t._stateKey, t._path.join("."), t._effect]), ct("span", {
+    const z = document.createTextNode(String(S));
+    f.replaceWith(z);
+  }, [t._stateKey, t._path.join("."), t._effect]), it("span", {
     ref: c,
     style: { display: "none" },
     "data-signal-id": m
@@ -1228,7 +1251,7 @@ function ge(t) {
     },
     () => o.getState().getNestedState(t._stateKey, t._path)
   );
-  return ct("text", {}, String(c));
+  return it("text", {}, String(c));
 }
 function Xt({
   stateKey: t,
@@ -1236,14 +1259,14 @@ function Xt({
   itemPath: m,
   children: f
 }) {
-  const [, y] = tt({}), [b, p] = Wt(), I = Z(null);
-  return it(() => {
+  const [, y] = et({}), [k, p] = Wt(), I = X(null);
+  return st(() => {
     p.height > 0 && p.height !== I.current && (I.current = p.height, o.getState().setShadowMetadata(t, m, {
       virtualizer: {
         itemHeight: p.height
       }
     }));
-  }, [p.height, t, m]), ut(() => {
+  }, [p.height, t, m]), gt(() => {
     const a = `${t}////${c}`, v = o.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
@@ -1254,10 +1277,10 @@ function Xt({
       const n = o.getState().stateComponents.get(t);
       n && n.components.delete(a);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ yt("div", { ref: b, children: f });
+  }, [t, c, m.join(".")]), /* @__PURE__ */ It("div", { ref: k, children: f });
 }
 export {
-  bt as $cogsSignal,
+  Ct as $cogsSignal,
   ge as $cogsSignalStore,
   le as addStateOptions,
   de as createCogsState,