cogsbox-state 0.5.344 → 0.5.346

package/dist/CogsState.jsx

@@ -1,63 +1,63 @@
 "use client";
-import { jsx as ht } from "react/jsx-runtime";
-import { useState as X, useRef as Q, useEffect as et, useLayoutEffect as lt, useMemo as vt, createElement as ot, useSyncExternalStore as Pt, startTransition as _t, useCallback as Tt } from "react";
-import { transformStateFunc as Mt, isDeepEqual as z, isFunction as Y, getNestedValue as B, getDifferences as yt, debounce as jt } from "./utility.js";
-import { pushFunc as mt, updateFn as rt, cutFunc as ct, ValidationWrapper as Rt, FormControlComponent as Ot } from "./Functions.jsx";
-import Ut from "superjson";
-import { v4 as It } from "uuid";
+import { jsx as ft } from "react/jsx-runtime";
+import { useState as Y, useRef as Z, useEffect as tt, useLayoutEffect as it, useMemo as St, createElement as ot, useSyncExternalStore as Ct, startTransition as bt, useCallback as yt } from "react";
+import { transformStateFunc as Nt, isDeepEqual as H, isFunction as q, getNestedValue as B, getDifferences as mt, debounce as Vt } from "./utility.js";
+import { pushFunc as gt, updateFn as rt, cutFunc as st, ValidationWrapper as Pt, FormControlComponent as xt } from "./Functions.jsx";
+import _t from "superjson";
+import { v4 as ht } from "uuid";
 import "zod";
-import { getGlobalStore as r, formRefStore as Et } from "./store.js";
-import { useCogsConfig as xt } from "./CogsStateClient.jsx";
-import { applyPatch as Ft } from "fast-json-patch";
-import Dt from "react-use-measure";
-function At(t, c) {
-  const m = r.getState().getInitialOptions, f = r.getState().setInitialStateOptions, y = m(t) || {};
+import { getGlobalStore as r, formRefStore as It } from "./store.js";
+import { useCogsConfig as Et } from "./CogsStateClient.jsx";
+import { applyPatch as Ot } from "fast-json-patch";
+import Mt from "react-use-measure";
+function pt(t, i) {
+  const h = r.getState().getInitialOptions, f = r.getState().setInitialStateOptions, I = h(t) || {};
   f(t, {
-    ...y,
-    ...c
+    ...I,
+    ...i
   });
 }
-function $t({
+function wt({
   stateKey: t,
-  options: c,
-  initialOptionsPart: m
+  options: i,
+  initialOptionsPart: h
 }) {
-  const f = tt(t) || {}, y = m[t] || {}, k = r.getState().setInitialStateOptions, p = { ...y, ...f };
-  let I = !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
-      !z(p[a], c[a]) && (I = !0, p[a] = c[a])) : (I = !0, p[a] = c[a]);
-  I && k(t, p);
+  const f = K(t) || {}, I = h[t] || {}, k = r.getState().setInitialStateOptions, w = { ...I, ...f };
+  let p = !1;
+  if (i)
+    for (const a in i)
+      w.hasOwnProperty(a) ? (a == "localStorage" && i[a] && w[a].key !== i[a]?.key && (p = !0, w[a] = i[a]), a == "initialState" && i[a] && w[a] !== i[a] && // Different references
+      !H(w[a], i[a]) && (p = !0, w[a] = i[a])) : (p = !0, w[a] = i[a]);
+  p && k(t, w);
 }
-function ce(t, { formElements: c, validation: m }) {
-  return { initialState: t, formElements: c, validation: m };
+function re(t, { formElements: i, validation: h }) {
+  return { initialState: t, formElements: i, validation: h };
 }
-const le = (t, c) => {
-  let m = t;
-  const [f, y] = Mt(m);
-  (Object.keys(y).length > 0 || c && Object.keys(c).length > 0) && Object.keys(y).forEach((I) => {
-    y[I] = y[I] || {}, y[I].formElements = {
-      ...c?.formElements,
+const oe = (t, i) => {
+  let h = t;
+  const [f, I] = Nt(h);
+  (Object.keys(I).length > 0 || i && Object.keys(i).length > 0) && Object.keys(I).forEach((p) => {
+    I[p] = I[p] || {}, I[p].formElements = {
+      ...i?.formElements,
       // Global defaults first
-      ...c?.validation,
-      ...y[I].formElements || {}
+      ...i?.validation,
+      ...I[p].formElements || {}
       // State-specific overrides
-    }, tt(I) || r.getState().setInitialStateOptions(I, y[I]);
+    }, K(p) || r.getState().setInitialStateOptions(p, I[p]);
   }), r.getState().setInitialStates(f), r.getState().setCreatedState(f);
-  const k = (I, a) => {
-    const [v] = X(a?.componentId ?? It());
-    $t({
-      stateKey: I,
+  const k = (p, a) => {
+    const [y] = Y(a?.componentId ?? ht());
+    wt({
+      stateKey: p,
       options: a,
-      initialOptionsPart: y
+      initialOptionsPart: I
     });
-    const n = r.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [W, U] = qt(
+    const n = r.getState().cogsStateStore[p] || f[p], S = a?.modifyState ? a.modifyState(n) : n, [F, U] = Gt(
       S,
       {
-        stateKey: I,
+        stateKey: p,
         syncUpdate: a?.syncUpdate,
-        componentId: v,
+        componentId: y,
         localStorage: a?.localStorage,
         middleware: a?.middleware,
         enabledSync: a?.enabledSync,
@@ -70,109 +70,109 @@ const le = (t, c) => {
     );
     return U;
   };
-  function p(I, a) {
-    $t({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && zt(I, a), ft(I);
+  function w(p, a) {
+    wt({ stateKey: p, options: a, initialOptionsPart: I }), a.localStorage && Dt(p, a), ut(p);
   }
-  return { useCogsState: k, setCogsOptions: p };
+  return { useCogsState: k, setCogsOptions: w };
 }, {
-  setUpdaterState: dt,
-  setState: K,
-  getInitialOptions: tt,
-  getKeyState: Ct,
-  getValidationErrors: Wt,
-  setStateLog: Lt,
-  updateInitialStateGlobal: pt,
-  addValidationError: Gt,
-  removeValidationError: J,
-  setServerSyncActions: Ht
-} = r.getState(), bt = (t, c, m, f, y) => {
-  m?.log && console.log(
+  setUpdaterState: ct,
+  setState: X,
+  getInitialOptions: K,
+  getKeyState: $t,
+  getValidationErrors: Rt,
+  setStateLog: Ut,
+  updateInitialStateGlobal: vt,
+  addValidationError: jt,
+  removeValidationError: z,
+  setServerSyncActions: Lt
+} = r.getState(), At = (t, i, h, f, I) => {
+  h?.log && console.log(
     "saving to localstorage",
-    c,
-    m.localStorage?.key,
+    i,
+    h.localStorage?.key,
     f
   );
-  const k = Y(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
+  const k = q(h?.localStorage?.key) ? h.localStorage?.key(t) : h?.localStorage?.key;
   if (k && f) {
-    const p = `${f}-${c}-${k}`;
-    let I;
+    const w = `${f}-${i}-${k}`;
+    let p;
     try {
-      I = gt(p)?.lastSyncedWithServer;
+      p = dt(w)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: y ?? I
-    }, v = Ut.serialize(a);
+      lastSyncedWithServer: I ?? p
+    }, y = _t.serialize(a);
     window.localStorage.setItem(
-      p,
-      JSON.stringify(v.json)
+      w,
+      JSON.stringify(y.json)
     );
   }
-}, gt = (t) => {
+}, dt = (t) => {
   if (!t) return null;
   try {
-    const c = window.localStorage.getItem(t);
-    return c ? JSON.parse(c) : null;
-  } catch (c) {
-    return console.error("Error loading from localStorage:", c), null;
+    const i = window.localStorage.getItem(t);
+    return i ? JSON.parse(i) : null;
+  } catch (i) {
+    return console.error("Error loading from localStorage:", i), null;
   }
-}, zt = (t, c) => {
-  const m = r.getState().cogsStateStore[t], { sessionId: f } = xt(), y = Y(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
-  if (y && f) {
-    const k = gt(
-      `${f}-${t}-${y}`
+}, Dt = (t, i) => {
+  const h = r.getState().cogsStateStore[t], { sessionId: f } = Et(), I = q(i?.localStorage?.key) ? i.localStorage.key(h) : i?.localStorage?.key;
+  if (I && f) {
+    const k = dt(
+      `${f}-${t}-${I}`
     );
     if (k && k.lastUpdated > (k.lastSyncedWithServer || 0))
-      return K(t, k.state), ft(t), !0;
+      return X(t, k.state), ut(t), !0;
   }
   return !1;
-}, Nt = (t, c, m, f, y, k) => {
-  const p = {
-    initialState: c,
-    updaterState: ut(
+}, kt = (t, i, h, f, I, k) => {
+  const w = {
+    initialState: i,
+    updaterState: lt(
       t,
       f,
-      y,
+      I,
       k
     ),
-    state: m
+    state: h
   };
-  pt(t, p.initialState), dt(t, p.updaterState), K(t, p.state);
-}, ft = (t) => {
-  const c = r.getState().stateComponents.get(t);
-  if (!c) return;
-  const m = /* @__PURE__ */ new Set();
-  c.components.forEach((f) => {
-    (f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none") || m.add(() => f.forceUpdate());
+  vt(t, w.initialState), ct(t, w.updaterState), X(t, w.state);
+}, ut = (t) => {
+  const i = r.getState().stateComponents.get(t);
+  if (!i) return;
+  const h = /* @__PURE__ */ new Set();
+  i.components.forEach((f) => {
+    (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());
   });
-}, de = (t, c) => {
-  const m = r.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"))
+}, ae = (t, i) => {
+  const h = r.getState().stateComponents.get(t);
+  if (h) {
+    const f = `${t}////${i}`, 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();
   }
-}, Bt = (t, c, m, f) => {
+}, Ft = (t, i, h, f) => {
   switch (t) {
     case "update":
       return {
-        oldValue: B(c, f),
-        newValue: B(m, f)
+        oldValue: B(i, f),
+        newValue: B(h, f)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: B(m, f)
+        newValue: B(h, f)
       };
     case "cut":
       return {
-        oldValue: B(c, f),
+        oldValue: B(i, f),
         newValue: null
         // or undefined
       };
@@ -180,72 +180,72 @@ const le = (t, c) => {
       return { oldValue: null, newValue: null };
   }
 };
-function qt(t, {
-  stateKey: c,
-  serverSync: m,
+function Gt(t, {
+  stateKey: i,
+  serverSync: h,
   localStorage: f,
-  formElements: y,
+  formElements: I,
   reactiveDeps: k,
-  reactiveType: p,
-  componentId: I,
+  reactiveType: w,
+  componentId: p,
   initialState: a,
-  syncUpdate: v,
+  syncUpdate: y,
   dependencies: n,
   serverState: S
 } = {}) {
-  const [W, U] = X({}), { sessionId: F } = xt();
-  let L = !c;
-  const [h] = X(c ?? It()), l = r.getState().stateLog[h], at = Q(/* @__PURE__ */ new Set()), Z = Q(I ?? It()), R = Q(
+  const [F, U] = Y({}), { sessionId: j } = Et();
+  let G = !i;
+  const [v] = Y(i ?? ht()), l = r.getState().stateLog[v], at = Z(/* @__PURE__ */ new Set()), J = Z(p ?? ht()), M = Z(
     null
   );
-  R.current = tt(h) ?? null, et(() => {
-    if (v && v.stateKey === h && v.path?.[0]) {
-      K(h, (o) => ({
+  M.current = K(v) ?? null, tt(() => {
+    if (y && y.stateKey === v && y.path?.[0]) {
+      X(v, (o) => ({
         ...o,
-        [v.path[0]]: v.newValue
+        [y.path[0]]: y.newValue
       }));
-      const e = `${v.stateKey}:${v.path.join(".")}`;
+      const e = `${y.stateKey}:${y.path.join(".")}`;
       r.getState().setSyncInfo(e, {
-        timeStamp: v.timeStamp,
-        userId: v.userId
+        timeStamp: y.timeStamp,
+        userId: y.userId
       });
     }
-  }, [v]), et(() => {
+  }, [y]), tt(() => {
     if (a) {
-      At(h, {
+      pt(v, {
         initialState: a
       });
-      const e = R.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = r.getState().initialStateGlobal[h];
-      if (!(i && !z(i, a) || !i) && !s)
+      const e = M.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = r.getState().initialStateGlobal[v];
+      if (!(c && !H(c, a) || !c) && !s)
         return;
-      let g = null;
-      const w = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      w && F && (g = gt(`${F}-${h}-${w}`));
-      let E = a, A = !1;
-      const M = s ? Date.now() : 0, P = g?.lastUpdated || 0, _ = g?.lastSyncedWithServer || 0;
-      s && M > P ? (E = e.serverState.data, A = !0) : g && P > _ && (E = g.state, e?.localStorage?.onChange && e?.localStorage?.onChange(E)), r.getState().initializeShadowState(h, a), Nt(
-        h,
+      let u = null;
+      const T = q(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
+      T && j && (u = dt(`${j}-${v}-${T}`));
+      let A = a, E = !1;
+      const P = s ? Date.now() : 0, V = u?.lastUpdated || 0, N = u?.lastSyncedWithServer || 0;
+      s && P > V ? (A = e.serverState.data, E = !0) : u && V > N && (A = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(A)), r.getState().initializeShadowState(v, a), kt(
+        v,
         a,
-        E,
-        nt,
-        Z.current,
-        F
-      ), A && w && F && bt(E, h, e, F, Date.now()), ft(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || U({});
+        A,
+        et,
+        J.current,
+        j
+      ), E && T && j && At(A, v, e, j, Date.now()), ut(v), (Array.isArray(w) ? w : [w || "component"]).includes("none") || U({});
     }
   }, [
     a,
     S?.status,
     S?.data,
     ...n || []
-  ]), lt(() => {
-    L && At(h, {
-      serverSync: m,
-      formElements: y,
+  ]), it(() => {
+    G && pt(v, {
+      serverSync: h,
+      formElements: I,
       initialState: a,
       localStorage: f,
-      middleware: R.current?.middleware
+      middleware: M.current?.middleware
     });
-    const e = `${h}////${Z.current}`, o = r.getState().stateComponents.get(h) || {
+    const e = `${v}////${J.current}`, o = r.getState().stateComponents.get(v) || {
       components: /* @__PURE__ */ new Map()
     };
     return o.components.set(e, {
@@ -253,253 +253,253 @@ function qt(t, {
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: k || void 0,
-      reactiveType: p ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(h, o), U({}), () => {
-      o && (o.components.delete(e), o.components.size === 0 && r.getState().stateComponents.delete(h));
+      reactiveType: w ?? ["component", "deps"]
+    }), r.getState().stateComponents.set(v, o), U({}), () => {
+      o && (o.components.delete(e), o.components.size === 0 && r.getState().stateComponents.delete(v));
     };
   }, []);
-  const nt = (e, o, s, i) => {
+  const et = (e, o, s, c) => {
     if (Array.isArray(o)) {
-      const g = `${h}-${o.join(".")}`;
-      at.current.add(g);
+      const u = `${v}-${o.join(".")}`;
+      at.current.add(u);
     }
-    const u = r.getState();
-    K(h, (g) => {
-      const w = Y(e) ? e(g) : e, E = `${h}-${o.join(".")}`;
-      if (E) {
-        let N = !1, x = u.signalDomElements.get(E);
-        if ((!x || x.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const O = o.slice(0, -1), D = B(w, O);
-          if (Array.isArray(D)) {
-            N = !0;
-            const $ = `${h}-${O.join(".")}`;
-            x = u.signalDomElements.get($);
+    const g = r.getState();
+    X(v, (u) => {
+      const T = q(e) ? e(u) : e, A = `${v}-${o.join(".")}`;
+      if (A) {
+        let O = !1, C = g.signalDomElements.get(A);
+        if ((!C || C.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const R = o.slice(0, -1), L = B(T, R);
+          if (Array.isArray(L)) {
+            O = !0;
+            const m = `${v}-${R.join(".")}`;
+            C = g.signalDomElements.get(m);
           }
         }
-        if (x) {
-          const O = N ? B(w, o.slice(0, -1)) : B(w, o);
-          x.forEach(({ parentId: D, position: $, effect: T }) => {
+        if (C) {
+          const R = O ? B(T, o.slice(0, -1)) : B(T, o);
+          C.forEach(({ parentId: L, position: m, effect: $ }) => {
             const b = document.querySelector(
-              `[data-parent-id="${D}"]`
+              `[data-parent-id="${L}"]`
             );
             if (b) {
-              const j = Array.from(b.childNodes);
-              if (j[$]) {
-                const C = T ? new Function("state", `return (${T})(state)`)(O) : O;
-                j[$].textContent = String(C);
+              const x = Array.from(b.childNodes);
+              if (x[m]) {
+                const _ = $ ? new Function("state", `return (${$})(state)`)(R) : R;
+                x[m].textContent = String(_);
               }
             }
           });
         }
       }
-      console.log("shadowState", u.shadowStateStore), s.updateType === "update" && (i || R.current?.validation?.key) && o && J(
-        (i || R.current?.validation?.key) + "." + o.join(".")
+      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (c || M.current?.validation?.key) && o && z(
+        (c || M.current?.validation?.key) + "." + o.join(".")
       );
-      const A = o.slice(0, o.length - 1);
-      s.updateType === "cut" && R.current?.validation?.key && J(
-        R.current?.validation?.key + "." + A.join(".")
-      ), s.updateType === "insert" && R.current?.validation?.key && Wt(
-        R.current?.validation?.key + "." + A.join(".")
-      ).filter(([x, O]) => {
-        let D = x?.split(".").length;
-        if (x == A.join(".") && D == A.length - 1) {
-          let $ = x + "." + A;
-          J(x), Gt($, O);
+      const E = o.slice(0, o.length - 1);
+      s.updateType === "cut" && M.current?.validation?.key && z(
+        M.current?.validation?.key + "." + E.join(".")
+      ), s.updateType === "insert" && M.current?.validation?.key && Rt(
+        M.current?.validation?.key + "." + E.join(".")
+      ).filter(([C, R]) => {
+        let L = C?.split(".").length;
+        if (C == E.join(".") && L == E.length - 1) {
+          let m = C + "." + E;
+          z(C), jt(m, R);
         }
       });
-      const M = u.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", M), M) {
-        const N = yt(g, w), x = new Set(N), O = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
+      const P = g.stateComponents.get(v);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", P), P) {
+        const O = mt(u, T), C = new Set(O), R = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
         for (const [
-          D,
-          $
-        ] of M.components.entries()) {
-          let T = !1;
-          const b = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
-          if (console.log("component", $), !b.includes("none")) {
+          L,
+          m
+        ] of P.components.entries()) {
+          let $ = !1;
+          const b = Array.isArray(m.reactiveType) ? m.reactiveType : [m.reactiveType || "component"];
+          if (console.log("component", m), !b.includes("none")) {
             if (b.includes("all")) {
-              $.forceUpdate();
+              m.forceUpdate();
               continue;
             }
-            if (b.includes("component") && (($.paths.has(O) || $.paths.has("")) && (T = !0), !T))
-              for (const j of x) {
-                let C = j;
+            if (b.includes("component") && ((m.paths.has(R) || m.paths.has("")) && ($ = !0), !$))
+              for (const x of C) {
+                let _ = x;
                 for (; ; ) {
-                  if ($.paths.has(C)) {
-                    T = !0;
+                  if (m.paths.has(_)) {
+                    $ = !0;
                     break;
                   }
-                  const G = C.lastIndexOf(".");
-                  if (G !== -1) {
-                    const q = C.substring(
+                  const Q = _.lastIndexOf(".");
+                  if (Q !== -1) {
+                    const nt = _.substring(
                       0,
-                      G
+                      Q
                     );
                     if (!isNaN(
-                      Number(C.substring(G + 1))
-                    ) && $.paths.has(q)) {
-                      T = !0;
+                      Number(_.substring(Q + 1))
+                    ) && m.paths.has(nt)) {
+                      $ = !0;
                       break;
                     }
-                    C = q;
+                    _ = nt;
                   } else
-                    C = "";
-                  if (C === "")
+                    _ = "";
+                  if (_ === "")
                     break;
                 }
-                if (T) break;
+                if ($) break;
               }
-            if (!T && b.includes("deps") && $.depsFunction) {
-              const j = $.depsFunction(w);
-              let C = !1;
-              typeof j == "boolean" ? j && (C = !0) : z($.deps, j) || ($.deps = j, C = !0), C && (T = !0);
+            if (!$ && b.includes("deps") && m.depsFunction) {
+              const x = m.depsFunction(T);
+              let _ = !1;
+              typeof x == "boolean" ? x && (_ = !0) : H(m.deps, x) || (m.deps = x, _ = !0), _ && ($ = !0);
             }
-            T && $.forceUpdate();
+            $ && m.forceUpdate();
           }
         }
       }
-      const P = Date.now();
-      o = o.map((N, x) => {
-        const O = o.slice(0, -1), D = B(w, O);
-        return x === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (D.length - 1).toString() : N;
+      const V = Date.now();
+      o = o.map((O, C) => {
+        const R = o.slice(0, -1), L = B(T, R);
+        return C === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (L.length - 1).toString() : O;
       });
-      const { oldValue: _, newValue: V } = Bt(
+      const { oldValue: N, newValue: D } = Ft(
         s.updateType,
-        g,
-        w,
+        u,
+        T,
         o
-      ), H = {
-        timeStamp: P,
-        stateKey: h,
+      ), W = {
+        timeStamp: V,
+        stateKey: v,
         path: o,
         updateType: s.updateType,
         status: "new",
-        oldValue: _,
-        newValue: V
+        oldValue: N,
+        newValue: D
       };
       switch (s.updateType) {
         case "update":
-          u.updateShadowAtPath(h, o, w);
+          g.updateShadowAtPath(v, o, T);
           break;
         case "insert":
-          const N = o.slice(0, -1);
-          u.insertShadowArrayElement(h, N, V);
+          const O = o.slice(0, -1);
+          g.insertShadowArrayElement(v, O, D);
           break;
         case "cut":
-          const x = o.slice(0, -1), O = parseInt(o[o.length - 1]);
-          u.removeShadowArrayElement(h, x, O);
+          const C = o.slice(0, -1), R = parseInt(o[o.length - 1]);
+          g.removeShadowArrayElement(v, C, R);
           break;
       }
-      if (Lt(h, (N) => {
-        const O = [...N ?? [], H].reduce((D, $) => {
-          const T = `${$.stateKey}:${JSON.stringify($.path)}`, b = D.get(T);
-          return b ? (b.timeStamp = Math.max(b.timeStamp, $.timeStamp), b.newValue = $.newValue, b.oldValue = b.oldValue ?? $.oldValue, b.updateType = $.updateType) : D.set(T, { ...$ }), D;
+      if (Ut(v, (O) => {
+        const R = [...O ?? [], W].reduce((L, m) => {
+          const $ = `${m.stateKey}:${JSON.stringify(m.path)}`, b = L.get($);
+          return b ? (b.timeStamp = Math.max(b.timeStamp, m.timeStamp), b.newValue = m.newValue, b.oldValue = b.oldValue ?? m.oldValue, b.updateType = m.updateType) : L.set($, { ...m }), L;
         }, /* @__PURE__ */ new Map());
-        return Array.from(O.values());
-      }), bt(
-        w,
-        h,
-        R.current,
-        F
-      ), R.current?.middleware && R.current.middleware({
+        return Array.from(R.values());
+      }), At(
+        T,
+        v,
+        M.current,
+        j
+      ), M.current?.middleware && M.current.middleware({
         updateLog: l,
-        update: H
-      }), R.current?.serverSync) {
-        const N = u.serverState[h], x = R.current?.serverSync;
-        Ht(h, {
-          syncKey: typeof x.syncKey == "string" ? x.syncKey : x.syncKey({ state: w }),
-          rollBackState: N,
-          actionTimeStamp: Date.now() + (x.debounce ?? 3e3),
+        update: W
+      }), M.current?.serverSync) {
+        const O = g.serverState[v], C = M.current?.serverSync;
+        Lt(v, {
+          syncKey: typeof C.syncKey == "string" ? C.syncKey : C.syncKey({ state: T }),
+          rollBackState: O,
+          actionTimeStamp: Date.now() + (C.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return w;
+      return T;
     });
   };
-  r.getState().updaterState[h] || (dt(
-    h,
-    ut(
-      h,
-      nt,
-      Z.current,
-      F
+  r.getState().updaterState[v] || (ct(
+    v,
+    lt(
+      v,
+      et,
+      J.current,
+      j
     )
-  ), r.getState().cogsStateStore[h] || K(h, t), r.getState().initialStateGlobal[h] || pt(h, t));
-  const d = vt(() => ut(
-    h,
-    nt,
-    Z.current,
-    F
-  ), [h, F]);
-  return [Ct(h), d];
+  ), r.getState().cogsStateStore[v] || X(v, t), r.getState().initialStateGlobal[v] || vt(v, t));
+  const d = St(() => lt(
+    v,
+    et,
+    J.current,
+    j
+  ), [v, j]);
+  return [$t(v), d];
 }
-function ut(t, c, m, f) {
-  const y = /* @__PURE__ */ new Map();
+function lt(t, i, h, f) {
+  const I = /* @__PURE__ */ new Map();
   let k = 0;
-  const p = (v) => {
-    const n = v.join(".");
-    for (const [S] of y)
-      (S === n || S.startsWith(n + ".")) && y.delete(S);
+  const w = (y) => {
+    const n = y.join(".");
+    for (const [S] of I)
+      (S === n || S.startsWith(n + ".")) && I.delete(S);
     k++;
-  }, I = {
-    removeValidation: (v) => {
-      v?.validationKey && J(v.validationKey);
+  }, p = {
+    removeValidation: (y) => {
+      y?.validationKey && z(y.validationKey);
     },
-    revertToInitialState: (v) => {
+    revertToInitialState: (y) => {
       const n = r.getState().getInitialOptions(t)?.validation;
-      n?.key && J(n?.key), v?.validationKey && J(v.validationKey);
+      n?.key && z(n?.key), y?.validationKey && z(y.validationKey);
       const S = r.getState().initialStateGlobal[t];
-      r.getState().clearSelectedIndexesForState(t), y.clear(), k++;
-      const W = a(S, []), U = tt(t), F = Y(U?.localStorage?.key) ? U?.localStorage?.key(S) : U?.localStorage?.key, L = `${f}-${t}-${F}`;
-      L && localStorage.removeItem(L), dt(t, W), K(t, S);
-      const h = r.getState().stateComponents.get(t);
-      return h && h.components.forEach((l) => {
+      r.getState().clearSelectedIndexesForState(t), I.clear(), k++;
+      const F = a(S, []), U = K(t), j = q(U?.localStorage?.key) ? U?.localStorage?.key(S) : U?.localStorage?.key, G = `${f}-${t}-${j}`;
+      G && localStorage.removeItem(G), ct(t, F), X(t, S);
+      const v = r.getState().stateComponents.get(t);
+      return v && v.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
-    updateInitialState: (v) => {
-      y.clear(), k++;
-      const n = ut(
+    updateInitialState: (y) => {
+      I.clear(), k++;
+      const n = lt(
         t,
-        c,
-        m,
+        i,
+        h,
         f
-      ), S = r.getState().initialStateGlobal[t], W = tt(t), U = Y(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, F = `${f}-${t}-${U}`;
-      return localStorage.getItem(F) && localStorage.removeItem(F), _t(() => {
-        pt(t, v), r.getState().initializeShadowState(t, v), dt(t, n), K(t, v);
-        const L = r.getState().stateComponents.get(t);
-        L && L.components.forEach((h) => {
-          h.forceUpdate();
+      ), S = r.getState().initialStateGlobal[t], F = K(t), U = q(F?.localStorage?.key) ? F?.localStorage?.key(S) : F?.localStorage?.key, j = `${f}-${t}-${U}`;
+      return localStorage.getItem(j) && localStorage.removeItem(j), bt(() => {
+        vt(t, y), r.getState().initializeShadowState(t, y), ct(t, n), X(t, y);
+        const G = r.getState().stateComponents.get(t);
+        G && G.components.forEach((v) => {
+          v.forceUpdate();
         });
       }), {
-        fetchId: (L) => n.get()[L]
+        fetchId: (G) => n.get()[G]
       };
     },
     _initialState: r.getState().initialStateGlobal[t],
     _serverState: r.getState().serverState[t],
     _isLoading: r.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const v = r.getState().serverState[t];
-      return !!(v && z(v, Ct(t)));
+      const y = r.getState().serverState[t];
+      return !!(y && H(y, $t(t)));
     }
   };
-  function a(v, n = [], S) {
-    const W = n.map(String).join(".");
-    y.get(W);
+  function a(y, n = [], S) {
+    const F = n.map(String).join(".");
+    I.get(F);
     const U = function() {
       return r().getNestedState(t, n);
     };
-    Object.keys(I).forEach((h) => {
-      U[h] = I[h];
+    Object.keys(p).forEach((v) => {
+      U[v] = p[v];
     });
-    const F = {
-      apply(h, l, at) {
+    const j = {
+      apply(v, l, at) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), r().getNestedState(t, n);
       },
-      get(h, l) {
-        S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
+      get(v, l) {
+        S?.validIndices && !Array.isArray(y) && (S = { ...S, validIndices: void 0 });
         const at = /* @__PURE__ */ new Set([
           "insert",
           "cut",
@@ -524,23 +524,23 @@ function ut(t, c, m, f) {
           "getComponents"
         ]);
         if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !at.has(l)) {
-          const d = `${t}////${m}`, e = r.getState().stateComponents.get(t);
+          const d = `${t}////${h}`, e = r.getState().stateComponents.get(t);
           if (e) {
             const o = e.components.get(d);
             if (o && !o.paths.has("")) {
               const s = n.join(".");
-              let i = !0;
-              for (const u of o.paths)
-                if (s.startsWith(u) && (s === u || s[u.length] === ".")) {
-                  i = !1;
+              let c = !0;
+              for (const g of o.paths)
+                if (s.startsWith(g) && (s === g || s[g.length] === ".")) {
+                  c = !1;
                   break;
                 }
-              i && o.paths.add(s);
+              c && o.paths.add(s);
             }
           }
         }
         if (l === "getDifferences")
-          return () => yt(
+          return () => mt(
             r.getState().cogsStateStore[t],
             r.getState().initialStateGlobal[t]
           );
@@ -551,25 +551,25 @@ function ut(t, c, m, f) {
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
             const o = r.getState().getNestedState(t, []), s = d?.validation?.key;
             try {
-              const i = await e.action(o);
-              if (i && !i.success && i.errors && s) {
-                r.getState().removeValidationError(s), i.errors.forEach((g) => {
-                  const w = [s, ...g.path].join(".");
-                  r.getState().addValidationError(w, g.message);
+              const c = await e.action(o);
+              if (c && !c.success && c.errors && s) {
+                r.getState().removeValidationError(s), c.errors.forEach((u) => {
+                  const T = [s, ...u.path].join(".");
+                  r.getState().addValidationError(T, u.message);
                 });
-                const u = r.getState().stateComponents.get(t);
-                u && u.components.forEach((g) => {
-                  g.forceUpdate();
+                const g = r.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;
-            } catch (i) {
-              return e.onError && e.onError(i), { success: !1, error: i };
+              return c?.success && e.onSuccess ? e.onSuccess(c.data) : !c?.success && e.onError && e.onError(c.error), c;
+            } catch (c) {
+              return e.onError && e.onError(c), { success: !1, error: c };
             }
           };
         if (l === "_status") {
           const d = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = B(e, n);
-          return z(d, o) ? "fresh" : "stale";
+          return H(d, o) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
@@ -577,11 +577,11 @@ function ut(t, c, m, f) {
               t,
               n
             ), e = r.getState().initialStateGlobal[t], o = B(e, n);
-            return z(d, o) ? "fresh" : "stale";
+            return H(d, o) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = r.getState().initialStateGlobal[t], e = tt(t), o = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${o}`;
+            const d = r.getState().initialStateGlobal[t], e = K(t), o = q(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${o}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -591,8 +591,8 @@ function ut(t, c, m, f) {
               throw new Error("Validation key not found");
             return r.getState().getValidationErrors(d.key + "." + n.join("."));
           };
-        if (Array.isArray(v)) {
-          const d = () => S?.validIndices ? v.map((o, s) => ({
+        if (Array.isArray(y)) {
+          const d = () => S?.validIndices ? y.map((o, s) => ({
             item: o,
             originalIndex: S.validIndices[s]
           })) : r.getState().getNestedState(t, n).map((o, s) => ({
@@ -604,7 +604,7 @@ function ut(t, c, m, f) {
               const e = r.getState().getSelectedIndex(t, n.join("."));
               if (e !== void 0)
                 return a(
-                  v[e],
+                  y[e],
                   [...n, e.toString()],
                   S
                 );
@@ -620,173 +620,167 @@ function ut(t, c, m, f) {
               const {
                 itemHeight: o = 50,
                 overscan: s = 6,
-                stickToBottom: i = !1
-              } = e, u = Q(null), g = () => i ? {
-                startIndex: Math.max(
-                  0,
-                  _.length - 10 - s
-                ),
-                endIndex: _.length
-              } : { startIndex: 0, endIndex: 10 }, [w, E] = X(g), A = Q(i), [M, P] = X(0);
-              et(() => r.getState().subscribeToShadowState(t, () => {
-                P((b) => b + 1);
+                stickToBottom: c = !1
+              } = e, g = Z(null), [u, T] = Y({
+                startIndex: 0,
+                endIndex: 10
+              }), A = Z(c), [E, P] = Y(0);
+              tt(() => r.getState().subscribeToShadowState(t, () => {
+                P(($) => $ + 1);
               }), [t]);
-              const _ = r().getNestedState(
+              const V = r().getNestedState(
                 t,
                 n
-              ), V = _.length, { totalHeight: H, positions: N } = vt(() => {
-                const T = r.getState().getShadowMetadata(t, n) || [];
-                let b = 0;
-                const j = [];
-                for (let C = 0; C < V; C++) {
-                  j[C] = b;
-                  const G = T[C]?.virtualizer?.itemHeight;
-                  b += G || o;
+              ), N = V.length, { totalHeight: D, positions: W } = St(() => {
+                const m = r.getState().getShadowMetadata(t, n) || [];
+                let $ = 0;
+                const b = [];
+                for (let x = 0; x < N; x++) {
+                  b[x] = $;
+                  const _ = m[x]?.virtualizer?.itemHeight;
+                  $ += _ || o;
                 }
-                return { totalHeight: b, positions: j };
+                return { totalHeight: $, positions: b };
               }, [
-                V,
+                N,
                 t,
                 n.join("."),
                 o,
-                M
-              ]), x = vt(() => {
-                const T = Math.max(0, w.startIndex), b = Math.min(V, w.endIndex), j = Array.from(
-                  { length: b - T },
-                  (G, q) => T + q
-                ), C = j.map((G) => _[G]);
-                return a(C, n, {
+                E
+              ]), O = St(() => {
+                const m = Math.max(0, u.startIndex), $ = Math.min(N, u.endIndex), b = Array.from(
+                  { length: $ - m },
+                  (_, Q) => m + Q
+                ), x = b.map((_) => V[_]);
+                return a(x, n, {
                   ...S,
-                  validIndices: j
+                  validIndices: b
                 });
-              }, [w.startIndex, w.endIndex, _, V]);
-              lt(() => {
-                const T = u.current;
-                if (!T || !i || !A.current)
+              }, [u.startIndex, u.endIndex, V, N]);
+              it(() => {
+                const m = g.current;
+                if (!m || !A.current || N === 0)
                   return;
-                const b = V - 1, j = r.getState().getShadowMetadata(t, n) || [];
-                if (b >= 0 && j[b]?.virtualizer?.itemHeight > 0 || V === 0) {
-                  const G = setTimeout(() => {
-                    T.scrollTo({
-                      top: T.scrollHeight,
-                      behavior: "smooth"
-                    });
-                  }, 50);
-                  return () => clearTimeout(G);
-                }
-              }, [V, H, i]), et(() => {
-                const T = u.current;
-                if (!T) return;
-                const b = () => {
-                  const { scrollTop: C, clientHeight: G } = T;
-                  let q = 0, st = V - 1;
-                  for (; q <= st; ) {
-                    const St = Math.floor((q + st) / 2);
-                    N[St] < C ? q = St + 1 : st = St - 1;
-                  }
-                  const wt = Math.max(0, st - s);
-                  let it = wt;
-                  const Vt = C + G;
-                  for (; it < V && N[it] < Vt; )
-                    it++;
-                  E({
-                    startIndex: wt,
-                    endIndex: Math.min(V, it + s)
-                  });
-                }, j = () => {
-                  T.scrollHeight - T.scrollTop - T.clientHeight < 1 || (A.current = !1), b();
+                console.log("ALGORITHM: Starting..."), T({
+                  startIndex: Math.max(0, N - 10 - s),
+                  endIndex: N
+                }), console.log(
+                  "ALGORITHM: Starting LOOP to wait for measurement."
+                );
+                let b = 0;
+                const x = setInterval(() => {
+                  b++, console.log(`LOOP ${b}: Checking last item...`);
+                  const _ = N - 1, nt = (r.getState().getShadowMetadata(t, n) || [])[_]?.virtualizer?.itemHeight || 0;
+                  nt > 0 ? (console.log(
+                    `%cSUCCESS: Last item height is ${nt}. Scrolling now.`,
+                    "color: green; font-weight: bold;"
+                  ), clearInterval(x), m.scrollTo({
+                    top: m.scrollHeight,
+                    behavior: "smooth"
+                  })) : (console.log("...WAITING. Height is not ready."), b > 20 && (console.error(
+                    "LOOP TIMEOUT: Last item was never measured. Stopping loop."
+                  ), clearInterval(x)));
+                }, 100);
+                return () => {
+                  console.log("ALGORITHM: Cleaning up loop."), clearInterval(x);
+                };
+              }, [N]), tt(() => {
+                const m = g.current;
+                if (!m) return;
+                const $ = () => {
+                  m.scrollHeight - m.scrollTop - m.clientHeight < 1 || (A.current = !1, console.log("USER ACTION: Scroll lock DISABLED."));
                 };
-                return T.addEventListener("scroll", j, {
+                return m.addEventListener("scroll", $, {
                   passive: !0
-                }), b(), () => T.removeEventListener("scroll", j);
-              }, [V, N]);
-              const O = Tt(
-                (T = "smooth") => {
-                  u.current && (A.current = !0, u.current.scrollTo({
-                    top: u.current.scrollHeight,
-                    behavior: T
+                }), () => m.removeEventListener("scroll", $);
+              }, []);
+              const C = yt(
+                (m = "smooth") => {
+                  g.current && (A.current = !0, console.log("USER ACTION: Scroll lock ENABLED."), g.current.scrollTo({
+                    top: g.current.scrollHeight,
+                    behavior: m
                   }));
                 },
                 []
-              ), D = Tt(
-                (T, b = "smooth") => {
-                  u.current && N[T] !== void 0 && (A.current = !1, u.current.scrollTo({
-                    top: N[T],
-                    behavior: b
+              ), R = yt(
+                (m, $ = "smooth") => {
+                  g.current && W[m] !== void 0 && (A.current = !1, console.log("USER ACTION: Scroll lock DISABLED."), g.current.scrollTo({
+                    top: W[m],
+                    behavior: $
                   }));
                 },
-                [N]
-              ), $ = {
+                [W]
+              ), L = {
                 outer: {
-                  ref: u,
+                  ref: g,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${H}px`,
+                    height: `${D}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${N[w.startIndex] || 0}px)`
+                    transform: `translateY(${W[u.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: x,
-                virtualizerProps: $,
-                scrollToBottom: O,
-                scrollToIndex: D
+                virtualState: O,
+                virtualizerProps: L,
+                scrollToBottom: C,
+                scrollToIndex: R
               };
             };
           if (l === "stateSort")
             return (e) => {
               const s = [...d()].sort(
-                (g, w) => e(g.item, w.item)
-              ), i = s.map(({ item: g }) => g), u = {
+                (u, T) => e(u.item, T.item)
+              ), c = s.map(({ item: u }) => u), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: g }) => g
+                  ({ originalIndex: u }) => u
                 )
               };
-              return a(i, n, u);
+              return a(c, n, g);
             };
           if (l === "stateFilter")
             return (e) => {
               const s = d().filter(
-                ({ item: g }, w) => e(g, w)
-              ), i = s.map(({ item: g }) => g), u = {
+                ({ item: u }, T) => e(u, T)
+              ), c = s.map(({ item: u }) => u), g = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: g }) => g
+                  ({ originalIndex: u }) => u
                 )
               };
-              return a(i, n, u);
+              return a(c, n, g);
             };
           if (l === "stateMap")
             return (e) => {
               const o = r.getState().getNestedState(t, n);
-              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (i, u) => u)).map((i, u) => {
-                const g = o[i], w = [...n, i.toString()], E = a(g, w, S);
-                return e(g, E, {
+              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, g) => g)).map((c, g) => {
+                const u = o[c], T = [...n, c.toString()], A = a(u, T, S);
+                return e(u, A, {
                   register: () => {
-                    const [, M] = X({}), P = `${m}-${n.join(".")}-${i}`;
-                    lt(() => {
-                      const _ = `${t}////${P}`, V = r.getState().stateComponents.get(t) || {
+                    const [, P] = Y({}), V = `${h}-${n.join(".")}-${c}`;
+                    it(() => {
+                      const N = `${t}////${V}`, D = r.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return V.components.set(_, {
-                        forceUpdate: () => M({}),
-                        paths: /* @__PURE__ */ new Set([w.join(".")])
-                      }), r.getState().stateComponents.set(t, V), () => {
-                        const H = r.getState().stateComponents.get(t);
-                        H && H.components.delete(_);
+                      return D.components.set(N, {
+                        forceUpdate: () => P({}),
+                        paths: /* @__PURE__ */ new Set([T.join(".")])
+                      }), r.getState().stateComponents.set(t, D), () => {
+                        const W = r.getState().stateComponents.get(t);
+                        W && W.components.delete(N);
                       };
-                    }, [t, P]);
+                    }, [t, V]);
                   },
-                  index: u,
-                  originalIndex: i
+                  index: g,
+                  originalIndex: c
                 });
               }) : (console.warn(
                 `stateMap called on a non-array value at path: ${n.join(".")}. The current value is:`,
@@ -794,20 +788,20 @@ function ut(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()], w = a(s, g, S);
+            return (e) => y.map((s, c) => {
+              let g;
+              S?.validIndices && S.validIndices[c] !== void 0 ? g = S.validIndices[c] : g = c;
+              const u = [...n, g.toString()], T = a(s, u, S);
               return e(
                 s,
-                w,
-                i,
-                v,
-                a(v, n, S)
+                T,
+                c,
+                y,
+                a(y, n, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => ot(Jt, {
+            return (e) => ot(Wt, {
               proxy: {
                 _stateKey: t,
                 _path: n,
@@ -819,17 +813,17 @@ function ut(t, c, m, f) {
           if (l === "stateList")
             return (e) => {
               const o = r.getState().getNestedState(t, n);
-              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (i, u) => u)).map((i, u) => {
-                const g = o[i], w = [...n, i.toString()], E = a(g, w, S), A = `${m}-${n.join(".")}-${i}`;
-                return ot(Zt, {
-                  key: i,
+              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, g) => g)).map((c, g) => {
+                const u = o[c], T = [...n, c.toString()], A = a(u, T, S), E = `${h}-${n.join(".")}-${c}`;
+                return ot(Bt, {
+                  key: c,
                   stateKey: t,
-                  itemComponentId: A,
-                  itemPath: w,
+                  itemComponentId: E,
+                  itemPath: T,
                   children: e(
-                    g,
-                    E,
                     u,
+                    A,
+                    g,
                     o,
                     a(o, n, S)
                   )
@@ -840,10 +834,10 @@ function ut(t, c, m, f) {
             };
           if (l === "stateFlattenOn")
             return (e) => {
-              const o = v;
-              y.clear(), k++;
+              const o = y;
+              I.clear(), k++;
               const s = o.flatMap(
-                (i) => i[e] ?? []
+                (c) => c[e] ?? []
               );
               return a(
                 s,
@@ -853,107 +847,107 @@ function ut(t, c, m, f) {
             };
           if (l === "index")
             return (e) => {
-              const o = v[e];
+              const o = y[e];
               return a(o, [...n, e.toString()]);
             };
           if (l === "last")
             return () => {
               const e = r.getState().getNestedState(t, n);
               if (e.length === 0) return;
-              const o = e.length - 1, s = e[o], i = [...n, o.toString()];
-              return a(s, i);
+              const o = e.length - 1, s = e[o], c = [...n, o.toString()];
+              return a(s, c);
             };
           if (l === "insert")
-            return (e) => (p(n), mt(c, e, n, t), a(
+            return (e) => (w(n), gt(i, e, n, t), a(
               r.getState().getNestedState(t, n),
               n
             ));
           if (l === "uniqueInsert")
             return (e, o, s) => {
-              const i = r.getState().getNestedState(t, n), u = Y(e) ? e(i) : e;
-              let g = null;
-              if (!i.some((E) => {
+              const c = r.getState().getNestedState(t, n), g = q(e) ? e(c) : e;
+              let u = null;
+              if (!c.some((A) => {
                 if (o) {
-                  const M = o.every(
-                    (P) => z(E[P], u[P])
+                  const P = o.every(
+                    (V) => H(A[V], g[V])
                   );
-                  return M && (g = E), M;
+                  return P && (u = A), P;
                 }
-                const A = z(E, u);
-                return A && (g = E), A;
+                const E = H(A, g);
+                return E && (u = A), E;
               }))
-                p(n), mt(c, u, n, t);
-              else if (s && g) {
-                const E = s(g), A = i.map(
-                  (M) => z(M, g) ? E : M
+                w(n), gt(i, g, n, t);
+              else if (s && u) {
+                const A = s(u), E = c.map(
+                  (P) => H(P, u) ? A : P
                 );
-                p(n), rt(c, A, n);
+                w(n), rt(i, E, n);
               }
             };
           if (l === "cut")
             return (e, o) => {
               if (!o?.waitForSync)
-                return p(n), ct(c, n, t, e), a(
+                return w(n), st(i, n, t, e), a(
                   r.getState().getNestedState(t, n),
                   n
                 );
             };
           if (l === "cutByValue")
             return (e) => {
-              for (let o = 0; o < v.length; o++)
-                v[o] === e && ct(c, n, t, o);
+              for (let o = 0; o < y.length; o++)
+                y[o] === e && st(i, n, t, o);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const o = v.findIndex((s) => s === e);
-              o > -1 ? ct(c, n, t, o) : mt(c, e, n, t);
+              const o = y.findIndex((s) => s === e);
+              o > -1 ? st(i, n, t, o) : gt(i, 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()];
-              return a(s.item, i, S);
+              const c = [...n, s.originalIndex.toString()];
+              return a(s.item, c, S);
             };
           if (l === "findWith")
             return (e, o) => {
-              const i = d().find(
-                ({ item: g }) => g[e] === o
+              const c = d().find(
+                ({ item: u }) => u[e] === o
               );
-              if (!i) return;
-              const u = [...n, i.originalIndex.toString()];
-              return a(i.item, u, S);
+              if (!c) return;
+              const g = [...n, c.originalIndex.toString()];
+              return a(c.item, g, S);
             };
         }
-        const Z = n[n.length - 1];
-        if (!isNaN(Number(Z))) {
+        const J = n[n.length - 1];
+        if (!isNaN(Number(J))) {
           const d = n.slice(0, -1), e = r.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => ct(
-              c,
+            return () => st(
+              i,
               d,
               t,
-              Number(Z)
+              Number(J)
             );
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(v)) {
+            if (S?.validIndices && Array.isArray(y)) {
               const d = r.getState().getNestedState(t, n);
               return S.validIndices.map((e) => d[e]);
             }
             return r.getState().getNestedState(t, n);
           };
         if (l === "$derive")
-          return (d) => kt({
+          return (d) => Tt({
             _stateKey: t,
             _path: n,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => kt({
+          return () => Tt({
             _stateKey: t,
             _path: n
           });
@@ -962,7 +956,7 @@ function ut(t, c, m, f) {
           return r.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => gt(f + "-" + t + "-" + d);
+          return (d) => dt(f + "-" + t + "-" + d);
         if (l === "_selected") {
           const d = n.slice(0, -1), e = d.join("."), o = r.getState().getNestedState(t, d);
           return Array.isArray(o) ? Number(n[n.length - 1]) === r.getState().getSelectedIndex(t, e) : void 0;
@@ -971,8 +965,8 @@ function ut(t, c, m, f) {
           return (d) => {
             const e = n.slice(0, -1), o = Number(n[n.length - 1]), s = e.join(".");
             d ? r.getState().setSelectedIndex(t, s, o) : r.getState().setSelectedIndex(t, s, void 0);
-            const i = r.getState().getNestedState(t, [...e]);
-            rt(c, i, e), p(e);
+            const c = r.getState().getNestedState(t, [...e]);
+            rt(i, c, e), w(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -982,74 +976,74 @@ function ut(t, c, m, f) {
               o,
               s === e ? void 0 : e
             );
-            const i = r.getState().getNestedState(t, [...d]);
-            rt(c, i, d), p(d);
+            const c = r.getState().getNestedState(t, [...d]);
+            rt(i, c, d), w(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
-              const e = r.getState().cogsStateStore[t], s = Ft(e, d).newDocument;
-              Nt(
+              const e = r.getState().cogsStateStore[t], s = Ot(e, d).newDocument;
+              kt(
                 t,
                 r.getState().initialStateGlobal[t],
                 s,
-                c,
-                m,
+                i,
+                h,
                 f
               );
-              const i = r.getState().stateComponents.get(t);
-              if (i) {
-                const u = yt(e, s), g = new Set(u);
+              const c = r.getState().stateComponents.get(t);
+              if (c) {
+                const g = mt(e, s), u = new Set(g);
                 for (const [
-                  w,
-                  E
-                ] of i.components.entries()) {
-                  let A = !1;
-                  const M = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
-                  if (!M.includes("none")) {
-                    if (M.includes("all")) {
-                      E.forceUpdate();
+                  T,
+                  A
+                ] of c.components.entries()) {
+                  let E = !1;
+                  const P = Array.isArray(A.reactiveType) ? A.reactiveType : [A.reactiveType || "component"];
+                  if (!P.includes("none")) {
+                    if (P.includes("all")) {
+                      A.forceUpdate();
                       continue;
                     }
-                    if (M.includes("component") && (E.paths.has("") && (A = !0), !A))
-                      for (const P of g) {
-                        if (E.paths.has(P)) {
-                          A = !0;
+                    if (P.includes("component") && (A.paths.has("") && (E = !0), !E))
+                      for (const V of u) {
+                        if (A.paths.has(V)) {
+                          E = !0;
                           break;
                         }
-                        let _ = P.lastIndexOf(".");
-                        for (; _ !== -1; ) {
-                          const V = P.substring(0, _);
-                          if (E.paths.has(V)) {
-                            A = !0;
+                        let N = V.lastIndexOf(".");
+                        for (; N !== -1; ) {
+                          const D = V.substring(0, N);
+                          if (A.paths.has(D)) {
+                            E = !0;
                             break;
                           }
-                          const H = P.substring(
-                            _ + 1
+                          const W = V.substring(
+                            N + 1
                           );
-                          if (!isNaN(Number(H))) {
-                            const N = V.lastIndexOf(".");
-                            if (N !== -1) {
-                              const x = V.substring(
+                          if (!isNaN(Number(W))) {
+                            const O = D.lastIndexOf(".");
+                            if (O !== -1) {
+                              const C = D.substring(
                                 0,
-                                N
+                                O
                               );
-                              if (E.paths.has(x)) {
-                                A = !0;
+                              if (A.paths.has(C)) {
+                                E = !0;
                                 break;
                               }
                             }
                           }
-                          _ = V.lastIndexOf(".");
+                          N = D.lastIndexOf(".");
                         }
-                        if (A) break;
+                        if (E) break;
                       }
-                    if (!A && M.includes("deps") && E.depsFunction) {
-                      const P = E.depsFunction(s);
-                      let _ = !1;
-                      typeof P == "boolean" ? P && (_ = !0) : z(E.deps, P) || (E.deps = P, _ = !0), _ && (A = !0);
+                    if (!E && P.includes("deps") && A.depsFunction) {
+                      const V = A.depsFunction(s);
+                      let N = !1;
+                      typeof V == "boolean" ? V && (N = !0) : H(A.deps, V) || (A.deps = V, N = !0), N && (E = !0);
                     }
-                    A && E.forceUpdate();
+                    E && A.forceUpdate();
                   }
                 }
               }
@@ -1061,27 +1055,27 @@ function ut(t, c, m, f) {
                 throw new Error("Zod schema not found");
               if (!d?.key)
                 throw new Error("Validation key not found");
-              J(d.key);
+              z(d.key);
               const o = r.getState().cogsStateStore[t];
               try {
                 const s = r.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) && z(g);
                 });
-                const i = d.zodSchema.safeParse(o);
-                return i.success ? !0 : (i.error.errors.forEach((g) => {
-                  const w = g.path, E = g.message, A = [d.key, ...w].join(".");
-                  e(A, E);
-                }), ft(t), !1);
+                const c = d.zodSchema.safeParse(o);
+                return c.success ? !0 : (c.error.errors.forEach((u) => {
+                  const T = u.path, A = u.message, E = [d.key, ...T].join(".");
+                  e(E, A);
+                }), ut(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 () => r().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => Et.getState().getFormRefsByStateKey(t);
+            return () => It.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return r.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1089,18 +1083,18 @@ function ut(t, c, m, f) {
           if (l === "_isLoading")
             return r.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 () => Et.getState().getFormRef(t + "." + n.join("."));
+          return () => It.getState().getFormRef(t + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ ht(
-            Rt,
+          }) => /* @__PURE__ */ ft(
+            Pt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: n,
@@ -1112,78 +1106,78 @@ function ut(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)
-              jt(() => {
-                rt(c, d, n, "");
+              Vt(() => {
+                rt(i, d, n, "");
                 const o = r.getState().getNestedState(t, n);
                 e?.afterUpdate && e.afterUpdate(o);
               }, e.debounce);
             else {
-              rt(c, d, n, "");
+              rt(i, d, n, "");
               const o = r.getState().getNestedState(t, n);
               e?.afterUpdate && e.afterUpdate(o);
             }
-            p(n);
+            w(n);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ ht(
-            Ot,
+          return (d, e) => /* @__PURE__ */ ft(
+            xt,
             {
-              setState: c,
+              setState: i,
               stateKey: t,
               path: n,
               child: d,
               formOpts: e
             }
           );
-        const R = [...n, l], nt = r.getState().getNestedState(t, R);
-        return a(nt, R, S);
+        const M = [...n, l], et = r.getState().getNestedState(t, M);
+        return a(et, M, S);
       }
-    }, L = new Proxy(U, F);
-    return y.set(W, {
-      proxy: L,
+    }, G = new Proxy(U, j);
+    return I.set(F, {
+      proxy: G,
       stateVersion: k
-    }), L;
+    }), G;
   }
   return a(
     r.getState().getNestedState(t, [])
   );
 }
-function kt(t) {
-  return ot(Yt, { proxy: t });
+function Tt(t) {
+  return ot(Ht, { proxy: t });
 }
-function Jt({
+function Wt({
   proxy: t,
-  rebuildStateShape: c
+  rebuildStateShape: i
 }) {
-  const m = r().getNestedState(t._stateKey, t._path);
-  return Array.isArray(m) ? c(
-    m,
+  const h = r().getNestedState(t._stateKey, t._path);
+  return Array.isArray(h) ? i(
+    h,
     t._path
   ).stateMapNoRender(
-    (y, k, p, I, a) => t._mapFn(y, k, p, I, a)
+    (I, k, w, p, a) => t._mapFn(I, k, w, p, a)
   ) : null;
 }
-function Yt({
+function Ht({
   proxy: t
 }) {
-  const c = Q(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return et(() => {
-    const f = c.current;
+  const i = Z(null), h = `${t._stateKey}-${t._path.join(".")}`;
+  return tt(() => {
+    const f = i.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
     };
-    r.getState().addSignalElement(m, v);
+    r.getState().addSignalElement(h, y);
     const n = r.getState().getNestedState(t._stateKey, t._path);
     let S;
     if (t._effect)
@@ -1198,61 +1192,61 @@ function Yt({
     else
       S = n;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const W = document.createTextNode(String(S));
-    f.replaceWith(W);
+    const F = document.createTextNode(String(S));
+    f.replaceWith(F);
   }, [t._stateKey, t._path.join("."), t._effect]), ot("span", {
-    ref: c,
+    ref: i,
     style: { display: "none" },
-    "data-signal-id": m
+    "data-signal-id": h
   });
 }
-function ue(t) {
-  const c = Pt(
-    (m) => {
+function se(t) {
+  const i = Ct(
+    (h) => {
       const f = r.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);
     },
     () => r.getState().getNestedState(t._stateKey, t._path)
   );
-  return ot("text", {}, String(c));
+  return ot("text", {}, String(i));
 }
-function Zt({
+function Bt({
   stateKey: t,
-  itemComponentId: c,
-  itemPath: m,
+  itemComponentId: i,
+  itemPath: h,
   children: f
 }) {
-  const [, y] = X({}), [k, p] = Dt(), I = Q(null);
-  return et(() => {
-    p.height > 0 && p.height !== I.current && (I.current = p.height, r.getState().setShadowMetadata(t, m, {
+  const [, I] = Y({}), [k, w] = Mt(), p = Z(null);
+  return tt(() => {
+    w.height > 0 && w.height !== p.current && (p.current = w.height, r.getState().setShadowMetadata(t, h, {
       virtualizer: {
-        itemHeight: p.height
+        itemHeight: w.height
       }
     }));
-  }, [p.height, t, m]), lt(() => {
-    const a = `${t}////${c}`, v = r.getState().stateComponents.get(t) || {
+  }, [w.height, t, h]), it(() => {
+    const a = `${t}////${i}`, y = r.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
-    return v.components.set(a, {
-      forceUpdate: () => y({}),
-      paths: /* @__PURE__ */ new Set([m.join(".")])
-    }), r.getState().stateComponents.set(t, v), () => {
+    return y.components.set(a, {
+      forceUpdate: () => I({}),
+      paths: /* @__PURE__ */ new Set([h.join(".")])
+    }), r.getState().stateComponents.set(t, y), () => {
       const n = r.getState().stateComponents.get(t);
       n && n.components.delete(a);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ ht("div", { ref: k, children: f });
+  }, [t, i, h.join(".")]), /* @__PURE__ */ ft("div", { ref: k, children: f });
 }
 export {
-  kt as $cogsSignal,
-  ue as $cogsSignalStore,
-  ce as addStateOptions,
-  le as createCogsState,
-  de as notifyComponent,
-  qt as useCogsStateFn
+  Tt as $cogsSignal,
+  se as $cogsSignalStore,
+  re as addStateOptions,
+  oe as createCogsState,
+  ae as notifyComponent,
+  Gt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map