cogsbox-state 0.5.385 → 0.5.387

package/dist/CogsState.jsx

@@ -1,63 +1,63 @@
 "use client";
-import { jsx as we } from "react/jsx-runtime";
-import { useState as K, useRef as J, useEffect as oe, useLayoutEffect as le, useMemo as Oe, createElement as de, useSyncExternalStore as je, startTransition as He, useCallback as be } from "react";
-import { transformStateFunc as Fe, isDeepEqual as q, isFunction as ee, getNestedValue as Z, getDifferences as _e, debounce as Be } from "./utility.js";
-import { pushFunc as Ee, updateFn as ce, cutFunc as me, ValidationWrapper as We, FormControlComponent as ze } from "./Functions.jsx";
+import { jsx as Oe } from "react/jsx-runtime";
+import { useState as K, useRef as q, useEffect as oe, useLayoutEffect as ce, useMemo as we, createElement as le, useSyncExternalStore as je, startTransition as He, useCallback as ke } from "react";
+import { transformStateFunc as Fe, isDeepEqual as J, isFunction as ee, getNestedValue as Z, getDifferences as _e, debounce as Be } from "./utility.js";
+import { pushFunc as Ee, updateFn as ie, cutFunc as me, ValidationWrapper as We, FormControlComponent as ze } from "./Functions.jsx";
 import qe from "superjson";
 import { v4 as Ae } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as Me } from "./store.js";
-import { useCogsConfig as Le } from "./CogsStateClient.jsx";
+import { getGlobalStore as o, formRefStore as be } from "./store.js";
+import { useCogsConfig as Ge } from "./CogsStateClient.jsx";
 import { applyPatch as Je } from "fast-json-patch";
 import Ye from "react-use-measure";
-function xe(e, i) {
-  const m = o.getState().getInitialOptions, g = o.getState().setInitialStateOptions, T = m(e) || {};
+function Me(e, i) {
+  const m = o.getState().getInitialOptions, g = o.getState().setInitialStateOptions, I = m(e) || {};
   g(e, {
-    ...T,
+    ...I,
     ...i
   });
 }
-function Pe({
+function xe({
   stateKey: e,
   options: i,
   initialOptionsPart: m
 }) {
-  const g = re(e) || {}, T = m[e] || {}, A = o.getState().setInitialStateOptions, E = { ...T, ...g };
-  let y = !1;
+  const g = re(e) || {}, I = m[e] || {}, N = o.getState().setInitialStateOptions, p = { ...I, ...g };
+  let v = !1;
   if (i)
     for (const s in i)
-      E.hasOwnProperty(s) ? (s == "localStorage" && i[s] && E[s].key !== i[s]?.key && (y = !0, E[s] = i[s]), s == "initialState" && i[s] && E[s] !== i[s] && // Different references
-      !q(E[s], i[s]) && (y = !0, E[s] = i[s])) : (y = !0, E[s] = i[s]);
-  y && A(e, E);
+      p.hasOwnProperty(s) ? (s == "localStorage" && i[s] && p[s].key !== i[s]?.key && (v = !0, p[s] = i[s]), s == "initialState" && i[s] && p[s] !== i[s] && // Different references
+      !J(p[s], i[s]) && (v = !0, p[s] = i[s])) : (v = !0, p[s] = i[s]);
+  v && N(e, p);
 }
 function It(e, { formElements: i, validation: m }) {
   return { initialState: e, formElements: i, validation: m };
 }
-const Tt = (e, i) => {
+const vt = (e, i) => {
   let m = e;
-  const [g, T] = Fe(m);
-  (Object.keys(T).length > 0 || i && Object.keys(i).length > 0) && Object.keys(T).forEach((y) => {
-    T[y] = T[y] || {}, T[y].formElements = {
+  const [g, I] = Fe(m);
+  (Object.keys(I).length > 0 || i && Object.keys(i).length > 0) && Object.keys(I).forEach((v) => {
+    I[v] = I[v] || {}, I[v].formElements = {
       ...i?.formElements,
       // Global defaults first
       ...i?.validation,
-      ...T[y].formElements || {}
+      ...I[v].formElements || {}
       // State-specific overrides
-    }, re(y) || o.getState().setInitialStateOptions(y, T[y]);
+    }, re(v) || o.getState().setInitialStateOptions(v, I[v]);
   }), o.getState().setInitialStates(g), o.getState().setCreatedState(g);
-  const A = (y, s) => {
-    const [I] = K(s?.componentId ?? Ae());
-    Pe({
-      stateKey: y,
+  const N = (v, s) => {
+    const [T] = K(s?.componentId ?? Ae());
+    xe({
+      stateKey: v,
       options: s,
-      initialOptionsPart: T
+      initialOptionsPart: I
     });
-    const n = o.getState().cogsStateStore[y] || g[y], S = s?.modifyState ? s.modifyState(n) : n, [B, L] = nt(
+    const n = o.getState().cogsStateStore[v] || g[v], S = s?.modifyState ? s.modifyState(n) : n, [W, U] = nt(
       S,
       {
-        stateKey: y,
+        stateKey: v,
         syncUpdate: s?.syncUpdate,
-        componentId: I,
+        componentId: T,
         localStorage: s?.localStorage,
         middleware: s?.middleware,
         enabledSync: s?.enabledSync,
@@ -68,12 +68,12 @@ const Tt = (e, i) => {
         serverState: s?.serverState
       }
     );
-    return L;
+    return U;
   };
-  function E(y, s) {
-    Pe({ stateKey: y, options: s, initialOptionsPart: T }), s.localStorage && et(y, s), ve(y);
+  function p(v, s) {
+    xe({ stateKey: v, options: s, initialOptionsPart: I }), s.localStorage && et(v, s), ve(v);
   }
-  return { useCogsState: A, setCogsOptions: E };
+  return { useCogsState: N, setCogsOptions: p };
 }, {
   setUpdaterState: he,
   setState: ne,
@@ -85,32 +85,32 @@ const Tt = (e, i) => {
   addValidationError: Qe,
   removeValidationError: Q,
   setServerSyncActions: Ke
-} = o.getState(), Ve = (e, i, m, g, T) => {
+} = o.getState(), Pe = (e, i, m, g, I) => {
   m?.log && console.log(
     "saving to localstorage",
     i,
     m.localStorage?.key,
     g
   );
-  const A = ee(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
-  if (A && g) {
-    const E = `${g}-${i}-${A}`;
-    let y;
+  const N = ee(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
+  if (N && g) {
+    const p = `${g}-${i}-${N}`;
+    let v;
     try {
-      y = Te(E)?.lastSyncedWithServer;
+      v = Ie(p)?.lastSyncedWithServer;
     } catch {
     }
     const s = {
       state: e,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: T ?? y
-    }, I = qe.serialize(s);
+      lastSyncedWithServer: I ?? v
+    }, T = qe.serialize(s);
     window.localStorage.setItem(
-      E,
-      JSON.stringify(I.json)
+      p,
+      JSON.stringify(T.json)
     );
   }
-}, Te = (e) => {
+}, Ie = (e) => {
   if (!e) return null;
   try {
     const i = window.localStorage.getItem(e);
@@ -119,27 +119,27 @@ const Tt = (e, i) => {
     return console.error("Error loading from localStorage:", i), null;
   }
 }, et = (e, i) => {
-  const m = o.getState().cogsStateStore[e], { sessionId: g } = Le(), T = ee(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
-  if (T && g) {
-    const A = Te(
-      `${g}-${e}-${T}`
+  const m = o.getState().cogsStateStore[e], { sessionId: g } = Ge(), I = ee(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
+  if (I && g) {
+    const N = Ie(
+      `${g}-${e}-${I}`
     );
-    if (A && A.lastUpdated > (A.lastSyncedWithServer || 0))
-      return ne(e, A.state), ve(e), !0;
+    if (N && N.lastUpdated > (N.lastSyncedWithServer || 0))
+      return ne(e, N.state), ve(e), !0;
   }
   return !1;
-}, De = (e, i, m, g, T, A) => {
-  const E = {
+}, Le = (e, i, m, g, I, N) => {
+  const p = {
     initialState: i,
-    updaterState: Ie(
+    updaterState: Te(
       e,
       g,
-      T,
-      A
+      I,
+      N
     ),
     state: m
   };
-  Ne(e, E.initialState), he(e, E.updaterState), ne(e, E.state);
+  Ne(e, p.initialState), he(e, p.updaterState), ne(e, p.state);
 }, ve = (e) => {
   const i = o.getState().stateComponents.get(e);
   if (!i) return;
@@ -149,13 +149,13 @@ const Tt = (e, i) => {
   }), queueMicrotask(() => {
     m.forEach((g) => g());
   });
-}, vt = (e, i) => {
+}, yt = (e, i) => {
   const m = o.getState().stateComponents.get(e);
   if (m) {
-    const g = `${e}////${i}`, T = m.components.get(g);
-    if ((T ? Array.isArray(T.reactiveType) ? T.reactiveType : [T.reactiveType || "component"] : null)?.includes("none"))
+    const g = `${e}////${i}`, I = m.components.get(g);
+    if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
       return;
-    T && T.forceUpdate();
+    I && I.forceUpdate();
   }
 }, tt = (e, i, m, g) => {
   switch (e) {
@@ -184,323 +184,323 @@ function nt(e, {
   stateKey: i,
   serverSync: m,
   localStorage: g,
-  formElements: T,
-  reactiveDeps: A,
-  reactiveType: E,
-  componentId: y,
+  formElements: I,
+  reactiveDeps: N,
+  reactiveType: p,
+  componentId: v,
   initialState: s,
-  syncUpdate: I,
+  syncUpdate: T,
   dependencies: n,
   serverState: S
 } = {}) {
-  const [B, L] = K({}), { sessionId: R } = Le();
-  let W = !i;
-  const [h] = K(i ?? Ae()), l = o.getState().stateLog[h], ue = J(/* @__PURE__ */ new Set()), te = J(y ?? Ae()), P = J(
+  const [W, U] = K({}), { sessionId: j } = Ge();
+  let z = !i;
+  const [h] = K(i ?? Ae()), l = o.getState().stateLog[h], de = q(/* @__PURE__ */ new Set()), te = q(v ?? Ae()), R = q(
     null
   );
-  P.current = re(h) ?? null, oe(() => {
-    if (I && I.stateKey === h && I.path?.[0]) {
+  R.current = re(h) ?? null, oe(() => {
+    if (T && T.stateKey === h && T.path?.[0]) {
       ne(h, (r) => ({
         ...r,
-        [I.path[0]]: I.newValue
+        [T.path[0]]: T.newValue
       }));
-      const t = `${I.stateKey}:${I.path.join(".")}`;
+      const t = `${T.stateKey}:${T.path.join(".")}`;
       o.getState().setSyncInfo(t, {
-        timeStamp: I.timeStamp,
-        userId: I.userId
+        timeStamp: T.timeStamp,
+        userId: T.userId
       });
     }
-  }, [I]), oe(() => {
+  }, [T]), oe(() => {
     if (s) {
-      xe(h, {
+      Me(h, {
         initialState: s
       });
-      const t = P.current, a = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = o.getState().initialStateGlobal[h];
-      if (!(c && !q(c, s) || !c) && !a)
+      const t = R.current, a = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = o.getState().initialStateGlobal[h];
+      if (!(c && !J(c, s) || !c) && !a)
         return;
       let u = null;
-      const w = ee(t?.localStorage?.key) ? t?.localStorage?.key(s) : t?.localStorage?.key;
-      w && R && (u = Te(`${R}-${h}-${w}`));
-      let p = s, O = !1;
-      const N = a ? Date.now() : 0, _ = u?.lastUpdated || 0, k = u?.lastSyncedWithServer || 0;
-      a && N > _ ? (p = t.serverState.data, O = !0) : u && _ > k && (p = u.state, t?.localStorage?.onChange && t?.localStorage?.onChange(p)), o.getState().initializeShadowState(h, s), De(
+      const E = ee(t?.localStorage?.key) ? t?.localStorage?.key(s) : t?.localStorage?.key;
+      E && j && (u = Ie(`${j}-${h}-${E}`));
+      let y = s, w = !1;
+      const C = a ? Date.now() : 0, A = u?.lastUpdated || 0, M = u?.lastSyncedWithServer || 0;
+      a && C > A ? (y = t.serverState.data, w = !0) : u && A > M && (y = u.state, t?.localStorage?.onChange && t?.localStorage?.onChange(y)), o.getState().initializeShadowState(h, s), Le(
         h,
         s,
-        p,
+        y,
         ae,
         te.current,
-        R
-      ), O && w && R && Ve(p, h, t, R, Date.now()), ve(h), (Array.isArray(E) ? E : [E || "component"]).includes("none") || L({});
+        j
+      ), w && E && j && Pe(y, h, t, j, Date.now()), ve(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || U({});
     }
   }, [
     s,
     S?.status,
     S?.data,
     ...n || []
-  ]), le(() => {
-    W && xe(h, {
+  ]), ce(() => {
+    z && Me(h, {
       serverSync: m,
-      formElements: T,
+      formElements: I,
       initialState: s,
       localStorage: g,
-      middleware: P.current?.middleware
+      middleware: R.current?.middleware
     });
     const t = `${h}////${te.current}`, r = o.getState().stateComponents.get(h) || {
       components: /* @__PURE__ */ new Map()
     };
     return r.components.set(t, {
-      forceUpdate: () => L({}),
+      forceUpdate: () => U({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: A || void 0,
-      reactiveType: E ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(h, r), L({}), () => {
+      depsFunction: N || void 0,
+      reactiveType: p ?? ["component", "deps"]
+    }), o.getState().stateComponents.set(h, r), U({}), () => {
       r && (r.components.delete(t), r.components.size === 0 && o.getState().stateComponents.delete(h));
     };
   }, []);
   const ae = (t, r, a, c) => {
     if (Array.isArray(r)) {
       const u = `${h}-${r.join(".")}`;
-      ue.current.add(u);
+      de.current.add(u);
     }
     const f = o.getState();
     ne(h, (u) => {
-      const w = ee(t) ? t(u) : t, p = `${h}-${r.join(".")}`;
-      if (p) {
-        let b = !1, C = f.signalDomElements.get(p);
-        if ((!C || C.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
-          const V = r.slice(0, -1), D = Z(w, V);
-          if (Array.isArray(D)) {
-            b = !0;
-            const v = `${h}-${V.join(".")}`;
-            C = f.signalDomElements.get(v);
+      const E = ee(t) ? t(u) : t, y = `${h}-${r.join(".")}`;
+      if (y) {
+        let x = !1, $ = f.signalDomElements.get(y);
+        if ((!$ || $.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
+          const L = r.slice(0, -1), V = Z(E, L);
+          if (Array.isArray(V)) {
+            x = !0;
+            const O = `${h}-${L.join(".")}`;
+            $ = f.signalDomElements.get(O);
           }
         }
-        if (C) {
-          const V = b ? Z(w, r.slice(0, -1)) : Z(w, r);
-          C.forEach(({ parentId: D, position: v, effect: U }) => {
-            const $ = document.querySelector(
-              `[data-parent-id="${D}"]`
+        if ($) {
+          const L = x ? Z(E, r.slice(0, -1)) : Z(E, r);
+          $.forEach(({ parentId: V, position: O, effect: _ }) => {
+            const D = document.querySelector(
+              `[data-parent-id="${V}"]`
             );
-            if ($) {
-              const z = Array.from($.childNodes);
-              if (z[v]) {
-                const H = U ? new Function("state", `return (${U})(state)`)(V) : V;
-                z[v].textContent = String(H);
+            if (D) {
+              const G = Array.from(D.childNodes);
+              if (G[O]) {
+                const B = _ ? new Function("state", `return (${_})(state)`)(L) : L;
+                G[O].textContent = String(B);
               }
             }
           });
         }
       }
-      console.log("shadowState", f.shadowStateStore), a.updateType === "update" && (c || P.current?.validation?.key) && r && Q(
-        (c || P.current?.validation?.key) + "." + r.join(".")
+      console.log("shadowState", f.shadowStateStore), a.updateType === "update" && (c || R.current?.validation?.key) && r && Q(
+        (c || R.current?.validation?.key) + "." + r.join(".")
       );
-      const O = r.slice(0, r.length - 1);
-      a.updateType === "cut" && P.current?.validation?.key && Q(
-        P.current?.validation?.key + "." + O.join(".")
-      ), a.updateType === "insert" && P.current?.validation?.key && Ze(
-        P.current?.validation?.key + "." + O.join(".")
-      ).filter(([C, V]) => {
-        let D = C?.split(".").length;
-        if (C == O.join(".") && D == O.length - 1) {
-          let v = C + "." + O;
-          Q(C), Qe(v, V);
+      const w = r.slice(0, r.length - 1);
+      a.updateType === "cut" && R.current?.validation?.key && Q(
+        R.current?.validation?.key + "." + w.join(".")
+      ), a.updateType === "insert" && R.current?.validation?.key && Ze(
+        R.current?.validation?.key + "." + w.join(".")
+      ).filter(([$, L]) => {
+        let V = $?.split(".").length;
+        if ($ == w.join(".") && V == w.length - 1) {
+          let O = $ + "." + w;
+          Q($), Qe(O, L);
         }
       });
-      const N = f.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", N), N) {
-        const b = _e(u, w), C = new Set(b), V = a.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
+      const C = f.stateComponents.get(h);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", C), C) {
+        const x = _e(u, E), $ = new Set(x), L = a.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
         for (const [
-          D,
-          v
-        ] of N.components.entries()) {
-          let U = !1;
-          const $ = Array.isArray(v.reactiveType) ? v.reactiveType : [v.reactiveType || "component"];
-          if (console.log("component", v), !$.includes("none")) {
-            if ($.includes("all")) {
-              v.forceUpdate();
+          V,
+          O
+        ] of C.components.entries()) {
+          let _ = !1;
+          const D = Array.isArray(O.reactiveType) ? O.reactiveType : [O.reactiveType || "component"];
+          if (console.log("component", O), !D.includes("none")) {
+            if (D.includes("all")) {
+              O.forceUpdate();
               continue;
             }
-            if ($.includes("component") && ((v.paths.has(V) || v.paths.has("")) && (U = !0), !U))
-              for (const z of C) {
-                let H = z;
+            if (D.includes("component") && ((O.paths.has(L) || O.paths.has("")) && (_ = !0), !_))
+              for (const G of $) {
+                let B = G;
                 for (; ; ) {
-                  if (v.paths.has(H)) {
-                    U = !0;
+                  if (O.paths.has(B)) {
+                    _ = !0;
                     break;
                   }
-                  const se = H.lastIndexOf(".");
+                  const se = B.lastIndexOf(".");
                   if (se !== -1) {
-                    const ge = H.substring(
+                    const ue = B.substring(
                       0,
                       se
                     );
                     if (!isNaN(
-                      Number(H.substring(se + 1))
-                    ) && v.paths.has(ge)) {
-                      U = !0;
+                      Number(B.substring(se + 1))
+                    ) && O.paths.has(ue)) {
+                      _ = !0;
                       break;
                     }
-                    H = ge;
+                    B = ue;
                   } else
-                    H = "";
-                  if (H === "")
+                    B = "";
+                  if (B === "")
                     break;
                 }
-                if (U) break;
+                if (_) break;
               }
-            if (!U && $.includes("deps") && v.depsFunction) {
-              const z = v.depsFunction(w);
-              let H = !1;
-              typeof z == "boolean" ? z && (H = !0) : q(v.deps, z) || (v.deps = z, H = !0), H && (U = !0);
+            if (!_ && D.includes("deps") && O.depsFunction) {
+              const G = O.depsFunction(E);
+              let B = !1;
+              typeof G == "boolean" ? G && (B = !0) : J(O.deps, G) || (O.deps = G, B = !0), B && (_ = !0);
             }
-            U && v.forceUpdate();
+            _ && O.forceUpdate();
           }
         }
       }
-      const _ = Date.now();
-      r = r.map((b, C) => {
-        const V = r.slice(0, -1), D = Z(w, V);
-        return C === r.length - 1 && ["insert", "cut"].includes(a.updateType) ? (D.length - 1).toString() : b;
+      const A = Date.now();
+      r = r.map((x, $) => {
+        const L = r.slice(0, -1), V = Z(E, L);
+        return $ === r.length - 1 && ["insert", "cut"].includes(a.updateType) ? (V.length - 1).toString() : x;
       });
-      const { oldValue: k, newValue: j } = tt(
+      const { oldValue: M, newValue: F } = tt(
         a.updateType,
         u,
-        w,
+        E,
         r
       ), Y = {
-        timeStamp: _,
+        timeStamp: A,
         stateKey: h,
         path: r,
         updateType: a.updateType,
         status: "new",
-        oldValue: k,
-        newValue: j
+        oldValue: M,
+        newValue: F
       };
       switch (a.updateType) {
         case "update":
-          f.updateShadowAtPath(h, r, w);
+          f.updateShadowAtPath(h, r, E);
           break;
         case "insert":
-          const b = r.slice(0, -1);
-          f.insertShadowArrayElement(h, b, j);
+          const x = r.slice(0, -1);
+          f.insertShadowArrayElement(h, x, F);
           break;
         case "cut":
-          const C = r.slice(0, -1), V = parseInt(r[r.length - 1]);
-          f.removeShadowArrayElement(h, C, V);
+          const $ = r.slice(0, -1), L = parseInt(r[r.length - 1]);
+          f.removeShadowArrayElement(h, $, L);
           break;
       }
-      if (Xe(h, (b) => {
-        const V = [...b ?? [], Y].reduce((D, v) => {
-          const U = `${v.stateKey}:${JSON.stringify(v.path)}`, $ = D.get(U);
-          return $ ? ($.timeStamp = Math.max($.timeStamp, v.timeStamp), $.newValue = v.newValue, $.oldValue = $.oldValue ?? v.oldValue, $.updateType = v.updateType) : D.set(U, { ...v }), D;
+      if (Xe(h, (x) => {
+        const L = [...x ?? [], Y].reduce((V, O) => {
+          const _ = `${O.stateKey}:${JSON.stringify(O.path)}`, D = V.get(_);
+          return D ? (D.timeStamp = Math.max(D.timeStamp, O.timeStamp), D.newValue = O.newValue, D.oldValue = D.oldValue ?? O.oldValue, D.updateType = O.updateType) : V.set(_, { ...O }), V;
         }, /* @__PURE__ */ new Map());
-        return Array.from(V.values());
-      }), Ve(
-        w,
+        return Array.from(L.values());
+      }), Pe(
+        E,
         h,
-        P.current,
-        R
-      ), P.current?.middleware && P.current.middleware({
+        R.current,
+        j
+      ), R.current?.middleware && R.current.middleware({
         updateLog: l,
         update: Y
-      }), P.current?.serverSync) {
-        const b = f.serverState[h], C = P.current?.serverSync;
+      }), R.current?.serverSync) {
+        const x = f.serverState[h], $ = R.current?.serverSync;
         Ke(h, {
-          syncKey: typeof C.syncKey == "string" ? C.syncKey : C.syncKey({ state: w }),
-          rollBackState: b,
-          actionTimeStamp: Date.now() + (C.debounce ?? 3e3),
+          syncKey: typeof $.syncKey == "string" ? $.syncKey : $.syncKey({ state: E }),
+          rollBackState: x,
+          actionTimeStamp: Date.now() + ($.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return w;
+      return E;
     });
   };
   o.getState().updaterState[h] || (he(
     h,
-    Ie(
+    Te(
       h,
       ae,
       te.current,
-      R
+      j
     )
   ), o.getState().cogsStateStore[h] || ne(h, e), o.getState().initialStateGlobal[h] || Ne(h, e));
-  const d = Oe(() => Ie(
+  const d = we(() => Te(
     h,
     ae,
     te.current,
-    R
-  ), [h, R]);
+    j
+  ), [h, j]);
   return [Re(h), d];
 }
-function Ie(e, i, m, g) {
-  const T = /* @__PURE__ */ new Map();
-  let A = 0;
-  const E = (I) => {
-    const n = I.join(".");
-    for (const [S] of T)
-      (S === n || S.startsWith(n + ".")) && T.delete(S);
-    A++;
-  }, y = {
-    removeValidation: (I) => {
-      I?.validationKey && Q(I.validationKey);
+function Te(e, i, m, g) {
+  const I = /* @__PURE__ */ new Map();
+  let N = 0;
+  const p = (T) => {
+    const n = T.join(".");
+    for (const [S] of I)
+      (S === n || S.startsWith(n + ".")) && I.delete(S);
+    N++;
+  }, v = {
+    removeValidation: (T) => {
+      T?.validationKey && Q(T.validationKey);
     },
-    revertToInitialState: (I) => {
+    revertToInitialState: (T) => {
       const n = o.getState().getInitialOptions(e)?.validation;
-      n?.key && Q(n?.key), I?.validationKey && Q(I.validationKey);
+      n?.key && Q(n?.key), T?.validationKey && Q(T.validationKey);
       const S = o.getState().initialStateGlobal[e];
-      o.getState().clearSelectedIndexesForState(e), T.clear(), A++;
-      const B = s(S, []), L = re(e), R = ee(L?.localStorage?.key) ? L?.localStorage?.key(S) : L?.localStorage?.key, W = `${g}-${e}-${R}`;
-      W && localStorage.removeItem(W), he(e, B), ne(e, S);
+      o.getState().clearSelectedIndexesForState(e), I.clear(), N++;
+      const W = s(S, []), U = re(e), j = ee(U?.localStorage?.key) ? U?.localStorage?.key(S) : U?.localStorage?.key, z = `${g}-${e}-${j}`;
+      z && localStorage.removeItem(z), he(e, W), ne(e, S);
       const h = o.getState().stateComponents.get(e);
       return h && h.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
-    updateInitialState: (I) => {
-      T.clear(), A++;
-      const n = Ie(
+    updateInitialState: (T) => {
+      I.clear(), N++;
+      const n = Te(
         e,
         i,
         m,
         g
-      ), S = o.getState().initialStateGlobal[e], B = re(e), L = ee(B?.localStorage?.key) ? B?.localStorage?.key(S) : B?.localStorage?.key, R = `${g}-${e}-${L}`;
-      return localStorage.getItem(R) && localStorage.removeItem(R), He(() => {
-        Ne(e, I), o.getState().initializeShadowState(e, I), he(e, n), ne(e, I);
-        const W = o.getState().stateComponents.get(e);
-        W && W.components.forEach((h) => {
+      ), S = o.getState().initialStateGlobal[e], W = re(e), U = ee(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, j = `${g}-${e}-${U}`;
+      return localStorage.getItem(j) && localStorage.removeItem(j), He(() => {
+        Ne(e, T), o.getState().initializeShadowState(e, T), he(e, n), ne(e, T);
+        const z = o.getState().stateComponents.get(e);
+        z && z.components.forEach((h) => {
           h.forceUpdate();
         });
       }), {
-        fetchId: (W) => n.get()[W]
+        fetchId: (z) => n.get()[z]
       };
     },
     _initialState: o.getState().initialStateGlobal[e],
     _serverState: o.getState().serverState[e],
     _isLoading: o.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
-      const I = o.getState().serverState[e];
-      return !!(I && q(I, Re(e)));
+      const T = o.getState().serverState[e];
+      return !!(T && J(T, Re(e)));
     }
   };
-  function s(I, n = [], S) {
-    const B = n.map(String).join(".");
-    T.get(B);
-    const L = function() {
+  function s(T, n = [], S) {
+    const W = n.map(String).join(".");
+    I.get(W);
+    const U = function() {
       return o().getNestedState(e, n);
     };
-    Object.keys(y).forEach((h) => {
-      L[h] = y[h];
+    Object.keys(v).forEach((h) => {
+      U[h] = v[h];
     });
-    const R = {
-      apply(h, l, ue) {
+    const j = {
+      apply(h, l, de) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${e}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), o().getNestedState(e, n);
       },
       get(h, l) {
-        S?.validIndices && !Array.isArray(I) && (S = { ...S, validIndices: void 0 });
-        const ue = /* @__PURE__ */ new Set([
+        S?.validIndices && !Array.isArray(T) && (S = { ...S, validIndices: void 0 });
+        const de = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,7 +523,7 @@ function Ie(e, i, m, g) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !ue.has(l)) {
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !de.has(l)) {
           const d = `${e}////${m}`, t = o.getState().stateComponents.get(e);
           if (t) {
             const r = t.components.get(d);
@@ -554,8 +554,8 @@ function Ie(e, i, m, g) {
               const c = await t.action(r);
               if (c && !c.success && c.errors && a) {
                 o.getState().removeValidationError(a), c.errors.forEach((u) => {
-                  const w = [a, ...u.path].join(".");
-                  o.getState().addValidationError(w, u.message);
+                  const E = [a, ...u.path].join(".");
+                  o.getState().addValidationError(E, u.message);
                 });
                 const f = o.getState().stateComponents.get(e);
                 f && f.components.forEach((u) => {
@@ -569,7 +569,7 @@ function Ie(e, i, m, g) {
           };
         if (l === "_status") {
           const d = o.getState().getNestedState(e, n), t = o.getState().initialStateGlobal[e], r = Z(t, n);
-          return q(d, r) ? "fresh" : "stale";
+          return J(d, r) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
@@ -577,7 +577,7 @@ function Ie(e, i, m, g) {
               e,
               n
             ), t = o.getState().initialStateGlobal[e], r = Z(t, n);
-            return q(d, r) ? "fresh" : "stale";
+            return J(d, r) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
@@ -591,8 +591,8 @@ function Ie(e, i, m, g) {
               throw new Error("Validation key not found");
             return o.getState().getValidationErrors(d.key + "." + n.join("."));
           };
-        if (Array.isArray(I)) {
-          const d = () => S?.validIndices ? I.map((r, a) => ({
+        if (Array.isArray(T)) {
+          const d = () => S?.validIndices ? T.map((r, a) => ({
             item: r,
             originalIndex: S.validIndices[a]
           })) : o.getState().getNestedState(e, n).map((r, a) => ({
@@ -604,7 +604,7 @@ function Ie(e, i, m, g) {
               const t = o.getState().getSelectedIndex(e, n.join("."));
               if (t !== void 0)
                 return s(
-                  I[t],
+                  T[t],
                   [...n, t.toString()],
                   S
                 );
@@ -622,174 +622,178 @@ function Ie(e, i, m, g) {
                 overscan: a = 6,
                 stickToBottom: c = !1,
                 dependencies: f = []
-              } = t, u = J(!1), w = J(null), [p, O] = K({
+              } = t, u = q(!1), E = q(null), [y, w] = K({
                 startIndex: 0,
                 endIndex: 10
-              }), [N, _] = K("IDLE_AT_TOP"), k = J(!1), j = J(0), Y = J(f), b = J(0), [C, V] = K(0);
+              }), [C, A] = K("IDLE_AT_TOP"), M = q(!1), F = q(0), Y = q(f), x = q(0), [$, L] = K(0), V = q(null);
               oe(() => o.getState().subscribeToShadowState(e, () => {
-                V((x) => x + 1);
+                L((P) => P + 1);
               }), [e]);
-              const D = o().getNestedState(
+              const O = o().getNestedState(
                 e,
                 n
-              ), v = D.length, { totalHeight: U, positions: $ } = Oe(() => {
-                const M = o.getState().getShadowMetadata(e, n) || [];
-                let x = 0;
-                const F = [];
-                for (let G = 0; G < v; G++) {
-                  F[G] = x;
-                  const X = M[G]?.virtualizer?.itemHeight;
-                  x += X || r;
+              ), _ = O.length, { totalHeight: D, positions: G } = we(() => {
+                const k = o.getState().getShadowMetadata(e, n) || [];
+                let P = 0;
+                const H = [];
+                for (let b = 0; b < _; b++) {
+                  H[b] = P;
+                  const X = k[b]?.virtualizer?.itemHeight;
+                  P += X || r;
                 }
-                return { totalHeight: x, positions: F };
+                return { totalHeight: P, positions: H };
               }, [
-                v,
+                _,
                 e,
                 n.join("."),
                 r,
-                C
-              ]), z = Oe(() => {
-                const M = Math.max(0, p.startIndex), x = Math.min(v, p.endIndex), F = Array.from(
-                  { length: x - M },
-                  (X, ie) => M + ie
-                ), G = F.map((X) => D[X]);
-                return s(G, n, {
+                $
+              ]), B = we(() => {
+                const k = Math.max(0, y.startIndex), P = Math.min(_, y.endIndex), H = Array.from(
+                  { length: P - k },
+                  (X, ge) => k + ge
+                ), b = H.map((X) => O[X]);
+                return s(b, n, {
                   ...S,
-                  validIndices: F
+                  validIndices: H
                 });
-              }, [p.startIndex, p.endIndex, D, v]);
-              le(() => {
-                const M = !q(
-                  f,
-                  Y.current
-                ), x = v > j.current;
-                if (M) {
-                  console.log("TRANSITION: Deps changed -> IDLE_AT_TOP"), _("IDLE_AT_TOP");
-                  return;
+              }, [y.startIndex, y.endIndex, O, _]);
+              ce(() => {
+                const k = E.current, P = _ > F.current;
+                if (P && V.current && k) {
+                  const { top: H, height: b } = V.current;
+                  k.scrollTop = H + (k.scrollHeight - b), V.current = null, console.log(
+                    `ANCHOR RESTORED to scrollTop: ${k.scrollTop}`
+                  );
+                } else {
+                  if (!J(
+                    f,
+                    Y.current
+                  )) {
+                    console.log("TRANSITION: Deps changed -> IDLE_AT_TOP"), A("IDLE_AT_TOP");
+                    return;
+                  }
+                  P && C === "LOCKED_AT_BOTTOM" && c && (console.log(
+                    "TRANSITION: New items arrived while locked -> GETTING_HEIGHTS"
+                  ), A("GETTING_HEIGHTS"));
                 }
-                x && N === "LOCKED_AT_BOTTOM" && c && (console.log(
-                  "TRANSITION: New items arrived while locked -> GETTING_HEIGHTS"
-                ), _("GETTING_HEIGHTS")), j.current = v, Y.current = f;
-              }, [v, ...f]), le(() => {
-                const M = w.current;
-                if (!M) return;
-                let x;
-                if (N === "IDLE_AT_TOP" && c && v > 0)
+                F.current = _, Y.current = f;
+              }, [_, ...f]), ce(() => {
+                const k = E.current;
+                if (!k) return;
+                let P;
+                if (C === "IDLE_AT_TOP" && c && _ > 0)
                   console.log(
                     "ACTION (IDLE_AT_TOP): Data has arrived -> GETTING_HEIGHTS"
-                  ), _("GETTING_HEIGHTS");
-                else if (N === "GETTING_HEIGHTS")
+                  ), A("GETTING_HEIGHTS");
+                else if (C === "GETTING_HEIGHTS")
                   console.log(
                     "ACTION (GETTING_HEIGHTS): Setting range to end and starting loop."
-                  ), O({
-                    startIndex: Math.max(0, v - 10 - a),
-                    endIndex: v
-                  }), x = setInterval(() => {
-                    const F = v - 1;
-                    ((o.getState().getShadowMetadata(e, n) || [])[F]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(x), u.current || (console.log(
+                  ), w({
+                    startIndex: Math.max(0, _ - 10 - a),
+                    endIndex: _
+                  }), P = setInterval(() => {
+                    const H = _ - 1;
+                    ((o.getState().getShadowMetadata(e, n) || [])[H]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(P), u.current || (console.log(
                       "ACTION (GETTING_HEIGHTS): Measurement success -> SCROLLING_TO_BOTTOM"
-                    ), _("SCROLLING_TO_BOTTOM")));
+                    ), A("SCROLLING_TO_BOTTOM")));
                   }, 100);
-                else if (N === "SCROLLING_TO_BOTTOM") {
+                else if (C === "SCROLLING_TO_BOTTOM") {
                   console.log(
                     "ACTION (SCROLLING_TO_BOTTOM): Executing scroll."
-                  ), k.current = !0;
-                  const F = j.current === 0 ? "auto" : "smooth";
-                  M.scrollTo({
-                    top: M.scrollHeight,
-                    behavior: F
+                  ), M.current = !0;
+                  const H = F.current === 0 ? "auto" : "smooth";
+                  k.scrollTo({
+                    top: k.scrollHeight,
+                    behavior: H
                   });
-                  const G = setTimeout(
+                  const b = setTimeout(
                     () => {
                       console.log(
                         "ACTION (SCROLLING_TO_BOTTOM): Scroll finished -> LOCKED_AT_BOTTOM"
-                      ), k.current = !1, u.current = !1, _("LOCKED_AT_BOTTOM");
+                      ), M.current = !1, u.current = !1, A("LOCKED_AT_BOTTOM");
                     },
-                    F === "smooth" ? 500 : 50
+                    H === "smooth" ? 500 : 50
                   );
-                  return () => clearTimeout(G);
+                  return () => clearTimeout(b);
                 }
                 return () => {
-                  x && clearInterval(x);
+                  P && clearInterval(P);
                 };
-              }, [N, v, $]), oe(() => {
-                const M = w.current;
-                if (!M) return;
-                const x = r, F = () => {
-                  if (k.current)
+              }, [C, _, G]), oe(() => {
+                const k = E.current;
+                if (!k) return;
+                const P = r, H = () => {
+                  if (M.current)
                     return;
-                  const { scrollTop: G, scrollHeight: X, clientHeight: ie } = M;
-                  console.log(
-                    "scrollTop, scrollHeight, clientHeight ",
-                    G,
-                    X,
-                    ie
-                  );
-                  const Ce = X - G - ie < 10;
-                  if (console.log("isAtBottom", Ce), Ce ? N !== "LOCKED_AT_BOTTOM" && _("LOCKED_AT_BOTTOM") : N !== "IDLE_NOT_AT_BOTTOM" && _("IDLE_NOT_AT_BOTTOM"), Math.abs(G - b.current) < x)
+                  const { scrollTop: b, scrollHeight: X, clientHeight: ge } = k;
+                  if (X - b - ge < 10 ? C !== "LOCKED_AT_BOTTOM" && (A("LOCKED_AT_BOTTOM"), V.current = null) : C !== "IDLE_NOT_AT_BOTTOM" && (A("IDLE_NOT_AT_BOTTOM"), V.current = {
+                    top: b,
+                    height: X
+                  }, console.log(`ANCHOR SET at scrollTop: ${b}`)), Math.abs(b - x.current) < P)
                     return;
                   console.log(
-                    `Threshold passed at ${G}px. Recalculating range...`
+                    `Threshold passed at ${b}px. Recalculating range...`
                   );
-                  let ye = v - 1, pe = 0, $e = 0;
+                  let ye = _ - 1, pe = 0, Ce = 0;
                   for (; pe <= ye; ) {
                     const Se = Math.floor((pe + ye) / 2);
-                    $[Se] < G ? ($e = Se, pe = Se + 1) : ye = Se - 1;
+                    G[Se] < b ? (Ce = Se, pe = Se + 1) : ye = Se - 1;
                   }
-                  const ke = Math.max(0, $e - a);
-                  let fe = ke;
-                  const Ue = G + ie;
-                  for (; fe < v && $[fe] < Ue; )
+                  const $e = Math.max(0, Ce - a);
+                  let fe = $e;
+                  const Ue = b + ge;
+                  for (; fe < _ && G[fe] < Ue; )
                     fe++;
-                  O({
-                    startIndex: ke,
-                    endIndex: Math.min(v, fe + a)
-                  }), b.current = G;
+                  w({
+                    startIndex: $e,
+                    endIndex: Math.min(_, fe + a)
+                  }), x.current = b;
                 };
-                return M.addEventListener("scroll", F, {
+                return k.addEventListener("scroll", H, {
                   passive: !0
-                }), () => M.removeEventListener("scroll", F);
-              }, [v, $, r, a, N]);
-              const H = be(() => {
+                }), () => k.removeEventListener("scroll", H);
+              }, [_, G, r, a, C]);
+              const se = ke(() => {
                 console.log(
                   "USER ACTION: Clicked scroll button -> SCROLLING_TO_BOTTOM"
-                ), _("SCROLLING_TO_BOTTOM");
-              }, []), se = be(
-                (M, x = "smooth") => {
-                  w.current && $[M] !== void 0 && (_("IDLE_NOT_AT_BOTTOM"), w.current.scrollTo({
-                    top: $[M],
-                    behavior: x
+                ), A("SCROLLING_TO_BOTTOM");
+              }, []), ue = ke(
+                (k, P = "smooth") => {
+                  E.current && G[k] !== void 0 && (A("IDLE_NOT_AT_BOTTOM"), E.current.scrollTo({
+                    top: G[k],
+                    behavior: P
                   }));
                 },
-                [$]
-              ), ge = {
+                [G]
+              ), De = {
                 outer: {
-                  ref: w,
+                  ref: E,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${U}px`,
+                    height: `${D}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${$[p.startIndex] || 0}px)`
+                    transform: `translateY(${G[y.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: z,
-                virtualizerProps: ge,
-                scrollToBottom: H,
-                scrollToIndex: se
+                virtualState: B,
+                virtualizerProps: De,
+                scrollToBottom: se,
+                scrollToIndex: ue
               };
             };
           if (l === "stateSort")
             return (t) => {
               const a = [...d()].sort(
-                (u, w) => t(u.item, w.item)
+                (u, E) => t(u.item, E.item)
               ), c = a.map(({ item: u }) => u), f = {
                 ...S,
                 validIndices: a.map(
@@ -801,7 +805,7 @@ function Ie(e, i, m, g) {
           if (l === "stateFilter")
             return (t) => {
               const a = d().filter(
-                ({ item: u }, w) => t(u, w)
+                ({ item: u }, E) => t(u, E)
               ), c = a.map(({ item: u }) => u), f = {
                 ...S,
                 validIndices: a.map(
@@ -814,22 +818,22 @@ function Ie(e, i, m, g) {
             return (t) => {
               const r = o.getState().getNestedState(e, n);
               return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (c, f) => f)).map((c, f) => {
-                const u = r[c], w = [...n, c.toString()], p = s(u, w, S);
-                return t(u, p, {
+                const u = r[c], E = [...n, c.toString()], y = s(u, E, S);
+                return t(u, y, {
                   register: () => {
-                    const [, N] = K({}), _ = `${m}-${n.join(".")}-${c}`;
-                    le(() => {
-                      const k = `${e}////${_}`, j = o.getState().stateComponents.get(e) || {
+                    const [, C] = K({}), A = `${m}-${n.join(".")}-${c}`;
+                    ce(() => {
+                      const M = `${e}////${A}`, F = o.getState().stateComponents.get(e) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return j.components.set(k, {
-                        forceUpdate: () => N({}),
-                        paths: /* @__PURE__ */ new Set([w.join(".")])
-                      }), o.getState().stateComponents.set(e, j), () => {
+                      return F.components.set(M, {
+                        forceUpdate: () => C({}),
+                        paths: /* @__PURE__ */ new Set([E.join(".")])
+                      }), o.getState().stateComponents.set(e, F), () => {
                         const Y = o.getState().stateComponents.get(e);
-                        Y && Y.components.delete(k);
+                        Y && Y.components.delete(M);
                       };
-                    }, [e, _]);
+                    }, [e, A]);
                   },
                   index: f,
                   originalIndex: c
@@ -840,20 +844,20 @@ function Ie(e, i, m, g) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (t) => I.map((a, c) => {
+            return (t) => T.map((a, c) => {
               let f;
               S?.validIndices && S.validIndices[c] !== void 0 ? f = S.validIndices[c] : f = c;
-              const u = [...n, f.toString()], w = s(a, u, S);
+              const u = [...n, f.toString()], E = s(a, u, S);
               return t(
                 a,
-                w,
+                E,
                 c,
-                I,
-                s(I, n, S)
+                T,
+                s(T, n, S)
               );
             });
           if (l === "$stateMap")
-            return (t) => de(rt, {
+            return (t) => le(rt, {
               proxy: {
                 _stateKey: e,
                 _path: n,
@@ -866,15 +870,15 @@ function Ie(e, i, m, g) {
             return (t) => {
               const r = o.getState().getNestedState(e, n);
               return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (c, f) => f)).map((c, f) => {
-                const u = r[c], w = [...n, c.toString()], p = s(u, w, S), O = `${m}-${n.join(".")}-${c}`;
-                return de(at, {
+                const u = r[c], E = [...n, c.toString()], y = s(u, E, S), w = `${m}-${n.join(".")}-${c}`;
+                return le(at, {
                   key: c,
                   stateKey: e,
-                  itemComponentId: O,
-                  itemPath: w,
+                  itemComponentId: w,
+                  itemPath: E,
                   children: t(
                     u,
-                    p,
+                    y,
                     f,
                     r,
                     s(r, n, S)
@@ -886,8 +890,8 @@ function Ie(e, i, m, g) {
             };
           if (l === "stateFlattenOn")
             return (t) => {
-              const r = I;
-              T.clear(), A++;
+              const r = T;
+              I.clear(), N++;
               const a = r.flatMap(
                 (c) => c[t] ?? []
               );
@@ -899,7 +903,7 @@ function Ie(e, i, m, g) {
             };
           if (l === "index")
             return (t) => {
-              const r = I[t];
+              const r = T[t];
               return s(r, [...n, t.toString()]);
             };
           if (l === "last")
@@ -910,7 +914,7 @@ function Ie(e, i, m, g) {
               return s(a, c);
             };
           if (l === "insert")
-            return (t) => (E(n), Ee(i, t, n, e), s(
+            return (t) => (p(n), Ee(i, t, n, e), s(
               o.getState().getNestedState(e, n),
               n
             ));
@@ -918,40 +922,40 @@ function Ie(e, i, m, g) {
             return (t, r, a) => {
               const c = o.getState().getNestedState(e, n), f = ee(t) ? t(c) : t;
               let u = null;
-              if (!c.some((p) => {
+              if (!c.some((y) => {
                 if (r) {
-                  const N = r.every(
-                    (_) => q(p[_], f[_])
+                  const C = r.every(
+                    (A) => J(y[A], f[A])
                   );
-                  return N && (u = p), N;
+                  return C && (u = y), C;
                 }
-                const O = q(p, f);
-                return O && (u = p), O;
+                const w = J(y, f);
+                return w && (u = y), w;
               }))
-                E(n), Ee(i, f, n, e);
+                p(n), Ee(i, f, n, e);
               else if (a && u) {
-                const p = a(u), O = c.map(
-                  (N) => q(N, u) ? p : N
+                const y = a(u), w = c.map(
+                  (C) => J(C, u) ? y : C
                 );
-                E(n), ce(i, O, n);
+                p(n), ie(i, w, n);
               }
             };
           if (l === "cut")
             return (t, r) => {
               if (!r?.waitForSync)
-                return E(n), me(i, n, e, t), s(
+                return p(n), me(i, n, e, t), s(
                   o.getState().getNestedState(e, n),
                   n
                 );
             };
           if (l === "cutByValue")
             return (t) => {
-              for (let r = 0; r < I.length; r++)
-                I[r] === t && me(i, n, e, r);
+              for (let r = 0; r < T.length; r++)
+                T[r] === t && me(i, n, e, r);
             };
           if (l === "toggleByValue")
             return (t) => {
-              const r = I.findIndex((a) => a === t);
+              const r = T.findIndex((a) => a === t);
               r > -1 ? me(i, n, e, r) : Ee(i, t, n, e);
             };
           if (l === "stateFind")
@@ -986,20 +990,20 @@ function Ie(e, i, m, g) {
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(I)) {
+            if (S?.validIndices && Array.isArray(T)) {
               const d = o.getState().getNestedState(e, n);
               return S.validIndices.map((t) => d[t]);
             }
             return o.getState().getNestedState(e, n);
           };
         if (l === "$derive")
-          return (d) => Ge({
+          return (d) => Ve({
             _stateKey: e,
             _path: n,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Ge({
+          return () => Ve({
             _stateKey: e,
             _path: n
           });
@@ -1008,7 +1012,7 @@ function Ie(e, i, m, g) {
           return o.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => Te(g + "-" + e + "-" + d);
+          return (d) => Ie(g + "-" + e + "-" + d);
         if (l === "_selected") {
           const d = n.slice(0, -1), t = d.join("."), r = o.getState().getNestedState(e, d);
           return Array.isArray(r) ? Number(n[n.length - 1]) === o.getState().getSelectedIndex(e, t) : void 0;
@@ -1018,7 +1022,7 @@ function Ie(e, i, m, g) {
             const t = n.slice(0, -1), r = Number(n[n.length - 1]), a = t.join(".");
             d ? o.getState().setSelectedIndex(e, a, r) : o.getState().setSelectedIndex(e, a, void 0);
             const c = o.getState().getNestedState(e, [...t]);
-            ce(i, c, t), E(t);
+            ie(i, c, t), p(t);
           };
         if (l === "toggleSelected")
           return () => {
@@ -1029,13 +1033,13 @@ function Ie(e, i, m, g) {
               a === t ? void 0 : t
             );
             const c = o.getState().getNestedState(e, [...d]);
-            ce(i, c, d), E(d);
+            ie(i, c, d), p(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
               const t = o.getState().cogsStateStore[e], a = Je(t, d).newDocument;
-              De(
+              Le(
                 e,
                 o.getState().initialStateGlobal[e],
                 a,
@@ -1047,55 +1051,55 @@ function Ie(e, i, m, g) {
               if (c) {
                 const f = _e(t, a), u = new Set(f);
                 for (const [
-                  w,
-                  p
+                  E,
+                  y
                 ] of c.components.entries()) {
-                  let O = !1;
-                  const N = Array.isArray(p.reactiveType) ? p.reactiveType : [p.reactiveType || "component"];
-                  if (!N.includes("none")) {
-                    if (N.includes("all")) {
-                      p.forceUpdate();
+                  let w = !1;
+                  const C = Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"];
+                  if (!C.includes("none")) {
+                    if (C.includes("all")) {
+                      y.forceUpdate();
                       continue;
                     }
-                    if (N.includes("component") && (p.paths.has("") && (O = !0), !O))
-                      for (const _ of u) {
-                        if (p.paths.has(_)) {
-                          O = !0;
+                    if (C.includes("component") && (y.paths.has("") && (w = !0), !w))
+                      for (const A of u) {
+                        if (y.paths.has(A)) {
+                          w = !0;
                           break;
                         }
-                        let k = _.lastIndexOf(".");
-                        for (; k !== -1; ) {
-                          const j = _.substring(0, k);
-                          if (p.paths.has(j)) {
-                            O = !0;
+                        let M = A.lastIndexOf(".");
+                        for (; M !== -1; ) {
+                          const F = A.substring(0, M);
+                          if (y.paths.has(F)) {
+                            w = !0;
                             break;
                           }
-                          const Y = _.substring(
-                            k + 1
+                          const Y = A.substring(
+                            M + 1
                           );
                           if (!isNaN(Number(Y))) {
-                            const b = j.lastIndexOf(".");
-                            if (b !== -1) {
-                              const C = j.substring(
+                            const x = F.lastIndexOf(".");
+                            if (x !== -1) {
+                              const $ = F.substring(
                                 0,
-                                b
+                                x
                               );
-                              if (p.paths.has(C)) {
-                                O = !0;
+                              if (y.paths.has($)) {
+                                w = !0;
                                 break;
                               }
                             }
                           }
-                          k = j.lastIndexOf(".");
+                          M = F.lastIndexOf(".");
                         }
-                        if (O) break;
+                        if (w) break;
                       }
-                    if (!O && N.includes("deps") && p.depsFunction) {
-                      const _ = p.depsFunction(a);
-                      let k = !1;
-                      typeof _ == "boolean" ? _ && (k = !0) : q(p.deps, _) || (p.deps = _, k = !0), k && (O = !0);
+                    if (!w && C.includes("deps") && y.depsFunction) {
+                      const A = y.depsFunction(a);
+                      let M = !1;
+                      typeof A == "boolean" ? A && (M = !0) : J(y.deps, A) || (y.deps = A, M = !0), M && (w = !0);
                     }
-                    O && p.forceUpdate();
+                    w && y.forceUpdate();
                   }
                 }
               }
@@ -1116,8 +1120,8 @@ function Ie(e, i, m, g) {
                 });
                 const c = d.zodSchema.safeParse(r);
                 return c.success ? !0 : (c.error.errors.forEach((u) => {
-                  const w = u.path, p = u.message, O = [d.key, ...w].join(".");
-                  t(O, p);
+                  const E = u.path, y = u.message, w = [d.key, ...E].join(".");
+                  t(w, y);
                 }), ve(e), !1);
               } catch (a) {
                 return console.error("Zod schema validation failed", a), !1;
@@ -1127,7 +1131,7 @@ function Ie(e, i, m, g) {
           if (l === "getComponents")
             return () => o().stateComponents.get(e);
           if (l === "getAllFormRefs")
-            return () => Me.getState().getFormRefsByStateKey(e);
+            return () => be.getState().getFormRefsByStateKey(e);
           if (l === "_initialState")
             return o.getState().initialStateGlobal[e];
           if (l === "_serverState")
@@ -1135,17 +1139,17 @@ function Ie(e, i, m, g) {
           if (l === "_isLoading")
             return o.getState().isLoadingGlobal[e];
           if (l === "revertToInitialState")
-            return y.revertToInitialState;
-          if (l === "updateInitialState") return y.updateInitialState;
-          if (l === "removeValidation") return y.removeValidation;
+            return v.revertToInitialState;
+          if (l === "updateInitialState") return v.updateInitialState;
+          if (l === "removeValidation") return v.removeValidation;
         }
         if (l === "getFormRef")
-          return () => Me.getState().getFormRef(e + "." + n.join("."));
+          return () => be.getState().getFormRef(e + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: t
-          }) => /* @__PURE__ */ we(
+          }) => /* @__PURE__ */ Oe(
             We,
             {
               formOpts: t ? { validation: { message: "" } } : void 0,
@@ -1158,24 +1162,24 @@ function Ie(e, i, m, g) {
           );
         if (l === "_stateKey") return e;
         if (l === "_path") return n;
-        if (l === "_isServerSynced") return y._isServerSynced;
+        if (l === "_isServerSynced") return v._isServerSynced;
         if (l === "update")
           return (d, t) => {
             if (t?.debounce)
               Be(() => {
-                ce(i, d, n, "");
+                ie(i, d, n, "");
                 const r = o.getState().getNestedState(e, n);
                 t?.afterUpdate && t.afterUpdate(r);
               }, t.debounce);
             else {
-              ce(i, d, n, "");
+              ie(i, d, n, "");
               const r = o.getState().getNestedState(e, n);
               t?.afterUpdate && t.afterUpdate(r);
             }
-            E(n);
+            p(n);
           };
         if (l === "formElement")
-          return (d, t) => /* @__PURE__ */ we(
+          return (d, t) => /* @__PURE__ */ Oe(
             ze,
             {
               setState: i,
@@ -1185,21 +1189,21 @@ function Ie(e, i, m, g) {
               formOpts: t
             }
           );
-        const P = [...n, l], ae = o.getState().getNestedState(e, P);
-        return s(ae, P, S);
+        const R = [...n, l], ae = o.getState().getNestedState(e, R);
+        return s(ae, R, S);
       }
-    }, W = new Proxy(L, R);
-    return T.set(B, {
-      proxy: W,
-      stateVersion: A
-    }), W;
+    }, z = new Proxy(U, j);
+    return I.set(W, {
+      proxy: z,
+      stateVersion: N
+    }), z;
   }
   return s(
     o.getState().getNestedState(e, [])
   );
 }
-function Ge(e) {
-  return de(ot, { proxy: e });
+function Ve(e) {
+  return le(ot, { proxy: e });
 }
 function rt({
   proxy: e,
@@ -1210,26 +1214,26 @@ function rt({
     m,
     e._path
   ).stateMapNoRender(
-    (T, A, E, y, s) => e._mapFn(T, A, E, y, s)
+    (I, N, p, v, s) => e._mapFn(I, N, p, v, s)
   ) : null;
 }
 function ot({
   proxy: e
 }) {
-  const i = J(null), m = `${e._stateKey}-${e._path.join(".")}`;
+  const i = q(null), m = `${e._stateKey}-${e._path.join(".")}`;
   return oe(() => {
     const g = i.current;
     if (!g || !g.parentElement) return;
-    const T = g.parentElement, E = Array.from(T.childNodes).indexOf(g);
-    let y = T.getAttribute("data-parent-id");
-    y || (y = `parent-${crypto.randomUUID()}`, T.setAttribute("data-parent-id", y));
-    const I = {
+    const I = g.parentElement, p = Array.from(I.childNodes).indexOf(g);
+    let v = I.getAttribute("data-parent-id");
+    v || (v = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", v));
+    const T = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: y,
-      position: E,
+      parentId: v,
+      position: p,
       effect: e._effect
     };
-    o.getState().addSignalElement(m, I);
+    o.getState().addSignalElement(m, T);
     const n = o.getState().getNestedState(e._stateKey, e._path);
     let S;
     if (e._effect)
@@ -1238,21 +1242,21 @@ function ot({
           "state",
           `return (${e._effect})(state)`
         )(n);
-      } catch (L) {
-        console.error("Error evaluating effect function during mount:", L), S = n;
+      } catch (U) {
+        console.error("Error evaluating effect function during mount:", U), S = n;
       }
     else
       S = n;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const B = document.createTextNode(String(S));
-    g.replaceWith(B);
-  }, [e._stateKey, e._path.join("."), e._effect]), de("span", {
+    const W = document.createTextNode(String(S));
+    g.replaceWith(W);
+  }, [e._stateKey, e._path.join("."), e._effect]), le("span", {
     ref: i,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
-function yt(e) {
+function pt(e) {
   const i = je(
     (m) => {
       const g = o.getState().stateComponents.get(e._stateKey) || {
@@ -1265,7 +1269,7 @@ function yt(e) {
     },
     () => o.getState().getNestedState(e._stateKey, e._path)
   );
-  return de("text", {}, String(i));
+  return le("text", {}, String(i));
 }
 function at({
   stateKey: e,
@@ -1273,32 +1277,32 @@ function at({
   itemPath: m,
   children: g
 }) {
-  const [, T] = K({}), [A, E] = Ye(), y = J(null);
+  const [, I] = K({}), [N, p] = Ye(), v = q(null);
   return oe(() => {
-    E.height > 0 && E.height !== y.current && (y.current = E.height, o.getState().setShadowMetadata(e, m, {
+    p.height > 0 && p.height !== v.current && (v.current = p.height, o.getState().setShadowMetadata(e, m, {
       virtualizer: {
-        itemHeight: E.height
+        itemHeight: p.height
       }
     }));
-  }, [E.height, e, m]), le(() => {
-    const s = `${e}////${i}`, I = o.getState().stateComponents.get(e) || {
+  }, [p.height, e, m]), ce(() => {
+    const s = `${e}////${i}`, T = o.getState().stateComponents.get(e) || {
       components: /* @__PURE__ */ new Map()
     };
-    return I.components.set(s, {
-      forceUpdate: () => T({}),
+    return T.components.set(s, {
+      forceUpdate: () => I({}),
       paths: /* @__PURE__ */ new Set([m.join(".")])
-    }), o.getState().stateComponents.set(e, I), () => {
+    }), o.getState().stateComponents.set(e, T), () => {
       const n = o.getState().stateComponents.get(e);
       n && n.components.delete(s);
     };
-  }, [e, i, m.join(".")]), /* @__PURE__ */ we("div", { ref: A, children: g });
+  }, [e, i, m.join(".")]), /* @__PURE__ */ Oe("div", { ref: N, children: g });
 }
 export {
-  Ge as $cogsSignal,
-  yt as $cogsSignalStore,
+  Ve as $cogsSignal,
+  pt as $cogsSignalStore,
   It as addStateOptions,
-  Tt as createCogsState,
-  vt as notifyComponent,
+  vt as createCogsState,
+  yt as notifyComponent,
   nt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map