cogsbox-state 0.5.402 → 0.5.404

package/dist/CogsState.jsx

@@ -1,63 +1,63 @@
 "use client";
-import { jsx as _t } from "react/jsx-runtime";
-import { useState as K, useRef as q, useEffect as ot, useLayoutEffect as lt, useMemo as wt, createElement as dt, useSyncExternalStore as Bt, startTransition as Ft, useCallback as bt } from "react";
-import { transformStateFunc as Wt, isDeepEqual as J, isFunction as tt, getNestedValue as Z, getDifferences as At, debounce as zt } from "./utility.js";
-import { pushFunc as Ot, updateFn as ct, cutFunc as ht, ValidationWrapper as qt, FormControlComponent as Jt } from "./Functions.jsx";
-import Yt from "superjson";
-import { v4 as Nt } from "uuid";
+import { jsx as pt } from "react/jsx-runtime";
+import { useState as et, useRef as X, useEffect as nt, useLayoutEffect as At, useMemo as wt, createElement as ct, useSyncExternalStore as Rt, startTransition as Ot, useCallback as kt } from "react";
+import { transformStateFunc as Ut, isDeepEqual as q, isFunction as K, getNestedValue as J, getDifferences as Tt, debounce as Ft } from "./utility.js";
+import { pushFunc as It, updateFn as it, cutFunc as ft, ValidationWrapper as Dt, FormControlComponent as Wt } from "./Functions.jsx";
+import Lt from "superjson";
+import { v4 as Et } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as Mt } from "./store.js";
-import { useCogsConfig as Lt } from "./CogsStateClient.jsx";
-import { applyPatch as Zt } from "fast-json-patch";
-import Xt from "react-use-measure";
+import { getGlobalStore as o, formRefStore as bt } from "./store.js";
+import { useCogsConfig as Pt } from "./CogsStateClient.jsx";
+import { applyPatch as Gt } from "fast-json-patch";
+import Bt from "react-use-measure";
 function xt(t, c) {
-  const m = o.getState().getInitialOptions, g = o.getState().setInitialStateOptions, I = m(t) || {};
+  const S = o.getState().getInitialOptions, g = o.getState().setInitialStateOptions, y = S(t) || {};
   g(t, {
-    ...I,
+    ...y,
     ...c
   });
 }
-function Pt({
+function Vt({
   stateKey: t,
   options: c,
-  initialOptionsPart: m
+  initialOptionsPart: S
 }) {
-  const g = rt(t) || {}, I = m[t] || {}, N = o.getState().setInitialStateOptions, p = { ...I, ...g };
-  let v = !1;
+  const g = at(t) || {}, y = S[t] || {}, b = o.getState().setInitialStateOptions, w = { ...y, ...g };
+  let I = !1;
   if (c)
     for (const s in c)
-      p.hasOwnProperty(s) ? (s == "localStorage" && c[s] && p[s].key !== c[s]?.key && (v = !0, p[s] = c[s]), s == "initialState" && c[s] && p[s] !== c[s] && // Different references
-      !J(p[s], c[s]) && (v = !0, p[s] = c[s])) : (v = !0, p[s] = c[s]);
-  v && N(t, p);
+      w.hasOwnProperty(s) ? (s == "localStorage" && c[s] && w[s].key !== c[s]?.key && (I = !0, w[s] = c[s]), s == "initialState" && c[s] && w[s] !== c[s] && // Different references
+      !q(w[s], c[s]) && (I = !0, w[s] = c[s])) : (I = !0, w[s] = c[s]);
+  I && b(t, w);
 }
-function Ie(t, { formElements: c, validation: m }) {
-  return { initialState: t, formElements: c, validation: m };
+function ue(t, { formElements: c, validation: S }) {
+  return { initialState: t, formElements: c, validation: S };
 }
-const ve = (t, c) => {
-  let m = t;
-  const [g, I] = Wt(m);
-  (Object.keys(I).length > 0 || c && Object.keys(c).length > 0) && Object.keys(I).forEach((v) => {
-    I[v] = I[v] || {}, I[v].formElements = {
+const ge = (t, c) => {
+  let S = t;
+  const [g, y] = Ut(S);
+  (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,
       // Global defaults first
       ...c?.validation,
-      ...I[v].formElements || {}
+      ...y[I].formElements || {}
       // State-specific overrides
-    }, rt(v) || o.getState().setInitialStateOptions(v, I[v]);
+    }, at(I) || o.getState().setInitialStateOptions(I, y[I]);
   }), o.getState().setInitialStates(g), o.getState().setCreatedState(g);
-  const N = (v, s) => {
-    const [T] = K(s?.componentId ?? Nt());
-    Pt({
-      stateKey: v,
+  const b = (I, s) => {
+    const [h] = et(s?.componentId ?? Et());
+    Vt({
+      stateKey: I,
       options: s,
-      initialOptionsPart: I
+      initialOptionsPart: y
     });
-    const r = o.getState().cogsStateStore[v] || g[v], S = s?.modifyState ? s.modifyState(r) : r, [W, j] = re(
-      S,
+    const r = o.getState().cogsStateStore[I] || g[I], f = s?.modifyState ? s.modifyState(r) : r, [G, U] = Zt(
+      f,
       {
-        stateKey: v,
+        stateKey: I,
         syncUpdate: s?.syncUpdate,
-        componentId: T,
+        componentId: h,
         localStorage: s?.localStorage,
         middleware: s?.middleware,
         enabledSync: s?.enabledSync,
@@ -68,49 +68,49 @@ const ve = (t, c) => {
         serverState: s?.serverState
       }
     );
-    return j;
+    return U;
   };
-  function p(v, s) {
-    Pt({ stateKey: v, options: s, initialOptionsPart: I }), s.localStorage && ee(v, s), ut(v);
+  function w(I, s) {
+    Vt({ stateKey: I, options: s, initialOptionsPart: y }), s.localStorage && Jt(I, s), lt(I);
   }
-  return { useCogsState: N, setCogsOptions: p };
+  return { useCogsState: b, setCogsOptions: w };
 }, {
-  setUpdaterState: Tt,
-  setState: nt,
-  getInitialOptions: rt,
-  getKeyState: Rt,
-  getValidationErrors: Qt,
-  setStateLog: Kt,
-  updateInitialStateGlobal: Ct,
-  addValidationError: Dt,
-  removeValidationError: Q,
-  setServerSyncActions: te
-} = o.getState(), Vt = (t, c, m, g, I) => {
-  m?.log && console.log(
+  setUpdaterState: St,
+  setState: rt,
+  getInitialOptions: at,
+  getKeyState: _t,
+  getValidationErrors: Ht,
+  setStateLog: zt,
+  updateInitialStateGlobal: $t,
+  addValidationError: Mt,
+  removeValidationError: Z,
+  setServerSyncActions: qt
+} = o.getState(), Nt = (t, c, S, g, y) => {
+  S?.log && console.log(
     "saving to localstorage",
     c,
-    m.localStorage?.key,
+    S.localStorage?.key,
     g
   );
-  const N = tt(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (N && g) {
-    const p = `${g}-${c}-${N}`;
-    let v;
+  const b = K(S?.localStorage?.key) ? S.localStorage?.key(t) : S?.localStorage?.key;
+  if (b && g) {
+    const w = `${g}-${c}-${b}`;
+    let I;
     try {
-      v = vt(p)?.lastSyncedWithServer;
+      I = ht(w)?.lastSyncedWithServer;
     } catch {
     }
     const s = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: I ?? v
-    }, T = Yt.serialize(s);
+      lastSyncedWithServer: y ?? I
+    }, h = Lt.serialize(s);
     window.localStorage.setItem(
-      p,
-      JSON.stringify(T.json)
+      w,
+      JSON.stringify(h.json)
     );
   }
-}, vt = (t) => {
+}, ht = (t) => {
   if (!t) return null;
   try {
     const c = window.localStorage.getItem(t);
@@ -118,61 +118,61 @@ const ve = (t, c) => {
   } catch (c) {
     return console.error("Error loading from localStorage:", c), null;
   }
-}, ee = (t, c) => {
-  const m = o.getState().cogsStateStore[t], { sessionId: g } = Lt(), I = tt(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
-  if (I && g) {
-    const N = vt(
-      `${g}-${t}-${I}`
+}, Jt = (t, c) => {
+  const S = o.getState().cogsStateStore[t], { sessionId: g } = Pt(), y = K(c?.localStorage?.key) ? c.localStorage.key(S) : c?.localStorage?.key;
+  if (y && g) {
+    const b = ht(
+      `${g}-${t}-${y}`
     );
-    if (N && N.lastUpdated > (N.lastSyncedWithServer || 0))
-      return nt(t, N.state), ut(t), !0;
+    if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
+      return rt(t, b.state), lt(t), !0;
   }
   return !1;
-}, Ht = (t, c, m, g, I, N) => {
-  const p = {
+}, jt = (t, c, S, g, y, b) => {
+  const w = {
     initialState: c,
-    updaterState: It(
+    updaterState: mt(
       t,
       g,
-      I,
-      N
+      y,
+      b
     ),
-    state: m
+    state: S
   };
-  Ct(t, p.initialState), Tt(t, p.updaterState), nt(t, p.state);
-}, ut = (t) => {
+  $t(t, w.initialState), St(t, w.updaterState), rt(t, w.state);
+}, lt = (t) => {
   const c = o.getState().stateComponents.get(t);
   if (!c) return;
-  const m = /* @__PURE__ */ new Set();
+  const S = /* @__PURE__ */ new Set();
   c.components.forEach((g) => {
-    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || m.add(() => g.forceUpdate());
+    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || S.add(() => g.forceUpdate());
   }), queueMicrotask(() => {
-    m.forEach((g) => g());
+    S.forEach((g) => g());
   });
-}, ye = (t, c) => {
-  const m = o.getState().stateComponents.get(t);
-  if (m) {
-    const g = `${t}////${c}`, I = m.components.get(g);
-    if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
+}, fe = (t, c) => {
+  const S = o.getState().stateComponents.get(t);
+  if (S) {
+    const g = `${t}////${c}`, y = S.components.get(g);
+    if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
       return;
-    I && I.forceUpdate();
+    y && y.forceUpdate();
   }
-}, ne = (t, c, m, g) => {
+}, Yt = (t, c, S, g) => {
   switch (t) {
     case "update":
       return {
-        oldValue: Z(c, g),
-        newValue: Z(m, g)
+        oldValue: J(c, g),
+        newValue: J(S, g)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: Z(m, g)
+        newValue: J(S, g)
       };
     case "cut":
       return {
-        oldValue: Z(c, g),
+        oldValue: J(c, g),
         newValue: null
         // or undefined
       };
@@ -180,327 +180,327 @@ const ve = (t, c) => {
       return { oldValue: null, newValue: null };
   }
 };
-function re(t, {
+function Zt(t, {
   stateKey: c,
-  serverSync: m,
+  serverSync: S,
   localStorage: g,
-  formElements: I,
-  reactiveDeps: N,
-  reactiveType: p,
-  componentId: v,
+  formElements: y,
+  reactiveDeps: b,
+  reactiveType: w,
+  componentId: I,
   initialState: s,
-  syncUpdate: T,
+  syncUpdate: h,
   dependencies: r,
-  serverState: S
+  serverState: f
 } = {}) {
-  const [W, j] = K({}), { sessionId: U } = Lt();
-  let z = !c;
-  const [h] = K(c ?? Nt()), l = o.getState().stateLog[h], gt = q(/* @__PURE__ */ new Set()), et = q(v ?? Nt()), R = q(
+  const [G, U] = et({}), { sessionId: F } = Pt();
+  let B = !c;
+  const [m] = et(c ?? Et()), l = o.getState().stateLog[m], dt = X(/* @__PURE__ */ new Set()), tt = X(I ?? Et()), j = X(
     null
   );
-  R.current = rt(h) ?? null, ot(() => {
-    if (T && T.stateKey === h && T.path?.[0]) {
-      nt(h, (n) => ({
+  j.current = at(m) ?? null, nt(() => {
+    if (h && h.stateKey === m && h.path?.[0]) {
+      rt(m, (n) => ({
         ...n,
-        [T.path[0]]: T.newValue
+        [h.path[0]]: h.newValue
       }));
-      const e = `${T.stateKey}:${T.path.join(".")}`;
+      const e = `${h.stateKey}:${h.path.join(".")}`;
       o.getState().setSyncInfo(e, {
-        timeStamp: T.timeStamp,
-        userId: T.userId
+        timeStamp: h.timeStamp,
+        userId: h.userId
       });
     }
-  }, [T]), ot(() => {
+  }, [h]), nt(() => {
     if (s) {
-      xt(h, {
+      xt(m, {
         initialState: s
       });
-      const e = R.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
-      if (!(i && !J(i, s) || !i) && !a)
+      const e = j.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[m];
+      if (!(i && !q(i, s) || !i) && !a)
         return;
       let u = null;
-      const E = tt(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
-      E && U && (u = vt(`${U}-${h}-${E}`));
-      let y = s, _ = !1;
-      const C = a ? Date.now() : 0, w = u?.lastUpdated || 0, b = u?.lastSyncedWithServer || 0;
-      a && C > w ? (y = e.serverState.data, _ = !0) : u && w > b && (y = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(y)), o.getState().initializeShadowState(h, s), Ht(
-        h,
+      const p = K(e?.localStorage?.key) ? e?.localStorage?.key(s) : e?.localStorage?.key;
+      p && F && (u = ht(`${F}-${m}-${p}`));
+      let T = s, A = !1;
+      const _ = a ? Date.now() : 0, C = u?.lastUpdated || 0, M = u?.lastSyncedWithServer || 0;
+      a && _ > C ? (T = e.serverState.data, A = !0) : u && C > M && (T = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(T)), o.getState().initializeShadowState(m, s), jt(
+        m,
         s,
-        y,
-        at,
-        et.current,
-        U
-      ), _ && E && U && Vt(y, h, e, U, Date.now()), ut(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || j({});
+        T,
+        st,
+        tt.current,
+        F
+      ), A && p && F && Nt(T, m, e, F, Date.now()), lt(m), (Array.isArray(w) ? w : [w || "component"]).includes("none") || U({});
     }
   }, [
     s,
-    S?.status,
-    S?.data,
+    f?.status,
+    f?.data,
     ...r || []
-  ]), lt(() => {
-    z && xt(h, {
-      serverSync: m,
-      formElements: I,
+  ]), At(() => {
+    B && xt(m, {
+      serverSync: S,
+      formElements: y,
       initialState: s,
       localStorage: g,
-      middleware: R.current?.middleware
+      middleware: j.current?.middleware
     });
-    const e = `${h}////${et.current}`, n = o.getState().stateComponents.get(h) || {
+    const e = `${m}////${tt.current}`, n = o.getState().stateComponents.get(m) || {
       components: /* @__PURE__ */ new Map()
     };
     return n.components.set(e, {
-      forceUpdate: () => j({}),
+      forceUpdate: () => U({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: N || void 0,
-      reactiveType: p ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(h, n), j({}), () => {
-      n && (n.components.delete(e), n.components.size === 0 && o.getState().stateComponents.delete(h));
+      depsFunction: b || void 0,
+      reactiveType: w ?? ["component", "deps"]
+    }), o.getState().stateComponents.set(m, n), U({}), () => {
+      n && (n.components.delete(e), n.components.size === 0 && o.getState().stateComponents.delete(m));
     };
   }, []);
-  const at = (e, n, a, i) => {
+  const st = (e, n, a, i) => {
     if (Array.isArray(n)) {
-      const u = `${h}-${n.join(".")}`;
-      gt.current.add(u);
+      const u = `${m}-${n.join(".")}`;
+      dt.current.add(u);
     }
-    const f = o.getState();
-    nt(h, (u) => {
-      const E = tt(e) ? e(u) : e, y = `${h}-${n.join(".")}`;
-      if (y) {
-        let P = !1, $ = f.signalDomElements.get(y);
-        if ((!$ || $.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
-          const D = n.slice(0, -1), V = Z(E, D);
-          if (Array.isArray(V)) {
-            P = !0;
-            const O = `${h}-${D.join(".")}`;
-            $ = f.signalDomElements.get(O);
+    const v = o.getState();
+    rt(m, (u) => {
+      const p = K(e) ? e(u) : e, T = `${m}-${n.join(".")}`;
+      if (T) {
+        let k = !1, V = v.signalDomElements.get(T);
+        if ((!V || V.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
+          const N = n.slice(0, -1), L = J(p, N);
+          if (Array.isArray(L)) {
+            k = !0;
+            const E = `${m}-${N.join(".")}`;
+            V = v.signalDomElements.get(E);
           }
         }
-        if ($) {
-          const D = P ? Z(E, n.slice(0, -1)) : Z(E, n);
-          $.forEach(({ parentId: V, position: O, effect: A }) => {
-            const H = document.querySelector(
-              `[data-parent-id="${V}"]`
+        if (V) {
+          const N = k ? J(p, n.slice(0, -1)) : J(p, n);
+          V.forEach(({ parentId: L, position: E, effect: D }) => {
+            const R = document.querySelector(
+              `[data-parent-id="${L}"]`
             );
-            if (H) {
-              const G = Array.from(H.childNodes);
-              if (G[O]) {
-                const F = A ? new Function("state", `return (${A})(state)`)(D) : D;
-                G[O].textContent = String(F);
+            if (R) {
+              const x = Array.from(R.childNodes);
+              if (x[E]) {
+                const $ = D ? new Function("state", `return (${D})(state)`)(N) : N;
+                x[E].textContent = String($);
               }
             }
           });
         }
       }
-      console.log("shadowState", f.shadowStateStore), a.updateType === "update" && (i || R.current?.validation?.key) && n && Q(
-        (i || R.current?.validation?.key) + "." + n.join(".")
+      console.log("shadowState", v.shadowStateStore), a.updateType === "update" && (i || j.current?.validation?.key) && n && Z(
+        (i || j.current?.validation?.key) + "." + n.join(".")
       );
-      const _ = n.slice(0, n.length - 1);
-      a.updateType === "cut" && R.current?.validation?.key && Q(
-        R.current?.validation?.key + "." + _.join(".")
-      ), a.updateType === "insert" && R.current?.validation?.key && Qt(
-        R.current?.validation?.key + "." + _.join(".")
-      ).filter(([$, D]) => {
-        let V = $?.split(".").length;
-        if ($ == _.join(".") && V == _.length - 1) {
-          let O = $ + "." + _;
-          Q($), Dt(O, D);
+      const A = n.slice(0, n.length - 1);
+      a.updateType === "cut" && j.current?.validation?.key && Z(
+        j.current?.validation?.key + "." + A.join(".")
+      ), a.updateType === "insert" && j.current?.validation?.key && Ht(
+        j.current?.validation?.key + "." + A.join(".")
+      ).filter(([V, N]) => {
+        let L = V?.split(".").length;
+        if (V == A.join(".") && L == A.length - 1) {
+          let E = V + "." + A;
+          Z(V), Mt(E, N);
         }
       });
-      const C = f.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", C), C) {
-        const P = At(u, E), $ = new Set(P), D = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
+      const _ = v.stateComponents.get(m);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", _), _) {
+        const k = Tt(u, p), V = new Set(k), N = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
         for (const [
-          V,
-          O
-        ] of C.components.entries()) {
-          let A = !1;
-          const H = Array.isArray(O.reactiveType) ? O.reactiveType : [O.reactiveType || "component"];
-          if (console.log("component", O), !H.includes("none")) {
-            if (H.includes("all")) {
-              O.forceUpdate();
+          L,
+          E
+        ] of _.components.entries()) {
+          let D = !1;
+          const R = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
+          if (console.log("component", E), !R.includes("none")) {
+            if (R.includes("all")) {
+              E.forceUpdate();
               continue;
             }
-            if (H.includes("component") && ((O.paths.has(D) || O.paths.has("")) && (A = !0), !A))
-              for (const G of $) {
-                let F = G;
+            if (R.includes("component") && ((E.paths.has(N) || E.paths.has("")) && (D = !0), !D))
+              for (const x of V) {
+                let $ = x;
                 for (; ; ) {
-                  if (O.paths.has(F)) {
-                    A = !0;
+                  if (E.paths.has($)) {
+                    D = !0;
                     break;
                   }
-                  const st = F.lastIndexOf(".");
-                  if (st !== -1) {
-                    const ft = F.substring(
+                  const W = $.lastIndexOf(".");
+                  if (W !== -1) {
+                    const O = $.substring(
                       0,
-                      st
+                      W
                     );
                     if (!isNaN(
-                      Number(F.substring(st + 1))
-                    ) && O.paths.has(ft)) {
-                      A = !0;
+                      Number($.substring(W + 1))
+                    ) && E.paths.has(O)) {
+                      D = !0;
                       break;
                     }
-                    F = ft;
+                    $ = O;
                   } else
-                    F = "";
-                  if (F === "")
+                    $ = "";
+                  if ($ === "")
                     break;
                 }
-                if (A) break;
+                if (D) break;
               }
-            if (!A && H.includes("deps") && O.depsFunction) {
-              const G = O.depsFunction(E);
-              let F = !1;
-              typeof G == "boolean" ? G && (F = !0) : J(O.deps, G) || (O.deps = G, F = !0), F && (A = !0);
+            if (!D && R.includes("deps") && E.depsFunction) {
+              const x = E.depsFunction(p);
+              let $ = !1;
+              typeof x == "boolean" ? x && ($ = !0) : q(E.deps, x) || (E.deps = x, $ = !0), $ && (D = !0);
             }
-            A && O.forceUpdate();
+            D && E.forceUpdate();
           }
         }
       }
-      const w = Date.now();
-      n = n.map((P, $) => {
-        const D = n.slice(0, -1), V = Z(E, D);
-        return $ === n.length - 1 && ["insert", "cut"].includes(a.updateType) ? (V.length - 1).toString() : P;
+      const C = Date.now();
+      n = n.map((k, V) => {
+        const N = n.slice(0, -1), L = J(p, N);
+        return V === n.length - 1 && ["insert", "cut"].includes(a.updateType) ? (L.length - 1).toString() : k;
       });
-      const { oldValue: b, newValue: B } = ne(
+      const { oldValue: M, newValue: P } = Yt(
         a.updateType,
         u,
-        E,
+        p,
         n
-      ), Y = {
-        timeStamp: w,
-        stateKey: h,
+      ), z = {
+        timeStamp: C,
+        stateKey: m,
         path: n,
         updateType: a.updateType,
         status: "new",
-        oldValue: b,
-        newValue: B
+        oldValue: M,
+        newValue: P
       };
       switch (a.updateType) {
         case "update":
-          f.updateShadowAtPath(h, n, E);
+          v.updateShadowAtPath(m, n, p);
           break;
         case "insert":
-          const P = n.slice(0, -1);
-          f.insertShadowArrayElement(h, P, B);
+          const k = n.slice(0, -1);
+          v.insertShadowArrayElement(m, k, P);
           break;
         case "cut":
-          const $ = n.slice(0, -1), D = parseInt(n[n.length - 1]);
-          f.removeShadowArrayElement(h, $, D);
+          const V = n.slice(0, -1), N = parseInt(n[n.length - 1]);
+          v.removeShadowArrayElement(m, V, N);
           break;
       }
-      if (Kt(h, (P) => {
-        const D = [...P ?? [], Y].reduce((V, O) => {
-          const A = `${O.stateKey}:${JSON.stringify(O.path)}`, H = V.get(A);
-          return H ? (H.timeStamp = Math.max(H.timeStamp, O.timeStamp), H.newValue = O.newValue, H.oldValue = H.oldValue ?? O.oldValue, H.updateType = O.updateType) : V.set(A, { ...O }), V;
+      if (zt(m, (k) => {
+        const N = [...k ?? [], z].reduce((L, E) => {
+          const D = `${E.stateKey}:${JSON.stringify(E.path)}`, R = L.get(D);
+          return R ? (R.timeStamp = Math.max(R.timeStamp, E.timeStamp), R.newValue = E.newValue, R.oldValue = R.oldValue ?? E.oldValue, R.updateType = E.updateType) : L.set(D, { ...E }), L;
         }, /* @__PURE__ */ new Map());
-        return Array.from(D.values());
-      }), Vt(
-        E,
-        h,
-        R.current,
-        U
-      ), R.current?.middleware && R.current.middleware({
+        return Array.from(N.values());
+      }), Nt(
+        p,
+        m,
+        j.current,
+        F
+      ), j.current?.middleware && j.current.middleware({
         updateLog: l,
-        update: Y
-      }), R.current?.serverSync) {
-        const P = f.serverState[h], $ = R.current?.serverSync;
-        te(h, {
-          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: E }),
-          rollBackState: P,
-          actionTimeStamp: Date.now() + ($.debounce ?? 3e3),
+        update: z
+      }), j.current?.serverSync) {
+        const k = v.serverState[m], V = j.current?.serverSync;
+        qt(m, {
+          syncKey: typeof V.syncKey == "string" ? V.syncKey : V.syncKey({ state: p }),
+          rollBackState: k,
+          actionTimeStamp: Date.now() + (V.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return E;
+      return p;
     });
   };
-  o.getState().updaterState[h] || (Tt(
-    h,
-    It(
-      h,
-      at,
-      et.current,
-      U
+  o.getState().updaterState[m] || (St(
+    m,
+    mt(
+      m,
+      st,
+      tt.current,
+      F
     )
-  ), o.getState().cogsStateStore[h] || nt(h, t), o.getState().initialStateGlobal[h] || Ct(h, t));
-  const d = wt(() => It(
-    h,
-    at,
-    et.current,
-    U
-  ), [h, U]);
-  return [Rt(h), d];
+  ), o.getState().cogsStateStore[m] || rt(m, t), o.getState().initialStateGlobal[m] || $t(m, t));
+  const d = wt(() => mt(
+    m,
+    st,
+    tt.current,
+    F
+  ), [m, F]);
+  return [_t(m), d];
 }
-function It(t, c, m, g) {
-  const I = /* @__PURE__ */ new Map();
-  let N = 0;
-  const p = (T) => {
-    const r = T.join(".");
-    for (const [S] of I)
-      (S === r || S.startsWith(r + ".")) && I.delete(S);
-    N++;
-  }, v = {
-    removeValidation: (T) => {
-      T?.validationKey && Q(T.validationKey);
+function mt(t, c, S, g) {
+  const y = /* @__PURE__ */ new Map();
+  let b = 0;
+  const w = (h) => {
+    const r = h.join(".");
+    for (const [f] of y)
+      (f === r || f.startsWith(r + ".")) && y.delete(f);
+    b++;
+  }, I = {
+    removeValidation: (h) => {
+      h?.validationKey && Z(h.validationKey);
     },
-    revertToInitialState: (T) => {
+    revertToInitialState: (h) => {
       const r = o.getState().getInitialOptions(t)?.validation;
-      r?.key && Q(r?.key), T?.validationKey && Q(T.validationKey);
-      const S = o.getState().initialStateGlobal[t];
-      o.getState().clearSelectedIndexesForState(t), I.clear(), N++;
-      const W = s(S, []), j = rt(t), U = tt(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, z = `${g}-${t}-${U}`;
-      z && localStorage.removeItem(z), Tt(t, W), nt(t, S);
-      const h = o.getState().stateComponents.get(t);
-      return h && h.components.forEach((l) => {
+      r?.key && Z(r?.key), h?.validationKey && Z(h.validationKey);
+      const f = o.getState().initialStateGlobal[t];
+      o.getState().clearSelectedIndexesForState(t), y.clear(), b++;
+      const G = s(f, []), U = at(t), F = K(U?.localStorage?.key) ? U?.localStorage?.key(f) : U?.localStorage?.key, B = `${g}-${t}-${F}`;
+      B && localStorage.removeItem(B), St(t, G), rt(t, f);
+      const m = o.getState().stateComponents.get(t);
+      return m && m.components.forEach((l) => {
         l.forceUpdate();
-      }), S;
+      }), f;
     },
-    updateInitialState: (T) => {
-      I.clear(), N++;
-      const r = It(
+    updateInitialState: (h) => {
+      y.clear(), b++;
+      const r = mt(
         t,
         c,
-        m,
+        S,
         g
-      ), S = o.getState().initialStateGlobal[t], W = rt(t), j = tt(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, U = `${g}-${t}-${j}`;
-      return localStorage.getItem(U) && localStorage.removeItem(U), Ft(() => {
-        Ct(t, T), o.getState().initializeShadowState(t, T), Tt(t, r), nt(t, T);
-        const z = o.getState().stateComponents.get(t);
-        z && z.components.forEach((h) => {
-          h.forceUpdate();
+      ), f = o.getState().initialStateGlobal[t], G = at(t), U = K(G?.localStorage?.key) ? G?.localStorage?.key(f) : G?.localStorage?.key, F = `${g}-${t}-${U}`;
+      return localStorage.getItem(F) && localStorage.removeItem(F), Ot(() => {
+        $t(t, h), o.getState().initializeShadowState(t, h), St(t, r), rt(t, h);
+        const B = o.getState().stateComponents.get(t);
+        B && B.components.forEach((m) => {
+          m.forceUpdate();
         });
       }), {
-        fetchId: (z) => r.get()[z]
+        fetchId: (B) => r.get()[B]
       };
     },
     _initialState: o.getState().initialStateGlobal[t],
     _serverState: o.getState().serverState[t],
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const T = o.getState().serverState[t];
-      return !!(T && J(T, Rt(t)));
+      const h = o.getState().serverState[t];
+      return !!(h && q(h, _t(t)));
     }
   };
-  function s(T, r = [], S) {
-    const W = r.map(String).join(".");
-    I.get(W);
-    const j = function() {
+  function s(h, r = [], f) {
+    const G = r.map(String).join(".");
+    y.get(G);
+    const U = function() {
       return o().getNestedState(t, r);
     };
-    Object.keys(v).forEach((h) => {
-      j[h] = v[h];
+    Object.keys(I).forEach((m) => {
+      U[m] = I[m];
     });
-    const U = {
-      apply(h, l, gt) {
+    const F = {
+      apply(m, l, dt) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${r.join(".")}`
         ), console.trace("Apply trap stack trace"), o().getNestedState(t, r);
       },
-      get(h, l) {
-        S?.validIndices && !Array.isArray(T) && (S = { ...S, validIndices: void 0 });
-        const gt = /* @__PURE__ */ new Set([
+      get(m, l) {
+        f?.validIndices && !Array.isArray(h) && (f = { ...f, validIndices: void 0 });
+        const dt = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,15 +523,15 @@ function It(t, c, m, g) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !gt.has(l)) {
-          const d = `${t}////${m}`, e = o.getState().stateComponents.get(t);
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !dt.has(l)) {
+          const d = `${t}////${S}`, e = o.getState().stateComponents.get(t);
           if (e) {
             const n = e.components.get(d);
             if (n && !n.paths.has("")) {
               const a = r.join(".");
               let i = !0;
-              for (const f of n.paths)
-                if (a.startsWith(f) && (a === f || a[f.length] === ".")) {
+              for (const v of n.paths)
+                if (a.startsWith(v) && (a === v || a[v.length] === ".")) {
                   i = !1;
                   break;
                 }
@@ -540,7 +540,7 @@ function It(t, c, m, g) {
           }
         }
         if (l === "getDifferences")
-          return () => At(
+          return () => Tt(
             o.getState().cogsStateStore[t],
             o.getState().initialStateGlobal[t]
           );
@@ -554,11 +554,11 @@ function It(t, c, m, g) {
               const i = await e.action(n);
               if (i && !i.success && i.errors && a) {
                 o.getState().removeValidationError(a), i.errors.forEach((u) => {
-                  const E = [a, ...u.path].join(".");
-                  o.getState().addValidationError(E, u.message);
+                  const p = [a, ...u.path].join(".");
+                  o.getState().addValidationError(p, u.message);
                 });
-                const f = o.getState().stateComponents.get(t);
-                f && f.components.forEach((u) => {
+                const v = o.getState().stateComponents.get(t);
+                v && v.components.forEach((u) => {
                   u.forceUpdate();
                 });
               }
@@ -568,20 +568,20 @@ function It(t, c, m, g) {
             }
           };
         if (l === "_status") {
-          const d = o.getState().getNestedState(t, r), e = o.getState().initialStateGlobal[t], n = Z(e, r);
-          return J(d, n) ? "fresh" : "stale";
+          const d = o.getState().getNestedState(t, r), e = o.getState().initialStateGlobal[t], n = J(e, r);
+          return q(d, n) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
             const d = o().getNestedState(
               t,
               r
-            ), e = o.getState().initialStateGlobal[t], n = Z(e, r);
-            return J(d, n) ? "fresh" : "stale";
+            ), e = o.getState().initialStateGlobal[t], n = J(e, r);
+            return q(d, n) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = o.getState().initialStateGlobal[t], e = rt(t), n = tt(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${g}-${t}-${n}`;
+            const d = o.getState().initialStateGlobal[t], e = at(t), n = K(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${g}-${t}-${n}`;
             a && localStorage.removeItem(a);
           };
         if (l === "showValidationErrors")
@@ -591,10 +591,10 @@ function It(t, c, m, g) {
               throw new Error("Validation key not found");
             return o.getState().getValidationErrors(d.key + "." + r.join("."));
           };
-        if (Array.isArray(T)) {
-          const d = () => S?.validIndices ? T.map((n, a) => ({
+        if (Array.isArray(h)) {
+          const d = () => f?.validIndices ? h.map((n, a) => ({
             item: n,
-            originalIndex: S.validIndices[a]
+            originalIndex: f.validIndices[a]
           })) : o.getState().getNestedState(t, r).map((n, a) => ({
             item: n,
             originalIndex: a
@@ -604,9 +604,9 @@ function It(t, c, m, g) {
               const e = o.getState().getSelectedIndex(t, r.join("."));
               if (e !== void 0)
                 return s(
-                  T[e],
+                  h[e],
                   [...r, e.toString()],
-                  S
+                  f
                 );
             };
           if (l === "clearSelected")
@@ -621,234 +621,182 @@ function It(t, c, m, g) {
                 itemHeight: n = 50,
                 overscan: a = 6,
                 stickToBottom: i = !1,
-                dependencies: f = []
-              } = e, u = q(!1), E = q(null), [y, _] = K({
+                dependencies: v = []
+              } = e, u = X(null), [p, T] = et({
                 startIndex: 0,
                 endIndex: 10
-              }), [C, w] = K("IDLE_AT_TOP"), b = q(!1), B = q(0), Y = q(f), P = q(0), [$, D] = K(0), V = q(null);
-              ot(() => o.getState().subscribeToShadowState(t, () => {
-                D((M) => M + 1);
+              }), [A, _] = et(0), C = X(!1), M = X(!0), P = X(
+                null
+              );
+              nt(() => o.getState().subscribeToShadowState(t, () => {
+                _(($) => $ + 1);
               }), [t]);
-              const O = o().getNestedState(
+              const z = o().getNestedState(
                 t,
                 r
-              ), A = O.length, { totalHeight: H, positions: G } = wt(() => {
-                const k = o.getState().getShadowMetadata(t, r) || [];
-                let M = 0;
-                const L = [];
-                for (let x = 0; x < A; x++) {
-                  L[x] = M;
-                  const X = k[x]?.virtualizer?.itemHeight;
-                  M += X || n;
+              ), k = z.length, { totalHeight: V, positions: N } = wt(() => {
+                const x = o.getState().getShadowMetadata(t, r) || [];
+                let $ = 0;
+                const W = [];
+                for (let O = 0; O < k; O++) {
+                  W[O] = $;
+                  const Q = x[O]?.virtualizer?.itemHeight;
+                  $ += Q || n;
                 }
-                return { totalHeight: M, positions: L };
+                return { totalHeight: $, positions: W };
               }, [
-                A,
+                k,
                 t,
                 r.join("."),
                 n,
-                $
-              ]), F = wt(() => {
-                const k = Math.max(0, y.startIndex), M = Math.min(A, y.endIndex), L = Array.from(
-                  { length: M - k },
-                  (X, it) => k + it
-                ), x = L.map((X) => O[X]);
-                return s(x, r, {
-                  ...S,
-                  validIndices: L
+                A
+              ]), L = wt(() => {
+                const x = Math.max(0, p.startIndex), $ = Math.min(k, p.endIndex), W = Array.from(
+                  { length: $ - x },
+                  (Q, Y) => x + Y
+                ), O = W.map((Q) => z[Q]);
+                return s(O, r, {
+                  ...f,
+                  validIndices: W
                 });
-              }, [y.startIndex, y.endIndex, O, A]);
-              lt(() => {
-                const k = E.current;
-                if (!k) return;
-                const M = A > B.current;
-                if (M && V.current) {
-                  const { top: L, height: x } = V.current;
-                  b.current = !0, k.scrollTop = L + (k.scrollHeight - x), console.log(
-                    `ANCHOR RESTORED to scrollTop: ${k.scrollTop}`
-                  ), setTimeout(() => {
-                    b.current = !1;
-                  }, 100), V.current = null;
-                } else {
-                  if (!J(
-                    f,
-                    Y.current
-                  )) {
-                    console.log("TRANSITION: Deps changed -> IDLE_AT_TOP"), w("IDLE_AT_TOP");
-                    return;
-                  }
-                  M && C === "LOCKED_AT_BOTTOM" && i && (console.log(
-                    "TRANSITION: New items arrived while locked -> GETTING_HEIGHTS"
-                  ), w("GETTING_HEIGHTS"));
-                }
-                B.current = A, Y.current = f;
-              }, [A, ...f]), lt(() => {
-                const k = E.current;
-                if (!k) return;
-                let M;
-                if (C === "IDLE_AT_TOP" && i && A > 0)
-                  console.log(
-                    "ACTION (IDLE_AT_TOP): Data has arrived -> GETTING_HEIGHTS"
-                  ), w("GETTING_HEIGHTS");
-                else if (C === "GETTING_HEIGHTS") {
-                  console.log(
-                    "ACTION (GETTING_HEIGHTS): Setting range to end and starting loop."
-                  ), _({
-                    startIndex: Math.max(0, A - 10 - a),
-                    endIndex: A
-                  });
-                  let L = 0;
-                  const x = 50;
-                  M = setInterval(() => {
-                    L++;
-                    const X = A - 1, yt = (o.getState().getShadowMetadata(t, r) || [])[X]?.virtualizer?.itemHeight || 0;
-                    console.log(
-                      `ACTION (GETTING_HEIGHTS): attempt ${L}, lastItemHeight =`,
-                      yt
-                    ), yt > 0 ? (clearInterval(M), console.log(
-                      "ACTION (GETTING_HEIGHTS): Measurement success -> SCROLLING_TO_BOTTOM"
-                    ), w("SCROLLING_TO_BOTTOM")) : L >= x && (clearInterval(M), console.log(
-                      "ACTION (GETTING_HEIGHTS): Timeout - proceeding anyway"
-                    ), w("SCROLLING_TO_BOTTOM"));
-                  }, 100);
-                } else if (C === "SCROLLING_TO_BOTTOM") {
+              }, [p.startIndex, p.endIndex, z, k]);
+              nt(() => {
+                if (!i || !u.current || k === 0 || !M.current) return;
+                P.current && clearInterval(P.current);
+                const x = 50, $ = p.endIndex < x, W = k > p.endIndex + x;
+                ($ || W) && T({
+                  startIndex: Math.max(0, k - 20),
+                  endIndex: k
+                });
+                let O = 0;
+                const Q = 50;
+                return P.current = setInterval(() => {
+                  const Y = u.current;
+                  if (!Y) return;
+                  O++;
+                  const { scrollTop: vt, scrollHeight: ot, clientHeight: ut } = Y, gt = vt + ut, H = ot, yt = H - gt < 5;
                   console.log(
-                    "ACTION (SCROLLING_TO_BOTTOM): Executing scroll."
-                  ), b.current = !0;
-                  const L = B.current === 0 ? "auto" : "smooth";
-                  k.scrollTo({
-                    top: k.scrollHeight,
-                    behavior: L
-                  });
-                  const x = setTimeout(
-                    () => {
-                      console.log(
-                        "ACTION (SCROLLING_TO_BOTTOM): Scroll finished -> LOCKED_AT_BOTTOM"
-                      ), b.current = !1, u.current = !1, w("LOCKED_AT_BOTTOM");
-                    },
-                    L === "smooth" ? 500 : 50
-                  );
-                  return () => clearTimeout(x);
-                }
-                return () => {
-                  M && clearInterval(M);
+                    `Scroll attempt ${O}: currentBottom=${gt}, actualBottom=${H}, isAtBottom=${yt}`
+                  ), yt || O >= Q ? (clearInterval(P.current), P.current = null, console.log(
+                    yt ? "Reached bottom!" : "Timeout - giving up"
+                  )) : Y.scrollTop = Y.scrollHeight;
+                }, 100), () => {
+                  P.current && (clearInterval(P.current), P.current = null);
                 };
-              }, [C, A, G]), ot(() => {
-                const k = E.current;
-                if (!k) return;
-                const M = n, L = () => {
-                  if (b.current)
-                    return;
-                  const { scrollTop: x, scrollHeight: X, clientHeight: it } = k;
-                  if (X - x - it < 10 ? (C !== "LOCKED_AT_BOTTOM" && w("LOCKED_AT_BOTTOM"), V.current = null) : (C !== "IDLE_NOT_AT_BOTTOM" && w("IDLE_NOT_AT_BOTTOM"), V.current = {
-                    top: x,
-                    height: X
-                  }), Math.abs(x - P.current) < M)
-                    return;
-                  console.log(
-                    `Threshold passed at ${x}px. Recalculating range...`
-                  );
-                  let pt = A - 1, Et = 0, $t = 0;
-                  for (; Et <= pt; ) {
-                    const mt = Math.floor((Et + pt) / 2);
-                    G[mt] < x ? ($t = mt, Et = mt + 1) : pt = mt - 1;
-                  }
-                  const kt = Math.max(0, $t - a);
-                  let St = kt;
-                  const Ut = x + it;
-                  for (; St < A && G[St] < Ut; )
-                    St++;
-                  _({
-                    startIndex: kt,
-                    endIndex: Math.min(A, St + a)
-                  }), P.current = x;
+              }, [k, i]), nt(() => {
+                const x = u.current;
+                if (!x) return;
+                let $;
+                const W = () => {
+                  P.current && (clearInterval(P.current), P.current = null);
+                  const { scrollTop: O, scrollHeight: Q, clientHeight: Y } = x, vt = Q - O - Y < 10;
+                  M.current = vt, clearTimeout($), C.current = !0, $ = setTimeout(() => {
+                    C.current = !1;
+                  }, 150);
+                  let ot = 0;
+                  for (let H = 0; H < N.length; H++)
+                    if (N[H] > O - n * a) {
+                      ot = Math.max(0, H - 1);
+                      break;
+                    }
+                  let ut = ot;
+                  const gt = O + Y;
+                  for (let H = ot; H < N.length && !(N[H] > gt + n * a); H++)
+                    ut = H;
+                  T({
+                    startIndex: Math.max(0, ot),
+                    endIndex: Math.min(k, ut + 1 + a)
+                  });
                 };
-                return k.addEventListener("scroll", L, {
+                return x.addEventListener("scroll", W, {
                   passive: !0
-                }), () => k.removeEventListener("scroll", L);
-              }, [A, G, n, a, C]);
-              const st = bt(() => {
-                console.log(
-                  "USER ACTION: Clicked scroll button -> SCROLLING_TO_BOTTOM"
-                ), w("SCROLLING_TO_BOTTOM");
-              }, []), ft = bt(
-                (k, M = "smooth") => {
-                  E.current && G[k] !== void 0 && (w("IDLE_NOT_AT_BOTTOM"), E.current.scrollTo({
-                    top: G[k],
-                    behavior: M
-                  }));
+                }), W(), () => {
+                  x.removeEventListener("scroll", W), clearTimeout($);
+                };
+              }, [N, k, n, a]);
+              const E = kt(
+                (x = "auto") => {
+                  M.current = !0, u.current && (u.current.scrollTop = u.current.scrollHeight);
                 },
-                [G]
-              ), jt = {
+                []
+              ), D = kt(
+                (x, $ = "smooth") => {
+                  u.current && N[x] !== void 0 && u.current.scrollTo({
+                    top: N[x],
+                    behavior: $
+                  });
+                },
+                [N]
+              ), R = {
                 outer: {
-                  ref: E,
+                  ref: u,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${H}px`,
+                    height: `${V}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${G[y.startIndex] || 0}px)`
+                    transform: `translateY(${N[p.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: F,
-                virtualizerProps: jt,
-                scrollToBottom: st,
-                scrollToIndex: ft
+                virtualState: L,
+                virtualizerProps: R,
+                scrollToBottom: E,
+                scrollToIndex: D
               };
             };
           if (l === "stateSort")
             return (e) => {
               const a = [...d()].sort(
-                (u, E) => e(u.item, E.item)
-              ), i = a.map(({ item: u }) => u), f = {
-                ...S,
+                (u, p) => e(u.item, p.item)
+              ), i = a.map(({ item: u }) => u), v = {
+                ...f,
                 validIndices: a.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return s(i, r, f);
+              return s(i, r, v);
             };
           if (l === "stateFilter")
             return (e) => {
               const a = d().filter(
-                ({ item: u }, E) => e(u, E)
-              ), i = a.map(({ item: u }) => u), f = {
-                ...S,
+                ({ item: u }, p) => e(u, p)
+              ), i = a.map(({ item: u }) => u), v = {
+                ...f,
                 validIndices: a.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return s(i, r, f);
+              return s(i, r, v);
             };
           if (l === "stateMap")
             return (e) => {
               const n = o.getState().getNestedState(t, r);
-              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
-                const u = n[i], E = [...r, i.toString()], y = s(u, E, S);
-                return e(u, y, {
+              return Array.isArray(n) ? (f?.validIndices || Array.from({ length: n.length }, (i, v) => v)).map((i, v) => {
+                const u = n[i], p = [...r, i.toString()], T = s(u, p, f);
+                return e(u, T, {
                   register: () => {
-                    const [, C] = K({}), w = `${m}-${r.join(".")}-${i}`;
-                    lt(() => {
-                      const b = `${t}////${w}`, B = o.getState().stateComponents.get(t) || {
+                    const [, _] = et({}), C = `${S}-${r.join(".")}-${i}`;
+                    At(() => {
+                      const M = `${t}////${C}`, P = o.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return B.components.set(b, {
-                        forceUpdate: () => C({}),
-                        paths: /* @__PURE__ */ new Set([E.join(".")])
-                      }), o.getState().stateComponents.set(t, B), () => {
-                        const Y = o.getState().stateComponents.get(t);
-                        Y && Y.components.delete(b);
+                      return P.components.set(M, {
+                        forceUpdate: () => _({}),
+                        paths: /* @__PURE__ */ new Set([p.join(".")])
+                      }), o.getState().stateComponents.set(t, P), () => {
+                        const z = o.getState().stateComponents.get(t);
+                        z && z.components.delete(M);
                       };
-                    }, [t, w]);
+                    }, [t, C]);
                   },
-                  index: f,
+                  index: v,
                   originalIndex: i
                 });
               }) : (console.warn(
@@ -857,20 +805,20 @@ function It(t, c, m, g) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => T.map((a, i) => {
-              let f;
-              S?.validIndices && S.validIndices[i] !== void 0 ? f = S.validIndices[i] : f = i;
-              const u = [...r, f.toString()], E = s(a, u, S);
+            return (e) => h.map((a, i) => {
+              let v;
+              f?.validIndices && f.validIndices[i] !== void 0 ? v = f.validIndices[i] : v = i;
+              const u = [...r, v.toString()], p = s(a, u, f);
               return e(
                 a,
-                E,
+                p,
                 i,
-                T,
-                s(T, r, S)
+                h,
+                s(h, r, f)
               );
             });
           if (l === "$stateMap")
-            return (e) => dt(oe, {
+            return (e) => ct(Xt, {
               proxy: {
                 _stateKey: t,
                 _path: r,
@@ -882,19 +830,19 @@ function It(t, c, m, g) {
           if (l === "stateList")
             return (e) => {
               const n = o.getState().getNestedState(t, r);
-              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
-                const u = n[i], E = [...r, i.toString()], y = s(u, E, S), _ = `${m}-${r.join(".")}-${i}`;
-                return dt(se, {
+              return Array.isArray(n) ? (f?.validIndices || Array.from({ length: n.length }, (i, v) => v)).map((i, v) => {
+                const u = n[i], p = [...r, i.toString()], T = s(u, p, f), A = `${S}-${r.join(".")}-${i}`;
+                return ct(Kt, {
                   key: i,
                   stateKey: t,
-                  itemComponentId: _,
-                  itemPath: E,
+                  itemComponentId: A,
+                  itemPath: p,
                   children: e(
                     u,
-                    y,
-                    { localIndex: f, originalIndex: i },
+                    T,
+                    { localIndex: v, originalIndex: i },
                     n,
-                    s(n, r, S)
+                    s(n, r, f)
                   )
                 });
               }) : (console.warn(
@@ -903,20 +851,20 @@ function It(t, c, m, g) {
             };
           if (l === "stateFlattenOn")
             return (e) => {
-              const n = T;
-              I.clear(), N++;
+              const n = h;
+              y.clear(), b++;
               const a = n.flatMap(
                 (i) => i[e] ?? []
               );
               return s(
                 a,
                 [...r, "[*]", e],
-                S
+                f
               );
             };
           if (l === "index")
             return (e) => {
-              const n = T[e];
+              const n = h[e];
               return s(n, [...r, e.toString()]);
             };
           if (l === "last")
@@ -927,58 +875,58 @@ function It(t, c, m, g) {
               return s(a, i);
             };
           if (l === "insert")
-            return (e) => (p(r), Ot(c, e, r, t), s(
+            return (e) => (w(r), It(c, e, r, t), s(
               o.getState().getNestedState(t, r),
               r
             ));
           if (l === "uniqueInsert")
             return (e, n, a) => {
-              const i = o.getState().getNestedState(t, r), f = tt(e) ? e(i) : e;
+              const i = o.getState().getNestedState(t, r), v = K(e) ? e(i) : e;
               let u = null;
-              if (!i.some((y) => {
+              if (!i.some((T) => {
                 if (n) {
-                  const C = n.every(
-                    (w) => J(y[w], f[w])
+                  const _ = n.every(
+                    (C) => q(T[C], v[C])
                   );
-                  return C && (u = y), C;
+                  return _ && (u = T), _;
                 }
-                const _ = J(y, f);
-                return _ && (u = y), _;
+                const A = q(T, v);
+                return A && (u = T), A;
               }))
-                p(r), Ot(c, f, r, t);
+                w(r), It(c, v, r, t);
               else if (a && u) {
-                const y = a(u), _ = i.map(
-                  (C) => J(C, u) ? y : C
+                const T = a(u), A = i.map(
+                  (_) => q(_, u) ? T : _
                 );
-                p(r), ct(c, _, r);
+                w(r), it(c, A, r);
               }
             };
           if (l === "cut")
             return (e, n) => {
               if (!n?.waitForSync)
-                return p(r), ht(c, r, t, e), s(
+                return w(r), ft(c, r, t, e), s(
                   o.getState().getNestedState(t, r),
                   r
                 );
             };
           if (l === "cutByValue")
             return (e) => {
-              for (let n = 0; n < T.length; n++)
-                T[n] === e && ht(c, r, t, n);
+              for (let n = 0; n < h.length; n++)
+                h[n] === e && ft(c, r, t, n);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const n = T.findIndex((a) => a === e);
-              n > -1 ? ht(c, r, t, n) : Ot(c, e, r, t);
+              const n = h.findIndex((a) => a === e);
+              n > -1 ? ft(c, r, t, n) : It(c, e, r, t);
             };
           if (l === "stateFind")
             return (e) => {
               const a = d().find(
-                ({ item: f }, u) => e(f, u)
+                ({ item: v }, u) => e(v, u)
               );
               if (!a) return;
               const i = [...r, a.originalIndex.toString()];
-              return s(a.item, i, S);
+              return s(a.item, i, f);
             };
           if (l === "findWith")
             return (e, n) => {
@@ -986,37 +934,37 @@ function It(t, c, m, g) {
                 ({ item: u }) => u[e] === n
               );
               if (!i) return;
-              const f = [...r, i.originalIndex.toString()];
-              return s(i.item, f, S);
+              const v = [...r, i.originalIndex.toString()];
+              return s(i.item, v, f);
             };
         }
-        const et = r[r.length - 1];
-        if (!isNaN(Number(et))) {
+        const tt = r[r.length - 1];
+        if (!isNaN(Number(tt))) {
           const d = r.slice(0, -1), e = o.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => ht(
+            return () => ft(
               c,
               d,
               t,
-              Number(et)
+              Number(tt)
             );
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(T)) {
+            if (f?.validIndices && Array.isArray(h)) {
               const d = o.getState().getNestedState(t, r);
-              return S.validIndices.map((e) => d[e]);
+              return f.validIndices.map((e) => d[e]);
             }
             return o.getState().getNestedState(t, r);
           };
         if (l === "$derive")
-          return (d) => Gt({
+          return (d) => Ct({
             _stateKey: t,
             _path: r,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Gt({
+          return () => Ct({
             _stateKey: t,
             _path: r
           });
@@ -1025,7 +973,7 @@ function It(t, c, m, g) {
           return o.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => vt(g + "-" + t + "-" + d);
+          return (d) => ht(g + "-" + t + "-" + d);
         if (l === "_selected") {
           const d = r.slice(0, -1), e = d.join("."), n = o.getState().getNestedState(t, d);
           return Array.isArray(n) ? Number(r[r.length - 1]) === o.getState().getSelectedIndex(t, e) : void 0;
@@ -1035,7 +983,7 @@ function It(t, c, m, g) {
             const e = r.slice(0, -1), n = Number(r[r.length - 1]), a = e.join(".");
             d ? o.getState().setSelectedIndex(t, a, n) : o.getState().setSelectedIndex(t, a, void 0);
             const i = o.getState().getNestedState(t, [...e]);
-            ct(c, i, e), p(e);
+            it(c, i, e), w(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -1046,7 +994,7 @@ function It(t, c, m, g) {
               a === e ? void 0 : e
             );
             const i = o.getState().getNestedState(t, [...d]);
-            ct(c, i, d), p(d);
+            it(c, i, d), w(d);
           };
         if (r.length == 0) {
           if (l === "addValidation")
@@ -1054,75 +1002,75 @@ function It(t, c, m, g) {
               const e = o.getState().getInitialOptions(t)?.validation;
               if (!e?.key)
                 throw new Error("Validation key not found");
-              Q(e.key), console.log("addValidationError", d), d.forEach((n) => {
+              Z(e.key), console.log("addValidationError", d), d.forEach((n) => {
                 const a = [e.key, ...n.path].join(".");
-                console.log("fullErrorPath", a), Dt(a, n.message);
-              }), ut(t);
+                console.log("fullErrorPath", a), Mt(a, n.message);
+              }), lt(t);
             };
           if (l === "applyJsonPatch")
             return (d) => {
-              const e = o.getState().cogsStateStore[t], a = Zt(e, d).newDocument;
-              Ht(
+              const e = o.getState().cogsStateStore[t], a = Gt(e, d).newDocument;
+              jt(
                 t,
                 o.getState().initialStateGlobal[t],
                 a,
                 c,
-                m,
+                S,
                 g
               );
               const i = o.getState().stateComponents.get(t);
               if (i) {
-                const f = At(e, a), u = new Set(f);
+                const v = Tt(e, a), u = new Set(v);
                 for (const [
-                  E,
-                  y
+                  p,
+                  T
                 ] of i.components.entries()) {
-                  let _ = !1;
-                  const C = Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"];
-                  if (!C.includes("none")) {
-                    if (C.includes("all")) {
-                      y.forceUpdate();
+                  let A = !1;
+                  const _ = Array.isArray(T.reactiveType) ? T.reactiveType : [T.reactiveType || "component"];
+                  if (!_.includes("none")) {
+                    if (_.includes("all")) {
+                      T.forceUpdate();
                       continue;
                     }
-                    if (C.includes("component") && (y.paths.has("") && (_ = !0), !_))
-                      for (const w of u) {
-                        if (y.paths.has(w)) {
-                          _ = !0;
+                    if (_.includes("component") && (T.paths.has("") && (A = !0), !A))
+                      for (const C of u) {
+                        if (T.paths.has(C)) {
+                          A = !0;
                           break;
                         }
-                        let b = w.lastIndexOf(".");
-                        for (; b !== -1; ) {
-                          const B = w.substring(0, b);
-                          if (y.paths.has(B)) {
-                            _ = !0;
+                        let M = C.lastIndexOf(".");
+                        for (; M !== -1; ) {
+                          const P = C.substring(0, M);
+                          if (T.paths.has(P)) {
+                            A = !0;
                             break;
                           }
-                          const Y = w.substring(
-                            b + 1
+                          const z = C.substring(
+                            M + 1
                           );
-                          if (!isNaN(Number(Y))) {
-                            const P = B.lastIndexOf(".");
-                            if (P !== -1) {
-                              const $ = B.substring(
+                          if (!isNaN(Number(z))) {
+                            const k = P.lastIndexOf(".");
+                            if (k !== -1) {
+                              const V = P.substring(
                                 0,
-                                P
+                                k
                               );
-                              if (y.paths.has($)) {
-                                _ = !0;
+                              if (T.paths.has(V)) {
+                                A = !0;
                                 break;
                               }
                             }
                           }
-                          b = B.lastIndexOf(".");
+                          M = P.lastIndexOf(".");
                         }
-                        if (_) break;
+                        if (A) break;
                       }
-                    if (!_ && C.includes("deps") && y.depsFunction) {
-                      const w = y.depsFunction(a);
-                      let b = !1;
-                      typeof w == "boolean" ? w && (b = !0) : J(y.deps, w) || (y.deps = w, b = !0), b && (_ = !0);
+                    if (!A && _.includes("deps") && T.depsFunction) {
+                      const C = T.depsFunction(a);
+                      let M = !1;
+                      typeof C == "boolean" ? C && (M = !0) : q(T.deps, C) || (T.deps = C, M = !0), M && (A = !0);
                     }
-                    _ && y.forceUpdate();
+                    A && T.forceUpdate();
                   }
                 }
               }
@@ -1134,27 +1082,27 @@ function It(t, c, m, g) {
                 throw new Error("Zod schema not found");
               if (!d?.key)
                 throw new Error("Validation key not found");
-              Q(d.key);
+              Z(d.key);
               const n = o.getState().cogsStateStore[t];
               try {
                 const a = o.getState().getValidationErrors(d.key);
-                a && a.length > 0 && a.forEach(([f]) => {
-                  f && f.startsWith(d.key) && Q(f);
+                a && a.length > 0 && a.forEach(([v]) => {
+                  v && v.startsWith(d.key) && Z(v);
                 });
                 const i = d.zodSchema.safeParse(n);
                 return i.success ? !0 : (i.error.errors.forEach((u) => {
-                  const E = u.path, y = u.message, _ = [d.key, ...E].join(".");
-                  e(_, y);
-                }), ut(t), !1);
+                  const p = u.path, T = u.message, A = [d.key, ...p].join(".");
+                  e(A, T);
+                }), lt(t), !1);
               } catch (a) {
                 return console.error("Zod schema validation failed", a), !1;
               }
             };
-          if (l === "_componentId") return m;
+          if (l === "_componentId") return S;
           if (l === "getComponents")
             return () => o().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => Mt.getState().getFormRefsByStateKey(t);
+            return () => bt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return o.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1162,48 +1110,48 @@ function It(t, c, m, g) {
           if (l === "_isLoading")
             return o.getState().isLoadingGlobal[t];
           if (l === "revertToInitialState")
-            return v.revertToInitialState;
-          if (l === "updateInitialState") return v.updateInitialState;
-          if (l === "removeValidation") return v.removeValidation;
+            return I.revertToInitialState;
+          if (l === "updateInitialState") return I.updateInitialState;
+          if (l === "removeValidation") return I.removeValidation;
         }
         if (l === "getFormRef")
-          return () => Mt.getState().getFormRef(t + "." + r.join("."));
+          return () => bt.getState().getFormRef(t + "." + r.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ _t(
-            qt,
+          }) => /* @__PURE__ */ pt(
+            Dt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: r,
               validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
-              validIndices: S?.validIndices,
+              validIndices: f?.validIndices,
               children: d
             }
           );
         if (l === "_stateKey") return t;
         if (l === "_path") return r;
-        if (l === "_isServerSynced") return v._isServerSynced;
+        if (l === "_isServerSynced") return I._isServerSynced;
         if (l === "update")
           return (d, e) => {
             if (e?.debounce)
-              zt(() => {
-                ct(c, d, r, "");
+              Ft(() => {
+                it(c, d, r, "");
                 const n = o.getState().getNestedState(t, r);
                 e?.afterUpdate && e.afterUpdate(n);
               }, e.debounce);
             else {
-              ct(c, d, r, "");
+              it(c, d, r, "");
               const n = o.getState().getNestedState(t, r);
               e?.afterUpdate && e.afterUpdate(n);
             }
-            p(r);
+            w(r);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ _t(
-            Jt,
+          return (d, e) => /* @__PURE__ */ pt(
+            Wt,
             {
               setState: c,
               stateKey: t,
@@ -1212,120 +1160,120 @@ function It(t, c, m, g) {
               formOpts: e
             }
           );
-        const R = [...r, l], at = o.getState().getNestedState(t, R);
-        return s(at, R, S);
+        const j = [...r, l], st = o.getState().getNestedState(t, j);
+        return s(st, j, f);
       }
-    }, z = new Proxy(j, U);
-    return I.set(W, {
-      proxy: z,
-      stateVersion: N
-    }), z;
+    }, B = new Proxy(U, F);
+    return y.set(G, {
+      proxy: B,
+      stateVersion: b
+    }), B;
   }
   return s(
     o.getState().getNestedState(t, [])
   );
 }
-function Gt(t) {
-  return dt(ae, { proxy: t });
+function Ct(t) {
+  return ct(Qt, { proxy: t });
 }
-function oe({
+function Xt({
   proxy: t,
   rebuildStateShape: c
 }) {
-  const m = o().getNestedState(t._stateKey, t._path);
-  return Array.isArray(m) ? c(
-    m,
+  const S = o().getNestedState(t._stateKey, t._path);
+  return Array.isArray(S) ? c(
+    S,
     t._path
   ).stateMapNoRender(
-    (I, N, p, v, s) => t._mapFn(I, N, p, v, s)
+    (y, b, w, I, s) => t._mapFn(y, b, w, I, s)
   ) : null;
 }
-function ae({
+function Qt({
   proxy: t
 }) {
-  const c = q(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return ot(() => {
+  const c = X(null), S = `${t._stateKey}-${t._path.join(".")}`;
+  return nt(() => {
     const g = c.current;
     if (!g || !g.parentElement) return;
-    const I = g.parentElement, p = Array.from(I.childNodes).indexOf(g);
-    let v = I.getAttribute("data-parent-id");
-    v || (v = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", v));
-    const T = {
+    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 h = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: v,
-      position: p,
+      parentId: I,
+      position: w,
       effect: t._effect
     };
-    o.getState().addSignalElement(m, T);
+    o.getState().addSignalElement(S, h);
     const r = o.getState().getNestedState(t._stateKey, t._path);
-    let S;
+    let f;
     if (t._effect)
       try {
-        S = new Function(
+        f = new Function(
           "state",
           `return (${t._effect})(state)`
         )(r);
-      } catch (j) {
-        console.error("Error evaluating effect function during mount:", j), S = r;
+      } catch (U) {
+        console.error("Error evaluating effect function during mount:", U), f = r;
       }
     else
-      S = r;
-    S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const W = document.createTextNode(String(S));
-    g.replaceWith(W);
-  }, [t._stateKey, t._path.join("."), t._effect]), dt("span", {
+      f = r;
+    f !== null && typeof f == "object" && (f = JSON.stringify(f));
+    const G = document.createTextNode(String(f));
+    g.replaceWith(G);
+  }, [t._stateKey, t._path.join("."), t._effect]), ct("span", {
     ref: c,
     style: { display: "none" },
-    "data-signal-id": m
+    "data-signal-id": S
   });
 }
-function pe(t) {
-  const c = Bt(
-    (m) => {
+function Se(t) {
+  const c = Rt(
+    (S) => {
       const g = o.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
       return g.components.set(t._stateKey, {
-        forceUpdate: m,
+        forceUpdate: S,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
       }), () => g.components.delete(t._stateKey);
     },
     () => o.getState().getNestedState(t._stateKey, t._path)
   );
-  return dt("text", {}, String(c));
+  return ct("text", {}, String(c));
 }
-function se({
+function Kt({
   stateKey: t,
   itemComponentId: c,
-  itemPath: m,
+  itemPath: S,
   children: g
 }) {
-  const [, I] = K({}), [N, p] = Xt(), v = q(null);
-  return ot(() => {
-    p.height > 0 && p.height !== v.current && (v.current = p.height, o.getState().setShadowMetadata(t, m, {
+  const [, y] = et({}), [b, w] = Bt(), I = X(null);
+  return nt(() => {
+    w.height > 0 && w.height !== I.current && (I.current = w.height, o.getState().setShadowMetadata(t, S, {
       virtualizer: {
-        itemHeight: p.height
+        itemHeight: w.height
       }
     }));
-  }, [p.height, t, m]), lt(() => {
-    const s = `${t}////${c}`, T = o.getState().stateComponents.get(t) || {
+  }, [w.height, t, S]), At(() => {
+    const s = `${t}////${c}`, h = o.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
-    return T.components.set(s, {
-      forceUpdate: () => I({}),
-      paths: /* @__PURE__ */ new Set([m.join(".")])
-    }), o.getState().stateComponents.set(t, T), () => {
+    return h.components.set(s, {
+      forceUpdate: () => y({}),
+      paths: /* @__PURE__ */ new Set([S.join(".")])
+    }), o.getState().stateComponents.set(t, h), () => {
       const r = o.getState().stateComponents.get(t);
       r && r.components.delete(s);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ _t("div", { ref: N, children: g });
+  }, [t, c, S.join(".")]), /* @__PURE__ */ pt("div", { ref: b, children: g });
 }
 export {
-  Gt as $cogsSignal,
-  pe as $cogsSignalStore,
-  Ie as addStateOptions,
-  ve as createCogsState,
-  ye as notifyComponent,
-  re as useCogsStateFn
+  Ct as $cogsSignal,
+  Se as $cogsSignalStore,
+  ue as addStateOptions,
+  ge as createCogsState,
+  fe as notifyComponent,
+  Zt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map