cogsbox-state 0.5.316 → 0.5.317

package/dist/CogsState.jsx

@@ -1,41 +1,41 @@
 "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 Ft from "superjson";
-import { v4 as wt } from "uuid";
+import { jsx as Ie } from "react/jsx-runtime";
+import { useState as te, useRef as X, useEffect as se, useLayoutEffect as ge, useMemo as pe, createElement as ie, useSyncExternalStore as _e, startTransition as Me, useCallback as Ee } from "react";
+import { transformStateFunc as Re, isDeepEqual as Y, isFunction as K, getNestedValue as Z, getDifferences as we, debounce as je } from "./utility.js";
+import { pushFunc as ye, updateFn as ae, cutFunc as ue, ValidationWrapper as Oe, FormControlComponent as Ue } from "./Functions.jsx";
+import Fe from "superjson";
+import { v4 as $e } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as Et } from "./store.js";
-import { useCogsConfig as Ct } from "./CogsStateClient.jsx";
-import { applyPatch as Dt } from "fast-json-patch";
-import Wt from "react-use-measure";
-function At(t, c) {
-  const m = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, y = m(t) || {};
-  f(t, {
+import { getGlobalStore as o, formRefStore as Ve } from "./store.js";
+import { useCogsConfig as xe } from "./CogsStateClient.jsx";
+import { applyPatch as De } from "fast-json-patch";
+import We from "react-use-measure";
+function be(e, c) {
+  const m = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, y = m(e) || {};
+  f(e, {
     ...y,
     ...c
   });
 }
-function Vt({
-  stateKey: t,
+function Ae({
+  stateKey: e,
   options: c,
   initialOptionsPart: m
 }) {
-  const f = rt(t) || {}, y = m[t] || {}, b = o.getState().setInitialStateOptions, p = { ...y, ...f };
+  const f = re(e) || {}, y = m[e] || {}, 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(e, p);
 }
-function le(t, { formElements: c, validation: m }) {
-  return { initialState: t, formElements: c, validation: m };
+function lt(e, { formElements: c, validation: m }) {
+  return { initialState: e, formElements: c, validation: m };
 }
-const de = (t, c) => {
-  let m = t;
-  const [f, y] = Rt(m);
+const dt = (e, c) => {
+  let m = e;
+  const [f, y] = Re(m);
   (Object.keys(y).length > 0 || c && Object.keys(c).length > 0) && Object.keys(y).forEach((I) => {
     y[I] = y[I] || {}, y[I].formElements = {
       ...c?.formElements,
@@ -43,16 +43,16 @@ const de = (t, c) => {
       ...c?.validation,
       ...y[I].formElements || {}
       // State-specific overrides
-    }, rt(I) || o.getState().setInitialStateOptions(I, y[I]);
+    }, re(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] = te(a?.componentId ?? $e());
+    Ae({
       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, [H, O] = Je(
       S,
       {
         stateKey: I,
@@ -71,77 +71,77 @@ const de = (t, c) => {
     return O;
   };
   function p(I, a) {
-    Vt({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Bt(I, a), mt(I);
+    Ae({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Be(I, a), he(I);
   }
-  return { useCogsState: b, setCogsOptions: p };
+  return { useCogsState: k, setCogsOptions: p };
 }, {
-  setUpdaterState: gt,
-  setState: et,
-  getInitialOptions: rt,
-  getKeyState: Nt,
-  getValidationErrors: Lt,
-  setStateLog: Gt,
-  updateInitialStateGlobal: $t,
-  addValidationError: Ht,
-  removeValidationError: X,
-  setServerSyncActions: zt
-} = o.getState(), kt = (t, c, m, f, y) => {
+  setUpdaterState: fe,
+  setState: ne,
+  getInitialOptions: re,
+  getKeyState: Ne,
+  getValidationErrors: Le,
+  setStateLog: Ge,
+  updateInitialStateGlobal: Te,
+  addValidationError: He,
+  removeValidationError: Q,
+  setServerSyncActions: ze
+} = o.getState(), ke = (e, c, m, f, y) => {
   m?.log && console.log(
     "saving to localstorage",
     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(e) : m?.localStorage?.key;
+  if (k && f) {
+    const p = `${f}-${c}-${k}`;
     let I;
     try {
-      I = St(p)?.lastSyncedWithServer;
+      I = me(p)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
-      state: t,
+      state: e,
       lastUpdated: Date.now(),
       lastSyncedWithServer: y ?? I
-    }, v = Ft.serialize(a);
+    }, v = Fe.serialize(a);
     window.localStorage.setItem(
       p,
       JSON.stringify(v.json)
     );
   }
-}, St = (t) => {
-  if (!t) return null;
+}, me = (e) => {
+  if (!e) return null;
   try {
-    const c = window.localStorage.getItem(t);
+    const c = window.localStorage.getItem(e);
     return c ? JSON.parse(c) : null;
   } catch (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;
+}, Be = (e, c) => {
+  const m = o.getState().cogsStateStore[e], { sessionId: f } = xe(), y = K(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
   if (y && f) {
-    const b = St(
-      `${f}-${t}-${y}`
+    const k = me(
+      `${f}-${e}-${y}`
     );
-    if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
-      return et(t, b.state), mt(t), !0;
+    if (k && k.lastUpdated > (k.lastSyncedWithServer || 0))
+      return ne(e, k.state), he(e), !0;
   }
   return !1;
-}, xt = (t, c, m, f, y, b) => {
+}, Pe = (e, c, m, f, y, k) => {
   const p = {
     initialState: c,
-    updaterState: ft(
-      t,
+    updaterState: Se(
+      e,
       f,
       y,
-      b
+      k
     ),
     state: m
   };
-  $t(t, p.initialState), gt(t, p.updaterState), et(t, p.state);
-}, mt = (t) => {
-  const c = o.getState().stateComponents.get(t);
+  Te(e, p.initialState), fe(e, p.updaterState), ne(e, p.state);
+}, he = (e) => {
+  const c = o.getState().stateComponents.get(e);
   if (!c) return;
   const m = /* @__PURE__ */ new Set();
   c.components.forEach((f) => {
@@ -149,30 +149,30 @@ const de = (t, c) => {
   }), queueMicrotask(() => {
     m.forEach((f) => f());
   });
-}, ue = (t, c) => {
-  const m = o.getState().stateComponents.get(t);
+}, ut = (e, c) => {
+  const m = o.getState().stateComponents.get(e);
   if (m) {
-    const f = `${t}////${c}`, y = m.components.get(f);
+    const f = `${e}////${c}`, y = m.components.get(f);
     if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
       return;
     y && y.forceUpdate();
   }
-}, qt = (t, c, m, f) => {
-  switch (t) {
+}, qe = (e, c, m, f) => {
+  switch (e) {
     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
       };
@@ -180,12 +180,12 @@ const de = (t, c) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Jt(t, {
+function Je(e, {
   stateKey: c,
   serverSync: m,
   localStorage: f,
   formElements: y,
-  reactiveDeps: b,
+  reactiveDeps: k,
   reactiveType: p,
   componentId: I,
   initialState: a,
@@ -193,183 +193,183 @@ 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 [H, O] = te({}), { sessionId: U } = xe();
+  let z = !c;
+  const [h] = te(c ?? $e()), d = o.getState().stateLog[h], ce = X(/* @__PURE__ */ new Set()), ee = X(I ?? $e()), R = X(
     null
   );
-  R.current = rt(h) ?? null, it(() => {
+  R.current = re(h) ?? null, se(() => {
     if (v && v.stateKey === h && v.path?.[0]) {
-      et(h, (r) => ({
+      ne(h, (r) => ({
         ...r,
         [v.path[0]]: v.newValue
       }));
-      const e = `${v.stateKey}:${v.path.join(".")}`;
-      o.getState().setSyncInfo(e, {
+      const t = `${v.stateKey}:${v.path.join(".")}`;
+      o.getState().setSyncInfo(t, {
         timeStamp: v.timeStamp,
         userId: v.userId
       });
     }
-  }, [v]), it(() => {
+  }, [v]), se(() => {
     if (a) {
-      At(h, {
+      be(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 t = R.current, s = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.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 l = null;
+      const T = K(t?.localStorage?.key) ? t?.localStorage?.key(a) : t?.localStorage?.key;
+      T && U && (l = me(`${U}-${h}-${T}`));
+      let w = a, b = !1;
+      const N = s ? Date.now() : 0, x = l?.lastUpdated || 0, P = l?.lastSyncedWithServer || 0;
+      s && N > x ? (w = t.serverState.data, b = !0) : l && x > P && (w = l.state, t?.localStorage?.onChange && t?.localStorage?.onChange(w)), o.getState().initializeShadowState(h, a), Pe(
         h,
         a,
         w,
-        ot,
-        K.current,
+        oe,
+        ee.current,
         U
-      ), V && T && U && kt(w, h, e, U, Date.now()), mt(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || O({});
+      ), b && T && U && ke(w, h, t, U, Date.now()), he(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || O({});
     }
   }, [
     a,
     S?.status,
     S?.data,
     ...n || []
-  ]), ut(() => {
-    H && At(h, {
+  ]), ge(() => {
+    z && be(h, {
       serverSync: m,
       formElements: y,
       initialState: a,
       localStorage: f,
       middleware: R.current?.middleware
     });
-    const e = `${h}////${K.current}`, r = o.getState().stateComponents.get(h) || {
+    const t = `${h}////${ee.current}`, r = o.getState().stateComponents.get(h) || {
       components: /* @__PURE__ */ new Map()
     };
-    return r.components.set(e, {
+    return r.components.set(t, {
       forceUpdate: () => O({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: b || void 0,
+      depsFunction: k || void 0,
       reactiveType: p ?? ["component", "deps"]
     }), o.getState().stateComponents.set(h, r), O({}), () => {
-      r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(h));
+      r && (r.components.delete(t), r.components.size === 0 && o.getState().stateComponents.delete(h));
     };
   }, []);
-  const ot = (e, r, s, i) => {
+  const oe = (t, r, s, i) => {
     if (Array.isArray(r)) {
-      const u = `${h}-${r.join(".")}`;
-      lt.current.add(u);
+      const l = `${h}-${r.join(".")}`;
+      ce.current.add(l);
     }
     const g = o.getState();
-    et(h, (u) => {
-      const T = Q(e) ? e(u) : e, w = `${h}-${r.join(".")}`;
+    ne(h, (l) => {
+      const T = K(t) ? t(l) : t, w = `${h}-${r.join(".")}`;
       if (w) {
-        let _ = !1, E = g.signalDomElements.get(w);
+        let M = !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 _ = r.slice(0, -1), W = Z(T, _);
           if (Array.isArray(W)) {
-            _ = !0;
-            const A = `${h}-${M.join(".")}`;
-            E = g.signalDomElements.get(A);
+            M = !0;
+            const V = `${h}-${_.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 _ = M ? Z(T, r.slice(0, -1)) : Z(T, r);
+          E.forEach(({ parentId: W, position: V, effect: F }) => {
             const j = 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 ($[V]) {
+                const A = F ? new Function("state", `return (${F})(state)`)(_) : _;
+                $[V].textContent = String(A);
               }
             }
           });
         }
       }
-      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (i || R.current?.validation?.key) && r && X(
+      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (i || R.current?.validation?.key) && r && Q(
         (i || R.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" && R.current?.validation?.key && Q(
+        R.current?.validation?.key + "." + b.join(".")
+      ), s.updateType === "insert" && R.current?.validation?.key && Le(
+        R.current?.validation?.key + "." + b.join(".")
+      ).filter(([E, _]) => {
         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), He(V, _);
         }
       });
-      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 M = we(l, T), E = new Set(M), _ = 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")) {
+          const j = Array.isArray(V.reactiveType) ? V.reactiveType : [V.reactiveType || "component"];
+          if (console.log("component", V), !j.includes("none")) {
             if (j.includes("all")) {
-              A.forceUpdate();
+              V.forceUpdate();
               continue;
             }
-            if (j.includes("component") && ((A.paths.has(M) || A.paths.has("")) && (F = !0), !F))
+            if (j.includes("component") && ((V.paths.has(_) || 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 B = A.substring(
                       0,
                       L
                     );
                     if (!isNaN(
-                      Number(k.substring(L + 1))
-                    ) && A.paths.has(z)) {
+                      Number(A.substring(L + 1))
+                    ) && V.paths.has(B)) {
                       F = !0;
                       break;
                     }
-                    k = z;
+                    A = B;
                   } 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 && j.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);
-        return E === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (W.length - 1).toString() : _;
+      const x = Date.now();
+      r = r.map((M, E) => {
+        const _ = r.slice(0, -1), W = Z(T, _);
+        return E === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (W.length - 1).toString() : M;
       });
-      const { oldValue: P, newValue: D } = qt(
+      const { oldValue: P, newValue: D } = qe(
         s.updateType,
-        u,
+        l,
         T,
         r
-      ), N = {
-        timeStamp: C,
+      ), C = {
+        timeStamp: x,
         stateKey: h,
         path: r,
         updateType: s.updateType,
@@ -382,33 +382,33 @@ function Jt(t, {
           g.updateShadowAtPath(h, r, T);
           break;
         case "insert":
-          const _ = r.slice(0, -1);
-          g.insertShadowArrayElement(h, _, D);
+          const M = r.slice(0, -1);
+          g.insertShadowArrayElement(h, M, 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), _ = parseInt(r[r.length - 1]);
+          g.removeShadowArrayElement(h, E, _);
           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;
+      if (Ge(h, (M) => {
+        const _ = [...M ?? [], C].reduce((W, V) => {
+          const F = `${V.stateKey}:${JSON.stringify(V.path)}`, j = W.get(F);
+          return j ? (j.timeStamp = Math.max(j.timeStamp, V.timeStamp), j.newValue = V.newValue, j.oldValue = j.oldValue ?? V.oldValue, j.updateType = V.updateType) : W.set(F, { ...V }), W;
         }, /* @__PURE__ */ new Map());
-        return Array.from(M.values());
-      }), kt(
+        return Array.from(_.values());
+      }), ke(
         T,
         h,
         R.current,
         U
       ), R.current?.middleware && R.current.middleware({
-        updateLog: l,
-        update: N
+        updateLog: d,
+        update: C
       }), R.current?.serverSync) {
-        const _ = g.serverState[h], E = R.current?.serverSync;
-        zt(h, {
+        const M = g.serverState[h], E = R.current?.serverSync;
+        ze(h, {
           syncKey: typeof E.syncKey == "string" ? E.syncKey : E.syncKey({ state: T }),
-          rollBackState: _,
+          rollBackState: M,
           actionTimeStamp: Date.now() + (E.debounce ?? 3e3),
           status: "waiting"
         });
@@ -416,91 +416,91 @@ function Jt(t, {
       return T;
     });
   };
-  o.getState().updaterState[h] || (gt(
+  o.getState().updaterState[h] || (fe(
     h,
-    ft(
+    Se(
       h,
-      ot,
-      K.current,
+      oe,
+      ee.current,
       U
     )
-  ), o.getState().cogsStateStore[h] || et(h, t), o.getState().initialStateGlobal[h] || $t(h, t));
-  const d = It(() => ft(
+  ), o.getState().cogsStateStore[h] || ne(h, e), o.getState().initialStateGlobal[h] || Te(h, e));
+  const u = pe(() => Se(
     h,
-    ot,
-    K.current,
+    oe,
+    ee.current,
     U
   ), [h, U]);
-  return [Nt(h), d];
+  return [Ne(h), u];
 }
-function ft(t, c, m, f) {
+function Se(e, 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);
-      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);
-      const h = o.getState().stateComponents.get(t);
-      return h && h.components.forEach((l) => {
-        l.forceUpdate();
+      const n = o.getState().getInitialOptions(e)?.validation;
+      n?.key && Q(n?.key), v?.validationKey && Q(v.validationKey);
+      const S = o.getState().initialStateGlobal[e];
+      o.getState().clearSelectedIndexesForState(e), y.clear(), k++;
+      const H = a(S, []), O = re(e), U = K(O?.localStorage?.key) ? O?.localStorage?.key(S) : O?.localStorage?.key, z = `${f}-${e}-${U}`;
+      z && localStorage.removeItem(z), fe(e, H), ne(e, S);
+      const h = o.getState().stateComponents.get(e);
+      return h && h.components.forEach((d) => {
+        d.forceUpdate();
       }), S;
     },
     updateInitialState: (v) => {
-      y.clear(), b++;
-      const n = ft(
-        t,
+      y.clear(), k++;
+      const n = Se(
+        e,
         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[e], H = re(e), O = K(H?.localStorage?.key) ? H?.localStorage?.key(S) : H?.localStorage?.key, U = `${f}-${e}-${O}`;
+      return localStorage.getItem(U) && localStorage.removeItem(U), Me(() => {
+        Te(e, v), o.getState().initializeShadowState(e, v), fe(e, n), ne(e, v);
+        const z = o.getState().stateComponents.get(e);
+        z && z.components.forEach((h) => {
           h.forceUpdate();
         });
       }), {
-        fetchId: (H) => n.get()[H]
+        fetchId: (z) => n.get()[z]
       };
     },
-    _initialState: o.getState().initialStateGlobal[t],
-    _serverState: o.getState().serverState[t],
-    _isLoading: o.getState().isLoadingGlobal[t],
+    _initialState: o.getState().initialStateGlobal[e],
+    _serverState: o.getState().serverState[e],
+    _isLoading: o.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
-      const v = o.getState().serverState[t];
-      return !!(v && q(v, Nt(t)));
+      const v = o.getState().serverState[e];
+      return !!(v && Y(v, Ne(e)));
     }
   };
   function a(v, n = [], S) {
-    const G = n.map(String).join(".");
-    y.get(G);
+    const H = n.map(String).join(".");
+    y.get(H);
     const O = function() {
-      return o().getNestedState(t, n);
+      return o().getNestedState(e, n);
     };
     Object.keys(I).forEach((h) => {
       O[h] = I[h];
     });
     const U = {
-      apply(h, l, lt) {
+      apply(h, d, ce) {
         return console.log(
-          `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
-        ), console.trace("Apply trap stack trace"), o().getNestedState(t, n);
+          `PROXY APPLY TRAP HIT: stateKey=${e}, path=${n.join(".")}`
+        ), console.trace("Apply trap stack trace"), o().getNestedState(e, n);
       },
-      get(h, l) {
+      get(h, d) {
         S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
-        const lt = /* @__PURE__ */ new Set([
+        const ce = /* @__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 (e) {
-            const r = e.components.get(d);
+        if (d !== "then" && !d.startsWith("$") && d !== "stateMapNoRender" && !ce.has(d)) {
+          const u = `${e}////${m}`, t = o.getState().stateComponents.get(e);
+          if (t) {
+            const r = t.components.get(u);
             if (r && !r.paths.has("")) {
               const s = n.join(".");
               let i = !0;
@@ -539,177 +539,205 @@ function ft(t, c, m, f) {
             }
           }
         }
-        if (l === "getDifferences")
-          return () => pt(
-            o.getState().cogsStateStore[t],
-            o.getState().initialStateGlobal[t]
+        if (d === "getDifferences")
+          return () => we(
+            o.getState().cogsStateStore[e],
+            o.getState().initialStateGlobal[e]
           );
-        if (l === "sync" && n.length === 0)
+        if (d === "sync" && n.length === 0)
           return async function() {
-            const d = o.getState().getInitialOptions(t), e = d?.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 u = o.getState().getInitialOptions(e), t = u?.sync;
+            if (!t)
+              return console.error(`No mutation defined for state key "${e}"`), { success: !1, error: "No mutation defined" };
+            const r = o.getState().getNestedState(e, []), s = u?.validation?.key;
             try {
-              const i = await e.action(r);
+              const i = await t.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((l) => {
+                  const T = [s, ...l.path].join(".");
+                  o.getState().addValidationError(T, l.message);
                 });
-                const g = o.getState().stateComponents.get(t);
-                g && g.components.forEach((u) => {
-                  u.forceUpdate();
+                const g = o.getState().stateComponents.get(e);
+                g && g.components.forEach((l) => {
+                  l.forceUpdate();
                 });
               }
-              return i?.success && e.onSuccess ? e.onSuccess(i.data) : !i?.success && e.onError && e.onError(i.error), i;
+              return i?.success && t.onSuccess ? t.onSuccess(i.data) : !i?.success && t.onError && t.onError(i.error), i;
             } catch (i) {
-              return e.onError && e.onError(i), { success: !1, error: i };
+              return t.onError && t.onError(i), { success: !1, error: i };
             }
           };
-        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";
+        if (d === "_status") {
+          const u = o.getState().getNestedState(e, n), t = o.getState().initialStateGlobal[e], r = Z(t, n);
+          return Y(u, r) ? "fresh" : "stale";
         }
-        if (l === "getStatus")
+        if (d === "getStatus")
           return function() {
-            const d = o().getNestedState(
-              t,
+            const u = o().getNestedState(
+              e,
               n
-            ), e = o.getState().initialStateGlobal[t], r = J(e, n);
-            return q(d, r) ? "fresh" : "stale";
+            ), t = o.getState().initialStateGlobal[e], r = Z(t, n);
+            return Y(u, r) ? "fresh" : "stale";
           };
-        if (l === "removeStorage")
+        if (d === "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[e], t = re(e), r = K(t?.localStorage?.key) ? t?.localStorage?.key(u) : t?.localStorage?.key, s = `${f}-${e}-${r}`;
             s && localStorage.removeItem(s);
           };
-        if (l === "showValidationErrors")
+        if (d === "showValidationErrors")
           return () => {
-            const d = o.getState().getInitialOptions(t)?.validation;
-            if (!d?.key)
+            const u = o.getState().getInitialOptions(e)?.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) => ({
+          })) : o.getState().getNestedState(e, n).map((r, s) => ({
             item: r,
             originalIndex: s
           }));
-          if (l === "getSelected")
+          if (d === "getSelected")
             return () => {
-              const e = o.getState().getSelectedIndex(t, n.join("."));
-              if (e !== void 0)
+              const t = o.getState().getSelectedIndex(e, n.join("."));
+              if (t !== void 0)
                 return a(
-                  v[e],
-                  [...n, e.toString()],
+                  v[t],
+                  [...n, t.toString()],
                   S
                 );
             };
-          if (l === "clearSelected")
+          if (d === "clearSelected")
             return () => {
-              o.getState().clearSelectedIndex({ stateKey: t, path: n });
+              o.getState().clearSelectedIndex({ stateKey: e, path: n });
             };
-          if (l === "getSelectedIndex")
-            return () => o.getState().getSelectedIndex(t, n.join(".")) ?? -1;
-          if (l === "useVirtualView")
-            return (e) => {
+          if (d === "getSelectedIndex")
+            return () => o.getState().getSelectedIndex(e, n.join(".")) ?? -1;
+          if (d === "useVirtualView")
+            return (t) => {
               const {
                 itemHeight: r = 50,
                 overscan: s = 5,
                 stickToBottom: i = !1
-              } = e, g = Z(null), [u, T] = tt({
+              } = t, g = X(null), [l, T] = te({
                 startIndex: 0,
                 endIndex: 10
-              }), w = Z(i), [V, x] = tt(0), C = Z(!1), P = Z(0);
-              it(() => {
+              }), w = X(i), [b, N] = te(0), x = X(!1), P = X(0);
+              se(() => {
                 let $ = 0;
-                return o.getState().subscribeToShadowState(t, () => {
+                return o.getState().subscribeToShadowState(e, () => {
                   $++, $ <= 5 && console.log(
                     `[VirtualView] Shadow update #${$}`
-                  ), x((L) => L + 1);
+                  ), N((L) => L + 1);
                 });
-              }, [t]);
+              }, [e]);
               const D = o().getNestedState(
-                t,
+                e,
                 n
-              ), N = D.length;
+              ), C = 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(() => {
-                const $ = o.getState().getShadowMetadata(t, n) || [];
-                let k = 0;
+                `[VirtualView] Initial setup - totalCount: ${C}, itemHeight: ${r}, stickToBottom: ${i}`
+              ), C !== P.current && (console.log(
+                `[VirtualView] Array size changed from ${P.current} to ${C}`
+              ), x.current = !1, P.current = C);
+              const { totalHeight: M, positions: E, visibleMeasured: _ } = pe(() => {
+                const $ = o.getState().getShadowMetadata(e, n) || [];
+                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 B = 0, q = 0;
+                for (let G = 0; G < C; G++) {
+                  L[G] = A;
+                  const de = $[G]?.virtualizer?.itemHeight;
+                  de && (B++, G >= l.startIndex && G < l.endIndex && q++), A += de || r;
                 }
-                const Y = z === N && N > 0;
+                const J = l.endIndex - l.startIndex, le = q === J && J > 0;
                 return console.log(
-                  `[VirtualView] Heights calc - measured: ${z}/${N}, allMeasured: ${Y}, totalHeight: ${k}`
-                ), { totalHeight: k, positions: L, allMeasured: Y };
+                  `[VirtualView] Heights calc - measured: ${B}/${C}, visible measured: ${q}/${J}, totalHeight: ${A}`
+                ), {
+                  totalHeight: A,
+                  positions: L,
+                  visibleMeasured: le
+                };
               }, [
-                N,
-                t,
+                C,
+                e,
                 n.join("."),
                 r,
-                V
-              ]), W = It(() => {
-                const $ = Math.max(0, u.startIndex), k = Math.min(N, u.endIndex);
+                b,
+                l
+                // Add range dependency
+              ]), W = pe(() => {
+                const $ = Math.max(0, l.startIndex), A = Math.min(C, l.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 - $ },
+                  (q, J) => $ + J
+                ), B = L.map((q) => D[q]);
+                return a(B, n, {
                   ...S,
                   validIndices: L
                 });
-              }, [u.startIndex, u.endIndex, D, N]);
-              ut(() => {
+              }, [l.startIndex, l.endIndex, D, C]);
+              ge(() => {
                 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: B } = $;
+                  let q = 0, J = C - 1;
+                  for (; q <= J; ) {
+                    const ve = Math.floor((q + J) / 2);
+                    E[ve] < B ? q = ve + 1 : J = ve - 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 le = Math.max(0, J - s);
+                  let G = le;
+                  const de = B + $.clientHeight;
+                  for (; G < C && E[G] < de; )
+                    G++;
+                  G = Math.min(C, G + s), T({ startIndex: le, endIndex: G });
                 }, 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 && !x.current && C > 0)
+                  if (_ || l.endIndex === C)
+                    console.log(
+                      `[VirtualView] Scrolling to bottom - visible measured: ${_}, at end: ${l.endIndex === C}`
+                    ), x.current = !0, setTimeout(() => {
+                      $.scrollTo({
+                        top: $.scrollHeight + 1e3,
+                        behavior: "auto"
+                      }), w.current = !0;
+                    }, 0);
+                  else {
+                    console.log(
+                      "[VirtualView] Jumping near bottom to trigger measurements"
+                    );
+                    const B = Math.max(
+                      0,
+                      (C - 20) * r
+                    );
+                    $.scrollTo({
+                      top: B,
+                      behavior: "auto"
+                    });
+                  }
+                return A(), () => {
                   $.removeEventListener("scroll", L);
                 };
-              }, [N, E, i, M]);
-              const A = Tt(
+              }, [
+                C,
+                E,
+                i,
+                _,
+                l.endIndex
+              ]);
+              const V = Ee(
                 ($ = "smooth") => {
                   g.current && (w.current = !0, g.current.scrollTo({
                     top: g.current.scrollHeight,
@@ -717,11 +745,11 @@ function ft(t, c, m, f) {
                   }));
                 },
                 []
-              ), F = Tt(
-                ($, k = "smooth") => {
+              ), F = Ee(
+                ($, A = "smooth") => {
                   g.current && E[$] !== void 0 && (w.current = !1, g.current.scrollTo({
                     top: E[$],
-                    behavior: k
+                    behavior: A
                   }));
                 },
                 [E]
@@ -732,67 +760,67 @@ function ft(t, c, m, f) {
                 },
                 inner: {
                   style: {
-                    height: `${_}px`,
+                    height: `${M}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${E[u.startIndex] || 0}px)`
+                    transform: `translateY(${E[l.startIndex] || 0}px)`
                   }
                 }
               };
               return {
                 virtualState: W,
                 virtualizerProps: j,
-                scrollToBottom: A,
+                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 = {
+          if (d === "stateSort")
+            return (t) => {
+              const s = [...u()].sort(
+                (l, T) => t(l.item, T.item)
+              ), i = s.map(({ item: l }) => l), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: u }) => u
+                  ({ originalIndex: l }) => l
                 )
               };
               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 = {
+          if (d === "stateFilter")
+            return (t) => {
+              const s = u().filter(
+                ({ item: l }, T) => t(l, T)
+              ), i = s.map(({ item: l }) => l), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: u }) => u
+                  ({ originalIndex: l }) => l
                 )
               };
               return a(i, n, g);
             };
-          if (l === "stateMap")
-            return (e) => {
-              const r = o.getState().getNestedState(t, n);
+          if (d === "stateMap")
+            return (t) => {
+              const r = o.getState().getNestedState(e, 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 l = r[i], T = [...n, i.toString()], w = a(l, T, S);
+                return t(l, w, {
                   register: () => {
-                    const [, x] = tt({}), C = `${m}-${n.join(".")}-${i}`;
-                    ut(() => {
-                      const P = `${t}////${C}`, D = o.getState().stateComponents.get(t) || {
+                    const [, N] = te({}), x = `${m}-${n.join(".")}-${i}`;
+                    ge(() => {
+                      const P = `${e}////${x}`, D = o.getState().stateComponents.get(e) || {
                         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);
+                      }), o.getState().stateComponents.set(e, D), () => {
+                        const C = o.getState().stateComponents.get(e);
+                        C && C.components.delete(P);
                       };
-                    }, [t, C]);
+                    }, [e, x]);
                   },
                   index: g,
                   originalIndex: i
@@ -802,12 +830,12 @@ function ft(t, c, m, f) {
                 r
               ), null);
             };
-          if (l === "stateMapNoRender")
-            return (e) => v.map((s, i) => {
+          if (d === "stateMapNoRender")
+            return (t) => 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);
-              return e(
+              const l = [...n, g.toString()], T = a(s, l, S);
+              return t(
                 s,
                 T,
                 i,
@@ -815,28 +843,28 @@ function ft(t, c, m, f) {
                 a(v, n, S)
               );
             });
-          if (l === "$stateMap")
-            return (e) => ct(Yt, {
+          if (d === "$stateMap")
+            return (t) => ie(Ye, {
               proxy: {
-                _stateKey: t,
+                _stateKey: e,
                 _path: n,
-                _mapFn: e
+                _mapFn: t
                 // Pass the actual function, not string
               },
               rebuildStateShape: a
             });
-          if (l === "stateList")
-            return (e) => {
-              const r = o.getState().getNestedState(t, n);
+          if (d === "stateList")
+            return (t) => {
+              const r = o.getState().getNestedState(e, 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 l = r[i], T = [...n, i.toString()], w = a(l, T, S), b = `${m}-${n.join(".")}-${i}`;
+                return ie(Xe, {
                   key: i,
-                  stateKey: t,
-                  itemComponentId: V,
+                  stateKey: e,
+                  itemComponentId: b,
                   itemPath: T,
-                  children: e(
-                    u,
+                  children: t(
+                    l,
                     w,
                     g,
                     r,
@@ -847,340 +875,340 @@ function ft(t, c, m, f) {
                 `stateList called on a non-array value at path: ${n.join(".")}.`
               ), null);
             };
-          if (l === "stateFlattenOn")
-            return (e) => {
+          if (d === "stateFlattenOn")
+            return (t) => {
               const r = v;
-              y.clear(), b++;
+              y.clear(), k++;
               const s = r.flatMap(
-                (i) => i[e] ?? []
+                (i) => i[t] ?? []
               );
               return a(
                 s,
-                [...n, "[*]", e],
+                [...n, "[*]", t],
                 S
               );
             };
-          if (l === "index")
-            return (e) => {
-              const r = v[e];
-              return a(r, [...n, e.toString()]);
+          if (d === "index")
+            return (t) => {
+              const r = v[t];
+              return a(r, [...n, t.toString()]);
             };
-          if (l === "last")
+          if (d === "last")
             return () => {
-              const e = o.getState().getNestedState(t, n);
-              if (e.length === 0) return;
-              const r = e.length - 1, s = e[r], i = [...n, r.toString()];
+              const t = o.getState().getNestedState(e, n);
+              if (t.length === 0) return;
+              const r = t.length - 1, s = t[r], i = [...n, r.toString()];
               return a(s, i);
             };
-          if (l === "insert")
-            return (e) => (p(n), vt(c, e, n, t), a(
-              o.getState().getNestedState(t, n),
+          if (d === "insert")
+            return (t) => (p(n), ye(c, t, n, e), a(
+              o.getState().getNestedState(e, 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;
+          if (d === "uniqueInsert")
+            return (t, r, s) => {
+              const i = o.getState().getNestedState(e, n), g = K(t) ? t(i) : t;
+              let l = null;
               if (!i.some((w) => {
                 if (r) {
-                  const x = r.every(
-                    (C) => q(w[C], g[C])
+                  const N = r.every(
+                    (x) => Y(w[x], g[x])
                   );
-                  return x && (u = w), x;
+                  return N && (l = w), N;
                 }
-                const V = q(w, g);
-                return V && (u = w), V;
+                const b = Y(w, g);
+                return b && (l = 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), ye(c, g, n, e);
+              else if (s && l) {
+                const w = s(l), b = i.map(
+                  (N) => Y(N, l) ? w : N
                 );
-                p(n), st(c, V, n);
+                p(n), ae(c, b, n);
               }
             };
-          if (l === "cut")
-            return (e, r) => {
+          if (d === "cut")
+            return (t, r) => {
               if (!r?.waitForSync)
-                return p(n), dt(c, n, t, e), a(
-                  o.getState().getNestedState(t, n),
+                return p(n), ue(c, n, e, t), a(
+                  o.getState().getNestedState(e, n),
                   n
                 );
             };
-          if (l === "cutByValue")
-            return (e) => {
+          if (d === "cutByValue")
+            return (t) => {
               for (let r = 0; r < v.length; r++)
-                v[r] === e && dt(c, n, t, r);
+                v[r] === t && ue(c, n, e, 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);
+          if (d === "toggleByValue")
+            return (t) => {
+              const r = v.findIndex((s) => s === t);
+              r > -1 ? ue(c, n, e, r) : ye(c, t, n, e);
             };
-          if (l === "stateFind")
-            return (e) => {
-              const s = d().find(
-                ({ item: g }, u) => e(g, u)
+          if (d === "stateFind")
+            return (t) => {
+              const s = u().find(
+                ({ item: g }, l) => t(g, l)
               );
               if (!s) return;
               const i = [...n, s.originalIndex.toString()];
               return a(s.item, i, S);
             };
-          if (l === "findWith")
-            return (e, r) => {
-              const i = d().find(
-                ({ item: u }) => u[e] === r
+          if (d === "findWith")
+            return (t, r) => {
+              const i = u().find(
+                ({ item: l }) => l[t] === 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);
-          if (Array.isArray(e) && l === "cut")
-            return () => dt(
+        const ee = n[n.length - 1];
+        if (!isNaN(Number(ee))) {
+          const u = n.slice(0, -1), t = o.getState().getNestedState(e, u);
+          if (Array.isArray(t) && d === "cut")
+            return () => ue(
               c,
-              d,
-              t,
-              Number(K)
+              u,
+              e,
+              Number(ee)
             );
         }
-        if (l === "get")
+        if (d === "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(e, n);
+              return S.validIndices.map((t) => u[t]);
             }
-            return o.getState().getNestedState(t, n);
+            return o.getState().getNestedState(e, n);
           };
-        if (l === "$derive")
-          return (d) => bt({
-            _stateKey: t,
+        if (d === "$derive")
+          return (u) => Ce({
+            _stateKey: e,
             _path: n,
-            _effect: d.toString()
+            _effect: u.toString()
           });
-        if (l === "$get")
-          return () => bt({
-            _stateKey: t,
+        if (d === "$get")
+          return () => Ce({
+            _stateKey: e,
             _path: n
           });
-        if (l === "lastSynced") {
-          const d = `${t}:${n.join(".")}`;
-          return o.getState().getSyncInfo(d);
+        if (d === "lastSynced") {
+          const u = `${e}:${n.join(".")}`;
+          return o.getState().getSyncInfo(u);
         }
-        if (l == "getLocalStorage")
-          return (d) => St(f + "-" + t + "-" + d);
-        if (l === "_selected") {
-          const d = n.slice(0, -1), e = d.join("."), r = o.getState().getNestedState(t, d);
-          return Array.isArray(r) ? Number(n[n.length - 1]) === o.getState().getSelectedIndex(t, e) : void 0;
+        if (d == "getLocalStorage")
+          return (u) => me(f + "-" + e + "-" + u);
+        if (d === "_selected") {
+          const u = n.slice(0, -1), t = u.join("."), r = o.getState().getNestedState(e, u);
+          return Array.isArray(r) ? Number(n[n.length - 1]) === o.getState().getSelectedIndex(e, t) : void 0;
         }
-        if (l === "setSelected")
-          return (d) => {
-            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);
-            const i = o.getState().getNestedState(t, [...e]);
-            st(c, i, e), p(e);
+        if (d === "setSelected")
+          return (u) => {
+            const t = n.slice(0, -1), r = Number(n[n.length - 1]), s = t.join(".");
+            u ? o.getState().setSelectedIndex(e, s, r) : o.getState().setSelectedIndex(e, s, void 0);
+            const i = o.getState().getNestedState(e, [...t]);
+            ae(c, i, t), p(t);
           };
-        if (l === "toggleSelected")
+        if (d === "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), t = Number(n[n.length - 1]), r = u.join("."), s = o.getState().getSelectedIndex(e, r);
             o.getState().setSelectedIndex(
-              t,
+              e,
               r,
-              s === e ? void 0 : e
+              s === t ? void 0 : t
             );
-            const i = o.getState().getNestedState(t, [...d]);
-            st(c, i, d), p(d);
+            const i = o.getState().getNestedState(e, [...u]);
+            ae(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(
-                t,
-                o.getState().initialStateGlobal[t],
+          if (d === "applyJsonPatch")
+            return (u) => {
+              const t = o.getState().cogsStateStore[e], s = De(t, u).newDocument;
+              Pe(
+                e,
+                o.getState().initialStateGlobal[e],
                 s,
                 c,
                 m,
                 f
               );
-              const i = o.getState().stateComponents.get(t);
+              const i = o.getState().stateComponents.get(e);
               if (i) {
-                const g = pt(e, s), u = new Set(g);
+                const g = we(t, s), l = 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 (w.paths.has(C)) {
-                          V = !0;
+                    if (N.includes("component") && (w.paths.has("") && (b = !0), !b))
+                      for (const x of l) {
+                        if (w.paths.has(x)) {
+                          b = !0;
                           break;
                         }
-                        let P = C.lastIndexOf(".");
+                        let P = x.lastIndexOf(".");
                         for (; P !== -1; ) {
-                          const D = C.substring(0, P);
+                          const D = x.substring(0, P);
                           if (w.paths.has(D)) {
-                            V = !0;
+                            b = !0;
                             break;
                           }
-                          const N = C.substring(
+                          const C = x.substring(
                             P + 1
                           );
-                          if (!isNaN(Number(N))) {
-                            const _ = D.lastIndexOf(".");
-                            if (_ !== -1) {
+                          if (!isNaN(Number(C))) {
+                            const M = D.lastIndexOf(".");
+                            if (M !== -1) {
                               const E = D.substring(
                                 0,
-                                _
+                                M
                               );
                               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) {
-                      const C = w.depsFunction(s);
+                    if (!b && N.includes("deps") && w.depsFunction) {
+                      const x = 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 x == "boolean" ? x && (P = !0) : Y(w.deps, x) || (w.deps = x, P = !0), P && (b = !0);
                     }
-                    V && w.forceUpdate();
+                    b && w.forceUpdate();
                   }
                 }
               }
             };
-          if (l === "validateZodSchema")
+          if (d === "validateZodSchema")
             return () => {
-              const d = o.getState().getInitialOptions(t)?.validation, e = o.getState().addValidationError;
-              if (!d?.zodSchema)
+              const u = o.getState().getInitialOptions(e)?.validation, t = 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);
-              const r = o.getState().cogsStateStore[t];
+              Q(u.key);
+              const r = o.getState().cogsStateStore[e];
               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((l) => {
+                  const T = l.path, w = l.message, b = [u.key, ...T].join(".");
+                  t(b, w);
+                }), he(e), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
             };
-          if (l === "_componentId") return m;
-          if (l === "getComponents")
-            return () => o().stateComponents.get(t);
-          if (l === "getAllFormRefs")
-            return () => Et.getState().getFormRefsByStateKey(t);
-          if (l === "_initialState")
-            return o.getState().initialStateGlobal[t];
-          if (l === "_serverState")
-            return o.getState().serverState[t];
-          if (l === "_isLoading")
-            return o.getState().isLoadingGlobal[t];
-          if (l === "revertToInitialState")
+          if (d === "_componentId") return m;
+          if (d === "getComponents")
+            return () => o().stateComponents.get(e);
+          if (d === "getAllFormRefs")
+            return () => Ve.getState().getFormRefsByStateKey(e);
+          if (d === "_initialState")
+            return o.getState().initialStateGlobal[e];
+          if (d === "_serverState")
+            return o.getState().serverState[e];
+          if (d === "_isLoading")
+            return o.getState().isLoadingGlobal[e];
+          if (d === "revertToInitialState")
             return I.revertToInitialState;
-          if (l === "updateInitialState") return I.updateInitialState;
-          if (l === "removeValidation") return I.removeValidation;
+          if (d === "updateInitialState") return I.updateInitialState;
+          if (d === "removeValidation") return I.removeValidation;
         }
-        if (l === "getFormRef")
-          return () => Et.getState().getFormRef(t + "." + n.join("."));
-        if (l === "validationWrapper")
+        if (d === "getFormRef")
+          return () => Ve.getState().getFormRef(e + "." + n.join("."));
+        if (d === "validationWrapper")
           return ({
-            children: d,
-            hideMessage: e
-          }) => /* @__PURE__ */ yt(
-            Ot,
+            children: u,
+            hideMessage: t
+          }) => /* @__PURE__ */ Ie(
+            Oe,
             {
-              formOpts: e ? { validation: { message: "" } } : void 0,
+              formOpts: t ? { validation: { message: "" } } : void 0,
               path: n,
-              validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
-              stateKey: t,
+              validationKey: o.getState().getInitialOptions(e)?.validation?.key || "",
+              stateKey: e,
               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) => {
-            if (e?.debounce)
-              jt(() => {
-                st(c, d, n, "");
-                const r = o.getState().getNestedState(t, n);
-                e?.afterUpdate && e.afterUpdate(r);
-              }, e.debounce);
+        if (d === "_stateKey") return e;
+        if (d === "_path") return n;
+        if (d === "_isServerSynced") return I._isServerSynced;
+        if (d === "update")
+          return (u, t) => {
+            if (t?.debounce)
+              je(() => {
+                ae(c, u, n, "");
+                const r = o.getState().getNestedState(e, n);
+                t?.afterUpdate && t.afterUpdate(r);
+              }, t.debounce);
             else {
-              st(c, d, n, "");
-              const r = o.getState().getNestedState(t, n);
-              e?.afterUpdate && e.afterUpdate(r);
+              ae(c, u, n, "");
+              const r = o.getState().getNestedState(e, n);
+              t?.afterUpdate && t.afterUpdate(r);
             }
             p(n);
           };
-        if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ yt(
-            Ut,
+        if (d === "formElement")
+          return (u, t) => /* @__PURE__ */ Ie(
+            Ue,
             {
               setState: c,
-              stateKey: t,
+              stateKey: e,
               path: n,
-              child: d,
-              formOpts: e
+              child: u,
+              formOpts: t
             }
           );
-        const R = [...n, l], ot = o.getState().getNestedState(t, R);
-        return a(ot, R, S);
+        const R = [...n, d], oe = o.getState().getNestedState(e, R);
+        return a(oe, R, S);
       }
-    }, H = new Proxy(O, U);
-    return y.set(G, {
-      proxy: H,
-      stateVersion: b
-    }), H;
+    }, z = new Proxy(O, U);
+    return y.set(H, {
+      proxy: z,
+      stateVersion: k
+    }), z;
   }
   return a(
-    o.getState().getNestedState(t, [])
+    o.getState().getNestedState(e, [])
   );
 }
-function bt(t) {
-  return ct(Zt, { proxy: t });
+function Ce(e) {
+  return ie(Ze, { proxy: e });
 }
-function Yt({
-  proxy: t,
+function Ye({
+  proxy: e,
   rebuildStateShape: c
 }) {
-  const m = o().getNestedState(t._stateKey, t._path);
+  const m = o().getNestedState(e._stateKey, e._path);
   return Array.isArray(m) ? c(
     m,
-    t._path
+    e._path
   ).stateMapNoRender(
-    (y, b, p, I, a) => t._mapFn(y, b, p, I, a)
+    (y, k, p, I, a) => e._mapFn(y, k, p, I, a)
   ) : null;
 }
-function Zt({
-  proxy: t
+function Ze({
+  proxy: e
 }) {
-  const c = Z(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return it(() => {
+  const c = X(null), m = `${e._stateKey}-${e._path.join(".")}`;
+  return se(() => {
     const f = c.current;
     if (!f || !f.parentElement) return;
     const y = f.parentElement, p = Array.from(y.childNodes).indexOf(f);
@@ -1190,16 +1218,16 @@ function Zt({
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: I,
       position: p,
-      effect: t._effect
+      effect: e._effect
     };
     o.getState().addSignalElement(m, v);
-    const n = o.getState().getNestedState(t._stateKey, t._path);
+    const n = o.getState().getNestedState(e._stateKey, e._path);
     let S;
-    if (t._effect)
+    if (e._effect)
       try {
         S = new Function(
           "state",
-          `return (${t._effect})(state)`
+          `return (${e._effect})(state)`
         )(n);
       } catch (O) {
         console.error("Error evaluating effect function during mount:", O), S = n;
@@ -1207,61 +1235,61 @@ function Zt({
     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 H = document.createTextNode(String(S));
+    f.replaceWith(H);
+  }, [e._stateKey, e._path.join("."), e._effect]), ie("span", {
     ref: c,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
-function ge(t) {
-  const c = _t(
+function gt(e) {
+  const c = _e(
     (m) => {
-      const f = o.getState().stateComponents.get(t._stateKey) || {
+      const f = o.getState().stateComponents.get(e._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return f.components.set(t._stateKey, {
+      return f.components.set(e._stateKey, {
         forceUpdate: m,
-        paths: /* @__PURE__ */ new Set([t._path.join(".")])
-      }), () => f.components.delete(t._stateKey);
+        paths: /* @__PURE__ */ new Set([e._path.join(".")])
+      }), () => f.components.delete(e._stateKey);
     },
-    () => o.getState().getNestedState(t._stateKey, t._path)
+    () => o.getState().getNestedState(e._stateKey, e._path)
   );
-  return ct("text", {}, String(c));
+  return ie("text", {}, String(c));
 }
-function Xt({
-  stateKey: t,
+function Xe({
+  stateKey: e,
   itemComponentId: c,
   itemPath: m,
   children: f
 }) {
-  const [, y] = tt({}), [b, p] = Wt(), I = Z(null);
-  return it(() => {
-    p.height > 0 && p.height !== I.current && (I.current = p.height, o.getState().setShadowMetadata(t, m, {
+  const [, y] = te({}), [k, p] = We(), I = X(null);
+  return se(() => {
+    p.height > 0 && p.height !== I.current && (I.current = p.height, o.getState().setShadowMetadata(e, m, {
       virtualizer: {
         itemHeight: p.height
       }
     }));
-  }, [p.height, t, m]), ut(() => {
-    const a = `${t}////${c}`, v = o.getState().stateComponents.get(t) || {
+  }, [p.height, e, m]), ge(() => {
+    const a = `${e}////${c}`, v = o.getState().stateComponents.get(e) || {
       components: /* @__PURE__ */ new Map()
     };
     return v.components.set(a, {
       forceUpdate: () => y({}),
       paths: /* @__PURE__ */ new Set([m.join(".")])
-    }), o.getState().stateComponents.set(t, v), () => {
-      const n = o.getState().stateComponents.get(t);
+    }), o.getState().stateComponents.set(e, v), () => {
+      const n = o.getState().stateComponents.get(e);
       n && n.components.delete(a);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ yt("div", { ref: b, children: f });
+  }, [e, c, m.join(".")]), /* @__PURE__ */ Ie("div", { ref: k, children: f });
 }
 export {
-  bt as $cogsSignal,
-  ge as $cogsSignalStore,
-  le as addStateOptions,
-  de as createCogsState,
-  ue as notifyComponent,
-  Jt as useCogsStateFn
+  Ce as $cogsSignal,
+  gt as $cogsSignalStore,
+  lt as addStateOptions,
+  dt as createCogsState,
+  ut as notifyComponent,
+  Je as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map