cogsbox-state 0.5.356 → 0.5.357

package/dist/CogsState.jsx

@@ -1,61 +1,61 @@
 "use client";
-import { jsx as ht } from "react/jsx-runtime";
-import { useState as K, useRef as Z, useEffect as nt, useLayoutEffect as lt, useMemo as vt, createElement as at, useSyncExternalStore as Pt, startTransition as _t, useCallback as At } from "react";
-import { transformStateFunc as Mt, isDeepEqual as B, isFunction as Y, getNestedValue as z, getDifferences as It, debounce as Ot } from "./utility.js";
-import { pushFunc as mt, updateFn as ot, cutFunc as ct, ValidationWrapper as Rt, FormControlComponent as Ut } from "./Functions.jsx";
-import jt from "superjson";
-import { v4 as yt } from "uuid";
+import { jsx as It } from "react/jsx-runtime";
+import { useState as Q, useRef as Z, useEffect as et, useLayoutEffect as gt, useMemo as pt, createElement as at, useSyncExternalStore as Ut, startTransition as Ot, useCallback as kt } from "react";
+import { transformStateFunc as jt, isDeepEqual as z, isFunction as Y, getNestedValue as q, getDifferences as wt, debounce as Ft } from "./utility.js";
+import { pushFunc as yt, updateFn as ot, cutFunc as ut, ValidationWrapper as Dt, FormControlComponent as Lt } from "./Functions.jsx";
+import Wt from "superjson";
+import { v4 as At } from "uuid";
 import "zod";
-import { getGlobalStore as r, formRefStore as Tt } from "./store.js";
-import { useCogsConfig as bt } from "./CogsStateClient.jsx";
-import { applyPatch as Lt } from "fast-json-patch";
-import Dt from "react-use-measure";
-function Et(t, i) {
-  const m = r.getState().getInitialOptions, f = r.getState().setInitialStateOptions, I = m(t) || {};
-  f(t, {
-    ...I,
+import { getGlobalStore as r, formRefStore as bt } from "./store.js";
+import { useCogsConfig as Pt } from "./CogsStateClient.jsx";
+import { applyPatch as Gt } from "fast-json-patch";
+import Ht from "react-use-measure";
+function Nt(t, i) {
+  const S = r.getState().getInitialOptions, g = r.getState().setInitialStateOptions, y = S(t) || {};
+  g(t, {
+    ...y,
     ...i
   });
 }
-function $t({
+function Ct({
   stateKey: t,
   options: i,
-  initialOptionsPart: m
+  initialOptionsPart: S
 }) {
-  const f = et(t) || {}, I = m[t] || {}, b = r.getState().setInitialStateOptions, p = { ...I, ...f };
-  let y = !1;
+  const g = tt(t) || {}, y = S[t] || {}, b = r.getState().setInitialStateOptions, p = { ...y, ...g };
+  let I = !1;
   if (i)
     for (const a in i)
-      p.hasOwnProperty(a) ? (a == "localStorage" && i[a] && p[a].key !== i[a]?.key && (y = !0, p[a] = i[a]), a == "initialState" && i[a] && p[a] !== i[a] && // Different references
-      !B(p[a], i[a]) && (y = !0, p[a] = i[a])) : (y = !0, p[a] = i[a]);
-  y && b(t, p);
+      p.hasOwnProperty(a) ? (a == "localStorage" && i[a] && p[a].key !== i[a]?.key && (I = !0, p[a] = i[a]), a == "initialState" && i[a] && p[a] !== i[a] && // Different references
+      !z(p[a], i[a]) && (I = !0, p[a] = i[a])) : (I = !0, p[a] = i[a]);
+  I && b(t, p);
 }
-function ce(t, { formElements: i, validation: m }) {
-  return { initialState: t, formElements: i, validation: m };
+function ge(t, { formElements: i, validation: S }) {
+  return { initialState: t, formElements: i, validation: S };
 }
-const le = (t, i) => {
-  let m = t;
-  const [f, I] = Mt(m);
-  (Object.keys(I).length > 0 || i && Object.keys(i).length > 0) && Object.keys(I).forEach((y) => {
-    I[y] = I[y] || {}, I[y].formElements = {
+const fe = (t, i) => {
+  let S = t;
+  const [g, y] = jt(S);
+  (Object.keys(y).length > 0 || i && Object.keys(i).length > 0) && Object.keys(y).forEach((I) => {
+    y[I] = y[I] || {}, y[I].formElements = {
       ...i?.formElements,
       // Global defaults first
       ...i?.validation,
-      ...I[y].formElements || {}
+      ...y[I].formElements || {}
       // State-specific overrides
-    }, et(y) || r.getState().setInitialStateOptions(y, I[y]);
-  }), r.getState().setInitialStates(f), r.getState().setCreatedState(f);
-  const b = (y, a) => {
-    const [v] = K(a?.componentId ?? yt());
-    $t({
-      stateKey: y,
+    }, tt(I) || r.getState().setInitialStateOptions(I, y[I]);
+  }), r.getState().setInitialStates(g), r.getState().setCreatedState(g);
+  const b = (I, a) => {
+    const [v] = Q(a?.componentId ?? At());
+    Ct({
+      stateKey: I,
       options: a,
-      initialOptionsPart: I
+      initialOptionsPart: y
     });
-    const n = r.getState().cogsStateStore[y] || f[y], S = a?.modifyState ? a.modifyState(n) : n, [F, j] = qt(
-      S,
+    const n = r.getState().cogsStateStore[I] || g[I], f = a?.modifyState ? a.modifyState(n) : n, [G, O] = Xt(
+      f,
       {
-        stateKey: y,
+        stateKey: I,
         syncUpdate: a?.syncUpdate,
         componentId: v,
         localStorage: a?.localStorage,
@@ -68,49 +68,49 @@ const le = (t, i) => {
         serverState: a?.serverState
       }
     );
-    return j;
+    return O;
   };
-  function p(y, a) {
-    $t({ stateKey: y, options: a, initialOptionsPart: I }), a.localStorage && Bt(y, a), ft(y);
+  function p(I, a) {
+    Ct({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Yt(I, a), ht(I);
   }
   return { useCogsState: b, setCogsOptions: p };
 }, {
-  setUpdaterState: dt,
-  setState: tt,
-  getInitialOptions: et,
-  getKeyState: Nt,
-  getValidationErrors: Ft,
-  setStateLog: Gt,
-  updateInitialStateGlobal: pt,
-  addValidationError: Wt,
+  setUpdaterState: ft,
+  setState: K,
+  getInitialOptions: tt,
+  getKeyState: _t,
+  getValidationErrors: Bt,
+  setStateLog: zt,
+  updateInitialStateGlobal: Et,
+  addValidationError: qt,
   removeValidationError: J,
-  setServerSyncActions: Ht
-} = r.getState(), kt = (t, i, m, f, I) => {
-  m?.log && console.log(
+  setServerSyncActions: Jt
+} = r.getState(), xt = (t, i, S, g, y) => {
+  S?.log && console.log(
     "saving to localstorage",
     i,
-    m.localStorage?.key,
-    f
+    S.localStorage?.key,
+    g
   );
-  const b = Y(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (b && f) {
-    const p = `${f}-${i}-${b}`;
-    let y;
+  const b = Y(S?.localStorage?.key) ? S.localStorage?.key(t) : S?.localStorage?.key;
+  if (b && g) {
+    const p = `${g}-${i}-${b}`;
+    let I;
     try {
-      y = gt(p)?.lastSyncedWithServer;
+      I = mt(p)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: I ?? y
-    }, v = jt.serialize(a);
+      lastSyncedWithServer: y ?? I
+    }, v = Wt.serialize(a);
     window.localStorage.setItem(
       p,
       JSON.stringify(v.json)
     );
   }
-}, gt = (t) => {
+}, mt = (t) => {
   if (!t) return null;
   try {
     const i = window.localStorage.getItem(t);
@@ -118,61 +118,61 @@ const le = (t, i) => {
   } catch (i) {
     return console.error("Error loading from localStorage:", i), null;
   }
-}, Bt = (t, i) => {
-  const m = r.getState().cogsStateStore[t], { sessionId: f } = bt(), I = Y(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
-  if (I && f) {
-    const b = gt(
-      `${f}-${t}-${I}`
+}, Yt = (t, i) => {
+  const S = r.getState().cogsStateStore[t], { sessionId: g } = Pt(), y = Y(i?.localStorage?.key) ? i.localStorage.key(S) : i?.localStorage?.key;
+  if (y && g) {
+    const b = mt(
+      `${g}-${t}-${y}`
     );
     if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
-      return tt(t, b.state), ft(t), !0;
+      return K(t, b.state), ht(t), !0;
   }
   return !1;
-}, xt = (t, i, m, f, I, b) => {
+}, Mt = (t, i, S, g, y, b) => {
   const p = {
     initialState: i,
-    updaterState: ut(
+    updaterState: St(
       t,
-      f,
-      I,
+      g,
+      y,
       b
     ),
-    state: m
+    state: S
   };
-  pt(t, p.initialState), dt(t, p.updaterState), tt(t, p.state);
-}, ft = (t) => {
+  Et(t, p.initialState), ft(t, p.updaterState), K(t, p.state);
+}, ht = (t) => {
   const i = r.getState().stateComponents.get(t);
   if (!i) return;
-  const m = /* @__PURE__ */ new Set();
-  i.components.forEach((f) => {
-    (f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none") || m.add(() => f.forceUpdate());
+  const S = /* @__PURE__ */ new Set();
+  i.components.forEach((g) => {
+    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || S.add(() => g.forceUpdate());
   }), queueMicrotask(() => {
-    m.forEach((f) => f());
+    S.forEach((g) => g());
   });
-}, de = (t, i) => {
-  const m = r.getState().stateComponents.get(t);
-  if (m) {
-    const f = `${t}////${i}`, I = m.components.get(f);
-    if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
+}, Se = (t, i) => {
+  const S = r.getState().stateComponents.get(t);
+  if (S) {
+    const g = `${t}////${i}`, y = S.components.get(g);
+    if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
       return;
-    I && I.forceUpdate();
+    y && y.forceUpdate();
   }
-}, zt = (t, i, m, f) => {
+}, Zt = (t, i, S, g) => {
   switch (t) {
     case "update":
       return {
-        oldValue: z(i, f),
-        newValue: z(m, f)
+        oldValue: q(i, g),
+        newValue: q(S, g)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: z(m, f)
+        newValue: q(S, g)
       };
     case "cut":
       return {
-        oldValue: z(i, f),
+        oldValue: q(i, g),
         newValue: null
         // or undefined
       };
@@ -180,27 +180,27 @@ const le = (t, i) => {
       return { oldValue: null, newValue: null };
   }
 };
-function qt(t, {
+function Xt(t, {
   stateKey: i,
-  serverSync: m,
-  localStorage: f,
-  formElements: I,
+  serverSync: S,
+  localStorage: g,
+  formElements: y,
   reactiveDeps: b,
   reactiveType: p,
-  componentId: y,
+  componentId: I,
   initialState: a,
   syncUpdate: v,
   dependencies: n,
-  serverState: S
+  serverState: f
 } = {}) {
-  const [F, j] = K({}), { sessionId: L } = bt();
-  let G = !i;
-  const [h] = K(i ?? yt()), l = r.getState().stateLog[h], st = Z(/* @__PURE__ */ new Set()), X = Z(y ?? yt()), R = Z(
+  const [G, O] = Q({}), { sessionId: j } = Pt();
+  let H = !i;
+  const [m] = Q(i ?? At()), l = r.getState().stateLog[m], st = Z(/* @__PURE__ */ new Set()), X = Z(I ?? At()), M = Z(
     null
   );
-  R.current = et(h) ?? null, nt(() => {
-    if (v && v.stateKey === h && v.path?.[0]) {
-      tt(h, (o) => ({
+  M.current = tt(m) ?? null, et(() => {
+    if (v && v.stateKey === m && v.path?.[0]) {
+      K(m, (o) => ({
         ...o,
         [v.path[0]]: v.newValue
       }));
@@ -210,269 +210,269 @@ function qt(t, {
         userId: v.userId
       });
     }
-  }, [v]), nt(() => {
+  }, [v]), et(() => {
     if (a) {
-      Et(h, {
+      Nt(m, {
         initialState: a
       });
-      const e = R.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = r.getState().initialStateGlobal[h];
-      if (!(c && !B(c, a) || !c) && !s)
+      const e = M.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = r.getState().initialStateGlobal[m];
+      if (!(c && !z(c, a) || !c) && !s)
         return;
       let u = null;
-      const T = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      T && L && (u = gt(`${L}-${h}-${T}`));
-      let w = a, E = !1;
-      const M = s ? Date.now() : 0, P = u?.lastUpdated || 0, O = u?.lastSyncedWithServer || 0;
-      s && M > P ? (w = e.serverState.data, E = !0) : u && P > O && (w = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), r.getState().initializeShadowState(h, a), xt(
-        h,
+      const w = Y(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
+      w && j && (u = mt(`${j}-${m}-${w}`));
+      let A = a, T = !1;
+      const C = s ? Date.now() : 0, N = u?.lastUpdated || 0, R = u?.lastSyncedWithServer || 0;
+      s && C > N ? (A = e.serverState.data, T = !0) : u && N > R && (A = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(A)), r.getState().initializeShadowState(m, a), Mt(
+        m,
         a,
-        w,
-        rt,
+        A,
+        nt,
         X.current,
-        L
-      ), E && T && L && kt(w, h, e, L, Date.now()), ft(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || j({});
+        j
+      ), T && w && j && xt(A, m, e, j, Date.now()), ht(m), (Array.isArray(p) ? p : [p || "component"]).includes("none") || O({});
     }
   }, [
     a,
-    S?.status,
-    S?.data,
+    f?.status,
+    f?.data,
     ...n || []
-  ]), lt(() => {
-    G && Et(h, {
-      serverSync: m,
-      formElements: I,
+  ]), gt(() => {
+    H && Nt(m, {
+      serverSync: S,
+      formElements: y,
       initialState: a,
-      localStorage: f,
-      middleware: R.current?.middleware
+      localStorage: g,
+      middleware: M.current?.middleware
     });
-    const e = `${h}////${X.current}`, o = r.getState().stateComponents.get(h) || {
+    const e = `${m}////${X.current}`, o = r.getState().stateComponents.get(m) || {
       components: /* @__PURE__ */ new Map()
     };
     return o.components.set(e, {
-      forceUpdate: () => j({}),
+      forceUpdate: () => O({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: b || void 0,
       reactiveType: p ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(h, o), j({}), () => {
-      o && (o.components.delete(e), o.components.size === 0 && r.getState().stateComponents.delete(h));
+    }), r.getState().stateComponents.set(m, o), O({}), () => {
+      o && (o.components.delete(e), o.components.size === 0 && r.getState().stateComponents.delete(m));
     };
   }, []);
-  const rt = (e, o, s, c) => {
+  const nt = (e, o, s, c) => {
     if (Array.isArray(o)) {
-      const u = `${h}-${o.join(".")}`;
+      const u = `${m}-${o.join(".")}`;
       st.current.add(u);
     }
-    const g = r.getState();
-    tt(h, (u) => {
-      const T = Y(e) ? e(u) : e, w = `${h}-${o.join(".")}`;
-      if (w) {
-        let V = !1, N = g.signalDomElements.get(w);
-        if ((!N || N.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const U = o.slice(0, -1), D = z(T, U);
-          if (Array.isArray(D)) {
-            V = !0;
-            const $ = `${h}-${U.join(".")}`;
-            N = g.signalDomElements.get($);
+    const h = r.getState();
+    K(m, (u) => {
+      const w = Y(e) ? e(u) : e, A = `${m}-${o.join(".")}`;
+      if (A) {
+        let _ = !1, $ = h.signalDomElements.get(A);
+        if ((!$ || $.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const U = o.slice(0, -1), L = q(w, U);
+          if (Array.isArray(L)) {
+            _ = !0;
+            const k = `${m}-${U.join(".")}`;
+            $ = h.signalDomElements.get(k);
           }
         }
-        if (N) {
-          const U = V ? z(T, o.slice(0, -1)) : z(T, o);
-          N.forEach(({ parentId: D, position: $, effect: A }) => {
-            const k = document.querySelector(
-              `[data-parent-id="${D}"]`
+        if ($) {
+          const U = _ ? q(w, o.slice(0, -1)) : q(w, o);
+          $.forEach(({ parentId: L, position: k, effect: F }) => {
+            const E = document.querySelector(
+              `[data-parent-id="${L}"]`
             );
-            if (k) {
-              const _ = Array.from(k.childNodes);
-              if (_[$]) {
-                const C = A ? new Function("state", `return (${A})(state)`)(U) : U;
-                _[$].textContent = String(C);
+            if (E) {
+              const V = Array.from(E.childNodes);
+              if (V[k]) {
+                const P = F ? new Function("state", `return (${F})(state)`)(U) : U;
+                V[k].textContent = String(P);
               }
             }
           });
         }
       }
-      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (c || R.current?.validation?.key) && o && J(
-        (c || R.current?.validation?.key) + "." + o.join(".")
+      console.log("shadowState", h.shadowStateStore), s.updateType === "update" && (c || M.current?.validation?.key) && o && J(
+        (c || M.current?.validation?.key) + "." + o.join(".")
       );
-      const E = o.slice(0, o.length - 1);
-      s.updateType === "cut" && R.current?.validation?.key && J(
-        R.current?.validation?.key + "." + E.join(".")
-      ), s.updateType === "insert" && R.current?.validation?.key && Ft(
-        R.current?.validation?.key + "." + E.join(".")
-      ).filter(([N, U]) => {
-        let D = N?.split(".").length;
-        if (N == E.join(".") && D == E.length - 1) {
-          let $ = N + "." + E;
-          J(N), Wt($, U);
+      const T = o.slice(0, o.length - 1);
+      s.updateType === "cut" && M.current?.validation?.key && J(
+        M.current?.validation?.key + "." + T.join(".")
+      ), s.updateType === "insert" && M.current?.validation?.key && Bt(
+        M.current?.validation?.key + "." + T.join(".")
+      ).filter(([$, U]) => {
+        let L = $?.split(".").length;
+        if ($ == T.join(".") && L == T.length - 1) {
+          let k = $ + "." + T;
+          J($), qt(k, U);
         }
       });
-      const M = g.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", M), M) {
-        const V = It(u, T), N = new Set(V), U = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
+      const C = h.stateComponents.get(m);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", C), C) {
+        const _ = wt(u, w), $ = new Set(_), U = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
         for (const [
-          D,
-          $
-        ] of M.components.entries()) {
-          let A = !1;
-          const k = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
-          if (console.log("component", $), !k.includes("none")) {
-            if (k.includes("all")) {
-              $.forceUpdate();
+          L,
+          k
+        ] of C.components.entries()) {
+          let F = !1;
+          const E = Array.isArray(k.reactiveType) ? k.reactiveType : [k.reactiveType || "component"];
+          if (console.log("component", k), !E.includes("none")) {
+            if (E.includes("all")) {
+              k.forceUpdate();
               continue;
             }
-            if (k.includes("component") && (($.paths.has(U) || $.paths.has("")) && (A = !0), !A))
-              for (const _ of N) {
-                let C = _;
+            if (E.includes("component") && ((k.paths.has(U) || k.paths.has("")) && (F = !0), !F))
+              for (const V of $) {
+                let P = V;
                 for (; ; ) {
-                  if ($.paths.has(C)) {
-                    A = !0;
+                  if (k.paths.has(P)) {
+                    F = !0;
                     break;
                   }
-                  const W = C.lastIndexOf(".");
+                  const W = P.lastIndexOf(".");
                   if (W !== -1) {
-                    const q = C.substring(
+                    const B = P.substring(
                       0,
                       W
                     );
                     if (!isNaN(
-                      Number(C.substring(W + 1))
-                    ) && $.paths.has(q)) {
-                      A = !0;
+                      Number(P.substring(W + 1))
+                    ) && k.paths.has(B)) {
+                      F = !0;
                       break;
                     }
-                    C = q;
+                    P = B;
                   } else
-                    C = "";
-                  if (C === "")
+                    P = "";
+                  if (P === "")
                     break;
                 }
-                if (A) break;
+                if (F) break;
               }
-            if (!A && k.includes("deps") && $.depsFunction) {
-              const _ = $.depsFunction(T);
-              let C = !1;
-              typeof _ == "boolean" ? _ && (C = !0) : B($.deps, _) || ($.deps = _, C = !0), C && (A = !0);
+            if (!F && E.includes("deps") && k.depsFunction) {
+              const V = k.depsFunction(w);
+              let P = !1;
+              typeof V == "boolean" ? V && (P = !0) : z(k.deps, V) || (k.deps = V, P = !0), P && (F = !0);
             }
-            A && $.forceUpdate();
+            F && k.forceUpdate();
           }
         }
       }
-      const P = Date.now();
-      o = o.map((V, N) => {
-        const U = o.slice(0, -1), D = z(T, U);
-        return N === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (D.length - 1).toString() : V;
+      const N = Date.now();
+      o = o.map((_, $) => {
+        const U = o.slice(0, -1), L = q(w, U);
+        return $ === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (L.length - 1).toString() : _;
       });
-      const { oldValue: O, newValue: x } = zt(
+      const { oldValue: R, newValue: D } = Zt(
         s.updateType,
         u,
-        T,
+        w,
         o
-      ), H = {
-        timeStamp: P,
-        stateKey: h,
+      ), x = {
+        timeStamp: N,
+        stateKey: m,
         path: o,
         updateType: s.updateType,
         status: "new",
-        oldValue: O,
-        newValue: x
+        oldValue: R,
+        newValue: D
       };
       switch (s.updateType) {
         case "update":
-          g.updateShadowAtPath(h, o, T);
+          h.updateShadowAtPath(m, o, w);
           break;
         case "insert":
-          const V = o.slice(0, -1);
-          g.insertShadowArrayElement(h, V, x);
+          const _ = o.slice(0, -1);
+          h.insertShadowArrayElement(m, _, D);
           break;
         case "cut":
-          const N = o.slice(0, -1), U = parseInt(o[o.length - 1]);
-          g.removeShadowArrayElement(h, N, U);
+          const $ = o.slice(0, -1), U = parseInt(o[o.length - 1]);
+          h.removeShadowArrayElement(m, $, U);
           break;
       }
-      if (Gt(h, (V) => {
-        const U = [...V ?? [], H].reduce((D, $) => {
-          const A = `${$.stateKey}:${JSON.stringify($.path)}`, k = D.get(A);
-          return k ? (k.timeStamp = Math.max(k.timeStamp, $.timeStamp), k.newValue = $.newValue, k.oldValue = k.oldValue ?? $.oldValue, k.updateType = $.updateType) : D.set(A, { ...$ }), D;
+      if (zt(m, (_) => {
+        const U = [..._ ?? [], x].reduce((L, k) => {
+          const F = `${k.stateKey}:${JSON.stringify(k.path)}`, E = L.get(F);
+          return E ? (E.timeStamp = Math.max(E.timeStamp, k.timeStamp), E.newValue = k.newValue, E.oldValue = E.oldValue ?? k.oldValue, E.updateType = k.updateType) : L.set(F, { ...k }), L;
         }, /* @__PURE__ */ new Map());
         return Array.from(U.values());
-      }), kt(
-        T,
-        h,
-        R.current,
-        L
-      ), R.current?.middleware && R.current.middleware({
+      }), xt(
+        w,
+        m,
+        M.current,
+        j
+      ), M.current?.middleware && M.current.middleware({
         updateLog: l,
-        update: H
-      }), R.current?.serverSync) {
-        const V = g.serverState[h], N = R.current?.serverSync;
-        Ht(h, {
-          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: T }),
-          rollBackState: V,
-          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
+        update: x
+      }), M.current?.serverSync) {
+        const _ = h.serverState[m], $ = M.current?.serverSync;
+        Jt(m, {
+          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: w }),
+          rollBackState: _,
+          actionTimeStamp: Date.now() + ($.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return T;
+      return w;
     });
   };
-  r.getState().updaterState[h] || (dt(
-    h,
-    ut(
-      h,
-      rt,
+  r.getState().updaterState[m] || (ft(
+    m,
+    St(
+      m,
+      nt,
       X.current,
-      L
+      j
     )
-  ), r.getState().cogsStateStore[h] || tt(h, t), r.getState().initialStateGlobal[h] || pt(h, t));
-  const d = vt(() => ut(
-    h,
-    rt,
+  ), r.getState().cogsStateStore[m] || K(m, t), r.getState().initialStateGlobal[m] || Et(m, t));
+  const d = pt(() => St(
+    m,
+    nt,
     X.current,
-    L
-  ), [h, L]);
-  return [Nt(h), d];
+    j
+  ), [m, j]);
+  return [_t(m), d];
 }
-function ut(t, i, m, f) {
-  const I = /* @__PURE__ */ new Map();
+function St(t, i, S, g) {
+  const y = /* @__PURE__ */ new Map();
   let b = 0;
   const p = (v) => {
     const n = v.join(".");
-    for (const [S] of I)
-      (S === n || S.startsWith(n + ".")) && I.delete(S);
+    for (const [f] of y)
+      (f === n || f.startsWith(n + ".")) && y.delete(f);
     b++;
-  }, y = {
+  }, I = {
     removeValidation: (v) => {
       v?.validationKey && J(v.validationKey);
     },
     revertToInitialState: (v) => {
       const n = r.getState().getInitialOptions(t)?.validation;
       n?.key && J(n?.key), v?.validationKey && J(v.validationKey);
-      const S = r.getState().initialStateGlobal[t];
-      r.getState().clearSelectedIndexesForState(t), I.clear(), b++;
-      const F = a(S, []), j = et(t), L = Y(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, G = `${f}-${t}-${L}`;
-      G && localStorage.removeItem(G), dt(t, F), tt(t, S);
-      const h = r.getState().stateComponents.get(t);
-      return h && h.components.forEach((l) => {
+      const f = r.getState().initialStateGlobal[t];
+      r.getState().clearSelectedIndexesForState(t), y.clear(), b++;
+      const G = a(f, []), O = tt(t), j = Y(O?.localStorage?.key) ? O?.localStorage?.key(f) : O?.localStorage?.key, H = `${g}-${t}-${j}`;
+      H && localStorage.removeItem(H), ft(t, G), K(t, f);
+      const m = r.getState().stateComponents.get(t);
+      return m && m.components.forEach((l) => {
         l.forceUpdate();
-      }), S;
+      }), f;
     },
     updateInitialState: (v) => {
-      I.clear(), b++;
-      const n = ut(
+      y.clear(), b++;
+      const n = St(
         t,
         i,
-        m,
-        f
-      ), S = r.getState().initialStateGlobal[t], F = et(t), j = Y(F?.localStorage?.key) ? F?.localStorage?.key(S) : F?.localStorage?.key, L = `${f}-${t}-${j}`;
-      return localStorage.getItem(L) && localStorage.removeItem(L), _t(() => {
-        pt(t, v), r.getState().initializeShadowState(t, v), dt(t, n), tt(t, v);
-        const G = r.getState().stateComponents.get(t);
-        G && G.components.forEach((h) => {
-          h.forceUpdate();
+        S,
+        g
+      ), f = r.getState().initialStateGlobal[t], G = tt(t), O = Y(G?.localStorage?.key) ? G?.localStorage?.key(f) : G?.localStorage?.key, j = `${g}-${t}-${O}`;
+      return localStorage.getItem(j) && localStorage.removeItem(j), Ot(() => {
+        Et(t, v), r.getState().initializeShadowState(t, v), ft(t, n), K(t, v);
+        const H = r.getState().stateComponents.get(t);
+        H && H.components.forEach((m) => {
+          m.forceUpdate();
         });
       }), {
-        fetchId: (G) => n.get()[G]
+        fetchId: (H) => n.get()[H]
       };
     },
     _initialState: r.getState().initialStateGlobal[t],
@@ -480,26 +480,26 @@ function ut(t, i, m, f) {
     _isLoading: r.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
       const v = r.getState().serverState[t];
-      return !!(v && B(v, Nt(t)));
+      return !!(v && z(v, _t(t)));
     }
   };
-  function a(v, n = [], S) {
-    const F = n.map(String).join(".");
-    I.get(F);
-    const j = function() {
+  function a(v, n = [], f) {
+    const G = n.map(String).join(".");
+    y.get(G);
+    const O = function() {
       return r().getNestedState(t, n);
     };
-    Object.keys(y).forEach((h) => {
-      j[h] = y[h];
+    Object.keys(I).forEach((m) => {
+      O[m] = I[m];
     });
-    const L = {
-      apply(h, l, st) {
+    const j = {
+      apply(m, l, st) {
         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(m, l) {
+        f?.validIndices && !Array.isArray(v) && (f = { ...f, validIndices: void 0 });
         const st = /* @__PURE__ */ new Set([
           "insert",
           "cut",
@@ -524,14 +524,14 @@ function ut(t, i, m, f) {
           "getComponents"
         ]);
         if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !st.has(l)) {
-          const d = `${t}////${m}`, e = r.getState().stateComponents.get(t);
+          const d = `${t}////${S}`, e = r.getState().stateComponents.get(t);
           if (e) {
             const o = e.components.get(d);
             if (o && !o.paths.has("")) {
               const s = n.join(".");
               let c = !0;
-              for (const g of o.paths)
-                if (s.startsWith(g) && (s === g || s[g.length] === ".")) {
+              for (const h of o.paths)
+                if (s.startsWith(h) && (s === h || s[h.length] === ".")) {
                   c = !1;
                   break;
                 }
@@ -540,7 +540,7 @@ function ut(t, i, m, f) {
           }
         }
         if (l === "getDifferences")
-          return () => It(
+          return () => wt(
             r.getState().cogsStateStore[t],
             r.getState().initialStateGlobal[t]
           );
@@ -554,11 +554,11 @@ function ut(t, i, m, f) {
               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 w = [s, ...u.path].join(".");
+                  r.getState().addValidationError(w, u.message);
                 });
-                const g = r.getState().stateComponents.get(t);
-                g && g.components.forEach((u) => {
+                const h = r.getState().stateComponents.get(t);
+                h && h.components.forEach((u) => {
                   u.forceUpdate();
                 });
               }
@@ -568,20 +568,20 @@ function ut(t, i, m, f) {
             }
           };
         if (l === "_status") {
-          const d = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = z(e, n);
-          return B(d, o) ? "fresh" : "stale";
+          const d = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = q(e, n);
+          return z(d, o) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
             const d = r().getNestedState(
               t,
               n
-            ), e = r.getState().initialStateGlobal[t], o = z(e, n);
-            return B(d, o) ? "fresh" : "stale";
+            ), e = r.getState().initialStateGlobal[t], o = q(e, n);
+            return z(d, o) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = r.getState().initialStateGlobal[t], e = et(t), o = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${o}`;
+            const d = r.getState().initialStateGlobal[t], e = tt(t), o = Y(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${g}-${t}-${o}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -592,9 +592,9 @@ function ut(t, i, m, f) {
             return r.getState().getValidationErrors(d.key + "." + n.join("."));
           };
         if (Array.isArray(v)) {
-          const d = () => S?.validIndices ? v.map((o, s) => ({
+          const d = () => f?.validIndices ? v.map((o, s) => ({
             item: o,
-            originalIndex: S.validIndices[s]
+            originalIndex: f.validIndices[s]
           })) : r.getState().getNestedState(t, n).map((o, s) => ({
             item: o,
             originalIndex: s
@@ -606,7 +606,7 @@ function ut(t, i, m, f) {
                 return a(
                   v[e],
                   [...n, e.toString()],
-                  S
+                  f
                 );
             };
           if (l === "clearSelected")
@@ -620,186 +620,177 @@ function ut(t, i, m, f) {
               const {
                 itemHeight: o = 50,
                 overscan: s = 6,
-                stickToBottom: c = !1
-              } = e, g = Z(null), [u, T] = K({
+                stickToBottom: c = !1,
+                dependencies: h = []
+              } = e, u = Z(null), [w, A] = Q({
                 startIndex: 0,
                 endIndex: 10
-              }), w = Z(c), E = Z(!1), [M, P] = K(0);
-              nt(() => r.getState().subscribeToShadowState(t, () => {
-                P((k) => k + 1);
+              }), T = Z(c), C = Z(0), [N, R] = Q(0);
+              et(() => r.getState().subscribeToShadowState(t, () => {
+                R((V) => V + 1);
               }), [t]);
-              const O = r().getNestedState(
+              const D = r().getNestedState(
                 t,
                 n
-              ), x = O.length, { totalHeight: H, positions: V } = vt(() => {
-                const A = r.getState().getShadowMetadata(t, n) || [];
-                let k = 0;
-                const _ = [];
-                for (let C = 0; C < x; C++) {
-                  _[C] = k;
-                  const W = A[C]?.virtualizer?.itemHeight;
-                  k += W || o;
+              ), x = D.length, { totalHeight: _, positions: $ } = pt(() => {
+                const E = r.getState().getShadowMetadata(t, n) || [];
+                let V = 0;
+                const P = [];
+                for (let W = 0; W < x; W++) {
+                  P[W] = V;
+                  const B = E[W]?.virtualizer?.itemHeight;
+                  V += B || o;
                 }
-                return { totalHeight: k, positions: _ };
+                return { totalHeight: V, positions: P };
               }, [
                 x,
                 t,
                 n.join("."),
                 o,
-                M
-              ]), N = vt(() => {
-                const A = Math.max(0, u.startIndex), k = Math.min(x, u.endIndex), _ = Array.from(
-                  { length: k - A },
-                  (W, q) => A + q
-                ), C = _.map((W) => O[W]);
-                return a(C, n, {
-                  ...S,
-                  validIndices: _
+                N
+              ]), U = pt(() => {
+                const E = Math.max(0, w.startIndex), V = Math.min(x, w.endIndex), P = Array.from(
+                  { length: V - E },
+                  (B, it) => E + it
+                ), W = P.map((B) => D[B]);
+                return a(W, n, {
+                  ...f,
+                  validIndices: P
                 });
-              }, [u.startIndex, u.endIndex, O, x]);
-              lt(() => {
-                const A = g.current;
-                if (!A || !w.current || x === 0)
-                  return;
-                console.log("ALGORITHM: Starting..."), T({
+              }, [w.startIndex, w.endIndex, D, x]);
+              gt(() => {
+                const E = u.current;
+                if (!E) return;
+                const V = x > C.current, P = c && T.current && V, W = () => {
+                  const { scrollTop: rt, clientHeight: Tt } = E;
+                  let ct = 0, lt = x - 1;
+                  for (; ct <= lt; ) {
+                    const vt = Math.floor((ct + lt) / 2);
+                    $[vt] < rt ? ct = vt + 1 : lt = vt - 1;
+                  }
+                  const $t = Math.max(0, lt - s);
+                  let dt = $t;
+                  const Rt = rt + Tt;
+                  for (; dt < x && $[dt] < Rt; )
+                    dt++;
+                  A({
+                    startIndex: $t,
+                    endIndex: Math.min(x, dt + s)
+                  });
+                };
+                let B;
+                P ? (console.log("ALGORITHM: Auto-scroll triggered."), console.log(
+                  "...Setting range to the end to render last item."
+                ), A({
                   startIndex: Math.max(0, x - 10 - s),
                   endIndex: x
-                }), console.log(
-                  "ALGORITHM: Starting LOOP to wait for measurement."
-                );
-                let _ = 0;
-                const C = setInterval(() => {
-                  _++, console.log(`LOOP ${_}: Checking last item...`);
-                  const W = x - 1, Q = (r.getState().getShadowMetadata(t, n) || [])[W]?.virtualizer?.itemHeight || 0;
-                  Q > 0 ? (console.log(
-                    `%cSUCCESS: Last item height is ${Q}. Scrolling now.`,
+                }), console.log("...Starting loop to wait for measurement."), B = setInterval(() => {
+                  const rt = x - 1;
+                  ((r.getState().getShadowMetadata(t, n) || [])[rt]?.virtualizer?.itemHeight || 0) > 0 ? (console.log(
+                    "%c...SUCCESS: Last item measured. Scrolling.",
                     "color: green; font-weight: bold;"
-                  ), clearInterval(C), E.current = !0, A.scrollTo({
-                    top: A.scrollHeight,
+                  ), clearInterval(B), E.scrollTo({
+                    top: E.scrollHeight,
                     behavior: "smooth"
-                  }), setTimeout(() => {
-                    E.current = !1;
-                  }, 1e3)) : (console.log("...WAITING. Height is not ready."), _ > 20 && (console.error(
-                    "LOOP TIMEOUT: Last item was never measured. Stopping loop."
-                  ), clearInterval(C)));
-                }, 100);
-                return () => {
-                  console.log("ALGORITHM: Cleaning up loop."), clearInterval(C);
-                };
-              }, [x, H, ...e.dependencies ?? []]), nt(() => {
-                const A = g.current;
-                if (!A) return;
-                const k = () => {
-                  const { scrollTop: C, clientHeight: W } = A;
-                  let q = 0, Q = x - 1;
-                  for (; q <= Q; ) {
-                    const St = Math.floor((q + Q) / 2);
-                    V[St] < C ? q = St + 1 : Q = St - 1;
-                  }
-                  const wt = Math.max(0, Q - s);
-                  let it = wt;
-                  const Vt = C + W;
-                  for (; it < x && V[it] < Vt; )
-                    it++;
-                  T({
-                    startIndex: wt,
-                    endIndex: Math.min(x, it + s)
-                  });
-                }, _ = () => {
-                  if (E.current)
-                    return;
-                  A.scrollHeight - A.scrollTop - A.clientHeight < 1 || (w.current = !1, console.log("USER ACTION: Scroll lock DISABLED.")), k();
+                  })) : console.log("...WAITING for measurement.");
+                }, 100)) : W();
+                const it = () => {
+                  E.scrollHeight - E.scrollTop - E.clientHeight < 1 || (T.current = !1), W();
                 };
-                return A.addEventListener("scroll", _, {
+                return E.addEventListener("scroll", it, {
                   passive: !0
-                }), k(), () => A.removeEventListener("scroll", _);
-              }, [x, V]);
-              const U = At(
-                (A = "smooth") => {
-                  g.current && (w.current = !0, console.log("USER ACTION: Scroll lock ENABLED."), g.current.scrollTo({
-                    top: g.current.scrollHeight,
-                    behavior: A
+                }), () => {
+                  E.removeEventListener("scroll", it), B && clearInterval(B);
+                };
+              }, [x, $, ...h]), et(() => {
+                C.current = x;
+              });
+              const L = kt(
+                (E = "smooth") => {
+                  u.current && (T.current = !0, console.log("USER ACTION: Scroll lock ENABLED."), u.current.scrollTo({
+                    top: u.current.scrollHeight,
+                    behavior: E
                   }));
                 },
                 []
-              ), D = At(
-                (A, k = "smooth") => {
-                  g.current && V[A] !== void 0 && (w.current = !1, console.log("USER ACTION: Scroll lock DISABLED."), g.current.scrollTo({
-                    top: V[A],
-                    behavior: k
+              ), k = kt(
+                (E, V = "smooth") => {
+                  u.current && $[E] !== void 0 && (T.current = !1, console.log("USER ACTION: Scroll lock DISABLED."), u.current.scrollTo({
+                    top: $[E],
+                    behavior: V
                   }));
                 },
-                [V]
-              ), $ = {
+                [$]
+              ), F = {
                 outer: {
-                  ref: g,
+                  ref: u,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${H}px`,
+                    height: `${_}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${V[u.startIndex] || 0}px)`
+                    transform: `translateY(${$[w.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: N,
-                virtualizerProps: $,
-                scrollToBottom: U,
-                scrollToIndex: D
+                virtualState: U,
+                virtualizerProps: F,
+                scrollToBottom: L,
+                scrollToIndex: k
               };
             };
           if (l === "stateSort")
             return (e) => {
               const s = [...d()].sort(
-                (u, T) => e(u.item, T.item)
-              ), c = s.map(({ item: u }) => u), g = {
-                ...S,
+                (u, w) => e(u.item, w.item)
+              ), c = s.map(({ item: u }) => u), h = {
+                ...f,
                 validIndices: s.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return a(c, n, g);
+              return a(c, n, h);
             };
           if (l === "stateFilter")
             return (e) => {
               const s = d().filter(
-                ({ item: u }, T) => e(u, T)
-              ), c = s.map(({ item: u }) => u), g = {
-                ...S,
+                ({ item: u }, w) => e(u, w)
+              ), c = s.map(({ item: u }) => u), h = {
+                ...f,
                 validIndices: s.map(
                   ({ originalIndex: u }) => u
                 )
               };
-              return a(c, n, g);
+              return a(c, n, h);
             };
           if (l === "stateMap")
             return (e) => {
               const o = r.getState().getNestedState(t, n);
-              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()], w = a(u, T, S);
-                return e(u, w, {
+              return Array.isArray(o) ? (f?.validIndices || Array.from({ length: o.length }, (c, h) => h)).map((c, h) => {
+                const u = o[c], w = [...n, c.toString()], A = a(u, w, f);
+                return e(u, A, {
                   register: () => {
-                    const [, M] = K({}), P = `${m}-${n.join(".")}-${c}`;
-                    lt(() => {
-                      const O = `${t}////${P}`, x = r.getState().stateComponents.get(t) || {
+                    const [, C] = Q({}), N = `${S}-${n.join(".")}-${c}`;
+                    gt(() => {
+                      const R = `${t}////${N}`, D = r.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return x.components.set(O, {
-                        forceUpdate: () => M({}),
-                        paths: /* @__PURE__ */ new Set([T.join(".")])
-                      }), r.getState().stateComponents.set(t, x), () => {
-                        const H = r.getState().stateComponents.get(t);
-                        H && H.components.delete(O);
+                      return D.components.set(R, {
+                        forceUpdate: () => C({}),
+                        paths: /* @__PURE__ */ new Set([w.join(".")])
+                      }), r.getState().stateComponents.set(t, D), () => {
+                        const x = r.getState().stateComponents.get(t);
+                        x && x.components.delete(R);
                       };
-                    }, [t, P]);
+                    }, [t, N]);
                   },
-                  index: g,
+                  index: h,
                   originalIndex: c
                 });
               }) : (console.warn(
@@ -809,19 +800,19 @@ function ut(t, i, m, f) {
             };
           if (l === "stateMapNoRender")
             return (e) => v.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);
+              let h;
+              f?.validIndices && f.validIndices[c] !== void 0 ? h = f.validIndices[c] : h = c;
+              const u = [...n, h.toString()], w = a(s, u, f);
               return e(
                 s,
-                T,
+                w,
                 c,
                 v,
-                a(v, n, S)
+                a(v, n, f)
               );
             });
           if (l === "$stateMap")
-            return (e) => at(Jt, {
+            return (e) => at(Qt, {
               proxy: {
                 _stateKey: t,
                 _path: n,
@@ -833,19 +824,19 @@ function ut(t, i, 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 }, (c, g) => g)).map((c, g) => {
-                const u = o[c], T = [...n, c.toString()], w = a(u, T, S), E = `${m}-${n.join(".")}-${c}`;
-                return at(Zt, {
+              return Array.isArray(o) ? (f?.validIndices || Array.from({ length: o.length }, (c, h) => h)).map((c, h) => {
+                const u = o[c], w = [...n, c.toString()], A = a(u, w, f), T = `${S}-${n.join(".")}-${c}`;
+                return at(te, {
                   key: c,
                   stateKey: t,
-                  itemComponentId: E,
-                  itemPath: T,
+                  itemComponentId: T,
+                  itemPath: w,
                   children: e(
                     u,
-                    w,
-                    g,
+                    A,
+                    h,
                     o,
-                    a(o, n, S)
+                    a(o, n, f)
                   )
                 });
               }) : (console.warn(
@@ -855,14 +846,14 @@ function ut(t, i, m, f) {
           if (l === "stateFlattenOn")
             return (e) => {
               const o = v;
-              I.clear(), b++;
+              y.clear(), b++;
               const s = o.flatMap(
                 (c) => c[e] ?? []
               );
               return a(
                 s,
                 [...n, "[*]", e],
-                S
+                f
               );
             };
           if (l === "index")
@@ -878,36 +869,36 @@ function ut(t, i, m, f) {
               return a(s, c);
             };
           if (l === "insert")
-            return (e) => (p(n), mt(i, e, n, t), a(
+            return (e) => (p(n), yt(i, e, n, t), a(
               r.getState().getNestedState(t, n),
               n
             ));
           if (l === "uniqueInsert")
             return (e, o, s) => {
-              const c = r.getState().getNestedState(t, n), g = Y(e) ? e(c) : e;
+              const c = r.getState().getNestedState(t, n), h = Y(e) ? e(c) : e;
               let u = null;
-              if (!c.some((w) => {
+              if (!c.some((A) => {
                 if (o) {
-                  const M = o.every(
-                    (P) => B(w[P], g[P])
+                  const C = o.every(
+                    (N) => z(A[N], h[N])
                   );
-                  return M && (u = w), M;
+                  return C && (u = A), C;
                 }
-                const E = B(w, g);
-                return E && (u = w), E;
+                const T = z(A, h);
+                return T && (u = A), T;
               }))
-                p(n), mt(i, g, n, t);
+                p(n), yt(i, h, n, t);
               else if (s && u) {
-                const w = s(u), E = c.map(
-                  (M) => B(M, u) ? w : M
+                const A = s(u), T = c.map(
+                  (C) => z(C, u) ? A : C
                 );
-                p(n), ot(i, E, n);
+                p(n), ot(i, T, n);
               }
             };
           if (l === "cut")
             return (e, o) => {
               if (!o?.waitForSync)
-                return p(n), ct(i, n, t, e), a(
+                return p(n), ut(i, n, t, e), a(
                   r.getState().getNestedState(t, n),
                   n
                 );
@@ -915,21 +906,21 @@ function ut(t, i, m, f) {
           if (l === "cutByValue")
             return (e) => {
               for (let o = 0; o < v.length; o++)
-                v[o] === e && ct(i, n, t, o);
+                v[o] === e && ut(i, n, t, o);
             };
           if (l === "toggleByValue")
             return (e) => {
               const o = v.findIndex((s) => s === e);
-              o > -1 ? ct(i, n, t, o) : mt(i, e, n, t);
+              o > -1 ? ut(i, n, t, o) : yt(i, e, n, t);
             };
           if (l === "stateFind")
             return (e) => {
               const s = d().find(
-                ({ item: g }, u) => e(g, u)
+                ({ item: h }, u) => e(h, u)
               );
               if (!s) return;
               const c = [...n, s.originalIndex.toString()];
-              return a(s.item, c, S);
+              return a(s.item, c, f);
             };
           if (l === "findWith")
             return (e, o) => {
@@ -937,15 +928,15 @@ function ut(t, i, m, f) {
                 ({ item: u }) => u[e] === o
               );
               if (!c) return;
-              const g = [...n, c.originalIndex.toString()];
-              return a(c.item, g, S);
+              const h = [...n, c.originalIndex.toString()];
+              return a(c.item, h, f);
             };
         }
         const X = n[n.length - 1];
         if (!isNaN(Number(X))) {
           const d = n.slice(0, -1), e = r.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => ct(
+            return () => ut(
               i,
               d,
               t,
@@ -954,20 +945,20 @@ function ut(t, i, m, f) {
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(v)) {
+            if (f?.validIndices && Array.isArray(v)) {
               const d = r.getState().getNestedState(t, n);
-              return S.validIndices.map((e) => d[e]);
+              return f.validIndices.map((e) => d[e]);
             }
             return r.getState().getNestedState(t, n);
           };
         if (l === "$derive")
-          return (d) => Ct({
+          return (d) => Vt({
             _stateKey: t,
             _path: n,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Ct({
+          return () => Vt({
             _stateKey: t,
             _path: n
           });
@@ -976,7 +967,7 @@ function ut(t, i, m, f) {
           return r.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => gt(f + "-" + t + "-" + d);
+          return (d) => mt(g + "-" + 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;
@@ -1002,68 +993,68 @@ function ut(t, i, m, f) {
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
-              const e = r.getState().cogsStateStore[t], s = Lt(e, d).newDocument;
-              xt(
+              const e = r.getState().cogsStateStore[t], s = Gt(e, d).newDocument;
+              Mt(
                 t,
                 r.getState().initialStateGlobal[t],
                 s,
                 i,
-                m,
-                f
+                S,
+                g
               );
               const c = r.getState().stateComponents.get(t);
               if (c) {
-                const g = It(e, s), u = new Set(g);
+                const h = wt(e, s), u = new Set(h);
                 for (const [
-                  T,
-                  w
+                  w,
+                  A
                 ] of c.components.entries()) {
-                  let E = !1;
-                  const M = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
-                  if (!M.includes("none")) {
-                    if (M.includes("all")) {
-                      w.forceUpdate();
+                  let T = !1;
+                  const C = Array.isArray(A.reactiveType) ? A.reactiveType : [A.reactiveType || "component"];
+                  if (!C.includes("none")) {
+                    if (C.includes("all")) {
+                      A.forceUpdate();
                       continue;
                     }
-                    if (M.includes("component") && (w.paths.has("") && (E = !0), !E))
-                      for (const P of u) {
-                        if (w.paths.has(P)) {
-                          E = !0;
+                    if (C.includes("component") && (A.paths.has("") && (T = !0), !T))
+                      for (const N of u) {
+                        if (A.paths.has(N)) {
+                          T = !0;
                           break;
                         }
-                        let O = P.lastIndexOf(".");
-                        for (; O !== -1; ) {
-                          const x = P.substring(0, O);
-                          if (w.paths.has(x)) {
-                            E = !0;
+                        let R = N.lastIndexOf(".");
+                        for (; R !== -1; ) {
+                          const D = N.substring(0, R);
+                          if (A.paths.has(D)) {
+                            T = !0;
                             break;
                           }
-                          const H = P.substring(
-                            O + 1
+                          const x = N.substring(
+                            R + 1
                           );
-                          if (!isNaN(Number(H))) {
-                            const V = x.lastIndexOf(".");
-                            if (V !== -1) {
-                              const N = x.substring(
+                          if (!isNaN(Number(x))) {
+                            const _ = D.lastIndexOf(".");
+                            if (_ !== -1) {
+                              const $ = D.substring(
                                 0,
-                                V
+                                _
                               );
-                              if (w.paths.has(N)) {
-                                E = !0;
+                              if (A.paths.has($)) {
+                                T = !0;
                                 break;
                               }
                             }
                           }
-                          O = x.lastIndexOf(".");
+                          R = D.lastIndexOf(".");
                         }
-                        if (E) break;
+                        if (T) break;
                       }
-                    if (!E && M.includes("deps") && w.depsFunction) {
-                      const P = w.depsFunction(s);
-                      let O = !1;
-                      typeof P == "boolean" ? P && (O = !0) : B(w.deps, P) || (w.deps = P, O = !0), O && (E = !0);
+                    if (!T && C.includes("deps") && A.depsFunction) {
+                      const N = A.depsFunction(s);
+                      let R = !1;
+                      typeof N == "boolean" ? N && (R = !0) : z(A.deps, N) || (A.deps = N, R = !0), R && (T = !0);
                     }
-                    E && w.forceUpdate();
+                    T && A.forceUpdate();
                   }
                 }
               }
@@ -1079,23 +1070,23 @@ function ut(t, i, m, f) {
               const o = r.getState().cogsStateStore[t];
               try {
                 const s = r.getState().getValidationErrors(d.key);
-                s && s.length > 0 && s.forEach(([g]) => {
-                  g && g.startsWith(d.key) && J(g);
+                s && s.length > 0 && s.forEach(([h]) => {
+                  h && h.startsWith(d.key) && J(h);
                 });
                 const c = d.zodSchema.safeParse(o);
                 return c.success ? !0 : (c.error.errors.forEach((u) => {
-                  const T = u.path, w = u.message, E = [d.key, ...T].join(".");
-                  e(E, w);
-                }), ft(t), !1);
+                  const w = u.path, A = u.message, T = [d.key, ...w].join(".");
+                  e(T, A);
+                }), ht(t), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
             };
-          if (l === "_componentId") return m;
+          if (l === "_componentId") return S;
           if (l === "getComponents")
             return () => r().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => Tt.getState().getFormRefsByStateKey(t);
+            return () => bt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return r.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1103,34 +1094,34 @@ function ut(t, i, m, f) {
           if (l === "_isLoading")
             return r.getState().isLoadingGlobal[t];
           if (l === "revertToInitialState")
-            return y.revertToInitialState;
-          if (l === "updateInitialState") return y.updateInitialState;
-          if (l === "removeValidation") return y.removeValidation;
+            return I.revertToInitialState;
+          if (l === "updateInitialState") return I.updateInitialState;
+          if (l === "removeValidation") return I.removeValidation;
         }
         if (l === "getFormRef")
-          return () => Tt.getState().getFormRef(t + "." + n.join("."));
+          return () => bt.getState().getFormRef(t + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ ht(
-            Rt,
+          }) => /* @__PURE__ */ It(
+            Dt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: n,
               validationKey: r.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
-              validIndices: S?.validIndices,
+              validIndices: f?.validIndices,
               children: d
             }
           );
         if (l === "_stateKey") return t;
         if (l === "_path") return n;
-        if (l === "_isServerSynced") return y._isServerSynced;
+        if (l === "_isServerSynced") return I._isServerSynced;
         if (l === "update")
           return (d, e) => {
             if (e?.debounce)
-              Ot(() => {
+              Ft(() => {
                 ot(i, d, n, "");
                 const o = r.getState().getNestedState(t, n);
                 e?.afterUpdate && e.afterUpdate(o);
@@ -1143,8 +1134,8 @@ function ut(t, i, m, f) {
             p(n);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ ht(
-            Ut,
+          return (d, e) => /* @__PURE__ */ It(
+            Lt,
             {
               setState: i,
               stateKey: t,
@@ -1153,120 +1144,120 @@ function ut(t, i, m, f) {
               formOpts: e
             }
           );
-        const R = [...n, l], rt = r.getState().getNestedState(t, R);
-        return a(rt, R, S);
+        const M = [...n, l], nt = r.getState().getNestedState(t, M);
+        return a(nt, M, f);
       }
-    }, G = new Proxy(j, L);
-    return I.set(F, {
-      proxy: G,
+    }, H = new Proxy(O, j);
+    return y.set(G, {
+      proxy: H,
       stateVersion: b
-    }), G;
+    }), H;
   }
   return a(
     r.getState().getNestedState(t, [])
   );
 }
-function Ct(t) {
-  return at(Yt, { proxy: t });
+function Vt(t) {
+  return at(Kt, { proxy: t });
 }
-function Jt({
+function Qt({
   proxy: t,
   rebuildStateShape: i
 }) {
-  const m = r().getNestedState(t._stateKey, t._path);
-  return Array.isArray(m) ? i(
-    m,
+  const S = r().getNestedState(t._stateKey, t._path);
+  return Array.isArray(S) ? i(
+    S,
     t._path
   ).stateMapNoRender(
-    (I, b, p, y, a) => t._mapFn(I, b, p, y, a)
+    (y, b, p, I, a) => t._mapFn(y, b, p, I, a)
   ) : null;
 }
-function Yt({
+function Kt({
   proxy: t
 }) {
-  const i = Z(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return nt(() => {
-    const f = i.current;
-    if (!f || !f.parentElement) return;
-    const I = f.parentElement, p = Array.from(I.childNodes).indexOf(f);
-    let y = I.getAttribute("data-parent-id");
-    y || (y = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", y));
+  const i = Z(null), S = `${t._stateKey}-${t._path.join(".")}`;
+  return et(() => {
+    const g = i.current;
+    if (!g || !g.parentElement) return;
+    const y = g.parentElement, p = Array.from(y.childNodes).indexOf(g);
+    let I = y.getAttribute("data-parent-id");
+    I || (I = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", I));
     const v = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: y,
+      parentId: I,
       position: p,
       effect: t._effect
     };
-    r.getState().addSignalElement(m, v);
+    r.getState().addSignalElement(S, v);
     const n = r.getState().getNestedState(t._stateKey, t._path);
-    let S;
+    let f;
     if (t._effect)
       try {
-        S = new Function(
+        f = new Function(
           "state",
           `return (${t._effect})(state)`
         )(n);
-      } catch (j) {
-        console.error("Error evaluating effect function during mount:", j), S = n;
+      } catch (O) {
+        console.error("Error evaluating effect function during mount:", O), f = n;
       }
     else
-      S = n;
-    S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const F = document.createTextNode(String(S));
-    f.replaceWith(F);
+      f = n;
+    f !== null && typeof f == "object" && (f = JSON.stringify(f));
+    const G = document.createTextNode(String(f));
+    g.replaceWith(G);
   }, [t._stateKey, t._path.join("."), t._effect]), at("span", {
     ref: i,
     style: { display: "none" },
-    "data-signal-id": m
+    "data-signal-id": S
   });
 }
-function ue(t) {
-  const i = Pt(
-    (m) => {
-      const f = r.getState().stateComponents.get(t._stateKey) || {
+function me(t) {
+  const i = Ut(
+    (S) => {
+      const g = r.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return f.components.set(t._stateKey, {
-        forceUpdate: m,
+      return g.components.set(t._stateKey, {
+        forceUpdate: S,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
-      }), () => f.components.delete(t._stateKey);
+      }), () => g.components.delete(t._stateKey);
     },
     () => r.getState().getNestedState(t._stateKey, t._path)
   );
   return at("text", {}, String(i));
 }
-function Zt({
+function te({
   stateKey: t,
   itemComponentId: i,
-  itemPath: m,
-  children: f
+  itemPath: S,
+  children: g
 }) {
-  const [, I] = K({}), [b, p] = Dt(), y = Z(null);
-  return nt(() => {
-    p.height > 0 && p.height !== y.current && (y.current = p.height, r.getState().setShadowMetadata(t, m, {
+  const [, y] = Q({}), [b, p] = Ht(), I = Z(null);
+  return et(() => {
+    p.height > 0 && p.height !== I.current && (I.current = p.height, r.getState().setShadowMetadata(t, S, {
       virtualizer: {
         itemHeight: p.height
       }
     }));
-  }, [p.height, t, m]), lt(() => {
+  }, [p.height, t, S]), gt(() => {
     const a = `${t}////${i}`, v = r.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
     return v.components.set(a, {
-      forceUpdate: () => I({}),
-      paths: /* @__PURE__ */ new Set([m.join(".")])
+      forceUpdate: () => y({}),
+      paths: /* @__PURE__ */ new Set([S.join(".")])
     }), r.getState().stateComponents.set(t, v), () => {
       const n = r.getState().stateComponents.get(t);
       n && n.components.delete(a);
     };
-  }, [t, i, m.join(".")]), /* @__PURE__ */ ht("div", { ref: b, children: f });
+  }, [t, i, S.join(".")]), /* @__PURE__ */ It("div", { ref: b, children: g });
 }
 export {
-  Ct as $cogsSignal,
-  ue as $cogsSignalStore,
-  ce as addStateOptions,
-  le as createCogsState,
-  de as notifyComponent,
-  qt as useCogsStateFn
+  Vt as $cogsSignal,
+  me as $cogsSignalStore,
+  ge as addStateOptions,
+  fe as createCogsState,
+  Se as notifyComponent,
+  Xt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map