cogsbox-state 0.5.343 → 0.5.345

package/dist/CogsState.jsx

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