cogsbox-state 0.5.422 → 0.5.424

package/dist/CogsState.jsx

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