cogsbox-state 0.5.382 → 0.5.383

package/dist/CogsState.jsx

@@ -1,16 +1,16 @@
 "use client";
-import { jsx as pe } from "react/jsx-runtime";
-import { useState as Q, useRef as Z, useEffect as oe, useLayoutEffect as ie, useMemo as Ee, createElement as ce, useSyncExternalStore as Re, startTransition as De, useCallback as Ce } from "react";
-import { transformStateFunc as Ue, isDeepEqual as q, isFunction as K, getNestedValue as J, getDifferences as _e, debounce as je } from "./utility.js";
-import { pushFunc as ye, updateFn as se, cutFunc as fe, ValidationWrapper as He, FormControlComponent as Fe } from "./Functions.jsx";
-import Be from "superjson";
-import { v4 as we } from "uuid";
+import { jsx as we } from "react/jsx-runtime";
+import { useState as K, useRef as J, useEffect as oe, useLayoutEffect as ce, useMemo as Oe, createElement as le, useSyncExternalStore as De, startTransition as Ue, useCallback as $e } from "react";
+import { transformStateFunc as je, isDeepEqual as q, isFunction as ee, getNestedValue as Y, getDifferences as _e, debounce as He } from "./utility.js";
+import { pushFunc as Ee, updateFn as ie, cutFunc as me, ValidationWrapper as Fe, FormControlComponent as Be } from "./Functions.jsx";
+import We from "superjson";
+import { v4 as Ae } from "uuid";
 import "zod";
-import { getGlobalStore as r, formRefStore as $e } from "./store.js";
-import { useCogsConfig as Ve } from "./CogsStateClient.jsx";
-import { applyPatch as We } from "fast-json-patch";
-import ze from "react-use-measure";
-function ke(e, i) {
+import { getGlobalStore as r, formRefStore as ke } from "./store.js";
+import { useCogsConfig as Pe } from "./CogsStateClient.jsx";
+import { applyPatch as ze } from "fast-json-patch";
+import qe from "react-use-measure";
+function be(e, i) {
   const m = r.getState().getInitialOptions, g = r.getState().setInitialStateOptions, T = m(e) || {};
   g(e, {
     ...T,
@@ -30,12 +30,12 @@ function xe({
       !q(p[a], i[a]) && (v = !0, p[a] = i[a])) : (v = !0, p[a] = i[a]);
   v && C(e, p);
 }
-function St(e, { formElements: i, validation: m }) {
+function It(e, { formElements: i, validation: m }) {
   return { initialState: e, formElements: i, validation: m };
 }
-const mt = (e, i) => {
+const ht = (e, i) => {
   let m = e;
-  const [g, T] = Ue(m);
+  const [g, T] = je(m);
   (Object.keys(T).length > 0 || i && Object.keys(i).length > 0) && Object.keys(T).forEach((v) => {
     T[v] = T[v] || {}, T[v].formElements = {
       ...i?.formElements,
@@ -46,13 +46,13 @@ const mt = (e, i) => {
     }, re(v) || r.getState().setInitialStateOptions(v, T[v]);
   }), r.getState().setInitialStates(g), r.getState().setCreatedState(g);
   const C = (v, a) => {
-    const [h] = Q(a?.componentId ?? we());
+    const [h] = K(a?.componentId ?? Ae());
     xe({
       stateKey: v,
       options: a,
       initialOptionsPart: T
     });
-    const n = r.getState().cogsStateStore[v] || g[v], S = a?.modifyState ? a.modifyState(n) : n, [F, L] = Ke(
+    const n = r.getState().cogsStateStore[v] || g[v], S = a?.modifyState ? a.modifyState(n) : n, [B, R] = et(
       S,
       {
         stateKey: v,
@@ -68,49 +68,49 @@ const mt = (e, i) => {
         serverState: a?.serverState
       }
     );
-    return L;
+    return R;
   };
   function p(v, a) {
-    xe({ stateKey: v, options: a, initialOptionsPart: T }), a.localStorage && Xe(v, a), he(v);
+    xe({ stateKey: v, options: a, initialOptionsPart: T }), a.localStorage && Qe(v, a), ve(v);
   }
   return { useCogsState: C, setCogsOptions: p };
 }, {
-  setUpdaterState: Se,
+  setUpdaterState: Ie,
   setState: ne,
   getInitialOptions: re,
-  getKeyState: Pe,
-  getValidationErrors: qe,
-  setStateLog: Je,
-  updateInitialStateGlobal: Oe,
-  addValidationError: Ye,
-  removeValidationError: X,
-  setServerSyncActions: Ze
-} = r.getState(), be = (e, i, m, g, T) => {
+  getKeyState: Le,
+  getValidationErrors: Je,
+  setStateLog: Ye,
+  updateInitialStateGlobal: Ne,
+  addValidationError: Ze,
+  removeValidationError: Q,
+  setServerSyncActions: Xe
+} = r.getState(), Me = (e, i, m, g, T) => {
   m?.log && console.log(
     "saving to localstorage",
     i,
     m.localStorage?.key,
     g
   );
-  const C = K(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
+  const C = ee(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
   if (C && g) {
     const p = `${g}-${i}-${C}`;
     let v;
     try {
-      v = Ie(p)?.lastSyncedWithServer;
+      v = Te(p)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: e,
       lastUpdated: Date.now(),
       lastSyncedWithServer: T ?? v
-    }, h = Be.serialize(a);
+    }, h = We.serialize(a);
     window.localStorage.setItem(
       p,
       JSON.stringify(h.json)
     );
   }
-}, Ie = (e) => {
+}, Te = (e) => {
   if (!e) return null;
   try {
     const i = window.localStorage.getItem(e);
@@ -118,20 +118,20 @@ const mt = (e, i) => {
   } catch (i) {
     return console.error("Error loading from localStorage:", i), null;
   }
-}, Xe = (e, i) => {
-  const m = r.getState().cogsStateStore[e], { sessionId: g } = Ve(), T = K(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
+}, Qe = (e, i) => {
+  const m = r.getState().cogsStateStore[e], { sessionId: g } = Pe(), T = ee(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
   if (T && g) {
-    const C = Ie(
+    const C = Te(
       `${g}-${e}-${T}`
     );
     if (C && C.lastUpdated > (C.lastSyncedWithServer || 0))
-      return ne(e, C.state), he(e), !0;
+      return ne(e, C.state), ve(e), !0;
   }
   return !1;
-}, Le = (e, i, m, g, T, C) => {
+}, Ge = (e, i, m, g, T, C) => {
   const p = {
     initialState: i,
-    updaterState: me(
+    updaterState: he(
       e,
       g,
       T,
@@ -139,8 +139,8 @@ const mt = (e, i) => {
     ),
     state: m
   };
-  Oe(e, p.initialState), Se(e, p.updaterState), ne(e, p.state);
-}, he = (e) => {
+  Ne(e, p.initialState), Ie(e, p.updaterState), ne(e, p.state);
+}, ve = (e) => {
   const i = r.getState().stateComponents.get(e);
   if (!i) return;
   const m = /* @__PURE__ */ new Set();
@@ -149,7 +149,7 @@ const mt = (e, i) => {
   }), queueMicrotask(() => {
     m.forEach((g) => g());
   });
-}, It = (e, i) => {
+}, Tt = (e, i) => {
   const m = r.getState().stateComponents.get(e);
   if (m) {
     const g = `${e}////${i}`, T = m.components.get(g);
@@ -157,22 +157,22 @@ const mt = (e, i) => {
       return;
     T && T.forceUpdate();
   }
-}, Qe = (e, i, m, g) => {
+}, Ke = (e, i, m, g) => {
   switch (e) {
     case "update":
       return {
-        oldValue: J(i, g),
-        newValue: J(m, g)
+        oldValue: Y(i, g),
+        newValue: Y(m, g)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: J(m, g)
+        newValue: Y(m, g)
       };
     case "cut":
       return {
-        oldValue: J(i, g),
+        oldValue: Y(i, g),
         newValue: null
         // or undefined
       };
@@ -180,7 +180,7 @@ const mt = (e, i) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Ke(e, {
+function et(e, {
   stateKey: i,
   serverSync: m,
   localStorage: g,
@@ -193,12 +193,12 @@ function Ke(e, {
   dependencies: n,
   serverState: S
 } = {}) {
-  const [F, L] = Q({}), { sessionId: G } = Ve();
-  let B = !i;
-  const [I] = Q(i ?? we()), l = r.getState().stateLog[I], le = Z(/* @__PURE__ */ new Set()), ee = Z(v ?? we()), V = Z(
+  const [B, R] = K({}), { sessionId: D } = Pe();
+  let W = !i;
+  const [I] = K(i ?? Ae()), l = r.getState().stateLog[I], de = J(/* @__PURE__ */ new Set()), te = J(v ?? Ae()), L = J(
     null
   );
-  V.current = re(I) ?? null, oe(() => {
+  L.current = re(I) ?? null, oe(() => {
     if (h && h.stateKey === I && h.path?.[0]) {
       ne(I, (o) => ({
         ...o,
@@ -212,228 +212,228 @@ function Ke(e, {
     }
   }, [h]), oe(() => {
     if (a) {
-      ke(I, {
+      be(I, {
         initialState: a
       });
-      const t = V.current, s = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = r.getState().initialStateGlobal[I];
+      const t = L.current, s = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = r.getState().initialStateGlobal[I];
       if (!(c && !q(c, a) || !c) && !s)
         return;
       let u = null;
-      const y = K(t?.localStorage?.key) ? t?.localStorage?.key(a) : t?.localStorage?.key;
-      y && G && (u = Ie(`${G}-${I}-${y}`));
+      const y = ee(t?.localStorage?.key) ? t?.localStorage?.key(a) : t?.localStorage?.key;
+      y && D && (u = Te(`${D}-${I}-${y}`));
       let E = a, w = !1;
-      const A = s ? Date.now() : 0, $ = u?.lastUpdated || 0, b = u?.lastSyncedWithServer || 0;
-      s && A > $ ? (E = t.serverState.data, w = !0) : u && $ > b && (E = u.state, t?.localStorage?.onChange && t?.localStorage?.onChange(E)), r.getState().initializeShadowState(I, a), Le(
+      const N = s ? Date.now() : 0, k = u?.lastUpdated || 0, x = u?.lastSyncedWithServer || 0;
+      s && N > k ? (E = t.serverState.data, w = !0) : u && k > x && (E = u.state, t?.localStorage?.onChange && t?.localStorage?.onChange(E)), r.getState().initializeShadowState(I, a), Ge(
         I,
         a,
         E,
         ae,
-        ee.current,
-        G
-      ), w && y && G && be(E, I, t, G, Date.now()), he(I), (Array.isArray(p) ? p : [p || "component"]).includes("none") || L({});
+        te.current,
+        D
+      ), w && y && D && Me(E, I, t, D, Date.now()), ve(I), (Array.isArray(p) ? p : [p || "component"]).includes("none") || R({});
     }
   }, [
     a,
     S?.status,
     S?.data,
     ...n || []
-  ]), ie(() => {
-    B && ke(I, {
+  ]), ce(() => {
+    W && be(I, {
       serverSync: m,
       formElements: T,
       initialState: a,
       localStorage: g,
-      middleware: V.current?.middleware
+      middleware: L.current?.middleware
     });
-    const t = `${I}////${ee.current}`, o = r.getState().stateComponents.get(I) || {
+    const t = `${I}////${te.current}`, o = r.getState().stateComponents.get(I) || {
       components: /* @__PURE__ */ new Map()
     };
     return o.components.set(t, {
-      forceUpdate: () => L({}),
+      forceUpdate: () => R({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: C || void 0,
       reactiveType: p ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(I, o), L({}), () => {
+    }), r.getState().stateComponents.set(I, o), R({}), () => {
       o && (o.components.delete(t), o.components.size === 0 && r.getState().stateComponents.delete(I));
     };
   }, []);
   const ae = (t, o, s, c) => {
     if (Array.isArray(o)) {
       const u = `${I}-${o.join(".")}`;
-      le.current.add(u);
+      de.current.add(u);
     }
     const f = r.getState();
     ne(I, (u) => {
-      const y = K(t) ? t(u) : t, E = `${I}-${o.join(".")}`;
+      const y = ee(t) ? t(u) : t, E = `${I}-${o.join(".")}`;
       if (E) {
-        let M = !1, N = f.signalDomElements.get(E);
-        if ((!N || N.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const O = o.slice(0, -1), j = J(y, O);
-          if (Array.isArray(j)) {
-            M = !0;
-            const _ = `${I}-${O.join(".")}`;
-            N = f.signalDomElements.get(_);
+        let P = !1, A = f.signalDomElements.get(E);
+        if ((!A || A.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const M = o.slice(0, -1), O = Y(y, M);
+          if (Array.isArray(O)) {
+            P = !0;
+            const _ = `${I}-${M.join(".")}`;
+            A = f.signalDomElements.get(_);
           }
         }
-        if (N) {
-          const O = M ? J(y, o.slice(0, -1)) : J(y, o);
-          N.forEach(({ parentId: j, position: _, effect: R }) => {
-            const P = document.querySelector(
-              `[data-parent-id="${j}"]`
+        if (A) {
+          const M = P ? Y(y, o.slice(0, -1)) : Y(y, o);
+          A.forEach(({ parentId: O, position: _, effect: b }) => {
+            const G = document.querySelector(
+              `[data-parent-id="${O}"]`
             );
-            if (P) {
-              const z = Array.from(P.childNodes);
+            if (G) {
+              const z = Array.from(G.childNodes);
               if (z[_]) {
-                const D = R ? new Function("state", `return (${R})(state)`)(O) : O;
-                z[_].textContent = String(D);
+                const U = b ? new Function("state", `return (${b})(state)`)(M) : M;
+                z[_].textContent = String(U);
               }
             }
           });
         }
       }
-      console.log("shadowState", f.shadowStateStore), s.updateType === "update" && (c || V.current?.validation?.key) && o && X(
-        (c || V.current?.validation?.key) + "." + o.join(".")
+      console.log("shadowState", f.shadowStateStore), s.updateType === "update" && (c || L.current?.validation?.key) && o && Q(
+        (c || L.current?.validation?.key) + "." + o.join(".")
       );
       const w = o.slice(0, o.length - 1);
-      s.updateType === "cut" && V.current?.validation?.key && X(
-        V.current?.validation?.key + "." + w.join(".")
-      ), s.updateType === "insert" && V.current?.validation?.key && qe(
-        V.current?.validation?.key + "." + w.join(".")
-      ).filter(([N, O]) => {
-        let j = N?.split(".").length;
-        if (N == w.join(".") && j == w.length - 1) {
-          let _ = N + "." + w;
-          X(N), Ye(_, O);
+      s.updateType === "cut" && L.current?.validation?.key && Q(
+        L.current?.validation?.key + "." + w.join(".")
+      ), s.updateType === "insert" && L.current?.validation?.key && Je(
+        L.current?.validation?.key + "." + w.join(".")
+      ).filter(([A, M]) => {
+        let O = A?.split(".").length;
+        if (A == w.join(".") && O == w.length - 1) {
+          let _ = A + "." + w;
+          Q(A), Ze(_, M);
         }
       });
-      const A = f.stateComponents.get(I);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", A), A) {
-        const M = _e(u, y), N = new Set(M), O = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
+      const N = f.stateComponents.get(I);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", N), N) {
+        const P = _e(u, y), A = new Set(P), M = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
         for (const [
-          j,
+          O,
           _
-        ] of A.components.entries()) {
-          let R = !1;
-          const P = Array.isArray(_.reactiveType) ? _.reactiveType : [_.reactiveType || "component"];
-          if (console.log("component", _), !P.includes("none")) {
-            if (P.includes("all")) {
+        ] of N.components.entries()) {
+          let b = !1;
+          const G = Array.isArray(_.reactiveType) ? _.reactiveType : [_.reactiveType || "component"];
+          if (console.log("component", _), !G.includes("none")) {
+            if (G.includes("all")) {
               _.forceUpdate();
               continue;
             }
-            if (P.includes("component") && ((_.paths.has(O) || _.paths.has("")) && (R = !0), !R))
-              for (const z of N) {
-                let D = z;
+            if (G.includes("component") && ((_.paths.has(M) || _.paths.has("")) && (b = !0), !b))
+              for (const z of A) {
+                let U = z;
                 for (; ; ) {
-                  if (_.paths.has(D)) {
-                    R = !0;
+                  if (_.paths.has(U)) {
+                    b = !0;
                     break;
                   }
-                  const k = D.lastIndexOf(".");
-                  if (k !== -1) {
-                    const x = D.substring(
+                  const se = U.lastIndexOf(".");
+                  if (se !== -1) {
+                    const $ = U.substring(
                       0,
-                      k
+                      se
                     );
                     if (!isNaN(
-                      Number(D.substring(k + 1))
-                    ) && _.paths.has(x)) {
-                      R = !0;
+                      Number(U.substring(se + 1))
+                    ) && _.paths.has($)) {
+                      b = !0;
                       break;
                     }
-                    D = x;
+                    U = $;
                   } else
-                    D = "";
-                  if (D === "")
+                    U = "";
+                  if (U === "")
                     break;
                 }
-                if (R) break;
+                if (b) break;
               }
-            if (!R && P.includes("deps") && _.depsFunction) {
+            if (!b && G.includes("deps") && _.depsFunction) {
               const z = _.depsFunction(y);
-              let D = !1;
-              typeof z == "boolean" ? z && (D = !0) : q(_.deps, z) || (_.deps = z, D = !0), D && (R = !0);
+              let U = !1;
+              typeof z == "boolean" ? z && (U = !0) : q(_.deps, z) || (_.deps = z, U = !0), U && (b = !0);
             }
-            R && _.forceUpdate();
+            b && _.forceUpdate();
           }
         }
       }
-      const $ = Date.now();
-      o = o.map((M, N) => {
-        const O = o.slice(0, -1), j = J(y, O);
-        return N === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (j.length - 1).toString() : M;
+      const k = Date.now();
+      o = o.map((P, A) => {
+        const M = o.slice(0, -1), O = Y(y, M);
+        return A === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (O.length - 1).toString() : P;
       });
-      const { oldValue: b, newValue: U } = Qe(
+      const { oldValue: x, newValue: j } = Ke(
         s.updateType,
         u,
         y,
         o
-      ), Y = {
-        timeStamp: $,
+      ), Z = {
+        timeStamp: k,
         stateKey: I,
         path: o,
         updateType: s.updateType,
         status: "new",
-        oldValue: b,
-        newValue: U
+        oldValue: x,
+        newValue: j
       };
       switch (s.updateType) {
         case "update":
           f.updateShadowAtPath(I, o, y);
           break;
         case "insert":
-          const M = o.slice(0, -1);
-          f.insertShadowArrayElement(I, M, U);
+          const P = o.slice(0, -1);
+          f.insertShadowArrayElement(I, P, j);
           break;
         case "cut":
-          const N = o.slice(0, -1), O = parseInt(o[o.length - 1]);
-          f.removeShadowArrayElement(I, N, O);
+          const A = o.slice(0, -1), M = parseInt(o[o.length - 1]);
+          f.removeShadowArrayElement(I, A, M);
           break;
       }
-      if (Je(I, (M) => {
-        const O = [...M ?? [], Y].reduce((j, _) => {
-          const R = `${_.stateKey}:${JSON.stringify(_.path)}`, P = j.get(R);
-          return P ? (P.timeStamp = Math.max(P.timeStamp, _.timeStamp), P.newValue = _.newValue, P.oldValue = P.oldValue ?? _.oldValue, P.updateType = _.updateType) : j.set(R, { ..._ }), j;
+      if (Ye(I, (P) => {
+        const M = [...P ?? [], Z].reduce((O, _) => {
+          const b = `${_.stateKey}:${JSON.stringify(_.path)}`, G = O.get(b);
+          return G ? (G.timeStamp = Math.max(G.timeStamp, _.timeStamp), G.newValue = _.newValue, G.oldValue = G.oldValue ?? _.oldValue, G.updateType = _.updateType) : O.set(b, { ..._ }), O;
         }, /* @__PURE__ */ new Map());
-        return Array.from(O.values());
-      }), be(
+        return Array.from(M.values());
+      }), Me(
         y,
         I,
-        V.current,
-        G
-      ), V.current?.middleware && V.current.middleware({
+        L.current,
+        D
+      ), L.current?.middleware && L.current.middleware({
         updateLog: l,
-        update: Y
-      }), V.current?.serverSync) {
-        const M = f.serverState[I], N = V.current?.serverSync;
-        Ze(I, {
-          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: y }),
-          rollBackState: M,
-          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
+        update: Z
+      }), L.current?.serverSync) {
+        const P = f.serverState[I], A = L.current?.serverSync;
+        Xe(I, {
+          syncKey: typeof A.syncKey == "string" ? A.syncKey : A.syncKey({ state: y }),
+          rollBackState: P,
+          actionTimeStamp: Date.now() + (A.debounce ?? 3e3),
           status: "waiting"
         });
       }
       return y;
     });
   };
-  r.getState().updaterState[I] || (Se(
+  r.getState().updaterState[I] || (Ie(
     I,
-    me(
+    he(
       I,
       ae,
-      ee.current,
-      G
+      te.current,
+      D
     )
-  ), r.getState().cogsStateStore[I] || ne(I, e), r.getState().initialStateGlobal[I] || Oe(I, e));
-  const d = Ee(() => me(
+  ), r.getState().cogsStateStore[I] || ne(I, e), r.getState().initialStateGlobal[I] || Ne(I, e));
+  const d = Oe(() => he(
     I,
     ae,
-    ee.current,
-    G
-  ), [I, G]);
-  return [Pe(I), d];
+    te.current,
+    D
+  ), [I, D]);
+  return [Le(I), d];
 }
-function me(e, i, m, g) {
+function he(e, i, m, g) {
   const T = /* @__PURE__ */ new Map();
   let C = 0;
   const p = (h) => {
@@ -443,15 +443,15 @@ function me(e, i, m, g) {
     C++;
   }, v = {
     removeValidation: (h) => {
-      h?.validationKey && X(h.validationKey);
+      h?.validationKey && Q(h.validationKey);
     },
     revertToInitialState: (h) => {
       const n = r.getState().getInitialOptions(e)?.validation;
-      n?.key && X(n?.key), h?.validationKey && X(h.validationKey);
+      n?.key && Q(n?.key), h?.validationKey && Q(h.validationKey);
       const S = r.getState().initialStateGlobal[e];
       r.getState().clearSelectedIndexesForState(e), T.clear(), C++;
-      const F = a(S, []), L = re(e), G = K(L?.localStorage?.key) ? L?.localStorage?.key(S) : L?.localStorage?.key, B = `${g}-${e}-${G}`;
-      B && localStorage.removeItem(B), Se(e, F), ne(e, S);
+      const B = a(S, []), R = re(e), D = ee(R?.localStorage?.key) ? R?.localStorage?.key(S) : R?.localStorage?.key, W = `${g}-${e}-${D}`;
+      W && localStorage.removeItem(W), Ie(e, B), ne(e, S);
       const I = r.getState().stateComponents.get(e);
       return I && I.components.forEach((l) => {
         l.forceUpdate();
@@ -459,20 +459,20 @@ function me(e, i, m, g) {
     },
     updateInitialState: (h) => {
       T.clear(), C++;
-      const n = me(
+      const n = he(
         e,
         i,
         m,
         g
-      ), S = r.getState().initialStateGlobal[e], F = re(e), L = K(F?.localStorage?.key) ? F?.localStorage?.key(S) : F?.localStorage?.key, G = `${g}-${e}-${L}`;
-      return localStorage.getItem(G) && localStorage.removeItem(G), De(() => {
-        Oe(e, h), r.getState().initializeShadowState(e, h), Se(e, n), ne(e, h);
-        const B = r.getState().stateComponents.get(e);
-        B && B.components.forEach((I) => {
+      ), S = r.getState().initialStateGlobal[e], B = re(e), R = ee(B?.localStorage?.key) ? B?.localStorage?.key(S) : B?.localStorage?.key, D = `${g}-${e}-${R}`;
+      return localStorage.getItem(D) && localStorage.removeItem(D), Ue(() => {
+        Ne(e, h), r.getState().initializeShadowState(e, h), Ie(e, n), ne(e, h);
+        const W = r.getState().stateComponents.get(e);
+        W && W.components.forEach((I) => {
           I.forceUpdate();
         });
       }), {
-        fetchId: (B) => n.get()[B]
+        fetchId: (W) => n.get()[W]
       };
     },
     _initialState: r.getState().initialStateGlobal[e],
@@ -480,27 +480,27 @@ function me(e, i, m, g) {
     _isLoading: r.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
       const h = r.getState().serverState[e];
-      return !!(h && q(h, Pe(e)));
+      return !!(h && q(h, Le(e)));
     }
   };
   function a(h, n = [], S) {
-    const F = n.map(String).join(".");
-    T.get(F);
-    const L = function() {
+    const B = n.map(String).join(".");
+    T.get(B);
+    const R = function() {
       return r().getNestedState(e, n);
     };
     Object.keys(v).forEach((I) => {
-      L[I] = v[I];
+      R[I] = v[I];
     });
-    const G = {
-      apply(I, l, le) {
+    const D = {
+      apply(I, l, de) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${e}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), r().getNestedState(e, n);
       },
       get(I, l) {
         S?.validIndices && !Array.isArray(h) && (S = { ...S, validIndices: void 0 });
-        const le = /* @__PURE__ */ new Set([
+        const de = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,7 +523,7 @@ function me(e, i, m, g) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !le.has(l)) {
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !de.has(l)) {
           const d = `${e}////${m}`, t = r.getState().stateComponents.get(e);
           if (t) {
             const o = t.components.get(d);
@@ -568,7 +568,7 @@ function me(e, i, m, g) {
             }
           };
         if (l === "_status") {
-          const d = r.getState().getNestedState(e, n), t = r.getState().initialStateGlobal[e], o = J(t, n);
+          const d = r.getState().getNestedState(e, n), t = r.getState().initialStateGlobal[e], o = Y(t, n);
           return q(d, o) ? "fresh" : "stale";
         }
         if (l === "getStatus")
@@ -576,12 +576,12 @@ function me(e, i, m, g) {
             const d = r().getNestedState(
               e,
               n
-            ), t = r.getState().initialStateGlobal[e], o = J(t, n);
+            ), t = r.getState().initialStateGlobal[e], o = Y(t, n);
             return q(d, o) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = r.getState().initialStateGlobal[e], t = re(e), o = K(t?.localStorage?.key) ? t?.localStorage?.key(d) : t?.localStorage?.key, s = `${g}-${e}-${o}`;
+            const d = r.getState().initialStateGlobal[e], t = re(e), o = ee(t?.localStorage?.key) ? t?.localStorage?.key(d) : t?.localStorage?.key, s = `${g}-${e}-${o}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -622,164 +622,166 @@ function me(e, i, m, g) {
                 overscan: s = 6,
                 stickToBottom: c = !1,
                 dependencies: f = []
-              } = t, u = Z(null), [y, E] = Q({
+              } = t, u = J(null), [y, E] = K({
                 startIndex: 0,
                 endIndex: 10
-              }), [w, A] = Q("IDLE_AT_TOP"), $ = Z(!1), b = Z(0), U = Z(f), [Y, M] = Q(0);
+              }), [w, N] = K("IDLE_AT_TOP"), k = J(!1), x = J(0), j = J(f), [Z, P] = K(0), A = J(null);
               oe(() => r.getState().subscribeToShadowState(e, () => {
-                M((x) => x + 1);
+                P((V) => V + 1);
               }), [e]);
-              const N = r().getNestedState(
+              const M = r().getNestedState(
                 e,
                 n
-              ), O = N.length, { totalHeight: j, positions: _ } = Ee(() => {
-                const k = r.getState().getShadowMetadata(e, n) || [];
-                let x = 0;
+              ), O = M.length, { totalHeight: _, positions: b } = Oe(() => {
+                const $ = r.getState().getShadowMetadata(e, n) || [];
+                let V = 0;
                 const H = [];
-                for (let W = 0; W < O; W++) {
-                  H[W] = x;
-                  const te = k[W]?.virtualizer?.itemHeight;
-                  x += te || o;
+                for (let F = 0; F < O; F++) {
+                  H[F] = V;
+                  const X = $[F]?.virtualizer?.itemHeight;
+                  V += X || o;
                 }
-                return { totalHeight: x, positions: H };
+                return { totalHeight: V, positions: H };
               }, [
                 O,
                 e,
                 n.join("."),
                 o,
-                Y
-              ]), R = Ee(() => {
-                const k = Math.max(0, y.startIndex), x = Math.min(O, y.endIndex), H = Array.from(
-                  { length: x - k },
-                  (te, Ae) => k + Ae
-                ), W = H.map((te) => N[te]);
-                return a(W, n, {
+                Z
+              ]), G = Oe(() => {
+                const $ = Math.max(0, y.startIndex), V = Math.min(O, y.endIndex), H = Array.from(
+                  { length: V - $ },
+                  (X, ue) => $ + ue
+                ), F = H.map((X) => M[X]);
+                return a(F, n, {
                   ...S,
                   validIndices: H
                 });
-              }, [y.startIndex, y.endIndex, N, O]);
-              ie(() => {
-                const k = !q(
+              }, [y.startIndex, y.endIndex, M, O]);
+              ce(() => {
+                const $ = u.current;
+                if (!$) return;
+                const V = O > x.current;
+                !q(
                   f,
-                  U.current
-                ), x = O > b.current;
-                if (k) {
-                  console.log("TRANSITION: Deps changed -> IDLE_AT_TOP"), A("IDLE_AT_TOP");
-                  return;
-                }
-                x && w === "LOCKED_AT_BOTTOM" && c && (console.log(
+                  j.current
+                ) ? (console.log(
+                  "TRANSITION (Hard Reset): Deps changed -> IDLE_AT_TOP"
+                ), N("IDLE_AT_TOP"), $.scrollTo({ top: 0 })) : V && w === "LOCKED_AT_BOTTOM" && c ? (console.log(
                   "TRANSITION: New items arrived while locked -> GETTING_HEIGHTS"
-                ), A("GETTING_HEIGHTS")), b.current = O, U.current = f;
-              }, [O, ...f]), ie(() => {
-                const k = u.current;
-                if (!k) return;
-                let x;
+                ), N("GETTING_HEIGHTS")) : V && A.current && (console.log(
+                  "ACTION: Maintaining scroll position after new items added."
+                ), $.scrollTop = A.current.scrollTop + ($.scrollHeight - A.current.scrollHeight)), x.current = O, j.current = f, A.current = null;
+              }, [O, ...f]), ce(() => {
+                const $ = u.current;
+                if (!$) return;
+                let V;
                 if (w === "IDLE_AT_TOP" && c && O > 0)
                   console.log(
                     "ACTION (IDLE_AT_TOP): Data arrived -> GETTING_HEIGHTS"
-                  ), A("GETTING_HEIGHTS");
+                  ), N("GETTING_HEIGHTS");
                 else if (w === "GETTING_HEIGHTS")
                   console.log("ACTION (GETTING_HEIGHTS): Setting range to end"), E({
                     startIndex: Math.max(0, O - 10 - s),
                     endIndex: O
-                  }), x = setInterval(() => {
+                  }), V = setInterval(() => {
                     const H = O - 1;
-                    ((r.getState().getShadowMetadata(e, n) || [])[H]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(x), console.log(
+                    ((r.getState().getShadowMetadata(e, n) || [])[H]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(V), console.log(
                       "ACTION (GETTING_HEIGHTS): Measurement success -> SCROLLING_TO_BOTTOM"
-                    ), A("SCROLLING_TO_BOTTOM"));
+                    ), N("SCROLLING_TO_BOTTOM"));
                   }, 100);
                 else if (w === "SCROLLING_TO_BOTTOM") {
                   console.log(
                     "ACTION (SCROLLING_TO_BOTTOM): Executing scroll."
-                  ), $.current = !0;
-                  const H = b.current === 0 ? "auto" : "smooth";
-                  k.scrollTo({
-                    top: k.scrollHeight,
+                  ), k.current = !0;
+                  const H = x.current === 0 ? "auto" : "smooth";
+                  $.scrollTo({
+                    top: $.scrollHeight,
                     behavior: H
                   });
-                  const W = setTimeout(
+                  const F = setTimeout(
                     () => {
-                      $.current = !1, A("LOCKED_AT_BOTTOM");
+                      k.current = !1, N("LOCKED_AT_BOTTOM");
                     },
                     H === "smooth" ? 500 : 50
                   );
-                  return () => clearTimeout(W);
+                  return () => clearTimeout(F);
                 }
                 return () => {
-                  x && clearInterval(x);
+                  V && clearInterval(V);
                 };
-              }, [w, O, _]), oe(() => {
-                const k = u.current;
-                if (!k) return;
-                const x = () => {
-                  if ($.current)
+              }, [w, O, b]), oe(() => {
+                const $ = u.current;
+                if (!$) return;
+                const V = 10, H = () => {
+                  if (k.current)
                     return;
-                  const { scrollTop: H, clientHeight: W, scrollHeight: te } = k;
-                  te - H - W < 1 ? w !== "LOCKED_AT_BOTTOM" && (console.log(
+                  const { scrollTop: F, clientHeight: X, scrollHeight: ue } = $;
+                  A.current = { scrollTop: F, scrollHeight: ue }, ue - F - X < V ? w !== "LOCKED_AT_BOTTOM" && (console.log(
                     "SCROLL EVENT: Reached bottom -> LOCKED_AT_BOTTOM"
-                  ), A("LOCKED_AT_BOTTOM")) : w !== "IDLE_NOT_AT_BOTTOM" && (console.log(
+                  ), N("LOCKED_AT_BOTTOM")) : w !== "IDLE_NOT_AT_BOTTOM" && (console.log(
                     "SCROLL EVENT: Scrolled up -> IDLE_NOT_AT_BOTTOM"
-                  ), A("IDLE_NOT_AT_BOTTOM"));
-                  let Te = O - 1, ve = 0, Ne = 0;
-                  for (; ve <= Te; ) {
-                    const ge = Math.floor((ve + Te) / 2);
-                    _[ge] < H ? (Ne = ge, ve = ge + 1) : Te = ge - 1;
+                  ), N("IDLE_NOT_AT_BOTTOM"));
+                  let ye = O - 1, pe = 0, Ce = 0;
+                  for (; pe <= ye; ) {
+                    const Se = Math.floor((pe + ye) / 2);
+                    b[Se] < F ? (Ce = Se, pe = Se + 1) : ye = Se - 1;
                   }
-                  const de = Math.max(
+                  const ge = Math.max(
                     0,
-                    Ne - s
+                    Ce - s
                   );
-                  if (de === y.startIndex)
+                  if (ge === y.startIndex)
                     return;
-                  let ue = de;
-                  const Ge = H + W;
-                  for (; ue < O && _[ue] < Ge; )
-                    ue++;
+                  let fe = ge;
+                  const Re = F + X;
+                  for (; fe < O && b[fe] < Re; )
+                    fe++;
                   console.log(
-                    `Index changed from ${y.startIndex} to ${de}. Updating range.`
+                    `Index changed from ${y.startIndex} to ${ge}. Updating range.`
                   ), E({
-                    startIndex: de,
-                    endIndex: Math.min(O, ue + s)
+                    startIndex: ge,
+                    endIndex: Math.min(O, fe + s)
                   });
                 };
-                return k.addEventListener("scroll", x, {
+                return $.addEventListener("scroll", H, {
                   passive: !0
-                }), () => k.removeEventListener("scroll", x);
-              }, [O, _, w, y.startIndex]);
-              const P = Ce(() => {
+                }), () => $.removeEventListener("scroll", H);
+              }, [O, b, w, y.startIndex]);
+              const z = $e(() => {
                 console.log(
                   "USER ACTION: Clicked scroll button -> SCROLLING_TO_BOTTOM"
-                ), O !== 0 && A("SCROLLING_TO_BOTTOM");
-              }, [O]), z = Ce(
-                (k, x = "smooth") => {
-                  u.current && _[k] !== void 0 && (A("IDLE_NOT_AT_BOTTOM"), u.current.scrollTo({
-                    top: _[k],
-                    behavior: x
+                ), O !== 0 && N("SCROLLING_TO_BOTTOM");
+              }, [O]), U = $e(
+                ($, V = "smooth") => {
+                  u.current && b[$] !== void 0 && (N("IDLE_NOT_AT_BOTTOM"), u.current.scrollTo({
+                    top: b[$],
+                    behavior: V
                   }));
                 },
-                [_]
-              ), D = {
+                [b]
+              ), se = {
                 outer: {
                   ref: u,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${j}px`,
+                    height: `${_}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${_[y.startIndex] || 0}px)`
+                    transform: `translateY(${b[y.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: R,
-                virtualizerProps: D,
-                scrollToBottom: P,
-                scrollToIndex: z
+                virtualState: G,
+                virtualizerProps: se,
+                scrollToBottom: z,
+                scrollToIndex: U
               };
             };
           if (l === "stateSort")
@@ -813,19 +815,19 @@ function me(e, i, m, g) {
                 const u = o[c], y = [...n, c.toString()], E = a(u, y, S);
                 return t(u, E, {
                   register: () => {
-                    const [, A] = Q({}), $ = `${m}-${n.join(".")}-${c}`;
-                    ie(() => {
-                      const b = `${e}////${$}`, U = r.getState().stateComponents.get(e) || {
+                    const [, N] = K({}), k = `${m}-${n.join(".")}-${c}`;
+                    ce(() => {
+                      const x = `${e}////${k}`, j = r.getState().stateComponents.get(e) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return U.components.set(b, {
-                        forceUpdate: () => A({}),
+                      return j.components.set(x, {
+                        forceUpdate: () => N({}),
                         paths: /* @__PURE__ */ new Set([y.join(".")])
-                      }), r.getState().stateComponents.set(e, U), () => {
-                        const Y = r.getState().stateComponents.get(e);
-                        Y && Y.components.delete(b);
+                      }), r.getState().stateComponents.set(e, j), () => {
+                        const Z = r.getState().stateComponents.get(e);
+                        Z && Z.components.delete(x);
                       };
-                    }, [e, $]);
+                    }, [e, k]);
                   },
                   index: f,
                   originalIndex: c
@@ -849,7 +851,7 @@ function me(e, i, m, g) {
               );
             });
           if (l === "$stateMap")
-            return (t) => ce(et, {
+            return (t) => le(tt, {
               proxy: {
                 _stateKey: e,
                 _path: n,
@@ -863,7 +865,7 @@ function me(e, i, m, g) {
               const o = r.getState().getNestedState(e, n);
               return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, f) => f)).map((c, f) => {
                 const u = o[c], y = [...n, c.toString()], E = a(u, y, S), w = `${m}-${n.join(".")}-${c}`;
-                return ce(nt, {
+                return le(rt, {
                   key: c,
                   stateKey: e,
                   itemComponentId: w,
@@ -906,36 +908,36 @@ function me(e, i, m, g) {
               return a(s, c);
             };
           if (l === "insert")
-            return (t) => (p(n), ye(i, t, n, e), a(
+            return (t) => (p(n), Ee(i, t, n, e), a(
               r.getState().getNestedState(e, n),
               n
             ));
           if (l === "uniqueInsert")
             return (t, o, s) => {
-              const c = r.getState().getNestedState(e, n), f = K(t) ? t(c) : t;
+              const c = r.getState().getNestedState(e, n), f = ee(t) ? t(c) : t;
               let u = null;
               if (!c.some((E) => {
                 if (o) {
-                  const A = o.every(
-                    ($) => q(E[$], f[$])
+                  const N = o.every(
+                    (k) => q(E[k], f[k])
                   );
-                  return A && (u = E), A;
+                  return N && (u = E), N;
                 }
                 const w = q(E, f);
                 return w && (u = E), w;
               }))
-                p(n), ye(i, f, n, e);
+                p(n), Ee(i, f, n, e);
               else if (s && u) {
                 const E = s(u), w = c.map(
-                  (A) => q(A, u) ? E : A
+                  (N) => q(N, u) ? E : N
                 );
-                p(n), se(i, w, n);
+                p(n), ie(i, w, n);
               }
             };
           if (l === "cut")
             return (t, o) => {
               if (!o?.waitForSync)
-                return p(n), fe(i, n, e, t), a(
+                return p(n), me(i, n, e, t), a(
                   r.getState().getNestedState(e, n),
                   n
                 );
@@ -943,12 +945,12 @@ function me(e, i, m, g) {
           if (l === "cutByValue")
             return (t) => {
               for (let o = 0; o < h.length; o++)
-                h[o] === t && fe(i, n, e, o);
+                h[o] === t && me(i, n, e, o);
             };
           if (l === "toggleByValue")
             return (t) => {
               const o = h.findIndex((s) => s === t);
-              o > -1 ? fe(i, n, e, o) : ye(i, t, n, e);
+              o > -1 ? me(i, n, e, o) : Ee(i, t, n, e);
             };
           if (l === "stateFind")
             return (t) => {
@@ -969,15 +971,15 @@ function me(e, i, m, g) {
               return a(c.item, f, S);
             };
         }
-        const ee = n[n.length - 1];
-        if (!isNaN(Number(ee))) {
+        const te = n[n.length - 1];
+        if (!isNaN(Number(te))) {
           const d = n.slice(0, -1), t = r.getState().getNestedState(e, d);
           if (Array.isArray(t) && l === "cut")
-            return () => fe(
+            return () => me(
               i,
               d,
               e,
-              Number(ee)
+              Number(te)
             );
         }
         if (l === "get")
@@ -989,13 +991,13 @@ function me(e, i, m, g) {
             return r.getState().getNestedState(e, n);
           };
         if (l === "$derive")
-          return (d) => Me({
+          return (d) => Ve({
             _stateKey: e,
             _path: n,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Me({
+          return () => Ve({
             _stateKey: e,
             _path: n
           });
@@ -1004,7 +1006,7 @@ function me(e, i, m, g) {
           return r.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => Ie(g + "-" + e + "-" + d);
+          return (d) => Te(g + "-" + e + "-" + d);
         if (l === "_selected") {
           const d = n.slice(0, -1), t = d.join("."), o = r.getState().getNestedState(e, d);
           return Array.isArray(o) ? Number(n[n.length - 1]) === r.getState().getSelectedIndex(e, t) : void 0;
@@ -1014,7 +1016,7 @@ function me(e, i, m, g) {
             const t = n.slice(0, -1), o = Number(n[n.length - 1]), s = t.join(".");
             d ? r.getState().setSelectedIndex(e, s, o) : r.getState().setSelectedIndex(e, s, void 0);
             const c = r.getState().getNestedState(e, [...t]);
-            se(i, c, t), p(t);
+            ie(i, c, t), p(t);
           };
         if (l === "toggleSelected")
           return () => {
@@ -1025,13 +1027,13 @@ function me(e, i, m, g) {
               s === t ? void 0 : t
             );
             const c = r.getState().getNestedState(e, [...d]);
-            se(i, c, d), p(d);
+            ie(i, c, d), p(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
-              const t = r.getState().cogsStateStore[e], s = We(t, d).newDocument;
-              Le(
+              const t = r.getState().cogsStateStore[e], s = ze(t, d).newDocument;
+              Ge(
                 e,
                 r.getState().initialStateGlobal[e],
                 s,
@@ -1047,49 +1049,49 @@ function me(e, i, m, g) {
                   E
                 ] of c.components.entries()) {
                   let w = !1;
-                  const A = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
-                  if (!A.includes("none")) {
-                    if (A.includes("all")) {
+                  const N = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
+                  if (!N.includes("none")) {
+                    if (N.includes("all")) {
                       E.forceUpdate();
                       continue;
                     }
-                    if (A.includes("component") && (E.paths.has("") && (w = !0), !w))
-                      for (const $ of u) {
-                        if (E.paths.has($)) {
+                    if (N.includes("component") && (E.paths.has("") && (w = !0), !w))
+                      for (const k of u) {
+                        if (E.paths.has(k)) {
                           w = !0;
                           break;
                         }
-                        let b = $.lastIndexOf(".");
-                        for (; b !== -1; ) {
-                          const U = $.substring(0, b);
-                          if (E.paths.has(U)) {
+                        let x = k.lastIndexOf(".");
+                        for (; x !== -1; ) {
+                          const j = k.substring(0, x);
+                          if (E.paths.has(j)) {
                             w = !0;
                             break;
                           }
-                          const Y = $.substring(
-                            b + 1
+                          const Z = k.substring(
+                            x + 1
                           );
-                          if (!isNaN(Number(Y))) {
-                            const M = U.lastIndexOf(".");
-                            if (M !== -1) {
-                              const N = U.substring(
+                          if (!isNaN(Number(Z))) {
+                            const P = j.lastIndexOf(".");
+                            if (P !== -1) {
+                              const A = j.substring(
                                 0,
-                                M
+                                P
                               );
-                              if (E.paths.has(N)) {
+                              if (E.paths.has(A)) {
                                 w = !0;
                                 break;
                               }
                             }
                           }
-                          b = U.lastIndexOf(".");
+                          x = j.lastIndexOf(".");
                         }
                         if (w) break;
                       }
-                    if (!w && A.includes("deps") && E.depsFunction) {
-                      const $ = E.depsFunction(s);
-                      let b = !1;
-                      typeof $ == "boolean" ? $ && (b = !0) : q(E.deps, $) || (E.deps = $, b = !0), b && (w = !0);
+                    if (!w && N.includes("deps") && E.depsFunction) {
+                      const k = E.depsFunction(s);
+                      let x = !1;
+                      typeof k == "boolean" ? k && (x = !0) : q(E.deps, k) || (E.deps = k, x = !0), x && (w = !0);
                     }
                     w && E.forceUpdate();
                   }
@@ -1103,18 +1105,18 @@ function me(e, i, m, g) {
                 throw new Error("Zod schema not found");
               if (!d?.key)
                 throw new Error("Validation key not found");
-              X(d.key);
+              Q(d.key);
               const o = r.getState().cogsStateStore[e];
               try {
                 const s = r.getState().getValidationErrors(d.key);
                 s && s.length > 0 && s.forEach(([f]) => {
-                  f && f.startsWith(d.key) && X(f);
+                  f && f.startsWith(d.key) && Q(f);
                 });
                 const c = d.zodSchema.safeParse(o);
                 return c.success ? !0 : (c.error.errors.forEach((u) => {
                   const y = u.path, E = u.message, w = [d.key, ...y].join(".");
                   t(w, E);
-                }), he(e), !1);
+                }), ve(e), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
@@ -1123,7 +1125,7 @@ function me(e, i, m, g) {
           if (l === "getComponents")
             return () => r().stateComponents.get(e);
           if (l === "getAllFormRefs")
-            return () => $e.getState().getFormRefsByStateKey(e);
+            return () => ke.getState().getFormRefsByStateKey(e);
           if (l === "_initialState")
             return r.getState().initialStateGlobal[e];
           if (l === "_serverState")
@@ -1136,13 +1138,13 @@ function me(e, i, m, g) {
           if (l === "removeValidation") return v.removeValidation;
         }
         if (l === "getFormRef")
-          return () => $e.getState().getFormRef(e + "." + n.join("."));
+          return () => ke.getState().getFormRef(e + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: t
-          }) => /* @__PURE__ */ pe(
-            He,
+          }) => /* @__PURE__ */ we(
+            Fe,
             {
               formOpts: t ? { validation: { message: "" } } : void 0,
               path: n,
@@ -1158,21 +1160,21 @@ function me(e, i, m, g) {
         if (l === "update")
           return (d, t) => {
             if (t?.debounce)
-              je(() => {
-                se(i, d, n, "");
+              He(() => {
+                ie(i, d, n, "");
                 const o = r.getState().getNestedState(e, n);
                 t?.afterUpdate && t.afterUpdate(o);
               }, t.debounce);
             else {
-              se(i, d, n, "");
+              ie(i, d, n, "");
               const o = r.getState().getNestedState(e, n);
               t?.afterUpdate && t.afterUpdate(o);
             }
             p(n);
           };
         if (l === "formElement")
-          return (d, t) => /* @__PURE__ */ pe(
-            Fe,
+          return (d, t) => /* @__PURE__ */ we(
+            Be,
             {
               setState: i,
               stateKey: e,
@@ -1181,23 +1183,23 @@ function me(e, i, m, g) {
               formOpts: t
             }
           );
-        const V = [...n, l], ae = r.getState().getNestedState(e, V);
-        return a(ae, V, S);
+        const L = [...n, l], ae = r.getState().getNestedState(e, L);
+        return a(ae, L, S);
       }
-    }, B = new Proxy(L, G);
-    return T.set(F, {
-      proxy: B,
+    }, W = new Proxy(R, D);
+    return T.set(B, {
+      proxy: W,
       stateVersion: C
-    }), B;
+    }), W;
   }
   return a(
     r.getState().getNestedState(e, [])
   );
 }
-function Me(e) {
-  return ce(tt, { proxy: e });
+function Ve(e) {
+  return le(nt, { proxy: e });
 }
-function et({
+function tt({
   proxy: e,
   rebuildStateShape: i
 }) {
@@ -1209,10 +1211,10 @@ function et({
     (T, C, p, v, a) => e._mapFn(T, C, p, v, a)
   ) : null;
 }
-function tt({
+function nt({
   proxy: e
 }) {
-  const i = Z(null), m = `${e._stateKey}-${e._path.join(".")}`;
+  const i = J(null), m = `${e._stateKey}-${e._path.join(".")}`;
   return oe(() => {
     const g = i.current;
     if (!g || !g.parentElement) return;
@@ -1234,22 +1236,22 @@ function tt({
           "state",
           `return (${e._effect})(state)`
         )(n);
-      } catch (L) {
-        console.error("Error evaluating effect function during mount:", L), S = n;
+      } catch (R) {
+        console.error("Error evaluating effect function during mount:", R), S = n;
       }
     else
       S = n;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const F = document.createTextNode(String(S));
-    g.replaceWith(F);
-  }, [e._stateKey, e._path.join("."), e._effect]), ce("span", {
+    const B = document.createTextNode(String(S));
+    g.replaceWith(B);
+  }, [e._stateKey, e._path.join("."), e._effect]), le("span", {
     ref: i,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
-function ht(e) {
-  const i = Re(
+function vt(e) {
+  const i = De(
     (m) => {
       const g = r.getState().stateComponents.get(e._stateKey) || {
         components: /* @__PURE__ */ new Map()
@@ -1261,22 +1263,22 @@ function ht(e) {
     },
     () => r.getState().getNestedState(e._stateKey, e._path)
   );
-  return ce("text", {}, String(i));
+  return le("text", {}, String(i));
 }
-function nt({
+function rt({
   stateKey: e,
   itemComponentId: i,
   itemPath: m,
   children: g
 }) {
-  const [, T] = Q({}), [C, p] = ze(), v = Z(null);
+  const [, T] = K({}), [C, p] = qe(), v = J(null);
   return oe(() => {
     p.height > 0 && p.height !== v.current && (v.current = p.height, r.getState().setShadowMetadata(e, m, {
       virtualizer: {
         itemHeight: p.height
       }
     }));
-  }, [p.height, e, m]), ie(() => {
+  }, [p.height, e, m]), ce(() => {
     const a = `${e}////${i}`, h = r.getState().stateComponents.get(e) || {
       components: /* @__PURE__ */ new Map()
     };
@@ -1287,14 +1289,14 @@ function nt({
       const n = r.getState().stateComponents.get(e);
       n && n.components.delete(a);
     };
-  }, [e, i, m.join(".")]), /* @__PURE__ */ pe("div", { ref: C, children: g });
+  }, [e, i, m.join(".")]), /* @__PURE__ */ we("div", { ref: C, children: g });
 }
 export {
-  Me as $cogsSignal,
-  ht as $cogsSignalStore,
-  St as addStateOptions,
-  mt as createCogsState,
-  It as notifyComponent,
-  Ke as useCogsStateFn
+  Ve as $cogsSignal,
+  vt as $cogsSignalStore,
+  It as addStateOptions,
+  ht as createCogsState,
+  Tt as notifyComponent,
+  et as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map