cogsbox-state 0.5.318 → 0.5.320

package/dist/CogsState.jsx

@@ -1,16 +1,16 @@
 "use client";
-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 $t } from "uuid";
+import { jsx as mt } from "react/jsx-runtime";
+import { useState as Q, useRef as Z, useEffect as ot, useLayoutEffect as ct, useMemo as ht, createElement as at, useSyncExternalStore as Ct, startTransition as Pt, useCallback as wt } from "react";
+import { transformStateFunc as _t, isDeepEqual as H, isFunction as Y, getNestedValue as z, getDifferences as vt, debounce as Mt } from "./utility.js";
+import { pushFunc as St, updateFn as rt, cutFunc as it, ValidationWrapper as jt, FormControlComponent as Rt } from "./Functions.jsx";
+import Ot from "superjson";
+import { v4 as yt } from "uuid";
 import "zod";
-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 bt(t, c) {
+import { getGlobalStore as o, formRefStore as Tt } from "./store.js";
+import { useCogsConfig as bt } from "./CogsStateClient.jsx";
+import { applyPatch as Ut } from "fast-json-patch";
+import Ft from "react-use-measure";
+function Et(t, c) {
   const m = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, y = m(t) || {};
   f(t, {
     ...y,
@@ -22,95 +22,95 @@ function At({
   options: c,
   initialOptionsPart: m
 }) {
-  const f = rt(t) || {}, y = m[t] || {}, k = o.getState().setInitialStateOptions, p = { ...y, ...f };
-  let I = !1;
+  const f = et(t) || {}, y = m[t] || {}, b = o.getState().setInitialStateOptions, T = { ...y, ...f };
+  let p = !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
-      !Y(p[a], c[a]) && (I = !0, p[a] = c[a])) : (I = !0, p[a] = c[a]);
-  I && k(t, p);
+    for (const s in c)
+      T.hasOwnProperty(s) ? (s == "localStorage" && c[s] && T[s].key !== c[s]?.key && (p = !0, T[s] = c[s]), s == "initialState" && c[s] && T[s] !== c[s] && // Different references
+      !H(T[s], c[s]) && (p = !0, T[s] = c[s])) : (p = !0, T[s] = c[s]);
+  p && b(t, T);
 }
-function le(t, { formElements: c, validation: m }) {
+function ie(t, { formElements: c, validation: m }) {
   return { initialState: t, formElements: c, validation: m };
 }
-const de = (t, c) => {
+const ce = (t, c) => {
   let m = t;
-  const [f, y] = Rt(m);
-  (Object.keys(y).length > 0 || c && Object.keys(c).length > 0) && Object.keys(y).forEach((I) => {
-    y[I] = y[I] || {}, y[I].formElements = {
+  const [f, y] = _t(m);
+  (Object.keys(y).length > 0 || c && Object.keys(c).length > 0) && Object.keys(y).forEach((p) => {
+    y[p] = y[p] || {}, y[p].formElements = {
       ...c?.formElements,
       // Global defaults first
       ...c?.validation,
-      ...y[I].formElements || {}
+      ...y[p].formElements || {}
       // State-specific overrides
-    }, rt(I) || o.getState().setInitialStateOptions(I, y[I]);
+    }, et(p) || o.getState().setInitialStateOptions(p, y[p]);
   }), o.getState().setInitialStates(f), o.getState().setCreatedState(f);
-  const k = (I, a) => {
-    const [v] = et(a?.componentId ?? $t());
+  const b = (p, s) => {
+    const [v] = Q(s?.componentId ?? yt());
     At({
-      stateKey: I,
-      options: a,
+      stateKey: p,
+      options: s,
       initialOptionsPart: y
     });
-    const n = o.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [z, j] = Jt(
+    const n = o.getState().cogsStateStore[p] || f[p], S = s?.modifyState ? s.modifyState(n) : n, [L, O] = Bt(
       S,
       {
-        stateKey: I,
-        syncUpdate: a?.syncUpdate,
+        stateKey: p,
+        syncUpdate: s?.syncUpdate,
         componentId: v,
-        localStorage: a?.localStorage,
-        middleware: a?.middleware,
-        enabledSync: a?.enabledSync,
-        reactiveType: a?.reactiveType,
-        reactiveDeps: a?.reactiveDeps,
-        initialState: a?.initialState,
-        dependencies: a?.dependencies,
-        serverState: a?.serverState
+        localStorage: s?.localStorage,
+        middleware: s?.middleware,
+        enabledSync: s?.enabledSync,
+        reactiveType: s?.reactiveType,
+        reactiveDeps: s?.reactiveDeps,
+        initialState: s?.initialState,
+        dependencies: s?.dependencies,
+        serverState: s?.serverState
       }
     );
-    return j;
+    return O;
   };
-  function p(I, a) {
-    At({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Bt(I, a), ht(I);
+  function T(p, s) {
+    At({ stateKey: p, options: s, initialOptionsPart: y }), s.localStorage && Ht(p, s), gt(p);
   }
-  return { useCogsState: k, setCogsOptions: p };
+  return { useCogsState: b, setCogsOptions: T };
 }, {
-  setUpdaterState: ft,
-  setState: nt,
-  getInitialOptions: rt,
+  setUpdaterState: lt,
+  setState: K,
+  getInitialOptions: et,
   getKeyState: Nt,
-  getValidationErrors: Lt,
-  setStateLog: Gt,
-  updateInitialStateGlobal: Tt,
-  addValidationError: Ht,
-  removeValidationError: Q,
-  setServerSyncActions: zt
-} = o.getState(), kt = (t, c, m, f, y) => {
+  getValidationErrors: Dt,
+  setStateLog: Wt,
+  updateInitialStateGlobal: It,
+  addValidationError: Lt,
+  removeValidationError: J,
+  setServerSyncActions: Gt
+} = o.getState(), $t = (t, c, m, f, y) => {
   m?.log && console.log(
     "saving to localstorage",
     c,
     m.localStorage?.key,
     f
   );
-  const k = K(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (k && f) {
-    const p = `${f}-${c}-${k}`;
-    let I;
+  const b = Y(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
+  if (b && f) {
+    const T = `${f}-${c}-${b}`;
+    let p;
     try {
-      I = mt(p)?.lastSyncedWithServer;
+      p = ut(T)?.lastSyncedWithServer;
     } catch {
     }
-    const a = {
+    const s = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: y ?? I
-    }, v = Ft.serialize(a);
+      lastSyncedWithServer: y ?? p
+    }, v = Ot.serialize(s);
     window.localStorage.setItem(
-      p,
+      T,
       JSON.stringify(v.json)
     );
   }
-}, mt = (t) => {
+}, ut = (t) => {
   if (!t) return null;
   try {
     const c = window.localStorage.getItem(t);
@@ -118,29 +118,29 @@ const de = (t, c) => {
   } catch (c) {
     return console.error("Error loading from localStorage:", c), null;
   }
-}, Bt = (t, c) => {
-  const m = o.getState().cogsStateStore[t], { sessionId: f } = xt(), y = K(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
+}, Ht = (t, c) => {
+  const m = o.getState().cogsStateStore[t], { sessionId: f } = bt(), y = Y(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
   if (y && f) {
-    const k = mt(
+    const b = ut(
       `${f}-${t}-${y}`
     );
-    if (k && k.lastUpdated > (k.lastSyncedWithServer || 0))
-      return nt(t, k.state), ht(t), !0;
+    if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
+      return K(t, b.state), gt(t), !0;
   }
   return !1;
-}, Pt = (t, c, m, f, y, k) => {
-  const p = {
+}, Vt = (t, c, m, f, y, b) => {
+  const T = {
     initialState: c,
-    updaterState: St(
+    updaterState: dt(
       t,
       f,
       y,
-      k
+      b
     ),
     state: m
   };
-  Tt(t, p.initialState), ft(t, p.updaterState), nt(t, p.state);
-}, ht = (t) => {
+  It(t, T.initialState), lt(t, T.updaterState), K(t, T.state);
+}, gt = (t) => {
   const c = o.getState().stateComponents.get(t);
   if (!c) return;
   const m = /* @__PURE__ */ new Set();
@@ -149,7 +149,7 @@ const de = (t, c) => {
   }), queueMicrotask(() => {
     m.forEach((f) => f());
   });
-}, ue = (t, c) => {
+}, le = (t, c) => {
   const m = o.getState().stateComponents.get(t);
   if (m) {
     const f = `${t}////${c}`, y = m.components.get(f);
@@ -157,22 +157,22 @@ const de = (t, c) => {
       return;
     y && y.forceUpdate();
   }
-}, qt = (t, c, m, f) => {
+}, zt = (t, c, m, f) => {
   switch (t) {
     case "update":
       return {
-        oldValue: Z(c, f),
-        newValue: Z(m, f)
+        oldValue: z(c, f),
+        newValue: z(m, f)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: Z(m, f)
+        newValue: z(m, f)
       };
     case "cut":
       return {
-        oldValue: Z(c, f),
+        oldValue: z(c, f),
         newValue: null
         // or undefined
       };
@@ -180,27 +180,27 @@ const de = (t, c) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Jt(t, {
+function Bt(t, {
   stateKey: c,
   serverSync: m,
   localStorage: f,
   formElements: y,
-  reactiveDeps: k,
-  reactiveType: p,
-  componentId: I,
-  initialState: a,
+  reactiveDeps: b,
+  reactiveType: T,
+  componentId: p,
+  initialState: s,
   syncUpdate: v,
   dependencies: n,
   serverState: S
 } = {}) {
-  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(
+  const [L, O] = Q({}), { sessionId: U } = bt();
+  let G = !c;
+  const [h] = Q(c ?? yt()), l = o.getState().stateLog[h], st = Z(/* @__PURE__ */ new Set()), X = Z(p ?? yt()), M = Z(
     null
   );
-  M.current = rt(h) ?? null, st(() => {
+  M.current = et(h) ?? null, ot(() => {
     if (v && v.stateKey === h && v.path?.[0]) {
-      nt(h, (r) => ({
+      K(h, (r) => ({
         ...r,
         [v.path[0]]: v.newValue
       }));
@@ -210,269 +210,269 @@ function Jt(t, {
         userId: v.userId
       });
     }
-  }, [v]), st(() => {
-    if (a) {
-      bt(h, {
-        initialState: a
+  }, [v]), ot(() => {
+    if (s) {
+      Et(h, {
+        initialState: 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)
+      const e = M.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
+      if (!(i && !H(i, s) || !i) && !a)
         return;
-      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(
+      let g = null;
+      const I = Y(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
+      I && U && (g = ut(`${U}-${h}-${I}`));
+      let w = s, A = !1;
+      const C = a ? Date.now() : 0, P = g?.lastUpdated || 0, j = g?.lastSyncedWithServer || 0;
+      a && C > P ? (w = e.serverState.data, A = !0) : g && P > j && (w = g.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), o.getState().initializeShadowState(h, s), Vt(
         h,
-        a,
+        s,
         w,
-        ot,
-        tt.current,
-        O
-      ), b && T && O && kt(w, h, e, O, Date.now()), ht(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || j({});
+        nt,
+        X.current,
+        U
+      ), A && I && U && $t(w, h, e, U, Date.now()), gt(h), (Array.isArray(T) ? T : [T || "component"]).includes("none") || O({});
     }
   }, [
-    a,
+    s,
     S?.status,
     S?.data,
     ...n || []
-  ]), gt(() => {
-    B && bt(h, {
+  ]), ct(() => {
+    G && Et(h, {
       serverSync: m,
       formElements: y,
-      initialState: a,
+      initialState: s,
       localStorage: f,
       middleware: M.current?.middleware
     });
-    const e = `${h}////${tt.current}`, r = o.getState().stateComponents.get(h) || {
+    const e = `${h}////${X.current}`, r = o.getState().stateComponents.get(h) || {
       components: /* @__PURE__ */ new Map()
     };
     return r.components.set(e, {
-      forceUpdate: () => j({}),
+      forceUpdate: () => O({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: k || void 0,
-      reactiveType: p ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(h, r), j({}), () => {
+      depsFunction: b || void 0,
+      reactiveType: T ?? ["component", "deps"]
+    }), o.getState().stateComponents.set(h, r), O({}), () => {
       r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(h));
     };
   }, []);
-  const ot = (e, r, s, i) => {
+  const nt = (e, r, a, i) => {
     if (Array.isArray(r)) {
-      const d = `${h}-${r.join(".")}`;
-      ct.current.add(d);
+      const g = `${h}-${r.join(".")}`;
+      st.current.add(g);
     }
-    const g = o.getState();
-    nt(h, (d) => {
-      const T = K(e) ? e(d) : e, w = `${h}-${r.join(".")}`;
+    const u = o.getState();
+    K(h, (g) => {
+      const I = Y(e) ? e(g) : 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 U = r.slice(0, -1), W = Z(T, U);
-          if (Array.isArray(W)) {
-            _ = !0;
-            const V = `${h}-${U.join(".")}`;
-            E = g.signalDomElements.get(V);
+        let x = !1, N = u.signalDomElements.get(w);
+        if ((!N || N.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
+          const R = r.slice(0, -1), D = z(I, R);
+          if (Array.isArray(D)) {
+            x = !0;
+            const $ = `${h}-${R.join(".")}`;
+            N = u.signalDomElements.get($);
           }
         }
-        if (E) {
-          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 (N) {
+          const R = x ? z(I, r.slice(0, -1)) : z(I, r);
+          N.forEach(({ parentId: D, position: $, effect: E }) => {
+            const k = document.querySelector(
+              `[data-parent-id="${D}"]`
             );
-            if (R) {
-              const $ = Array.from(R.childNodes);
-              if ($[V]) {
-                const A = F ? new Function("state", `return (${F})(state)`)(U) : U;
-                $[V].textContent = String(A);
+            if (k) {
+              const _ = Array.from(k.childNodes);
+              if (_[$]) {
+                const V = E ? new Function("state", `return (${E})(state)`)(R) : R;
+                _[$].textContent = String(V);
               }
             }
           });
         }
       }
-      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (i || M.current?.validation?.key) && r && Q(
+      console.log("shadowState", u.shadowStateStore), a.updateType === "update" && (i || M.current?.validation?.key) && r && J(
         (i || M.current?.validation?.key) + "." + r.join(".")
       );
-      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 == b.join(".") && W == b.length - 1) {
-          let V = E + "." + b;
-          Q(E), Ht(V, U);
+      const A = r.slice(0, r.length - 1);
+      a.updateType === "cut" && M.current?.validation?.key && J(
+        M.current?.validation?.key + "." + A.join(".")
+      ), a.updateType === "insert" && M.current?.validation?.key && Dt(
+        M.current?.validation?.key + "." + A.join(".")
+      ).filter(([N, R]) => {
+        let D = N?.split(".").length;
+        if (N == A.join(".") && D == A.length - 1) {
+          let $ = N + "." + A;
+          J(N), Lt($, R);
         }
       });
-      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(".") || "";
+      const C = u.stateComponents.get(h);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", C), C) {
+        const x = vt(g, I), N = new Set(x), R = a.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
         for (const [
-          W,
-          V
-        ] of N.components.entries()) {
-          let F = !1;
-          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();
+          D,
+          $
+        ] of C.components.entries()) {
+          let E = !1;
+          const k = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
+          if (console.log("component", $), !k.includes("none")) {
+            if (k.includes("all")) {
+              $.forceUpdate();
               continue;
             }
-            if (R.includes("component") && ((V.paths.has(U) || V.paths.has("")) && (F = !0), !F))
-              for (const $ of E) {
-                let A = $;
+            if (k.includes("component") && (($.paths.has(R) || $.paths.has("")) && (E = !0), !E))
+              for (const _ of N) {
+                let V = _;
                 for (; ; ) {
-                  if (V.paths.has(A)) {
-                    F = !0;
+                  if ($.paths.has(V)) {
+                    E = !0;
                     break;
                   }
-                  const L = A.lastIndexOf(".");
-                  if (L !== -1) {
-                    const q = A.substring(
+                  const W = V.lastIndexOf(".");
+                  if (W !== -1) {
+                    const q = V.substring(
                       0,
-                      L
+                      W
                     );
                     if (!isNaN(
-                      Number(A.substring(L + 1))
-                    ) && V.paths.has(q)) {
-                      F = !0;
+                      Number(V.substring(W + 1))
+                    ) && $.paths.has(q)) {
+                      E = !0;
                       break;
                     }
-                    A = q;
+                    V = q;
                   } else
-                    A = "";
-                  if (A === "")
+                    V = "";
+                  if (V === "")
                     break;
                 }
-                if (F) break;
+                if (E) break;
               }
-            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);
+            if (!E && k.includes("deps") && $.depsFunction) {
+              const _ = $.depsFunction(I);
+              let V = !1;
+              typeof _ == "boolean" ? _ && (V = !0) : H($.deps, _) || ($.deps = _, V = !0), V && (E = !0);
             }
-            F && V.forceUpdate();
+            E && $.forceUpdate();
           }
         }
       }
-      const C = Date.now();
-      r = r.map((_, E) => {
-        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 P = Date.now();
+      r = r.map((x, N) => {
+        const R = r.slice(0, -1), D = z(I, R);
+        return N === r.length - 1 && ["insert", "cut"].includes(a.updateType) ? (D.length - 1).toString() : x;
       });
-      const { oldValue: P, newValue: D } = qt(
-        s.updateType,
-        d,
-        T,
+      const { oldValue: j, newValue: F } = zt(
+        a.updateType,
+        g,
+        I,
         r
-      ), x = {
-        timeStamp: C,
+      ), B = {
+        timeStamp: P,
         stateKey: h,
         path: r,
-        updateType: s.updateType,
+        updateType: a.updateType,
         status: "new",
-        oldValue: P,
-        newValue: D
+        oldValue: j,
+        newValue: F
       };
-      switch (s.updateType) {
+      switch (a.updateType) {
         case "update":
-          g.updateShadowAtPath(h, r, T);
+          u.updateShadowAtPath(h, r, I);
           break;
         case "insert":
-          const _ = r.slice(0, -1);
-          g.insertShadowArrayElement(h, _, D);
+          const x = r.slice(0, -1);
+          u.insertShadowArrayElement(h, x, F);
           break;
         case "cut":
-          const E = r.slice(0, -1), U = parseInt(r[r.length - 1]);
-          g.removeShadowArrayElement(h, E, U);
+          const N = r.slice(0, -1), R = parseInt(r[r.length - 1]);
+          u.removeShadowArrayElement(h, N, R);
           break;
       }
-      if (Gt(h, (_) => {
-        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;
+      if (Wt(h, (x) => {
+        const R = [...x ?? [], B].reduce((D, $) => {
+          const E = `${$.stateKey}:${JSON.stringify($.path)}`, k = D.get(E);
+          return k ? (k.timeStamp = Math.max(k.timeStamp, $.timeStamp), k.newValue = $.newValue, k.oldValue = k.oldValue ?? $.oldValue, k.updateType = $.updateType) : D.set(E, { ...$ }), D;
         }, /* @__PURE__ */ new Map());
-        return Array.from(U.values());
-      }), kt(
-        T,
+        return Array.from(R.values());
+      }), $t(
+        I,
         h,
         M.current,
-        O
+        U
       ), M.current?.middleware && M.current.middleware({
         updateLog: l,
-        update: x
+        update: B
       }), 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: _,
-          actionTimeStamp: Date.now() + (E.debounce ?? 3e3),
+        const x = u.serverState[h], N = M.current?.serverSync;
+        Gt(h, {
+          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: I }),
+          rollBackState: x,
+          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return T;
+      return I;
     });
   };
-  o.getState().updaterState[h] || (ft(
+  o.getState().updaterState[h] || (lt(
     h,
-    St(
+    dt(
       h,
-      ot,
-      tt.current,
-      O
+      nt,
+      X.current,
+      U
     )
-  ), o.getState().cogsStateStore[h] || nt(h, t), o.getState().initialStateGlobal[h] || Tt(h, t));
-  const u = pt(() => St(
+  ), o.getState().cogsStateStore[h] || K(h, t), o.getState().initialStateGlobal[h] || It(h, t));
+  const d = ht(() => dt(
     h,
-    ot,
-    tt.current,
-    O
-  ), [h, O]);
-  return [Nt(h), u];
+    nt,
+    X.current,
+    U
+  ), [h, U]);
+  return [Nt(h), d];
 }
-function St(t, c, m, f) {
+function dt(t, c, m, f) {
   const y = /* @__PURE__ */ new Map();
-  let k = 0;
-  const p = (v) => {
+  let b = 0;
+  const T = (v) => {
     const n = v.join(".");
     for (const [S] of y)
       (S === n || S.startsWith(n + ".")) && y.delete(S);
-    k++;
-  }, I = {
+    b++;
+  }, p = {
     removeValidation: (v) => {
-      v?.validationKey && Q(v.validationKey);
+      v?.validationKey && J(v.validationKey);
     },
     revertToInitialState: (v) => {
       const n = o.getState().getInitialOptions(t)?.validation;
-      n?.key && Q(n?.key), v?.validationKey && Q(v.validationKey);
+      n?.key && J(n?.key), v?.validationKey && J(v.validationKey);
       const S = o.getState().initialStateGlobal[t];
-      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);
+      o.getState().clearSelectedIndexesForState(t), y.clear(), b++;
+      const L = s(S, []), O = et(t), U = Y(O?.localStorage?.key) ? O?.localStorage?.key(S) : O?.localStorage?.key, G = `${f}-${t}-${U}`;
+      G && localStorage.removeItem(G), lt(t, L), K(t, S);
       const h = o.getState().stateComponents.get(t);
       return h && h.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
     updateInitialState: (v) => {
-      y.clear(), k++;
-      const n = St(
+      y.clear(), b++;
+      const n = dt(
         t,
         c,
         m,
         f
-      ), 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) => {
+      ), S = o.getState().initialStateGlobal[t], L = et(t), O = Y(L?.localStorage?.key) ? L?.localStorage?.key(S) : L?.localStorage?.key, U = `${f}-${t}-${O}`;
+      return localStorage.getItem(U) && localStorage.removeItem(U), Pt(() => {
+        It(t, v), o.getState().initializeShadowState(t, v), lt(t, n), K(t, v);
+        const G = o.getState().stateComponents.get(t);
+        G && G.components.forEach((h) => {
           h.forceUpdate();
         });
       }), {
-        fetchId: (B) => n.get()[B]
+        fetchId: (G) => n.get()[G]
       };
     },
     _initialState: o.getState().initialStateGlobal[t],
@@ -480,27 +480,27 @@ function St(t, c, m, f) {
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
       const v = o.getState().serverState[t];
-      return !!(v && Y(v, Nt(t)));
+      return !!(v && H(v, Nt(t)));
     }
   };
-  function a(v, n = [], S) {
-    const z = n.map(String).join(".");
-    y.get(z);
-    const j = function() {
+  function s(v, n = [], S) {
+    const L = n.map(String).join(".");
+    y.get(L);
+    const O = function() {
       return o().getNestedState(t, n);
     };
-    Object.keys(I).forEach((h) => {
-      j[h] = I[h];
+    Object.keys(p).forEach((h) => {
+      O[h] = p[h];
     });
-    const O = {
-      apply(h, l, ct) {
+    const U = {
+      apply(h, l, st) {
         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 ct = /* @__PURE__ */ new Set([
+        const st = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,43 +523,43 @@ function St(t, c, m, f) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !ct.has(l)) {
-          const u = `${t}////${m}`, e = o.getState().stateComponents.get(t);
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !st.has(l)) {
+          const d = `${t}////${m}`, e = o.getState().stateComponents.get(t);
           if (e) {
-            const r = e.components.get(u);
+            const r = e.components.get(d);
             if (r && !r.paths.has("")) {
-              const s = n.join(".");
+              const a = n.join(".");
               let i = !0;
-              for (const g of r.paths)
-                if (s.startsWith(g) && (s === g || s[g.length] === ".")) {
+              for (const u of r.paths)
+                if (a.startsWith(u) && (a === u || a[u.length] === ".")) {
                   i = !1;
                   break;
                 }
-              i && r.paths.add(s);
+              i && r.paths.add(a);
             }
           }
         }
         if (l === "getDifferences")
-          return () => wt(
+          return () => vt(
             o.getState().cogsStateStore[t],
             o.getState().initialStateGlobal[t]
           );
         if (l === "sync" && n.length === 0)
           return async function() {
-            const u = o.getState().getInitialOptions(t), e = u?.sync;
+            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 = u?.validation?.key;
+            const r = o.getState().getNestedState(t, []), a = d?.validation?.key;
             try {
               const i = await e.action(r);
-              if (i && !i.success && i.errors && s) {
-                o.getState().removeValidationError(s), i.errors.forEach((d) => {
-                  const T = [s, ...d.path].join(".");
-                  o.getState().addValidationError(T, d.message);
+              if (i && !i.success && i.errors && a) {
+                o.getState().removeValidationError(a), i.errors.forEach((g) => {
+                  const I = [a, ...g.path].join(".");
+                  o.getState().addValidationError(I, g.message);
                 });
-                const g = o.getState().stateComponents.get(t);
-                g && g.components.forEach((d) => {
-                  d.forceUpdate();
+                const u = o.getState().stateComponents.get(t);
+                u && u.components.forEach((g) => {
+                  g.forceUpdate();
                 });
               }
               return i?.success && e.onSuccess ? e.onSuccess(i.data) : !i?.success && e.onError && e.onError(i.error), i;
@@ -568,42 +568,42 @@ function St(t, c, m, f) {
             }
           };
         if (l === "_status") {
-          const u = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = Z(e, n);
-          return Y(u, r) ? "fresh" : "stale";
+          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = z(e, n);
+          return H(d, r) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
-            const u = o().getNestedState(
+            const d = o().getNestedState(
               t,
               n
-            ), e = o.getState().initialStateGlobal[t], r = Z(e, n);
-            return Y(u, r) ? "fresh" : "stale";
+            ), e = o.getState().initialStateGlobal[t], r = z(e, n);
+            return H(d, r) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            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);
+            const d = o.getState().initialStateGlobal[t], e = et(t), r = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${f}-${t}-${r}`;
+            a && localStorage.removeItem(a);
           };
         if (l === "showValidationErrors")
           return () => {
-            const u = o.getState().getInitialOptions(t)?.validation;
-            if (!u?.key)
+            const d = o.getState().getInitialOptions(t)?.validation;
+            if (!d?.key)
               throw new Error("Validation key not found");
-            return o.getState().getValidationErrors(u.key + "." + n.join("."));
+            return o.getState().getValidationErrors(d.key + "." + n.join("."));
           };
         if (Array.isArray(v)) {
-          const u = () => S?.validIndices ? v.map((r, s) => ({
+          const d = () => S?.validIndices ? v.map((r, a) => ({
             item: r,
-            originalIndex: S.validIndices[s]
-          })) : o.getState().getNestedState(t, n).map((r, s) => ({
+            originalIndex: S.validIndices[a]
+          })) : o.getState().getNestedState(t, n).map((r, a) => ({
             item: r,
-            originalIndex: s
+            originalIndex: a
           }));
           if (l === "getSelected")
             return () => {
               const e = o.getState().getSelectedIndex(t, n.join("."));
               if (e !== void 0)
-                return a(
+                return s(
                   v[e],
                   [...n, e.toString()],
                   S
@@ -619,205 +619,169 @@ function St(t, c, m, f) {
             return (e) => {
               const {
                 itemHeight: r = 50,
-                overscan: s = 5,
+                overscan: a = 5,
                 stickToBottom: i = !1
-              } = e, g = X(null), [d, T] = et({
-                startIndex: 0,
-                endIndex: 10
-              }), 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 #${$}`
-                  ), N((L) => L + 1);
-                });
-              }, [t]);
-              const D = o().getNestedState(
+              } = e, u = Z(null), g = o().getNestedState(
                 t,
                 n
-              ), x = D.length;
-              console.log(
-                `[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 A = 0;
-                const L = [];
-                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;
+              ), I = g.length, [w, A] = Q({
+                startIndex: 0,
+                endIndex: 10
+              }), C = Z(i), [P, j] = Q(0), F = Z(!1);
+              ot(() => o.getState().subscribeToShadowState(t, () => {
+                j((k) => k + 1);
+              }), [t]);
+              const { totalHeight: B, positions: x } = ht(() => {
+                const E = o.getState().getShadowMetadata(t, n) || [];
+                let k = 0;
+                const _ = [];
+                for (let V = 0; V < I; V++) {
+                  _[V] = k;
+                  const W = E[V]?.virtualizer?.itemHeight;
+                  k += W || r;
                 }
-                const G = d.endIndex - d.startIndex, lt = J === G && G > 0;
-                return console.log(
-                  `[VirtualView] Heights calc - measured: ${q}/${x}, visible measured: ${J}/${G}, totalHeight: ${A}`
-                ), {
-                  totalHeight: A,
-                  positions: L,
-                  visibleMeasured: lt
-                };
+                return { totalHeight: k, positions: _ };
               }, [
-                x,
+                I,
                 t,
                 n.join("."),
                 r,
-                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: ${$}-${A} (${A - $} items)`
-                );
-                const L = Array.from(
-                  { length: A - $ },
-                  (J, G) => $ + G
-                ), q = L.map((J) => D[J]);
-                return a(q, n, {
+                P
+              ]), N = ht(() => {
+                const E = Math.max(0, w.startIndex), k = Math.min(I, w.endIndex), _ = Array.from(
+                  { length: k - E },
+                  (W, q) => E + q
+                ), V = _.map((W) => g[W]);
+                return s(V, n, {
                   ...S,
-                  validIndices: L
+                  validIndices: _
                 });
-              }, [d.startIndex, d.endIndex, D, x]);
-              gt(() => {
-                const $ = g.current;
-                if (!$) return;
-                const A = () => {
-                  if (!$) return;
-                  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;
+              }, [w.startIndex, w.endIndex, g, I]);
+              ct(() => {
+                const E = u.current;
+                if (!E) return;
+                const k = () => {
+                  if (!E) return;
+                  const { scrollTop: V } = E;
+                  let W = 0, q = I - 1;
+                  for (; W <= q; ) {
+                    const ft = Math.floor((W + q) / 2);
+                    x[ft] < V ? W = ft + 1 : q = ft - 1;
                   }
-                  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, A();
+                  const pt = Math.max(0, q - a);
+                  let tt = pt;
+                  const xt = V + E.clientHeight;
+                  for (; tt < I && x[tt] < xt; )
+                    tt++;
+                  tt = Math.min(I, tt + a), A({ startIndex: pt, endIndex: tt });
+                }, _ = () => {
+                  C.current = E.scrollHeight - E.scrollTop - E.clientHeight < 1, k();
                 };
-                if ($.addEventListener("scroll", L, {
+                if (E.addEventListener("scroll", _, {
                   passive: !0
-                }), 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);
+                }), i && !F.current && I > 0 && E.clientHeight > 0) {
+                  F.current = !0;
+                  const V = Math.ceil(
+                    E.clientHeight / r
+                  ), W = Math.max(
+                    0,
+                    I - V - a
+                  );
+                  A({
+                    startIndex: W,
+                    endIndex: I
+                  }), E.scrollTop = E.scrollHeight;
+                }
+                return k(), () => {
+                  E.removeEventListener("scroll", _);
                 };
-              }, [x, E, i]);
-              const V = Et(
-                ($ = "smooth") => {
-                  g.current && (w.current = !0, g.current.scrollTo({
-                    top: g.current.scrollHeight,
-                    behavior: $
+              }, [I, x, i, r, a]);
+              const R = wt(
+                (E = "smooth") => {
+                  u.current && (C.current = !0, u.current.scrollTo({
+                    top: u.current.scrollHeight,
+                    behavior: E
                   }));
                 },
                 []
-              ), F = Et(
-                ($, A = "smooth") => {
-                  g.current && E[$] !== void 0 && (w.current = !1, g.current.scrollTo({
-                    top: E[$],
-                    behavior: A
+              ), D = wt(
+                (E, k = "smooth") => {
+                  u.current && x[E] !== void 0 && (C.current = !1, u.current.scrollTo({
+                    top: x[E],
+                    behavior: k
                   }));
                 },
-                [E]
-              ), R = {
+                [x]
+              ), $ = {
                 outer: {
-                  ref: g,
+                  ref: u,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${_}px`,
+                    height: `${B}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${E[d.startIndex] || 0}px)`
+                    transform: `translateY(${x[w.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: W,
-                virtualizerProps: R,
-                scrollToBottom: V,
-                scrollToIndex: F
+                virtualState: N,
+                virtualizerProps: $,
+                scrollToBottom: R,
+                scrollToIndex: D
               };
             };
           if (l === "stateSort")
             return (e) => {
-              const s = [...u()].sort(
-                (d, T) => e(d.item, T.item)
-              ), i = s.map(({ item: d }) => d), g = {
+              const a = [...d()].sort(
+                (g, I) => e(g.item, I.item)
+              ), i = a.map(({ item: g }) => g), u = {
                 ...S,
-                validIndices: s.map(
-                  ({ originalIndex: d }) => d
+                validIndices: a.map(
+                  ({ originalIndex: g }) => g
                 )
               };
-              return a(i, n, g);
+              return s(i, n, u);
             };
           if (l === "stateFilter")
             return (e) => {
-              const s = u().filter(
-                ({ item: d }, T) => e(d, T)
-              ), i = s.map(({ item: d }) => d), g = {
+              const a = d().filter(
+                ({ item: g }, I) => e(g, I)
+              ), i = a.map(({ item: g }) => g), u = {
                 ...S,
-                validIndices: s.map(
-                  ({ originalIndex: d }) => d
+                validIndices: a.map(
+                  ({ originalIndex: g }) => g
                 )
               };
-              return a(i, n, g);
+              return s(i, n, u);
             };
           if (l === "stateMap")
             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 d = r[i], T = [...n, i.toString()], w = a(d, T, S);
-                return e(d, w, {
+              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
+                const g = r[i], I = [...n, i.toString()], w = s(g, I, S);
+                return e(g, w, {
                   register: () => {
-                    const [, N] = et({}), C = `${m}-${n.join(".")}-${i}`;
-                    gt(() => {
-                      const P = `${t}////${C}`, D = o.getState().stateComponents.get(t) || {
+                    const [, C] = Q({}), P = `${m}-${n.join(".")}-${i}`;
+                    ct(() => {
+                      const j = `${t}////${P}`, F = o.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return D.components.set(P, {
-                        forceUpdate: () => N({}),
-                        paths: /* @__PURE__ */ new Set([T.join(".")])
-                      }), o.getState().stateComponents.set(t, D), () => {
-                        const x = o.getState().stateComponents.get(t);
-                        x && x.components.delete(P);
+                      return F.components.set(j, {
+                        forceUpdate: () => C({}),
+                        paths: /* @__PURE__ */ new Set([I.join(".")])
+                      }), o.getState().stateComponents.set(t, F), () => {
+                        const B = o.getState().stateComponents.get(t);
+                        B && B.components.delete(j);
                       };
-                    }, [t, C]);
+                    }, [t, P]);
                   },
-                  index: g,
+                  index: u,
                   originalIndex: i
                 });
               }) : (console.warn(
@@ -826,44 +790,44 @@ function St(t, c, m, f) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => v.map((s, i) => {
-              let g;
-              S?.validIndices && S.validIndices[i] !== void 0 ? g = S.validIndices[i] : g = i;
-              const d = [...n, g.toString()], T = a(s, d, S);
+            return (e) => v.map((a, i) => {
+              let u;
+              S?.validIndices && S.validIndices[i] !== void 0 ? u = S.validIndices[i] : u = i;
+              const g = [...n, u.toString()], I = s(a, g, S);
               return e(
-                s,
-                T,
+                a,
+                I,
                 i,
                 v,
-                a(v, n, S)
+                s(v, n, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => it(Yt, {
+            return (e) => at(qt, {
               proxy: {
                 _stateKey: t,
                 _path: n,
                 _mapFn: e
                 // Pass the actual function, not string
               },
-              rebuildStateShape: a
+              rebuildStateShape: s
             });
           if (l === "stateList")
             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 d = r[i], T = [...n, i.toString()], w = a(d, T, S), b = `${m}-${n.join(".")}-${i}`;
-                return it(Xt, {
+              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
+                const g = r[i], I = [...n, i.toString()], w = s(g, I, S), A = `${m}-${n.join(".")}-${i}`;
+                return at(Yt, {
                   key: i,
                   stateKey: t,
-                  itemComponentId: b,
-                  itemPath: T,
+                  itemComponentId: A,
+                  itemPath: I,
                   children: e(
-                    d,
-                    w,
                     g,
+                    w,
+                    u,
                     r,
-                    a(r, n, S)
+                    s(r, n, S)
                   )
                 });
               }) : (console.warn(
@@ -873,12 +837,12 @@ function St(t, c, m, f) {
           if (l === "stateFlattenOn")
             return (e) => {
               const r = v;
-              y.clear(), k++;
-              const s = r.flatMap(
+              y.clear(), b++;
+              const a = r.flatMap(
                 (i) => i[e] ?? []
               );
-              return a(
-                s,
+              return s(
+                a,
                 [...n, "[*]", e],
                 S
               );
@@ -886,46 +850,46 @@ function St(t, c, m, f) {
           if (l === "index")
             return (e) => {
               const r = v[e];
-              return a(r, [...n, e.toString()]);
+              return s(r, [...n, e.toString()]);
             };
           if (l === "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()];
-              return a(s, i);
+              const r = e.length - 1, a = e[r], i = [...n, r.toString()];
+              return s(a, i);
             };
           if (l === "insert")
-            return (e) => (p(n), yt(c, e, n, t), a(
+            return (e) => (T(n), St(c, e, n, t), s(
               o.getState().getNestedState(t, n),
               n
             ));
           if (l === "uniqueInsert")
-            return (e, r, s) => {
-              const i = o.getState().getNestedState(t, n), g = K(e) ? e(i) : e;
-              let d = null;
+            return (e, r, a) => {
+              const i = o.getState().getNestedState(t, n), u = Y(e) ? e(i) : e;
+              let g = null;
               if (!i.some((w) => {
                 if (r) {
-                  const N = r.every(
-                    (C) => Y(w[C], g[C])
+                  const C = r.every(
+                    (P) => H(w[P], u[P])
                   );
-                  return N && (d = w), N;
+                  return C && (g = w), C;
                 }
-                const b = Y(w, g);
-                return b && (d = w), b;
+                const A = H(w, u);
+                return A && (g = w), A;
               }))
-                p(n), yt(c, g, n, t);
-              else if (s && d) {
-                const w = s(d), b = i.map(
-                  (N) => Y(N, d) ? w : N
+                T(n), St(c, u, n, t);
+              else if (a && g) {
+                const w = a(g), A = i.map(
+                  (C) => H(C, g) ? w : C
                 );
-                p(n), at(c, b, n);
+                T(n), rt(c, A, n);
               }
             };
           if (l === "cut")
             return (e, r) => {
               if (!r?.waitForSync)
-                return p(n), ut(c, n, t, e), a(
+                return T(n), it(c, n, t, e), s(
                   o.getState().getNestedState(t, n),
                   n
                 );
@@ -933,187 +897,187 @@ function St(t, c, m, f) {
           if (l === "cutByValue")
             return (e) => {
               for (let r = 0; r < v.length; r++)
-                v[r] === e && ut(c, n, t, r);
+                v[r] === e && it(c, n, t, r);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const r = v.findIndex((s) => s === e);
-              r > -1 ? ut(c, n, t, r) : yt(c, e, n, t);
+              const r = v.findIndex((a) => a === e);
+              r > -1 ? it(c, n, t, r) : St(c, e, n, t);
             };
           if (l === "stateFind")
             return (e) => {
-              const s = u().find(
-                ({ item: g }, d) => e(g, d)
+              const a = d().find(
+                ({ item: u }, g) => e(u, g)
               );
-              if (!s) return;
-              const i = [...n, s.originalIndex.toString()];
-              return a(s.item, i, S);
+              if (!a) return;
+              const i = [...n, a.originalIndex.toString()];
+              return s(a.item, i, S);
             };
           if (l === "findWith")
             return (e, r) => {
-              const i = u().find(
-                ({ item: d }) => d[e] === r
+              const i = d().find(
+                ({ item: g }) => g[e] === r
               );
               if (!i) return;
-              const g = [...n, i.originalIndex.toString()];
-              return a(i.item, g, S);
+              const u = [...n, i.originalIndex.toString()];
+              return s(i.item, u, S);
             };
         }
-        const tt = n[n.length - 1];
-        if (!isNaN(Number(tt))) {
-          const u = n.slice(0, -1), e = o.getState().getNestedState(t, u);
+        const X = n[n.length - 1];
+        if (!isNaN(Number(X))) {
+          const d = n.slice(0, -1), e = o.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => ut(
+            return () => it(
               c,
-              u,
+              d,
               t,
-              Number(tt)
+              Number(X)
             );
         }
         if (l === "get")
           return () => {
             if (S?.validIndices && Array.isArray(v)) {
-              const u = o.getState().getNestedState(t, n);
-              return S.validIndices.map((e) => u[e]);
+              const d = o.getState().getNestedState(t, n);
+              return S.validIndices.map((e) => d[e]);
             }
             return o.getState().getNestedState(t, n);
           };
         if (l === "$derive")
-          return (u) => Ct({
+          return (d) => kt({
             _stateKey: t,
             _path: n,
-            _effect: u.toString()
+            _effect: d.toString()
           });
         if (l === "$get")
-          return () => Ct({
+          return () => kt({
             _stateKey: t,
             _path: n
           });
         if (l === "lastSynced") {
-          const u = `${t}:${n.join(".")}`;
-          return o.getState().getSyncInfo(u);
+          const d = `${t}:${n.join(".")}`;
+          return o.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (u) => mt(f + "-" + t + "-" + u);
+          return (d) => ut(f + "-" + t + "-" + d);
         if (l === "_selected") {
-          const u = n.slice(0, -1), e = u.join("."), r = o.getState().getNestedState(t, u);
+          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 (l === "setSelected")
-          return (u) => {
-            const e = n.slice(0, -1), r = Number(n[n.length - 1]), s = e.join(".");
-            u ? o.getState().setSelectedIndex(t, s, r) : o.getState().setSelectedIndex(t, s, void 0);
+          return (d) => {
+            const e = n.slice(0, -1), r = Number(n[n.length - 1]), a = e.join(".");
+            d ? o.getState().setSelectedIndex(t, a, r) : o.getState().setSelectedIndex(t, a, void 0);
             const i = o.getState().getNestedState(t, [...e]);
-            at(c, i, e), p(e);
+            rt(c, i, e), T(e);
           };
         if (l === "toggleSelected")
           return () => {
-            const u = n.slice(0, -1), e = Number(n[n.length - 1]), r = u.join("."), s = o.getState().getSelectedIndex(t, r);
+            const d = n.slice(0, -1), e = Number(n[n.length - 1]), r = d.join("."), a = o.getState().getSelectedIndex(t, r);
             o.getState().setSelectedIndex(
               t,
               r,
-              s === e ? void 0 : e
+              a === e ? void 0 : e
             );
-            const i = o.getState().getNestedState(t, [...u]);
-            at(c, i, u), p(u);
+            const i = o.getState().getNestedState(t, [...d]);
+            rt(c, i, d), T(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
-            return (u) => {
-              const e = o.getState().cogsStateStore[t], s = Dt(e, u).newDocument;
-              Pt(
+            return (d) => {
+              const e = o.getState().cogsStateStore[t], a = Ut(e, d).newDocument;
+              Vt(
                 t,
                 o.getState().initialStateGlobal[t],
-                s,
+                a,
                 c,
                 m,
                 f
               );
               const i = o.getState().stateComponents.get(t);
               if (i) {
-                const g = wt(e, s), d = new Set(g);
+                const u = vt(e, a), g = new Set(u);
                 for (const [
-                  T,
+                  I,
                   w
                 ] of i.components.entries()) {
-                  let b = !1;
-                  const N = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
-                  if (!N.includes("none")) {
-                    if (N.includes("all")) {
+                  let A = !1;
+                  const C = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
+                  if (!C.includes("none")) {
+                    if (C.includes("all")) {
                       w.forceUpdate();
                       continue;
                     }
-                    if (N.includes("component") && (w.paths.has("") && (b = !0), !b))
-                      for (const C of d) {
-                        if (w.paths.has(C)) {
-                          b = !0;
+                    if (C.includes("component") && (w.paths.has("") && (A = !0), !A))
+                      for (const P of g) {
+                        if (w.paths.has(P)) {
+                          A = !0;
                           break;
                         }
-                        let P = C.lastIndexOf(".");
-                        for (; P !== -1; ) {
-                          const D = C.substring(0, P);
-                          if (w.paths.has(D)) {
-                            b = !0;
+                        let j = P.lastIndexOf(".");
+                        for (; j !== -1; ) {
+                          const F = P.substring(0, j);
+                          if (w.paths.has(F)) {
+                            A = !0;
                             break;
                           }
-                          const x = C.substring(
-                            P + 1
+                          const B = P.substring(
+                            j + 1
                           );
-                          if (!isNaN(Number(x))) {
-                            const _ = D.lastIndexOf(".");
-                            if (_ !== -1) {
-                              const E = D.substring(
+                          if (!isNaN(Number(B))) {
+                            const x = F.lastIndexOf(".");
+                            if (x !== -1) {
+                              const N = F.substring(
                                 0,
-                                _
+                                x
                               );
-                              if (w.paths.has(E)) {
-                                b = !0;
+                              if (w.paths.has(N)) {
+                                A = !0;
                                 break;
                               }
                             }
                           }
-                          P = D.lastIndexOf(".");
+                          j = F.lastIndexOf(".");
                         }
-                        if (b) break;
+                        if (A) break;
                       }
-                    if (!b && N.includes("deps") && w.depsFunction) {
-                      const C = w.depsFunction(s);
-                      let P = !1;
-                      typeof C == "boolean" ? C && (P = !0) : Y(w.deps, C) || (w.deps = C, P = !0), P && (b = !0);
+                    if (!A && C.includes("deps") && w.depsFunction) {
+                      const P = w.depsFunction(a);
+                      let j = !1;
+                      typeof P == "boolean" ? P && (j = !0) : H(w.deps, P) || (w.deps = P, j = !0), j && (A = !0);
                     }
-                    b && w.forceUpdate();
+                    A && w.forceUpdate();
                   }
                 }
               }
             };
           if (l === "validateZodSchema")
             return () => {
-              const u = o.getState().getInitialOptions(t)?.validation, e = o.getState().addValidationError;
-              if (!u?.zodSchema)
+              const d = o.getState().getInitialOptions(t)?.validation, e = o.getState().addValidationError;
+              if (!d?.zodSchema)
                 throw new Error("Zod schema not found");
-              if (!u?.key)
+              if (!d?.key)
                 throw new Error("Validation key not found");
-              Q(u.key);
+              J(d.key);
               const r = o.getState().cogsStateStore[t];
               try {
-                const s = o.getState().getValidationErrors(u.key);
-                s && s.length > 0 && s.forEach(([g]) => {
-                  g && g.startsWith(u.key) && Q(g);
+                const a = o.getState().getValidationErrors(d.key);
+                a && a.length > 0 && a.forEach(([u]) => {
+                  u && u.startsWith(d.key) && J(u);
                 });
-                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;
+                const i = d.zodSchema.safeParse(r);
+                return i.success ? !0 : (i.error.errors.forEach((g) => {
+                  const I = g.path, w = g.message, A = [d.key, ...I].join(".");
+                  e(A, w);
+                }), gt(t), !1);
+              } catch (a) {
+                return console.error("Zod schema validation failed", a), !1;
               }
             };
           if (l === "_componentId") return m;
           if (l === "getComponents")
             return () => o().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => Vt.getState().getFormRefsByStateKey(t);
+            return () => Tt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return o.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1121,73 +1085,73 @@ function St(t, c, m, f) {
           if (l === "_isLoading")
             return o.getState().isLoadingGlobal[t];
           if (l === "revertToInitialState")
-            return I.revertToInitialState;
-          if (l === "updateInitialState") return I.updateInitialState;
-          if (l === "removeValidation") return I.removeValidation;
+            return p.revertToInitialState;
+          if (l === "updateInitialState") return p.updateInitialState;
+          if (l === "removeValidation") return p.removeValidation;
         }
         if (l === "getFormRef")
-          return () => Vt.getState().getFormRef(t + "." + n.join("."));
+          return () => Tt.getState().getFormRef(t + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
-            children: u,
+            children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ It(
-            Ot,
+          }) => /* @__PURE__ */ mt(
+            jt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: n,
               validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
               validIndices: S?.validIndices,
-              children: u
+              children: d
             }
           );
         if (l === "_stateKey") return t;
         if (l === "_path") return n;
-        if (l === "_isServerSynced") return I._isServerSynced;
+        if (l === "_isServerSynced") return p._isServerSynced;
         if (l === "update")
-          return (u, e) => {
+          return (d, e) => {
             if (e?.debounce)
-              jt(() => {
-                at(c, u, n, "");
+              Mt(() => {
+                rt(c, d, n, "");
                 const r = o.getState().getNestedState(t, n);
                 e?.afterUpdate && e.afterUpdate(r);
               }, e.debounce);
             else {
-              at(c, u, n, "");
+              rt(c, d, n, "");
               const r = o.getState().getNestedState(t, n);
               e?.afterUpdate && e.afterUpdate(r);
             }
-            p(n);
+            T(n);
           };
         if (l === "formElement")
-          return (u, e) => /* @__PURE__ */ It(
-            Ut,
+          return (d, e) => /* @__PURE__ */ mt(
+            Rt,
             {
               setState: c,
               stateKey: t,
               path: n,
-              child: u,
+              child: d,
               formOpts: e
             }
           );
-        const M = [...n, l], ot = o.getState().getNestedState(t, M);
-        return a(ot, M, S);
+        const M = [...n, l], nt = o.getState().getNestedState(t, M);
+        return s(nt, M, S);
       }
-    }, B = new Proxy(j, O);
-    return y.set(z, {
-      proxy: B,
-      stateVersion: k
-    }), B;
+    }, G = new Proxy(O, U);
+    return y.set(L, {
+      proxy: G,
+      stateVersion: b
+    }), G;
   }
-  return a(
+  return s(
     o.getState().getNestedState(t, [])
   );
 }
-function Ct(t) {
-  return it(Zt, { proxy: t });
+function kt(t) {
+  return at(Jt, { proxy: t });
 }
-function Yt({
+function qt({
   proxy: t,
   rebuildStateShape: c
 }) {
@@ -1196,23 +1160,23 @@ function Yt({
     m,
     t._path
   ).stateMapNoRender(
-    (y, k, p, I, a) => t._mapFn(y, k, p, I, a)
+    (y, b, T, p, s) => t._mapFn(y, b, T, p, s)
   ) : null;
 }
-function Zt({
+function Jt({
   proxy: t
 }) {
-  const c = X(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return st(() => {
+  const c = Z(null), m = `${t._stateKey}-${t._path.join(".")}`;
+  return ot(() => {
     const f = c.current;
     if (!f || !f.parentElement) return;
-    const y = f.parentElement, p = Array.from(y.childNodes).indexOf(f);
-    let I = y.getAttribute("data-parent-id");
-    I || (I = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", I));
+    const y = f.parentElement, T = Array.from(y.childNodes).indexOf(f);
+    let p = y.getAttribute("data-parent-id");
+    p || (p = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", p));
     const v = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: I,
-      position: p,
+      parentId: p,
+      position: T,
       effect: t._effect
     };
     o.getState().addSignalElement(m, v);
@@ -1224,22 +1188,22 @@ function Zt({
           "state",
           `return (${t._effect})(state)`
         )(n);
-      } catch (j) {
-        console.error("Error evaluating effect function during mount:", j), S = n;
+      } catch (O) {
+        console.error("Error evaluating effect function during mount:", O), S = n;
       }
     else
       S = n;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const z = document.createTextNode(String(S));
-    f.replaceWith(z);
-  }, [t._stateKey, t._path.join("."), t._effect]), it("span", {
+    const L = document.createTextNode(String(S));
+    f.replaceWith(L);
+  }, [t._stateKey, t._path.join("."), t._effect]), at("span", {
     ref: c,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
-function ge(t) {
-  const c = _t(
+function de(t) {
+  const c = Ct(
     (m) => {
       const f = o.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
@@ -1251,40 +1215,40 @@ function ge(t) {
     },
     () => o.getState().getNestedState(t._stateKey, t._path)
   );
-  return it("text", {}, String(c));
+  return at("text", {}, String(c));
 }
-function Xt({
+function Yt({
   stateKey: t,
   itemComponentId: c,
   itemPath: m,
   children: f
 }) {
-  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, {
+  const [, y] = Q({}), [b, T] = Ft(), p = Z(null);
+  return ot(() => {
+    T.height > 0 && T.height !== p.current && (p.current = T.height, o.getState().setShadowMetadata(t, m, {
       virtualizer: {
-        itemHeight: p.height
+        itemHeight: T.height
       }
     }));
-  }, [p.height, t, m]), gt(() => {
-    const a = `${t}////${c}`, v = o.getState().stateComponents.get(t) || {
+  }, [T.height, t, m]), ct(() => {
+    const s = `${t}////${c}`, v = o.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
-    return v.components.set(a, {
+    return v.components.set(s, {
       forceUpdate: () => y({}),
       paths: /* @__PURE__ */ new Set([m.join(".")])
     }), o.getState().stateComponents.set(t, v), () => {
       const n = o.getState().stateComponents.get(t);
-      n && n.components.delete(a);
+      n && n.components.delete(s);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ It("div", { ref: k, children: f });
+  }, [t, c, m.join(".")]), /* @__PURE__ */ mt("div", { ref: b, children: f });
 }
 export {
-  Ct as $cogsSignal,
-  ge as $cogsSignalStore,
-  le as addStateOptions,
-  de as createCogsState,
-  ue as notifyComponent,
-  Jt as useCogsStateFn
+  kt as $cogsSignal,
+  de as $cogsSignalStore,
+  ie as addStateOptions,
+  ce as createCogsState,
+  le as notifyComponent,
+  Bt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map