cogsbox-state 0.5.306 → 0.5.308

package/dist/CogsState.jsx

@@ -1,63 +1,63 @@
 "use client";
 import { jsx as yt } from "react/jsx-runtime";
-import { useState as tt, useRef as B, useEffect as at, useLayoutEffect as dt, useMemo as It, createElement as st, useSyncExternalStore as Mt, startTransition as jt, useCallback as Et } from "react";
-import { transformStateFunc as Ot, isDeepEqual as H, isFunction as Y, getNestedValue as z, getDifferences as pt, debounce as Ft } from "./utility.js";
-import { pushFunc as vt, updateFn as ot, cutFunc as lt, ValidationWrapper as Rt, FormControlComponent as Ut } from "./Functions.jsx";
-import Dt from "superjson";
+import { useState as et, useRef as z, useEffect as lt, useLayoutEffect as dt, useMemo as It, createElement as ot, useSyncExternalStore as _t, startTransition as Mt, useCallback as Et } from "react";
+import { transformStateFunc as jt, isDeepEqual as H, isFunction as Y, getNestedValue as B, getDifferences as pt, debounce as Ot } from "./utility.js";
+import { pushFunc as vt, updateFn as rt, cutFunc as ct, ValidationWrapper as Rt, FormControlComponent as Ft } from "./Functions.jsx";
+import Ut from "superjson";
 import { v4 as wt } from "uuid";
 import "zod";
 import { getGlobalStore as o, formRefStore as Tt } from "./store.js";
 import { useCogsConfig as Ct } from "./CogsStateClient.jsx";
-import { applyPatch as Wt } from "fast-json-patch";
+import { applyPatch as Dt } from "fast-json-patch";
 import Gt from "react-use-measure";
 function $t(t, c) {
-  const m = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, y = m(t) || {};
+  const h = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, I = h(t) || {};
   f(t, {
-    ...y,
+    ...I,
     ...c
   });
 }
-function bt({
+function kt({
   stateKey: t,
   options: c,
-  initialOptionsPart: m
+  initialOptionsPart: h
 }) {
-  const f = nt(t) || {}, y = m[t] || {}, b = o.getState().setInitialStateOptions, p = { ...y, ...f };
-  let I = !1;
+  const f = tt(t) || {}, I = h[t] || {}, $ = o.getState().setInitialStateOptions, w = { ...I, ...f };
+  let p = !1;
   if (c)
     for (const a in c)
-      p.hasOwnProperty(a) ? (a == "localStorage" && c[a] && p[a].key !== c[a]?.key && (I = !0, p[a] = c[a]), a == "initialState" && c[a] && p[a] !== c[a] && // Different references
-      !H(p[a], c[a]) && (I = !0, p[a] = c[a])) : (I = !0, p[a] = c[a]);
-  I && b(t, p);
+      w.hasOwnProperty(a) ? (a == "localStorage" && c[a] && w[a].key !== c[a]?.key && (p = !0, w[a] = c[a]), a == "initialState" && c[a] && w[a] !== c[a] && // Different references
+      !H(w[a], c[a]) && (p = !0, w[a] = c[a])) : (p = !0, w[a] = c[a]);
+  p && $(t, w);
 }
-function de(t, { formElements: c, validation: m }) {
-  return { initialState: t, formElements: c, validation: m };
+function le(t, { formElements: c, validation: h }) {
+  return { initialState: t, formElements: c, validation: h };
 }
-const ue = (t, c) => {
-  let m = t;
-  const [f, y] = Ot(m);
-  (Object.keys(y).length > 0 || c && Object.keys(c).length > 0) && Object.keys(y).forEach((I) => {
-    y[I] = y[I] || {}, y[I].formElements = {
+const de = (t, c) => {
+  let h = t;
+  const [f, I] = jt(h);
+  (Object.keys(I).length > 0 || c && Object.keys(c).length > 0) && Object.keys(I).forEach((p) => {
+    I[p] = I[p] || {}, I[p].formElements = {
       ...c?.formElements,
       // Global defaults first
       ...c?.validation,
-      ...y[I].formElements || {}
+      ...I[p].formElements || {}
       // State-specific overrides
-    }, nt(I) || o.getState().setInitialStateOptions(I, y[I]);
+    }, tt(p) || o.getState().setInitialStateOptions(p, I[p]);
   }), o.getState().setInitialStates(f), o.getState().setCreatedState(f);
-  const b = (I, a) => {
-    const [v] = tt(a?.componentId ?? wt());
-    bt({
-      stateKey: I,
+  const $ = (p, a) => {
+    const [y] = et(a?.componentId ?? wt());
+    kt({
+      stateKey: p,
       options: a,
-      initialOptionsPart: y
+      initialOptionsPart: I
     });
-    const n = o.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [W, R] = Yt(
+    const n = o.getState().cogsStateStore[p] || f[p], S = a?.modifyState ? a.modifyState(n) : n, [W, R] = Jt(
       S,
       {
-        stateKey: I,
+        stateKey: p,
         syncUpdate: a?.syncUpdate,
-        componentId: v,
+        componentId: y,
         localStorage: a?.localStorage,
         middleware: a?.middleware,
         enabledSync: a?.enabledSync,
@@ -70,44 +70,44 @@ const ue = (t, c) => {
     );
     return R;
   };
-  function p(I, a) {
-    bt({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Bt(I, a), St(I);
+  function w(p, a) {
+    kt({ stateKey: p, options: a, initialOptionsPart: I }), a.localStorage && zt(p, a), St(p);
   }
-  return { useCogsState: b, setCogsOptions: p };
+  return { useCogsState: $, setCogsOptions: w };
 }, {
   setUpdaterState: ut,
-  setState: et,
-  getInitialOptions: nt,
+  setState: K,
+  getInitialOptions: tt,
   getKeyState: Vt,
-  getValidationErrors: Lt,
-  setStateLog: Ht,
+  getValidationErrors: Wt,
+  setStateLog: Lt,
   updateInitialStateGlobal: At,
-  addValidationError: zt,
+  addValidationError: Ht,
   removeValidationError: J,
-  setServerSyncActions: qt
-} = o.getState(), kt = (t, c, m, f, y) => {
-  m?.log && console.log(
+  setServerSyncActions: Bt
+} = o.getState(), Nt = (t, c, h, f, I) => {
+  h?.log && console.log(
     "saving to localstorage",
     c,
-    m.localStorage?.key,
+    h.localStorage?.key,
     f
   );
-  const b = Y(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (b && f) {
-    const p = `${f}-${c}-${b}`;
-    let I;
+  const $ = Y(h?.localStorage?.key) ? h.localStorage?.key(t) : h?.localStorage?.key;
+  if ($ && f) {
+    const w = `${f}-${c}-${$}`;
+    let p;
     try {
-      I = ft(p)?.lastSyncedWithServer;
+      p = ft(w)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: y ?? I
-    }, v = Dt.serialize(a);
+      lastSyncedWithServer: I ?? p
+    }, y = Ut.serialize(a);
     window.localStorage.setItem(
-      p,
-      JSON.stringify(v.json)
+      w,
+      JSON.stringify(y.json)
     );
   }
 }, ft = (t) => {
@@ -118,61 +118,61 @@ const ue = (t, c) => {
   } catch (c) {
     return console.error("Error loading from localStorage:", c), null;
   }
-}, Bt = (t, c) => {
-  const m = o.getState().cogsStateStore[t], { sessionId: f } = Ct(), y = Y(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
-  if (y && f) {
-    const b = ft(
-      `${f}-${t}-${y}`
+}, zt = (t, c) => {
+  const h = o.getState().cogsStateStore[t], { sessionId: f } = Ct(), I = Y(c?.localStorage?.key) ? c.localStorage.key(h) : c?.localStorage?.key;
+  if (I && f) {
+    const $ = ft(
+      `${f}-${t}-${I}`
     );
-    if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
-      return et(t, b.state), St(t), !0;
+    if ($ && $.lastUpdated > ($.lastSyncedWithServer || 0))
+      return K(t, $.state), St(t), !0;
   }
   return !1;
-}, xt = (t, c, m, f, y, b) => {
-  const p = {
+}, xt = (t, c, h, f, I, $) => {
+  const w = {
     initialState: c,
     updaterState: gt(
       t,
       f,
-      y,
-      b
+      I,
+      $
     ),
-    state: m
+    state: h
   };
-  At(t, p.initialState), ut(t, p.updaterState), et(t, p.state);
+  At(t, w.initialState), ut(t, w.updaterState), K(t, w.state);
 }, St = (t) => {
   const c = o.getState().stateComponents.get(t);
   if (!c) return;
-  const m = /* @__PURE__ */ new Set();
+  const h = /* @__PURE__ */ new Set();
   c.components.forEach((f) => {
-    (f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none") || m.add(() => f.forceUpdate());
+    (f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none") || h.add(() => f.forceUpdate());
   }), queueMicrotask(() => {
-    m.forEach((f) => f());
+    h.forEach((f) => f());
   });
-}, ge = (t, c) => {
-  const m = o.getState().stateComponents.get(t);
-  if (m) {
-    const f = `${t}////${c}`, y = m.components.get(f);
-    if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
+}, ue = (t, c) => {
+  const h = o.getState().stateComponents.get(t);
+  if (h) {
+    const f = `${t}////${c}`, I = h.components.get(f);
+    if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
       return;
-    y && y.forceUpdate();
+    I && I.forceUpdate();
   }
-}, Jt = (t, c, m, f) => {
+}, qt = (t, c, h, f) => {
   switch (t) {
     case "update":
       return {
-        oldValue: z(c, f),
-        newValue: z(m, f)
+        oldValue: B(c, f),
+        newValue: B(h, f)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: z(m, f)
+        newValue: B(h, f)
       };
     case "cut":
       return {
-        oldValue: z(c, f),
+        oldValue: B(c, f),
         newValue: null
         // or undefined
       };
@@ -180,57 +180,57 @@ const ue = (t, c) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Yt(t, {
+function Jt(t, {
   stateKey: c,
-  serverSync: m,
+  serverSync: h,
   localStorage: f,
-  formElements: y,
-  reactiveDeps: b,
-  reactiveType: p,
-  componentId: I,
+  formElements: I,
+  reactiveDeps: $,
+  reactiveType: w,
+  componentId: p,
   initialState: a,
-  syncUpdate: v,
+  syncUpdate: y,
   dependencies: n,
   serverState: S
 } = {}) {
-  const [W, R] = tt({}), { sessionId: U } = Ct();
-  let G = !c;
-  const [h] = tt(c ?? wt()), l = o.getState().stateLog[h], it = B(/* @__PURE__ */ new Set()), Z = B(I ?? wt()), j = B(
+  const [W, R] = et({}), { sessionId: F } = Ct();
+  let L = !c;
+  const [v] = et(c ?? wt()), l = o.getState().stateLog[v], at = z(/* @__PURE__ */ new Set()), Z = z(p ?? wt()), j = z(
     null
   );
-  j.current = nt(h) ?? null, at(() => {
-    if (v && v.stateKey === h && v.path?.[0]) {
-      et(h, (r) => ({
+  j.current = tt(v) ?? null, lt(() => {
+    if (y && y.stateKey === v && y.path?.[0]) {
+      K(v, (r) => ({
         ...r,
-        [v.path[0]]: v.newValue
+        [y.path[0]]: y.newValue
       }));
-      const e = `${v.stateKey}:${v.path.join(".")}`;
+      const e = `${y.stateKey}:${y.path.join(".")}`;
       o.getState().setSyncInfo(e, {
-        timeStamp: v.timeStamp,
-        userId: v.userId
+        timeStamp: y.timeStamp,
+        userId: y.userId
       });
     }
-  }, [v]), at(() => {
+  }, [y]), lt(() => {
     if (a) {
-      $t(h, {
+      $t(v, {
         initialState: a
       });
-      const e = j.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
+      const e = j.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[v];
       if (!(i && !H(i, a) || !i) && !s)
         return;
-      let g = null;
-      const A = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      A && U && (g = ft(`${U}-${h}-${A}`));
-      let w = a, T = !1;
-      const _ = s ? Date.now() : 0, C = g?.lastUpdated || 0, M = g?.lastSyncedWithServer || 0;
-      s && _ > C ? (w = e.serverState.data, T = !0) : g && C > M && (w = g.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), o.getState().initializeShadowState(h, a), xt(
-        h,
+      let u = null;
+      const E = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
+      E && F && (u = ft(`${F}-${v}-${E}`));
+      let A = a, T = !1;
+      const P = s ? Date.now() : 0, C = u?.lastUpdated || 0, k = u?.lastSyncedWithServer || 0;
+      s && P > C ? (A = e.serverState.data, T = !0) : u && C > k && (A = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(A)), o.getState().initializeShadowState(v, a), xt(
+        v,
         a,
-        w,
-        rt,
+        A,
+        nt,
         Z.current,
-        U
-      ), T && A && U && kt(w, h, e, U, Date.now()), St(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || R({});
+        F
+      ), T && E && F && Nt(A, v, e, F, Date.now()), St(v), (Array.isArray(w) ? w : [w || "component"]).includes("none") || R({});
     }
   }, [
     a,
@@ -238,269 +238,269 @@ function Yt(t, {
     S?.data,
     ...n || []
   ]), dt(() => {
-    G && $t(h, {
-      serverSync: m,
-      formElements: y,
+    L && $t(v, {
+      serverSync: h,
+      formElements: I,
       initialState: a,
       localStorage: f,
       middleware: j.current?.middleware
     });
-    const e = `${h}////${Z.current}`, r = o.getState().stateComponents.get(h) || {
+    const e = `${v}////${Z.current}`, r = o.getState().stateComponents.get(v) || {
       components: /* @__PURE__ */ new Map()
     };
     return r.components.set(e, {
       forceUpdate: () => R({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: b || void 0,
-      reactiveType: p ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(h, r), R({}), () => {
-      r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(h));
+      depsFunction: $ || void 0,
+      reactiveType: w ?? ["component", "deps"]
+    }), o.getState().stateComponents.set(v, r), R({}), () => {
+      r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(v));
     };
   }, []);
-  const rt = (e, r, s, i) => {
+  const nt = (e, r, s, i) => {
     if (Array.isArray(r)) {
-      const g = `${h}-${r.join(".")}`;
-      it.current.add(g);
+      const u = `${v}-${r.join(".")}`;
+      at.current.add(u);
     }
-    const u = o.getState();
-    et(h, (g) => {
-      const A = Y(e) ? e(g) : e, w = `${h}-${r.join(".")}`;
-      if (w) {
-        let V = !1, k = u.signalDomElements.get(w);
-        if ((!k || k.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const O = r.slice(0, -1), D = z(A, O);
-          if (Array.isArray(D)) {
-            V = !0;
-            const $ = `${h}-${O.join(".")}`;
-            k = u.signalDomElements.get($);
+    const g = o.getState();
+    K(v, (u) => {
+      const E = Y(e) ? e(u) : e, A = `${v}-${r.join(".")}`;
+      if (A) {
+        let M = !1, N = g.signalDomElements.get(A);
+        if ((!N || N.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const O = r.slice(0, -1), G = B(E, O);
+          if (Array.isArray(G)) {
+            M = !0;
+            const m = `${v}-${O.join(".")}`;
+            N = g.signalDomElements.get(m);
           }
         }
-        if (k) {
-          const O = V ? z(A, r.slice(0, -1)) : z(A, r);
-          k.forEach(({ parentId: D, position: $, effect: E }) => {
-            const N = document.querySelector(
-              `[data-parent-id="${D}"]`
+        if (N) {
+          const O = M ? B(E, r.slice(0, -1)) : B(E, r);
+          N.forEach(({ parentId: G, position: m, effect: b }) => {
+            const V = document.querySelector(
+              `[data-parent-id="${G}"]`
             );
-            if (N) {
-              const F = Array.from(N.childNodes);
-              if (F[$]) {
-                const x = E ? new Function("state", `return (${E})(state)`)(O) : O;
-                F[$].textContent = String(x);
+            if (V) {
+              const _ = Array.from(V.childNodes);
+              if (_[m]) {
+                const x = b ? new Function("state", `return (${b})(state)`)(O) : O;
+                _[m].textContent = String(x);
               }
             }
           });
         }
       }
-      console.log("shadowState", u.shadowStateStore), s.updateType === "update" && (i || j.current?.validation?.key) && r && J(
+      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (i || j.current?.validation?.key) && r && J(
         (i || j.current?.validation?.key) + "." + r.join(".")
       );
       const T = r.slice(0, r.length - 1);
       s.updateType === "cut" && j.current?.validation?.key && J(
         j.current?.validation?.key + "." + T.join(".")
-      ), s.updateType === "insert" && j.current?.validation?.key && Lt(
+      ), s.updateType === "insert" && j.current?.validation?.key && Wt(
         j.current?.validation?.key + "." + T.join(".")
-      ).filter(([k, O]) => {
-        let D = k?.split(".").length;
-        if (k == T.join(".") && D == T.length - 1) {
-          let $ = k + "." + T;
-          J(k), zt($, O);
+      ).filter(([N, O]) => {
+        let G = N?.split(".").length;
+        if (N == T.join(".") && G == T.length - 1) {
+          let m = N + "." + T;
+          J(N), Ht(m, O);
         }
       });
-      const _ = u.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", _), _) {
-        const V = pt(g, A), k = new Set(V), O = s.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
+      const P = g.stateComponents.get(v);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", P), P) {
+        const M = pt(u, E), N = new Set(M), O = s.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
         for (const [
-          D,
-          $
-        ] of _.components.entries()) {
-          let E = !1;
-          const N = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
-          if (console.log("component", $), !N.includes("none")) {
-            if (N.includes("all")) {
-              $.forceUpdate();
+          G,
+          m
+        ] of P.components.entries()) {
+          let b = !1;
+          const V = Array.isArray(m.reactiveType) ? m.reactiveType : [m.reactiveType || "component"];
+          if (console.log("component", m), !V.includes("none")) {
+            if (V.includes("all")) {
+              m.forceUpdate();
               continue;
             }
-            if (N.includes("component") && (($.paths.has(O) || $.paths.has("")) && (E = !0), !E))
-              for (const F of k) {
-                let x = F;
+            if (V.includes("component") && ((m.paths.has(O) || m.paths.has("")) && (b = !0), !b))
+              for (const _ of N) {
+                let x = _;
                 for (; ; ) {
-                  if ($.paths.has(x)) {
-                    E = !0;
+                  if (m.paths.has(x)) {
+                    b = !0;
                     break;
                   }
-                  const L = x.lastIndexOf(".");
-                  if (L !== -1) {
-                    const X = x.substring(
+                  const q = x.lastIndexOf(".");
+                  if (q !== -1) {
+                    const st = x.substring(
                       0,
-                      L
+                      q
                     );
                     if (!isNaN(
-                      Number(x.substring(L + 1))
-                    ) && $.paths.has(X)) {
-                      E = !0;
+                      Number(x.substring(q + 1))
+                    ) && m.paths.has(st)) {
+                      b = !0;
                       break;
                     }
-                    x = X;
+                    x = st;
                   } else
                     x = "";
                   if (x === "")
                     break;
                 }
-                if (E) break;
+                if (b) break;
               }
-            if (!E && N.includes("deps") && $.depsFunction) {
-              const F = $.depsFunction(A);
+            if (!b && V.includes("deps") && m.depsFunction) {
+              const _ = m.depsFunction(E);
               let x = !1;
-              typeof F == "boolean" ? F && (x = !0) : H($.deps, F) || ($.deps = F, x = !0), x && (E = !0);
+              typeof _ == "boolean" ? _ && (x = !0) : H(m.deps, _) || (m.deps = _, x = !0), x && (b = !0);
             }
-            E && $.forceUpdate();
+            b && m.forceUpdate();
           }
         }
       }
       const C = Date.now();
-      r = r.map((V, k) => {
-        const O = r.slice(0, -1), D = z(A, O);
-        return k === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (D.length - 1).toString() : V;
+      r = r.map((M, N) => {
+        const O = r.slice(0, -1), G = B(E, O);
+        return N === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (G.length - 1).toString() : M;
       });
-      const { oldValue: M, newValue: P } = Jt(
+      const { oldValue: k, newValue: D } = qt(
         s.updateType,
-        g,
-        A,
+        u,
+        E,
         r
-      ), q = {
+      ), U = {
         timeStamp: C,
-        stateKey: h,
+        stateKey: v,
         path: r,
         updateType: s.updateType,
         status: "new",
-        oldValue: M,
-        newValue: P
+        oldValue: k,
+        newValue: D
       };
       switch (s.updateType) {
         case "update":
-          u.updateShadowAtPath(h, r, A);
+          g.updateShadowAtPath(v, r, E);
           break;
         case "insert":
-          const V = r.slice(0, -1);
-          u.insertShadowArrayElement(h, V, P);
+          const M = r.slice(0, -1);
+          g.insertShadowArrayElement(v, M, D);
           break;
         case "cut":
-          const k = r.slice(0, -1), O = parseInt(r[r.length - 1]);
-          u.removeShadowArrayElement(h, k, O);
+          const N = r.slice(0, -1), O = parseInt(r[r.length - 1]);
+          g.removeShadowArrayElement(v, N, O);
           break;
       }
-      if (Ht(h, (V) => {
-        const O = [...V ?? [], q].reduce((D, $) => {
-          const E = `${$.stateKey}:${JSON.stringify($.path)}`, N = D.get(E);
-          return N ? (N.timeStamp = Math.max(N.timeStamp, $.timeStamp), N.newValue = $.newValue, N.oldValue = N.oldValue ?? $.oldValue, N.updateType = $.updateType) : D.set(E, { ...$ }), D;
+      if (Lt(v, (M) => {
+        const O = [...M ?? [], U].reduce((G, m) => {
+          const b = `${m.stateKey}:${JSON.stringify(m.path)}`, V = G.get(b);
+          return V ? (V.timeStamp = Math.max(V.timeStamp, m.timeStamp), V.newValue = m.newValue, V.oldValue = V.oldValue ?? m.oldValue, V.updateType = m.updateType) : G.set(b, { ...m }), G;
         }, /* @__PURE__ */ new Map());
         return Array.from(O.values());
-      }), kt(
-        A,
-        h,
+      }), Nt(
+        E,
+        v,
         j.current,
-        U
+        F
       ), j.current?.middleware && j.current.middleware({
         updateLog: l,
-        update: q
+        update: U
       }), j.current?.serverSync) {
-        const V = u.serverState[h], k = j.current?.serverSync;
-        qt(h, {
-          syncKey: typeof k.syncKey == "string" ? k.syncKey : k.syncKey({ state: A }),
-          rollBackState: V,
-          actionTimeStamp: Date.now() + (k.debounce ?? 3e3),
+        const M = g.serverState[v], N = j.current?.serverSync;
+        Bt(v, {
+          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: E }),
+          rollBackState: M,
+          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return A;
+      return E;
     });
   };
-  o.getState().updaterState[h] || (ut(
-    h,
+  o.getState().updaterState[v] || (ut(
+    v,
     gt(
-      h,
-      rt,
+      v,
+      nt,
       Z.current,
-      U
+      F
     )
-  ), o.getState().cogsStateStore[h] || et(h, t), o.getState().initialStateGlobal[h] || At(h, t));
+  ), o.getState().cogsStateStore[v] || K(v, t), o.getState().initialStateGlobal[v] || At(v, t));
   const d = It(() => gt(
-    h,
-    rt,
+    v,
+    nt,
     Z.current,
-    U
-  ), [h, U]);
-  return [Vt(h), d];
+    F
+  ), [v, F]);
+  return [Vt(v), d];
 }
-function gt(t, c, m, f) {
-  const y = /* @__PURE__ */ new Map();
-  let b = 0;
-  const p = (v) => {
-    const n = v.join(".");
-    for (const [S] of y)
-      (S === n || S.startsWith(n + ".")) && y.delete(S);
-    b++;
-  }, I = {
-    removeValidation: (v) => {
-      v?.validationKey && J(v.validationKey);
+function gt(t, c, h, f) {
+  const I = /* @__PURE__ */ new Map();
+  let $ = 0;
+  const w = (y) => {
+    const n = y.join(".");
+    for (const [S] of I)
+      (S === n || S.startsWith(n + ".")) && I.delete(S);
+    $++;
+  }, p = {
+    removeValidation: (y) => {
+      y?.validationKey && J(y.validationKey);
     },
-    revertToInitialState: (v) => {
+    revertToInitialState: (y) => {
       const n = o.getState().getInitialOptions(t)?.validation;
-      n?.key && J(n?.key), v?.validationKey && J(v.validationKey);
+      n?.key && J(n?.key), y?.validationKey && J(y.validationKey);
       const S = o.getState().initialStateGlobal[t];
-      o.getState().clearSelectedIndexesForState(t), y.clear(), b++;
-      const W = a(S, []), R = nt(t), U = Y(R?.localStorage?.key) ? R?.localStorage?.key(S) : R?.localStorage?.key, G = `${f}-${t}-${U}`;
-      G && localStorage.removeItem(G), ut(t, W), et(t, S);
-      const h = o.getState().stateComponents.get(t);
-      return h && h.components.forEach((l) => {
+      o.getState().clearSelectedIndexesForState(t), I.clear(), $++;
+      const W = a(S, []), R = tt(t), F = Y(R?.localStorage?.key) ? R?.localStorage?.key(S) : R?.localStorage?.key, L = `${f}-${t}-${F}`;
+      L && localStorage.removeItem(L), ut(t, W), K(t, S);
+      const v = o.getState().stateComponents.get(t);
+      return v && v.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
-    updateInitialState: (v) => {
-      y.clear(), b++;
+    updateInitialState: (y) => {
+      I.clear(), $++;
       const n = gt(
         t,
         c,
-        m,
+        h,
         f
-      ), S = o.getState().initialStateGlobal[t], W = nt(t), R = Y(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, U = `${f}-${t}-${R}`;
-      return localStorage.getItem(U) && localStorage.removeItem(U), jt(() => {
-        At(t, v), o.getState().initializeShadowState(t, v), ut(t, n), et(t, v);
-        const G = o.getState().stateComponents.get(t);
-        G && G.components.forEach((h) => {
-          h.forceUpdate();
+      ), S = o.getState().initialStateGlobal[t], W = tt(t), R = Y(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, F = `${f}-${t}-${R}`;
+      return localStorage.getItem(F) && localStorage.removeItem(F), Mt(() => {
+        At(t, y), o.getState().initializeShadowState(t, y), ut(t, n), K(t, y);
+        const L = o.getState().stateComponents.get(t);
+        L && L.components.forEach((v) => {
+          v.forceUpdate();
         });
       }), {
-        fetchId: (G) => n.get()[G]
+        fetchId: (L) => n.get()[L]
       };
     },
     _initialState: o.getState().initialStateGlobal[t],
     _serverState: o.getState().serverState[t],
     _isLoading: o.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const v = o.getState().serverState[t];
-      return !!(v && H(v, Vt(t)));
+      const y = o.getState().serverState[t];
+      return !!(y && H(y, Vt(t)));
     }
   };
-  function a(v, n = [], S) {
+  function a(y, n = [], S) {
     const W = n.map(String).join(".");
-    y.get(W);
+    I.get(W);
     const R = function() {
       return o().getNestedState(t, n);
     };
-    Object.keys(I).forEach((h) => {
-      R[h] = I[h];
+    Object.keys(p).forEach((v) => {
+      R[v] = p[v];
     });
-    const U = {
-      apply(h, l, it) {
+    const F = {
+      apply(v, l, at) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), o().getNestedState(t, n);
       },
-      get(h, l) {
-        S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
-        const it = /* @__PURE__ */ new Set([
+      get(v, l) {
+        S?.validIndices && !Array.isArray(y) && (S = { ...S, validIndices: void 0 });
+        const at = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,15 +523,15 @@ function gt(t, c, m, f) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !it.has(l)) {
-          const d = `${t}////${m}`, e = o.getState().stateComponents.get(t);
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !at.has(l)) {
+          const d = `${t}////${h}`, e = o.getState().stateComponents.get(t);
           if (e) {
             const r = e.components.get(d);
             if (r && !r.paths.has("")) {
               const s = n.join(".");
               let i = !0;
-              for (const u of r.paths)
-                if (s.startsWith(u) && (s === u || s[u.length] === ".")) {
+              for (const g of r.paths)
+                if (s.startsWith(g) && (s === g || s[g.length] === ".")) {
                   i = !1;
                   break;
                 }
@@ -553,13 +553,13 @@ function gt(t, c, m, f) {
             try {
               const i = await e.action(r);
               if (i && !i.success && i.errors && s) {
-                o.getState().removeValidationError(s), i.errors.forEach((g) => {
-                  const A = [s, ...g.path].join(".");
-                  o.getState().addValidationError(A, g.message);
+                o.getState().removeValidationError(s), i.errors.forEach((u) => {
+                  const E = [s, ...u.path].join(".");
+                  o.getState().addValidationError(E, u.message);
                 });
-                const u = o.getState().stateComponents.get(t);
-                u && u.components.forEach((g) => {
-                  g.forceUpdate();
+                const g = o.getState().stateComponents.get(t);
+                g && g.components.forEach((u) => {
+                  u.forceUpdate();
                 });
               }
               return i?.success && e.onSuccess ? e.onSuccess(i.data) : !i?.success && e.onError && e.onError(i.error), i;
@@ -568,7 +568,7 @@ function gt(t, c, m, f) {
             }
           };
         if (l === "_status") {
-          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = z(e, n);
+          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = B(e, n);
           return H(d, r) ? "fresh" : "stale";
         }
         if (l === "getStatus")
@@ -576,12 +576,12 @@ function gt(t, c, m, f) {
             const d = o().getNestedState(
               t,
               n
-            ), e = o.getState().initialStateGlobal[t], r = z(e, n);
+            ), e = o.getState().initialStateGlobal[t], r = B(e, n);
             return H(d, r) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = o.getState().initialStateGlobal[t], e = nt(t), r = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${r}`;
+            const d = o.getState().initialStateGlobal[t], e = tt(t), r = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${r}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -591,8 +591,8 @@ function gt(t, c, m, f) {
               throw new Error("Validation key not found");
             return o.getState().getValidationErrors(d.key + "." + n.join("."));
           };
-        if (Array.isArray(v)) {
-          const d = () => S?.validIndices ? v.map((r, s) => ({
+        if (Array.isArray(y)) {
+          const d = () => S?.validIndices ? y.map((r, s) => ({
             item: r,
             originalIndex: S.validIndices[s]
           })) : o.getState().getNestedState(t, n).map((r, s) => ({
@@ -604,7 +604,7 @@ function gt(t, c, m, f) {
               const e = o.getState().getSelectedIndex(t, n.join("."));
               if (e !== void 0)
                 return a(
-                  v[e],
+                  y[e],
                   [...n, e.toString()],
                   S
                 );
@@ -621,156 +621,158 @@ function gt(t, c, m, f) {
                 itemHeight: r = 50,
                 overscan: s = 5,
                 stickToBottom: i = !1
-              } = e, u = B(null), [g, A] = tt({
+              } = e, g = z(null), [u, E] = et({
                 startIndex: 0,
                 endIndex: 10
-              }), [, w] = tt({}), T = B(i), _ = B(0), C = B(!0);
-              at(() => o.getState().subscribeToShadowState(t, () => w({})), [t]);
-              const M = o().getNestedState(
+              }), A = z(i), T = z(0), P = z(!0), C = o().getNestedState(
                 t,
                 n
-              ), P = M.length, { totalHeight: q, positions: V } = It(() => {
-                const E = o.getState().getShadowMetadata(t, n) || [];
-                let N = 0;
-                const F = [];
-                for (let x = 0; x < P; x++) {
-                  F[x] = N;
-                  const L = E[x]?.virtualizer?.itemHeight;
-                  N += L || r;
+              ), k = C.length, { totalHeight: D, positions: U } = It(() => {
+                const m = o.getState().getShadowMetadata(t, n) || [];
+                let b = 0;
+                const V = [];
+                for (let _ = 0; _ < k; _++) {
+                  V[_] = b;
+                  const x = m[_]?.virtualizer?.itemHeight;
+                  b += x || r;
                 }
-                return { totalHeight: N, positions: F };
-              }, [P, t, n.join("."), r]), k = It(() => {
-                const E = Math.max(0, g.startIndex), N = Math.min(P, g.endIndex), F = Array.from(
-                  { length: N - E },
-                  (L, X) => E + X
-                ), x = F.map((L) => M[L]);
-                return a(x, n, {
+                return { totalHeight: b, positions: V };
+              }, [k, t, n.join("."), r]);
+              console.log("height", D);
+              const M = It(() => {
+                const m = Math.max(0, u.startIndex), b = Math.min(k, u.endIndex), V = Array.from(
+                  { length: b - m },
+                  (x, q) => m + q
+                ), _ = V.map((x) => C[x]);
+                return a(_, n, {
                   ...S,
-                  validIndices: F
+                  validIndices: V
                 });
-              }, [g.startIndex, g.endIndex, M, P]);
+              }, [u.startIndex, u.endIndex, C, k]);
               dt(() => {
-                const E = u.current;
-                if (!E) return;
-                const N = T.current, F = P > _.current;
-                _.current = P;
-                const x = () => {
-                  const { scrollTop: L, clientHeight: X, scrollHeight: Pt } = E;
-                  T.current = Pt - L - X < 10;
-                  let mt = 0, ct = P - 1;
-                  for (; mt <= ct; ) {
-                    const K = Math.floor((mt + ct) / 2);
-                    V[K] < L ? mt = K + 1 : ct = K - 1;
+                const m = g.current;
+                if (!m) return;
+                const b = A.current, V = k > T.current;
+                T.current = k;
+                const _ = () => {
+                  const { scrollTop: x, clientHeight: q, scrollHeight: st } = m;
+                  A.current = st - x - q < 10;
+                  let mt = 0, it = k - 1;
+                  for (; mt <= it; ) {
+                    const Q = Math.floor((mt + it) / 2);
+                    U[Q] < x ? mt = Q + 1 : it = Q - 1;
                   }
-                  const ht = Math.max(0, ct - s);
-                  let Q = ht;
-                  const _t = L + X;
-                  for (; Q < P && V[Q] < _t; )
-                    Q++;
-                  Q = Math.min(P, Q + s), A((K) => K.startIndex !== ht || K.endIndex !== Q ? { startIndex: ht, endIndex: Q } : K);
+                  const ht = Math.max(0, it - s);
+                  let X = ht;
+                  const Pt = x + q;
+                  for (; X < k && U[X] < Pt; )
+                    X++;
+                  X = Math.min(k, X + s), E((Q) => Q.startIndex !== ht || Q.endIndex !== X ? { startIndex: ht, endIndex: X } : Q);
                 };
-                return E.addEventListener("scroll", x, {
+                return m.addEventListener("scroll", _, {
                   passive: !0
-                }), i && (C.current && P > 0 ? requestAnimationFrame(() => {
-                  requestAnimationFrame(() => {
-                    u.current && (u.current.scrollTo({
-                      top: u.current.scrollHeight,
-                      behavior: "auto"
-                    }), C.current = !1);
-                  });
-                }) : !C.current && N && F && requestAnimationFrame(() => {
-                  E.scrollTo({
-                    top: E.scrollHeight,
+                }), i && (P.current ? (console.log(
+                  "stickToBottom initial mount",
+                  m.scrollHeight
+                ), m.scrollTo({
+                  top: m.scrollHeight,
+                  behavior: "auto"
+                }), P.current = !1) : b && V && (console.log(
+                  "stickToBottom wasAtBottom && listGrew",
+                  m.scrollHeight
+                ), requestAnimationFrame(() => {
+                  m.scrollTo({
+                    top: m.scrollHeight,
                     behavior: "smooth"
                   });
-                })), x(), () => E.removeEventListener("scroll", x);
-              }, [P, V, s, i]);
-              const O = Et(
-                (E = "smooth") => {
-                  u.current && u.current.scrollTo({
-                    top: u.current.scrollHeight,
-                    behavior: E
+                }))), console.log("wasAtBottom && listGrew", b, V), _(), () => m.removeEventListener("scroll", _);
+              }, [k, U, s, i]);
+              const N = Et(
+                (m = "smooth") => {
+                  g.current && g.current.scrollTo({
+                    top: g.current.scrollHeight,
+                    behavior: m
                   });
                 },
                 []
-              ), D = Et(
-                (E, N = "smooth") => {
-                  u.current && V[E] !== void 0 && u.current.scrollTo({
-                    top: V[E],
-                    behavior: N
+              ), O = Et(
+                (m, b = "smooth") => {
+                  g.current && U[m] !== void 0 && g.current.scrollTo({
+                    top: U[m],
+                    behavior: b
                   });
                 },
-                [V]
-              ), $ = {
+                [U]
+              ), G = {
                 outer: {
-                  ref: u,
+                  ref: g,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${q}px`,
+                    height: `${D}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${V[g.startIndex] || 0}px)`
+                    transform: `translateY(${U[u.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: k,
-                virtualizerProps: $,
-                scrollToBottom: O,
-                scrollToIndex: D
+                virtualState: M,
+                virtualizerProps: G,
+                scrollToBottom: N,
+                scrollToIndex: O
               };
             };
           if (l === "stateSort")
             return (e) => {
               const s = [...d()].sort(
-                (g, A) => e(g.item, A.item)
-              ), i = s.map(({ item: g }) => g), u = {
+                (u, E) => e(u.item, E.item)
+              ), i = s.map(({ item: u }) => u), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: g }) => g
+                  ({ originalIndex: u }) => u
                 )
               };
-              return a(i, n, u);
+              return a(i, n, g);
             };
           if (l === "stateFilter")
             return (e) => {
               const s = d().filter(
-                ({ item: g }, A) => e(g, A)
-              ), i = s.map(({ item: g }) => g), u = {
+                ({ item: u }, E) => e(u, E)
+              ), i = s.map(({ item: u }) => u), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: g }) => g
+                  ({ originalIndex: u }) => u
                 )
               };
-              return a(i, n, u);
+              return a(i, n, g);
             };
           if (l === "stateMap")
             return (e) => {
               const r = o.getState().getNestedState(t, n);
-              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
-                const g = r[i], A = [...n, i.toString()], w = a(g, A, S);
-                return e(g, w, {
+              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, g) => g)).map((i, g) => {
+                const u = r[i], E = [...n, i.toString()], A = a(u, E, S);
+                return e(u, A, {
                   register: () => {
-                    const [, _] = tt({}), C = `${m}-${n.join(".")}-${i}`;
+                    const [, P] = et({}), C = `${h}-${n.join(".")}-${i}`;
                     dt(() => {
-                      const M = `${t}////${C}`, P = o.getState().stateComponents.get(t) || {
+                      const k = `${t}////${C}`, D = o.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return P.components.set(M, {
-                        forceUpdate: () => _({}),
-                        paths: /* @__PURE__ */ new Set([A.join(".")])
-                      }), o.getState().stateComponents.set(t, P), () => {
-                        const q = o.getState().stateComponents.get(t);
-                        q && q.components.delete(M);
+                      return D.components.set(k, {
+                        forceUpdate: () => P({}),
+                        paths: /* @__PURE__ */ new Set([E.join(".")])
+                      }), o.getState().stateComponents.set(t, D), () => {
+                        const U = o.getState().stateComponents.get(t);
+                        U && U.components.delete(k);
                       };
                     }, [t, C]);
                   },
-                  index: u,
+                  index: g,
                   originalIndex: i
                 });
               }) : (console.warn(
@@ -779,20 +781,20 @@ function gt(t, c, m, f) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => v.map((s, i) => {
-              let u;
-              S?.validIndices && S.validIndices[i] !== void 0 ? u = S.validIndices[i] : u = i;
-              const g = [...n, u.toString()], A = a(s, g, S);
+            return (e) => y.map((s, i) => {
+              let g;
+              S?.validIndices && S.validIndices[i] !== void 0 ? g = S.validIndices[i] : g = i;
+              const u = [...n, g.toString()], E = a(s, u, S);
               return e(
                 s,
-                A,
+                E,
                 i,
-                v,
-                a(v, n, S)
+                y,
+                a(y, n, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => st(Zt, {
+            return (e) => ot(Yt, {
               proxy: {
                 _stateKey: t,
                 _path: n,
@@ -804,17 +806,17 @@ function gt(t, c, m, f) {
           if (l === "stateList")
             return (e) => {
               const r = o.getState().getNestedState(t, n);
-              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, u) => u)).map((i, u) => {
-                const g = r[i], A = [...n, i.toString()], w = a(g, A, S), T = `${m}-${n.join(".")}-${i}`;
-                return st(Qt, {
+              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, g) => g)).map((i, g) => {
+                const u = r[i], E = [...n, i.toString()], A = a(u, E, S), T = `${h}-${n.join(".")}-${i}`;
+                return ot(Xt, {
                   key: i,
                   stateKey: t,
                   itemComponentId: T,
-                  itemPath: A,
+                  itemPath: E,
                   children: e(
-                    g,
-                    w,
                     u,
+                    A,
+                    g,
                     r,
                     a(r, n, S)
                   )
@@ -825,8 +827,8 @@ function gt(t, c, m, f) {
             };
           if (l === "stateFlattenOn")
             return (e) => {
-              const r = v;
-              y.clear(), b++;
+              const r = y;
+              I.clear(), $++;
               const s = r.flatMap(
                 (i) => i[e] ?? []
               );
@@ -838,7 +840,7 @@ function gt(t, c, m, f) {
             };
           if (l === "index")
             return (e) => {
-              const r = v[e];
+              const r = y[e];
               return a(r, [...n, e.toString()]);
             };
           if (l === "last")
@@ -849,54 +851,54 @@ function gt(t, c, m, f) {
               return a(s, i);
             };
           if (l === "insert")
-            return (e) => (p(n), vt(c, e, n, t), a(
+            return (e) => (w(n), vt(c, e, n, t), a(
               o.getState().getNestedState(t, n),
               n
             ));
           if (l === "uniqueInsert")
             return (e, r, s) => {
-              const i = o.getState().getNestedState(t, n), u = Y(e) ? e(i) : e;
-              let g = null;
-              if (!i.some((w) => {
+              const i = o.getState().getNestedState(t, n), g = Y(e) ? e(i) : e;
+              let u = null;
+              if (!i.some((A) => {
                 if (r) {
-                  const _ = r.every(
-                    (C) => H(w[C], u[C])
+                  const P = r.every(
+                    (C) => H(A[C], g[C])
                   );
-                  return _ && (g = w), _;
+                  return P && (u = A), P;
                 }
-                const T = H(w, u);
-                return T && (g = w), T;
+                const T = H(A, g);
+                return T && (u = A), T;
               }))
-                p(n), vt(c, u, n, t);
-              else if (s && g) {
-                const w = s(g), T = i.map(
-                  (_) => H(_, g) ? w : _
+                w(n), vt(c, g, n, t);
+              else if (s && u) {
+                const A = s(u), T = i.map(
+                  (P) => H(P, u) ? A : P
                 );
-                p(n), ot(c, T, n);
+                w(n), rt(c, T, n);
               }
             };
           if (l === "cut")
             return (e, r) => {
               if (!r?.waitForSync)
-                return p(n), lt(c, n, t, e), a(
+                return w(n), ct(c, n, t, e), a(
                   o.getState().getNestedState(t, n),
                   n
                 );
             };
           if (l === "cutByValue")
             return (e) => {
-              for (let r = 0; r < v.length; r++)
-                v[r] === e && lt(c, n, t, r);
+              for (let r = 0; r < y.length; r++)
+                y[r] === e && ct(c, n, t, r);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const r = v.findIndex((s) => s === e);
-              r > -1 ? lt(c, n, t, r) : vt(c, e, n, t);
+              const r = y.findIndex((s) => s === e);
+              r > -1 ? ct(c, n, t, r) : vt(c, e, n, t);
             };
           if (l === "stateFind")
             return (e) => {
               const s = d().find(
-                ({ item: u }, g) => e(u, g)
+                ({ item: g }, u) => e(g, u)
               );
               if (!s) return;
               const i = [...n, s.originalIndex.toString()];
@@ -905,18 +907,18 @@ function gt(t, c, m, f) {
           if (l === "findWith")
             return (e, r) => {
               const i = d().find(
-                ({ item: g }) => g[e] === r
+                ({ item: u }) => u[e] === r
               );
               if (!i) return;
-              const u = [...n, i.originalIndex.toString()];
-              return a(i.item, u, S);
+              const g = [...n, i.originalIndex.toString()];
+              return a(i.item, g, S);
             };
         }
         const Z = n[n.length - 1];
         if (!isNaN(Number(Z))) {
           const d = n.slice(0, -1), e = o.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => lt(
+            return () => ct(
               c,
               d,
               t,
@@ -925,20 +927,20 @@ function gt(t, c, m, f) {
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(v)) {
+            if (S?.validIndices && Array.isArray(y)) {
               const d = o.getState().getNestedState(t, n);
               return S.validIndices.map((e) => d[e]);
             }
             return o.getState().getNestedState(t, n);
           };
         if (l === "$derive")
-          return (d) => Nt({
+          return (d) => bt({
             _stateKey: t,
             _path: n,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Nt({
+          return () => bt({
             _stateKey: t,
             _path: n
           });
@@ -957,7 +959,7 @@ function gt(t, c, m, f) {
             const e = n.slice(0, -1), r = Number(n[n.length - 1]), s = e.join(".");
             d ? o.getState().setSelectedIndex(t, s, r) : o.getState().setSelectedIndex(t, s, void 0);
             const i = o.getState().getNestedState(t, [...e]);
-            ot(c, i, e), p(e);
+            rt(c, i, e), w(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -968,73 +970,73 @@ function gt(t, c, m, f) {
               s === e ? void 0 : e
             );
             const i = o.getState().getNestedState(t, [...d]);
-            ot(c, i, d), p(d);
+            rt(c, i, d), w(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
-              const e = o.getState().cogsStateStore[t], s = Wt(e, d).newDocument;
+              const e = o.getState().cogsStateStore[t], s = Dt(e, d).newDocument;
               xt(
                 t,
                 o.getState().initialStateGlobal[t],
                 s,
                 c,
-                m,
+                h,
                 f
               );
               const i = o.getState().stateComponents.get(t);
               if (i) {
-                const u = pt(e, s), g = new Set(u);
+                const g = pt(e, s), u = new Set(g);
                 for (const [
-                  A,
-                  w
+                  E,
+                  A
                 ] of i.components.entries()) {
                   let T = !1;
-                  const _ = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
-                  if (!_.includes("none")) {
-                    if (_.includes("all")) {
-                      w.forceUpdate();
+                  const P = Array.isArray(A.reactiveType) ? A.reactiveType : [A.reactiveType || "component"];
+                  if (!P.includes("none")) {
+                    if (P.includes("all")) {
+                      A.forceUpdate();
                       continue;
                     }
-                    if (_.includes("component") && (w.paths.has("") && (T = !0), !T))
-                      for (const C of g) {
-                        if (w.paths.has(C)) {
+                    if (P.includes("component") && (A.paths.has("") && (T = !0), !T))
+                      for (const C of u) {
+                        if (A.paths.has(C)) {
                           T = !0;
                           break;
                         }
-                        let M = C.lastIndexOf(".");
-                        for (; M !== -1; ) {
-                          const P = C.substring(0, M);
-                          if (w.paths.has(P)) {
+                        let k = C.lastIndexOf(".");
+                        for (; k !== -1; ) {
+                          const D = C.substring(0, k);
+                          if (A.paths.has(D)) {
                             T = !0;
                             break;
                           }
-                          const q = C.substring(
-                            M + 1
+                          const U = C.substring(
+                            k + 1
                           );
-                          if (!isNaN(Number(q))) {
-                            const V = P.lastIndexOf(".");
-                            if (V !== -1) {
-                              const k = P.substring(
+                          if (!isNaN(Number(U))) {
+                            const M = D.lastIndexOf(".");
+                            if (M !== -1) {
+                              const N = D.substring(
                                 0,
-                                V
+                                M
                               );
-                              if (w.paths.has(k)) {
+                              if (A.paths.has(N)) {
                                 T = !0;
                                 break;
                               }
                             }
                           }
-                          M = P.lastIndexOf(".");
+                          k = D.lastIndexOf(".");
                         }
                         if (T) break;
                       }
-                    if (!T && _.includes("deps") && w.depsFunction) {
-                      const C = w.depsFunction(s);
-                      let M = !1;
-                      typeof C == "boolean" ? C && (M = !0) : H(w.deps, C) || (w.deps = C, M = !0), M && (T = !0);
+                    if (!T && P.includes("deps") && A.depsFunction) {
+                      const C = A.depsFunction(s);
+                      let k = !1;
+                      typeof C == "boolean" ? C && (k = !0) : H(A.deps, C) || (A.deps = C, k = !0), k && (T = !0);
                     }
-                    T && w.forceUpdate();
+                    T && A.forceUpdate();
                   }
                 }
               }
@@ -1050,19 +1052,19 @@ function gt(t, c, m, f) {
               const r = o.getState().cogsStateStore[t];
               try {
                 const s = o.getState().getValidationErrors(d.key);
-                s && s.length > 0 && s.forEach(([u]) => {
-                  u && u.startsWith(d.key) && J(u);
+                s && s.length > 0 && s.forEach(([g]) => {
+                  g && g.startsWith(d.key) && J(g);
                 });
                 const i = d.zodSchema.safeParse(r);
-                return i.success ? !0 : (i.error.errors.forEach((g) => {
-                  const A = g.path, w = g.message, T = [d.key, ...A].join(".");
-                  e(T, w);
+                return i.success ? !0 : (i.error.errors.forEach((u) => {
+                  const E = u.path, A = u.message, T = [d.key, ...E].join(".");
+                  e(T, A);
                 }), St(t), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
             };
-          if (l === "_componentId") return m;
+          if (l === "_componentId") return h;
           if (l === "getComponents")
             return () => o().stateComponents.get(t);
           if (l === "getAllFormRefs")
@@ -1074,9 +1076,9 @@ function gt(t, c, m, f) {
           if (l === "_isLoading")
             return o.getState().isLoadingGlobal[t];
           if (l === "revertToInitialState")
-            return I.revertToInitialState;
-          if (l === "updateInitialState") return I.updateInitialState;
-          if (l === "removeValidation") return I.removeValidation;
+            return p.revertToInitialState;
+          if (l === "updateInitialState") return p.updateInitialState;
+          if (l === "removeValidation") return p.removeValidation;
         }
         if (l === "getFormRef")
           return () => Tt.getState().getFormRef(t + "." + n.join("."));
@@ -1097,25 +1099,25 @@ function gt(t, c, m, f) {
           );
         if (l === "_stateKey") return t;
         if (l === "_path") return n;
-        if (l === "_isServerSynced") return I._isServerSynced;
+        if (l === "_isServerSynced") return p._isServerSynced;
         if (l === "update")
           return (d, e) => {
             if (e?.debounce)
-              Ft(() => {
-                ot(c, d, n, "");
+              Ot(() => {
+                rt(c, d, n, "");
                 const r = o.getState().getNestedState(t, n);
                 e?.afterUpdate && e.afterUpdate(r);
               }, e.debounce);
             else {
-              ot(c, d, n, "");
+              rt(c, d, n, "");
               const r = o.getState().getNestedState(t, n);
               e?.afterUpdate && e.afterUpdate(r);
             }
-            p(n);
+            w(n);
           };
         if (l === "formElement")
           return (d, e) => /* @__PURE__ */ yt(
-            Ut,
+            Ft,
             {
               setState: c,
               stateKey: t,
@@ -1124,51 +1126,51 @@ function gt(t, c, m, f) {
               formOpts: e
             }
           );
-        const j = [...n, l], rt = o.getState().getNestedState(t, j);
-        return a(rt, j, S);
+        const j = [...n, l], nt = o.getState().getNestedState(t, j);
+        return a(nt, j, S);
       }
-    }, G = new Proxy(R, U);
-    return y.set(W, {
-      proxy: G,
-      stateVersion: b
-    }), G;
+    }, L = new Proxy(R, F);
+    return I.set(W, {
+      proxy: L,
+      stateVersion: $
+    }), L;
   }
   return a(
     o.getState().getNestedState(t, [])
   );
 }
-function Nt(t) {
-  return st(Xt, { proxy: t });
+function bt(t) {
+  return ot(Zt, { proxy: t });
 }
-function Zt({
+function Yt({
   proxy: t,
   rebuildStateShape: c
 }) {
-  const m = o().getNestedState(t._stateKey, t._path);
-  return Array.isArray(m) ? c(
-    m,
+  const h = o().getNestedState(t._stateKey, t._path);
+  return Array.isArray(h) ? c(
+    h,
     t._path
   ).stateMapNoRender(
-    (y, b, p, I, a) => t._mapFn(y, b, p, I, a)
+    (I, $, w, p, a) => t._mapFn(I, $, w, p, a)
   ) : null;
 }
-function Xt({
+function Zt({
   proxy: t
 }) {
-  const c = B(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return at(() => {
+  const c = z(null), h = `${t._stateKey}-${t._path.join(".")}`;
+  return lt(() => {
     const f = c.current;
     if (!f || !f.parentElement) return;
-    const y = f.parentElement, p = Array.from(y.childNodes).indexOf(f);
-    let I = y.getAttribute("data-parent-id");
-    I || (I = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", I));
-    const v = {
+    const I = f.parentElement, w = Array.from(I.childNodes).indexOf(f);
+    let p = I.getAttribute("data-parent-id");
+    p || (p = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", p));
+    const y = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: I,
-      position: p,
+      parentId: p,
+      position: w,
       effect: t._effect
     };
-    o.getState().addSignalElement(m, v);
+    o.getState().addSignalElement(h, y);
     const n = o.getState().getNestedState(t._stateKey, t._path);
     let S;
     if (t._effect)
@@ -1185,59 +1187,59 @@ function Xt({
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
     const W = document.createTextNode(String(S));
     f.replaceWith(W);
-  }, [t._stateKey, t._path.join("."), t._effect]), st("span", {
+  }, [t._stateKey, t._path.join("."), t._effect]), ot("span", {
     ref: c,
     style: { display: "none" },
-    "data-signal-id": m
+    "data-signal-id": h
   });
 }
-function fe(t) {
-  const c = Mt(
-    (m) => {
+function ge(t) {
+  const c = _t(
+    (h) => {
       const f = o.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
       return f.components.set(t._stateKey, {
-        forceUpdate: m,
+        forceUpdate: h,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
       }), () => f.components.delete(t._stateKey);
     },
     () => o.getState().getNestedState(t._stateKey, t._path)
   );
-  return st("text", {}, String(c));
+  return ot("text", {}, String(c));
 }
-function Qt({
+function Xt({
   stateKey: t,
   itemComponentId: c,
-  itemPath: m,
+  itemPath: h,
   children: f
 }) {
-  const [, y] = tt({}), [b, p] = Gt(), I = B(null);
-  return at(() => {
-    p.height > 0 && p.height !== I.current && (I.current = p.height, o.getState().setShadowMetadata(t, m, {
+  const [, I] = et({}), [$, w] = Gt(), p = z(null);
+  return lt(() => {
+    w.height > 0 && w.height !== p.current && (p.current = w.height, o.getState().setShadowMetadata(t, h, {
       virtualizer: {
-        itemHeight: p.height
+        itemHeight: w.height
       }
     }));
-  }, [p.height, t, m]), dt(() => {
-    const a = `${t}////${c}`, v = o.getState().stateComponents.get(t) || {
+  }, [w.height, t, h]), dt(() => {
+    const a = `${t}////${c}`, y = o.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
-    return v.components.set(a, {
-      forceUpdate: () => y({}),
-      paths: /* @__PURE__ */ new Set([m.join(".")])
-    }), o.getState().stateComponents.set(t, v), () => {
+    return y.components.set(a, {
+      forceUpdate: () => I({}),
+      paths: /* @__PURE__ */ new Set([h.join(".")])
+    }), o.getState().stateComponents.set(t, y), () => {
       const n = o.getState().stateComponents.get(t);
       n && n.components.delete(a);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ yt("div", { ref: b, children: f });
+  }, [t, c, h.join(".")]), /* @__PURE__ */ yt("div", { ref: $, children: f });
 }
 export {
-  Nt as $cogsSignal,
-  fe as $cogsSignalStore,
-  de as addStateOptions,
-  ue as createCogsState,
-  ge as notifyComponent,
-  Yt as useCogsStateFn
+  bt as $cogsSignal,
+  ge as $cogsSignalStore,
+  le as addStateOptions,
+  de as createCogsState,
+  ue as notifyComponent,
+  Jt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map