cogsbox-state 0.5.362 → 0.5.364

package/dist/CogsState.jsx

@@ -1,41 +1,41 @@
 "use client";
 import { jsx as Ie } from "react/jsx-runtime";
-import { useState as ee, useRef as J, useEffect as oe, useLayoutEffect as ie, useMemo as pe, createElement as ce, useSyncExternalStore as Oe, startTransition as Re, useCallback as $e } from "react";
-import { transformStateFunc as Ue, isDeepEqual as B, isFunction as X, getNestedValue as q, getDifferences as we, debounce as je } from "./utility.js";
-import { pushFunc as ye, updateFn as se, cutFunc as ue, ValidationWrapper as Fe, FormControlComponent as De } from "./Functions.jsx";
-import Le from "superjson";
-import { v4 as Ee } from "uuid";
+import { useState as te, useRef as q, useEffect as ae, useLayoutEffect as ce, useMemo as pe, createElement as le, useSyncExternalStore as Oe, startTransition as Re, useCallback as $e } from "react";
+import { transformStateFunc as Ue, isDeepEqual as B, isFunction as Q, getNestedValue as J, getDifferences as we, debounce as je } from "./utility.js";
+import { pushFunc as ye, updateFn as ie, cutFunc as ge, ValidationWrapper as Fe, FormControlComponent as Le } from "./Functions.jsx";
+import De from "superjson";
+import { v4 as Te } from "uuid";
 import "zod";
 import { getGlobalStore as r, formRefStore as ke } from "./store.js";
-import { useCogsConfig as Pe } from "./CogsStateClient.jsx";
-import { applyPatch as Ge } from "fast-json-patch";
-import We from "react-use-measure";
-function Ne(e, i) {
-  const S = r.getState().getInitialOptions, g = r.getState().setInitialStateOptions, y = S(e) || {};
-  g(e, {
+import { useCogsConfig as Ve } from "./CogsStateClient.jsx";
+import { applyPatch as We } from "fast-json-patch";
+import Ge from "react-use-measure";
+function be(e, i) {
+  const m = r.getState().getInitialOptions, f = r.getState().setInitialStateOptions, y = m(e) || {};
+  f(e, {
     ...y,
     ...i
   });
 }
-function be({
+function Ce({
   stateKey: e,
   options: i,
-  initialOptionsPart: S
+  initialOptionsPart: m
 }) {
-  const g = re(e) || {}, y = S[e] || {}, b = r.getState().setInitialStateOptions, w = { ...y, ...g };
+  const f = oe(e) || {}, y = m[e] || {}, b = r.getState().setInitialStateOptions, T = { ...y, ...f };
   let I = !1;
   if (i)
     for (const a in i)
-      w.hasOwnProperty(a) ? (a == "localStorage" && i[a] && w[a].key !== i[a]?.key && (I = !0, w[a] = i[a]), a == "initialState" && i[a] && w[a] !== i[a] && // Different references
-      !B(w[a], i[a]) && (I = !0, w[a] = i[a])) : (I = !0, w[a] = i[a]);
-  I && b(e, w);
+      T.hasOwnProperty(a) ? (a == "localStorage" && i[a] && T[a].key !== i[a]?.key && (I = !0, T[a] = i[a]), a == "initialState" && i[a] && T[a] !== i[a] && // Different references
+      !B(T[a], i[a]) && (I = !0, T[a] = i[a])) : (I = !0, T[a] = i[a]);
+  I && b(e, T);
 }
-function ut(e, { formElements: i, validation: S }) {
-  return { initialState: e, formElements: i, validation: S };
+function ut(e, { formElements: i, validation: m }) {
+  return { initialState: e, formElements: i, validation: m };
 }
 const gt = (e, i) => {
-  let S = e;
-  const [g, y] = Ue(S);
+  let m = e;
+  const [f, y] = Ue(m);
   (Object.keys(y).length > 0 || i && Object.keys(i).length > 0) && Object.keys(y).forEach((I) => {
     y[I] = y[I] || {}, y[I].formElements = {
       ...i?.formElements,
@@ -43,17 +43,17 @@ const gt = (e, i) => {
       ...i?.validation,
       ...y[I].formElements || {}
       // State-specific overrides
-    }, re(I) || r.getState().setInitialStateOptions(I, y[I]);
-  }), r.getState().setInitialStates(g), r.getState().setCreatedState(g);
+    }, oe(I) || r.getState().setInitialStateOptions(I, y[I]);
+  }), r.getState().setInitialStates(f), r.getState().setCreatedState(f);
   const b = (I, a) => {
-    const [v] = ee(a?.componentId ?? Ee());
-    be({
+    const [v] = te(a?.componentId ?? Te());
+    Ce({
       stateKey: I,
       options: a,
       initialOptionsPart: y
     });
-    const n = r.getState().cogsStateStore[I] || g[I], f = a?.modifyState ? a.modifyState(n) : n, [W, U] = Ze(
-      f,
+    const n = r.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [G, U] = Ze(
+      S,
       {
         stateKey: I,
         syncUpdate: a?.syncUpdate,
@@ -70,47 +70,47 @@ const gt = (e, i) => {
     );
     return U;
   };
-  function w(I, a) {
-    be({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Je(I, a), me(I);
+  function T(I, a) {
+    Ce({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Je(I, a), he(I);
   }
-  return { useCogsState: b, setCogsOptions: w };
+  return { useCogsState: b, setCogsOptions: T };
 }, {
-  setUpdaterState: ge,
-  setState: te,
-  getInitialOptions: re,
-  getKeyState: Ve,
+  setUpdaterState: fe,
+  setState: ne,
+  getInitialOptions: oe,
+  getKeyState: Pe,
   getValidationErrors: He,
   setStateLog: ze,
   updateInitialStateGlobal: Ae,
   addValidationError: Be,
-  removeValidationError: Z,
+  removeValidationError: X,
   setServerSyncActions: qe
-} = r.getState(), Ce = (e, i, S, g, y) => {
-  S?.log && console.log(
+} = r.getState(), Ne = (e, i, m, f, y) => {
+  m?.log && console.log(
     "saving to localstorage",
     i,
-    S.localStorage?.key,
-    g
+    m.localStorage?.key,
+    f
   );
-  const b = X(S?.localStorage?.key) ? S.localStorage?.key(e) : S?.localStorage?.key;
-  if (b && g) {
-    const w = `${g}-${i}-${b}`;
+  const b = Q(m?.localStorage?.key) ? m.localStorage?.key(e) : m?.localStorage?.key;
+  if (b && f) {
+    const T = `${f}-${i}-${b}`;
     let I;
     try {
-      I = Se(w)?.lastSyncedWithServer;
+      I = me(T)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: e,
       lastUpdated: Date.now(),
       lastSyncedWithServer: y ?? I
-    }, v = Le.serialize(a);
+    }, v = De.serialize(a);
     window.localStorage.setItem(
-      w,
+      T,
       JSON.stringify(v.json)
     );
   }
-}, Se = (e) => {
+}, me = (e) => {
   if (!e) return null;
   try {
     const i = window.localStorage.getItem(e);
@@ -119,60 +119,60 @@ const gt = (e, i) => {
     return console.error("Error loading from localStorage:", i), null;
   }
 }, Je = (e, i) => {
-  const S = r.getState().cogsStateStore[e], { sessionId: g } = Pe(), y = X(i?.localStorage?.key) ? i.localStorage.key(S) : i?.localStorage?.key;
-  if (y && g) {
-    const b = Se(
-      `${g}-${e}-${y}`
+  const m = r.getState().cogsStateStore[e], { sessionId: f } = Ve(), y = Q(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
+  if (y && f) {
+    const b = me(
+      `${f}-${e}-${y}`
     );
     if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
-      return te(e, b.state), me(e), !0;
+      return ne(e, b.state), he(e), !0;
   }
   return !1;
-}, _e = (e, i, S, g, y, b) => {
-  const w = {
+}, _e = (e, i, m, f, y, b) => {
+  const T = {
     initialState: i,
-    updaterState: fe(
+    updaterState: Se(
       e,
-      g,
+      f,
       y,
       b
     ),
-    state: S
+    state: m
   };
-  Ae(e, w.initialState), ge(e, w.updaterState), te(e, w.state);
-}, me = (e) => {
+  Ae(e, T.initialState), fe(e, T.updaterState), ne(e, T.state);
+}, he = (e) => {
   const i = r.getState().stateComponents.get(e);
   if (!i) return;
-  const S = /* @__PURE__ */ new Set();
-  i.components.forEach((g) => {
-    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || S.add(() => g.forceUpdate());
+  const m = /* @__PURE__ */ new Set();
+  i.components.forEach((f) => {
+    (f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none") || m.add(() => f.forceUpdate());
   }), queueMicrotask(() => {
-    S.forEach((g) => g());
+    m.forEach((f) => f());
   });
 }, ft = (e, i) => {
-  const S = r.getState().stateComponents.get(e);
-  if (S) {
-    const g = `${e}////${i}`, y = S.components.get(g);
+  const m = r.getState().stateComponents.get(e);
+  if (m) {
+    const f = `${e}////${i}`, y = m.components.get(f);
     if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
       return;
     y && y.forceUpdate();
   }
-}, Ye = (e, i, S, g) => {
+}, Ye = (e, i, m, f) => {
   switch (e) {
     case "update":
       return {
-        oldValue: q(i, g),
-        newValue: q(S, g)
+        oldValue: J(i, f),
+        newValue: J(m, f)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: q(S, g)
+        newValue: J(m, f)
       };
     case "cut":
       return {
-        oldValue: q(i, g),
+        oldValue: J(i, f),
         newValue: null
         // or undefined
       };
@@ -182,25 +182,25 @@ const gt = (e, i) => {
 };
 function Ze(e, {
   stateKey: i,
-  serverSync: S,
-  localStorage: g,
+  serverSync: m,
+  localStorage: f,
   formElements: y,
   reactiveDeps: b,
-  reactiveType: w,
+  reactiveType: T,
   componentId: I,
   initialState: a,
   syncUpdate: v,
   dependencies: n,
-  serverState: f
+  serverState: S
 } = {}) {
-  const [W, U] = ee({}), { sessionId: j } = Pe();
+  const [G, U] = te({}), { sessionId: j } = Ve();
   let H = !i;
-  const [m] = ee(i ?? Ee()), l = r.getState().stateLog[m], le = J(/* @__PURE__ */ new Set()), Q = J(I ?? Ee()), _ = J(
+  const [h] = te(i ?? Te()), l = r.getState().stateLog[h], de = q(/* @__PURE__ */ new Set()), K = q(I ?? Te()), M = q(
     null
   );
-  _.current = re(m) ?? null, oe(() => {
-    if (v && v.stateKey === m && v.path?.[0]) {
-      te(m, (o) => ({
+  M.current = oe(h) ?? null, ae(() => {
+    if (v && v.stateKey === h && v.path?.[0]) {
+      ne(h, (o) => ({
         ...o,
         [v.path[0]]: v.newValue
       }));
@@ -210,42 +210,42 @@ function Ze(e, {
         userId: v.userId
       });
     }
-  }, [v]), oe(() => {
+  }, [v]), ae(() => {
     if (a) {
-      Ne(m, {
+      be(h, {
         initialState: a
       });
-      const t = _.current, s = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = r.getState().initialStateGlobal[m];
+      const t = M.current, s = t?.serverState?.id !== void 0 && t?.serverState?.status === "success" && t?.serverState?.data, c = r.getState().initialStateGlobal[h];
       if (!(c && !B(c, a) || !c) && !s)
         return;
       let d = null;
-      const p = X(t?.localStorage?.key) ? t?.localStorage?.key(a) : t?.localStorage?.key;
-      p && j && (d = Se(`${j}-${m}-${p}`));
-      let E = a, A = !1;
-      const V = s ? Date.now() : 0, P = d?.lastUpdated || 0, M = d?.lastSyncedWithServer || 0;
-      s && V > P ? (E = t.serverState.data, A = !0) : d && P > M && (E = d.state, t?.localStorage?.onChange && t?.localStorage?.onChange(E)), r.getState().initializeShadowState(m, a), _e(
-        m,
+      const p = Q(t?.localStorage?.key) ? t?.localStorage?.key(a) : t?.localStorage?.key;
+      p && j && (d = me(`${j}-${h}-${p}`));
+      let A = a, $ = !1;
+      const N = s ? Date.now() : 0, C = d?.lastUpdated || 0, _ = d?.lastSyncedWithServer || 0;
+      s && N > C ? (A = t.serverState.data, $ = !0) : d && C > _ && (A = d.state, t?.localStorage?.onChange && t?.localStorage?.onChange(A)), r.getState().initializeShadowState(h, a), _e(
+        h,
         a,
-        E,
-        ae,
-        Q.current,
+        A,
+        se,
+        K.current,
         j
-      ), A && p && j && Ce(E, m, t, j, Date.now()), me(m), (Array.isArray(w) ? w : [w || "component"]).includes("none") || U({});
+      ), $ && p && j && Ne(A, h, t, j, Date.now()), he(h), (Array.isArray(T) ? T : [T || "component"]).includes("none") || U({});
     }
   }, [
     a,
-    f?.status,
-    f?.data,
+    S?.status,
+    S?.data,
     ...n || []
-  ]), ie(() => {
-    H && Ne(m, {
-      serverSync: S,
+  ]), ce(() => {
+    H && be(h, {
+      serverSync: m,
       formElements: y,
       initialState: a,
-      localStorage: g,
-      middleware: _.current?.middleware
+      localStorage: f,
+      middleware: M.current?.middleware
     });
-    const t = `${m}////${Q.current}`, o = r.getState().stateComponents.get(m) || {
+    const t = `${h}////${K.current}`, o = r.getState().stateComponents.get(h) || {
       components: /* @__PURE__ */ new Map()
     };
     return o.components.set(t, {
@@ -253,223 +253,223 @@ function Ze(e, {
       paths: /* @__PURE__ */ new Set(),
       deps: [],
       depsFunction: b || void 0,
-      reactiveType: w ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(m, o), U({}), () => {
-      o && (o.components.delete(t), o.components.size === 0 && r.getState().stateComponents.delete(m));
+      reactiveType: T ?? ["component", "deps"]
+    }), r.getState().stateComponents.set(h, o), U({}), () => {
+      o && (o.components.delete(t), o.components.size === 0 && r.getState().stateComponents.delete(h));
     };
   }, []);
-  const ae = (t, o, s, c) => {
+  const se = (t, o, s, c) => {
     if (Array.isArray(o)) {
-      const d = `${m}-${o.join(".")}`;
-      le.current.add(d);
+      const d = `${h}-${o.join(".")}`;
+      de.current.add(d);
     }
-    const h = r.getState();
-    te(m, (d) => {
-      const p = X(t) ? t(d) : t, E = `${m}-${o.join(".")}`;
-      if (E) {
-        let T = !1, C = h.signalDomElements.get(E);
-        if ((!C || C.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const x = o.slice(0, -1), L = q(p, x);
-          if (Array.isArray(L)) {
-            T = !0;
-            const k = `${m}-${x.join(".")}`;
-            C = h.signalDomElements.get(k);
+    const g = r.getState();
+    ne(h, (d) => {
+      const p = Q(t) ? t(d) : t, A = `${h}-${o.join(".")}`;
+      if (A) {
+        let V = !1, w = g.signalDomElements.get(A);
+        if ((!w || w.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const O = o.slice(0, -1), P = J(p, O);
+          if (Array.isArray(P)) {
+            V = !0;
+            const k = `${h}-${O.join(".")}`;
+            w = g.signalDomElements.get(k);
           }
         }
-        if (C) {
-          const x = T ? q(p, o.slice(0, -1)) : q(p, o);
-          C.forEach(({ parentId: L, position: k, effect: F }) => {
-            const O = document.querySelector(
-              `[data-parent-id="${L}"]`
+        if (w) {
+          const O = V ? J(p, o.slice(0, -1)) : J(p, o);
+          w.forEach(({ parentId: P, position: k, effect: F }) => {
+            const R = document.querySelector(
+              `[data-parent-id="${P}"]`
             );
-            if (O) {
-              const $ = Array.from(O.childNodes);
-              if ($[k]) {
-                const N = F ? new Function("state", `return (${F})(state)`)(x) : x;
-                $[k].textContent = String(N);
+            if (R) {
+              const z = Array.from(R.childNodes);
+              if (z[k]) {
+                const E = F ? new Function("state", `return (${F})(state)`)(O) : O;
+                z[k].textContent = String(E);
               }
             }
           });
         }
       }
-      console.log("shadowState", h.shadowStateStore), s.updateType === "update" && (c || _.current?.validation?.key) && o && Z(
-        (c || _.current?.validation?.key) + "." + o.join(".")
+      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (c || M.current?.validation?.key) && o && X(
+        (c || M.current?.validation?.key) + "." + o.join(".")
       );
-      const A = o.slice(0, o.length - 1);
-      s.updateType === "cut" && _.current?.validation?.key && Z(
-        _.current?.validation?.key + "." + A.join(".")
-      ), s.updateType === "insert" && _.current?.validation?.key && He(
-        _.current?.validation?.key + "." + A.join(".")
-      ).filter(([C, x]) => {
-        let L = C?.split(".").length;
-        if (C == A.join(".") && L == A.length - 1) {
-          let k = C + "." + A;
-          Z(C), Be(k, x);
+      const $ = o.slice(0, o.length - 1);
+      s.updateType === "cut" && M.current?.validation?.key && X(
+        M.current?.validation?.key + "." + $.join(".")
+      ), s.updateType === "insert" && M.current?.validation?.key && He(
+        M.current?.validation?.key + "." + $.join(".")
+      ).filter(([w, O]) => {
+        let P = w?.split(".").length;
+        if (w == $.join(".") && P == $.length - 1) {
+          let k = w + "." + $;
+          X(w), Be(k, O);
         }
       });
-      const V = h.stateComponents.get(m);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", V), V) {
-        const T = we(d, p), C = new Set(T), x = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
+      const N = g.stateComponents.get(h);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", N), N) {
+        const V = we(d, p), w = new Set(V), O = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
         for (const [
-          L,
+          P,
           k
-        ] of V.components.entries()) {
+        ] of N.components.entries()) {
           let F = !1;
-          const O = Array.isArray(k.reactiveType) ? k.reactiveType : [k.reactiveType || "component"];
-          if (console.log("component", k), !O.includes("none")) {
-            if (O.includes("all")) {
+          const R = Array.isArray(k.reactiveType) ? k.reactiveType : [k.reactiveType || "component"];
+          if (console.log("component", k), !R.includes("none")) {
+            if (R.includes("all")) {
               k.forceUpdate();
               continue;
             }
-            if (O.includes("component") && ((k.paths.has(x) || k.paths.has("")) && (F = !0), !F))
-              for (const $ of C) {
-                let N = $;
+            if (R.includes("component") && ((k.paths.has(O) || k.paths.has("")) && (F = !0), !F))
+              for (const z of w) {
+                let E = z;
                 for (; ; ) {
-                  if (k.paths.has(N)) {
+                  if (k.paths.has(E)) {
                     F = !0;
                     break;
                   }
-                  const D = N.lastIndexOf(".");
-                  if (D !== -1) {
-                    const R = N.substring(
+                  const x = E.lastIndexOf(".");
+                  if (x !== -1) {
+                    const L = E.substring(
                       0,
-                      D
+                      x
                     );
                     if (!isNaN(
-                      Number(N.substring(D + 1))
-                    ) && k.paths.has(R)) {
+                      Number(E.substring(x + 1))
+                    ) && k.paths.has(L)) {
                       F = !0;
                       break;
                     }
-                    N = R;
+                    E = L;
                   } else
-                    N = "";
-                  if (N === "")
+                    E = "";
+                  if (E === "")
                     break;
                 }
                 if (F) break;
               }
-            if (!F && O.includes("deps") && k.depsFunction) {
-              const $ = k.depsFunction(p);
-              let N = !1;
-              typeof $ == "boolean" ? $ && (N = !0) : B(k.deps, $) || (k.deps = $, N = !0), N && (F = !0);
+            if (!F && R.includes("deps") && k.depsFunction) {
+              const z = k.depsFunction(p);
+              let E = !1;
+              typeof z == "boolean" ? z && (E = !0) : B(k.deps, z) || (k.deps = z, E = !0), E && (F = !0);
             }
             F && k.forceUpdate();
           }
         }
       }
-      const P = Date.now();
-      o = o.map((T, C) => {
-        const x = o.slice(0, -1), L = q(p, x);
-        return C === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (L.length - 1).toString() : T;
+      const C = Date.now();
+      o = o.map((V, w) => {
+        const O = o.slice(0, -1), P = J(p, O);
+        return w === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (P.length - 1).toString() : V;
       });
-      const { oldValue: M, newValue: G } = Ye(
+      const { oldValue: _, newValue: W } = Ye(
         s.updateType,
         d,
         p,
         o
-      ), z = {
-        timeStamp: P,
-        stateKey: m,
+      ), Y = {
+        timeStamp: C,
+        stateKey: h,
         path: o,
         updateType: s.updateType,
         status: "new",
-        oldValue: M,
-        newValue: G
+        oldValue: _,
+        newValue: W
       };
       switch (s.updateType) {
         case "update":
-          h.updateShadowAtPath(m, o, p);
+          g.updateShadowAtPath(h, o, p);
           break;
         case "insert":
-          const T = o.slice(0, -1);
-          h.insertShadowArrayElement(m, T, G);
+          const V = o.slice(0, -1);
+          g.insertShadowArrayElement(h, V, W);
           break;
         case "cut":
-          const C = o.slice(0, -1), x = parseInt(o[o.length - 1]);
-          h.removeShadowArrayElement(m, C, x);
+          const w = o.slice(0, -1), O = parseInt(o[o.length - 1]);
+          g.removeShadowArrayElement(h, w, O);
           break;
       }
-      if (ze(m, (T) => {
-        const x = [...T ?? [], z].reduce((L, k) => {
-          const F = `${k.stateKey}:${JSON.stringify(k.path)}`, O = L.get(F);
-          return O ? (O.timeStamp = Math.max(O.timeStamp, k.timeStamp), O.newValue = k.newValue, O.oldValue = O.oldValue ?? k.oldValue, O.updateType = k.updateType) : L.set(F, { ...k }), L;
+      if (ze(h, (V) => {
+        const O = [...V ?? [], Y].reduce((P, k) => {
+          const F = `${k.stateKey}:${JSON.stringify(k.path)}`, R = P.get(F);
+          return R ? (R.timeStamp = Math.max(R.timeStamp, k.timeStamp), R.newValue = k.newValue, R.oldValue = R.oldValue ?? k.oldValue, R.updateType = k.updateType) : P.set(F, { ...k }), P;
         }, /* @__PURE__ */ new Map());
-        return Array.from(x.values());
-      }), Ce(
+        return Array.from(O.values());
+      }), Ne(
         p,
-        m,
-        _.current,
+        h,
+        M.current,
         j
-      ), _.current?.middleware && _.current.middleware({
+      ), M.current?.middleware && M.current.middleware({
         updateLog: l,
-        update: z
-      }), _.current?.serverSync) {
-        const T = h.serverState[m], C = _.current?.serverSync;
-        qe(m, {
-          syncKey: typeof C.syncKey == "string" ? C.syncKey : C.syncKey({ state: p }),
-          rollBackState: T,
-          actionTimeStamp: Date.now() + (C.debounce ?? 3e3),
+        update: Y
+      }), M.current?.serverSync) {
+        const V = g.serverState[h], w = M.current?.serverSync;
+        qe(h, {
+          syncKey: typeof w.syncKey == "string" ? w.syncKey : w.syncKey({ state: p }),
+          rollBackState: V,
+          actionTimeStamp: Date.now() + (w.debounce ?? 3e3),
           status: "waiting"
         });
       }
       return p;
     });
   };
-  r.getState().updaterState[m] || (ge(
-    m,
-    fe(
-      m,
-      ae,
-      Q.current,
+  r.getState().updaterState[h] || (fe(
+    h,
+    Se(
+      h,
+      se,
+      K.current,
       j
     )
-  ), r.getState().cogsStateStore[m] || te(m, e), r.getState().initialStateGlobal[m] || Ae(m, e));
-  const u = pe(() => fe(
-    m,
-    ae,
-    Q.current,
+  ), r.getState().cogsStateStore[h] || ne(h, e), r.getState().initialStateGlobal[h] || Ae(h, e));
+  const u = pe(() => Se(
+    h,
+    se,
+    K.current,
     j
-  ), [m, j]);
-  return [Ve(m), u];
+  ), [h, j]);
+  return [Pe(h), u];
 }
-function fe(e, i, S, g) {
+function Se(e, i, m, f) {
   const y = /* @__PURE__ */ new Map();
   let b = 0;
-  const w = (v) => {
+  const T = (v) => {
     const n = v.join(".");
-    for (const [f] of y)
-      (f === n || f.startsWith(n + ".")) && y.delete(f);
+    for (const [S] of y)
+      (S === n || S.startsWith(n + ".")) && y.delete(S);
     b++;
   }, I = {
     removeValidation: (v) => {
-      v?.validationKey && Z(v.validationKey);
+      v?.validationKey && X(v.validationKey);
     },
     revertToInitialState: (v) => {
       const n = r.getState().getInitialOptions(e)?.validation;
-      n?.key && Z(n?.key), v?.validationKey && Z(v.validationKey);
-      const f = r.getState().initialStateGlobal[e];
+      n?.key && X(n?.key), v?.validationKey && X(v.validationKey);
+      const S = r.getState().initialStateGlobal[e];
       r.getState().clearSelectedIndexesForState(e), y.clear(), b++;
-      const W = a(f, []), U = re(e), j = X(U?.localStorage?.key) ? U?.localStorage?.key(f) : U?.localStorage?.key, H = `${g}-${e}-${j}`;
-      H && localStorage.removeItem(H), ge(e, W), te(e, f);
-      const m = r.getState().stateComponents.get(e);
-      return m && m.components.forEach((l) => {
+      const G = a(S, []), U = oe(e), j = Q(U?.localStorage?.key) ? U?.localStorage?.key(S) : U?.localStorage?.key, H = `${f}-${e}-${j}`;
+      H && localStorage.removeItem(H), fe(e, G), ne(e, S);
+      const h = r.getState().stateComponents.get(e);
+      return h && h.components.forEach((l) => {
         l.forceUpdate();
-      }), f;
+      }), S;
     },
     updateInitialState: (v) => {
       y.clear(), b++;
-      const n = fe(
+      const n = Se(
         e,
         i,
-        S,
-        g
-      ), f = r.getState().initialStateGlobal[e], W = re(e), U = X(W?.localStorage?.key) ? W?.localStorage?.key(f) : W?.localStorage?.key, j = `${g}-${e}-${U}`;
+        m,
+        f
+      ), S = r.getState().initialStateGlobal[e], G = oe(e), U = Q(G?.localStorage?.key) ? G?.localStorage?.key(S) : G?.localStorage?.key, j = `${f}-${e}-${U}`;
       return localStorage.getItem(j) && localStorage.removeItem(j), Re(() => {
-        Ae(e, v), r.getState().initializeShadowState(e, v), ge(e, n), te(e, v);
+        Ae(e, v), r.getState().initializeShadowState(e, v), fe(e, n), ne(e, v);
         const H = r.getState().stateComponents.get(e);
-        H && H.components.forEach((m) => {
-          m.forceUpdate();
+        H && H.components.forEach((h) => {
+          h.forceUpdate();
         });
       }), {
         fetchId: (H) => n.get()[H]
@@ -480,27 +480,27 @@ function fe(e, i, S, g) {
     _isLoading: r.getState().isLoadingGlobal[e],
     _isServerSynced: () => {
       const v = r.getState().serverState[e];
-      return !!(v && B(v, Ve(e)));
+      return !!(v && B(v, Pe(e)));
     }
   };
-  function a(v, n = [], f) {
-    const W = n.map(String).join(".");
-    y.get(W);
+  function a(v, n = [], S) {
+    const G = n.map(String).join(".");
+    y.get(G);
     const U = function() {
       return r().getNestedState(e, n);
     };
-    Object.keys(I).forEach((m) => {
-      U[m] = I[m];
+    Object.keys(I).forEach((h) => {
+      U[h] = I[h];
     });
     const j = {
-      apply(m, l, le) {
+      apply(h, 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(m, l) {
-        f?.validIndices && !Array.isArray(v) && (f = { ...f, validIndices: void 0 });
-        const le = /* @__PURE__ */ new Set([
+      get(h, l) {
+        S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
+        const de = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,15 +523,15 @@ function fe(e, i, S, g) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !le.has(l)) {
-          const u = `${e}////${S}`, t = r.getState().stateComponents.get(e);
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !de.has(l)) {
+          const u = `${e}////${m}`, t = r.getState().stateComponents.get(e);
           if (t) {
             const o = t.components.get(u);
             if (o && !o.paths.has("")) {
               const s = n.join(".");
               let c = !0;
-              for (const h of o.paths)
-                if (s.startsWith(h) && (s === h || s[h.length] === ".")) {
+              for (const g of o.paths)
+                if (s.startsWith(g) && (s === g || s[g.length] === ".")) {
                   c = !1;
                   break;
                 }
@@ -557,8 +557,8 @@ function fe(e, i, S, g) {
                   const p = [s, ...d.path].join(".");
                   r.getState().addValidationError(p, d.message);
                 });
-                const h = r.getState().stateComponents.get(e);
-                h && h.components.forEach((d) => {
+                const g = r.getState().stateComponents.get(e);
+                g && g.components.forEach((d) => {
                   d.forceUpdate();
                 });
               }
@@ -568,7 +568,7 @@ function fe(e, i, S, g) {
             }
           };
         if (l === "_status") {
-          const u = r.getState().getNestedState(e, n), t = r.getState().initialStateGlobal[e], o = q(t, n);
+          const u = r.getState().getNestedState(e, n), t = r.getState().initialStateGlobal[e], o = J(t, n);
           return B(u, o) ? "fresh" : "stale";
         }
         if (l === "getStatus")
@@ -576,12 +576,12 @@ function fe(e, i, S, g) {
             const u = r().getNestedState(
               e,
               n
-            ), t = r.getState().initialStateGlobal[e], o = q(t, n);
+            ), t = r.getState().initialStateGlobal[e], o = J(t, n);
             return B(u, o) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const u = r.getState().initialStateGlobal[e], t = re(e), o = X(t?.localStorage?.key) ? t?.localStorage?.key(u) : t?.localStorage?.key, s = `${g}-${e}-${o}`;
+            const u = r.getState().initialStateGlobal[e], t = oe(e), o = Q(t?.localStorage?.key) ? t?.localStorage?.key(u) : t?.localStorage?.key, s = `${f}-${e}-${o}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -592,9 +592,9 @@ function fe(e, i, S, g) {
             return r.getState().getValidationErrors(u.key + "." + n.join("."));
           };
         if (Array.isArray(v)) {
-          const u = () => f?.validIndices ? v.map((o, s) => ({
+          const u = () => S?.validIndices ? v.map((o, s) => ({
             item: o,
-            originalIndex: f.validIndices[s]
+            originalIndex: S.validIndices[s]
           })) : r.getState().getNestedState(e, n).map((o, s) => ({
             item: o,
             originalIndex: s
@@ -606,7 +606,7 @@ function fe(e, i, S, g) {
                 return a(
                   v[t],
                   [...n, t.toString()],
-                  f
+                  S
                 );
             };
           if (l === "clearSelected")
@@ -621,191 +621,191 @@ function fe(e, i, S, g) {
                 itemHeight: o = 50,
                 overscan: s = 6,
                 stickToBottom: c = !1,
-                dependencies: h = []
-              } = t, d = J(null), [p, E] = ee({
+                dependencies: g = []
+              } = t, d = q(null), [p, A] = te({
                 startIndex: 0,
                 endIndex: 10
-              }), A = J(c), V = J(!1), P = J(0), [M, G] = ee(0);
-              oe(() => r.getState().subscribeToShadowState(e, () => {
-                G((N) => N + 1);
+              }), $ = q(c), N = q(!1), C = q(0), _ = q(g), [W, Y] = te(0);
+              ae(() => r.getState().subscribeToShadowState(e, () => {
+                Y((x) => x + 1);
               }), [e]);
-              const z = r().getNestedState(
+              const V = r().getNestedState(
                 e,
                 n
-              ), T = z.length, { totalHeight: C, positions: x } = pe(() => {
-                const $ = r.getState().getShadowMetadata(e, n) || [];
-                let N = 0;
-                const D = [];
-                for (let R = 0; R < T; R++) {
-                  D[R] = N;
-                  const Y = $[R]?.virtualizer?.itemHeight;
-                  N += Y || o;
+              ), w = V.length, { totalHeight: O, positions: P } = pe(() => {
+                const E = r.getState().getShadowMetadata(e, n) || [];
+                let x = 0;
+                const L = [];
+                for (let D = 0; D < w; D++) {
+                  L[D] = x;
+                  const Z = E[D]?.virtualizer?.itemHeight;
+                  x += Z || o;
                 }
-                return { totalHeight: N, positions: D };
+                return { totalHeight: x, positions: L };
               }, [
-                T,
+                w,
                 e,
                 n.join("."),
                 o,
-                M
-              ]), L = pe(() => {
-                const $ = Math.max(0, p.startIndex), N = Math.min(T, p.endIndex), D = Array.from(
-                  { length: N - $ },
-                  (Y, ne) => $ + ne
-                ), R = D.map((Y) => z[Y]);
-                return a(R, n, {
-                  ...f,
-                  validIndices: D
+                W
+              ]), k = pe(() => {
+                const E = Math.max(0, p.startIndex), x = Math.min(w, p.endIndex), L = Array.from(
+                  { length: x - E },
+                  (Z, re) => E + re
+                ), D = L.map((Z) => V[Z]);
+                return a(D, n, {
+                  ...S,
+                  validIndices: L
                 });
-              }, [p.startIndex, p.endIndex, z, T]);
-              ie(() => {
-                const $ = T > P.current;
-                A.current && $ && (console.log(
+              }, [p.startIndex, p.endIndex, V, w]);
+              ce(() => {
+                const E = w > C.current, x = !B(
+                  g,
+                  _.current
+                );
+                x && ($.current = c), $.current && (E || x) && (console.log(
                   "PHASE 1: Auto-scroll needed. Setting range to render the last item."
-                ), E({
-                  startIndex: Math.max(0, T - 10 - s),
-                  endIndex: T
-                })), P.current = T;
-              }, [T]), ie(() => {
-                const $ = d.current, N = p.endIndex === T && T > 0;
-                if (!$ || !A.current || !N)
+                ), A({
+                  startIndex: Math.max(0, w - 10 - s),
+                  endIndex: w
+                })), C.current = w, _.current = g;
+              }, [w, ...g]), ce(() => {
+                const E = d.current, x = p.endIndex === w && w > 0;
+                if (!E || !$.current || !x)
                   return;
                 console.log(
-                  "PHASE 2: Range is at the end. Starting the measurement loop."
+                  "PHASE 2: Range is set to the end. Starting the measurement loop."
                 );
-                let D = 0;
-                const R = setInterval(() => {
-                  D++, console.log(`LOOP ${D}: Checking last item...`);
-                  const Y = T - 1, K = (r.getState().getShadowMetadata(e, n) || [])[Y]?.virtualizer?.itemHeight || 0;
-                  K > 0 ? (console.log(
-                    `%cSUCCESS: Last item height is ${K}. Scrolling now.`,
+                let L = 0;
+                const D = setInterval(() => {
+                  L++, console.log(`LOOP ${L}: Checking last item...`);
+                  const Z = w - 1, ee = (r.getState().getShadowMetadata(e, n) || [])[Z]?.virtualizer?.itemHeight || 0;
+                  ee > 0 ? (console.log(
+                    `%cSUCCESS: Last item height is ${ee}. Scrolling now.`,
                     "color: green; font-weight: bold;"
-                  ), clearInterval(R), V.current = !0, $.scrollTo({
-                    top: $.scrollHeight,
+                  ), clearInterval(D), N.current = !0, E.scrollTo({
+                    top: E.scrollHeight,
                     behavior: "smooth"
                   }), setTimeout(() => {
-                    V.current = !1;
-                  }, 1e3)) : D > 20 ? (console.error(
+                    N.current = !1;
+                  }, 1e3)) : L > 30 ? (console.error(
                     "LOOP TIMEOUT: Last item was never measured. Stopping loop."
-                  ), clearInterval(R)) : console.log("...WAITING. Height is not ready.");
+                  ), clearInterval(D)) : console.log("...WAITING. Height is not ready.");
                 }, 100);
-                return () => clearInterval(R);
-              }, [p.endIndex, T, x]), oe(() => {
-                const $ = d.current;
-                if (!$) return;
-                console.log(
-                  "DEPENDENCY CHANGE: Resetting scroll lock and initial view."
-                ), A.current = c;
-                const N = () => {
-                  const { scrollTop: R, clientHeight: Y } = $;
-                  let ne = 0, K = T - 1;
-                  for (; ne <= K; ) {
-                    const ve = Math.floor((ne + K) / 2);
-                    x[ve] < R ? ne = ve + 1 : K = ve - 1;
+                return () => clearInterval(D);
+              }, [p]), ae(() => {
+                const E = d.current;
+                if (!E) return;
+                const x = () => {
+                  const { scrollTop: D, clientHeight: Z } = E;
+                  let re = 0, ee = w - 1;
+                  for (; re <= ee; ) {
+                    const ve = Math.floor((re + ee) / 2);
+                    P[ve] < D ? re = ve + 1 : ee = ve - 1;
                   }
-                  const he = Math.max(0, K - s);
-                  let de = he;
-                  const Me = R + Y;
-                  for (; de < T && x[de] < Me; )
-                    de++;
-                  const Te = Math.min(T, de + s);
-                  console.log(
-                    `RANGE UPDATE: Start: ${he}, End: ${Te}, Total: ${T}`
-                  ), E({ startIndex: he, endIndex: Te });
-                }, D = () => {
-                  if (V.current) return;
-                  $.scrollHeight - $.scrollTop - $.clientHeight < 1 || (A.current = !1), N();
+                  const Ee = Math.max(0, ee - s);
+                  let ue = Ee;
+                  const Me = D + Z;
+                  for (; ue < w && P[ue] < Me; )
+                    ue++;
+                  A({
+                    startIndex: Ee,
+                    endIndex: Math.min(w, ue + s)
+                  });
+                }, L = () => {
+                  if (N.current) return;
+                  E.scrollHeight - E.scrollTop - E.clientHeight < 1 || ($.current = !1), x();
                 };
-                return $.addEventListener("scroll", D, {
+                return E.addEventListener("scroll", L, {
                   passive: !0
-                }), N(), () => $.removeEventListener("scroll", D);
-              }, [...h, T, x]);
-              const k = $e(
-                ($ = "smooth") => {
-                  d.current && (A.current = !0, d.current.scrollTo({
+                }), x(), () => E.removeEventListener("scroll", L);
+              }, [w, P, ...g]);
+              const F = $e(
+                (E = "smooth") => {
+                  d.current && ($.current = !0, d.current.scrollTo({
                     top: d.current.scrollHeight,
-                    behavior: $
+                    behavior: E
                   }));
                 },
                 []
-              ), F = $e(
-                ($, N = "smooth") => {
-                  d.current && x[$] !== void 0 && (A.current = !1, d.current.scrollTo({
-                    top: x[$],
-                    behavior: N
+              ), R = $e(
+                (E, x = "smooth") => {
+                  d.current && P[E] !== void 0 && ($.current = !1, d.current.scrollTo({
+                    top: P[E],
+                    behavior: x
                   }));
                 },
-                [x]
-              ), O = {
+                [P]
+              ), z = {
                 outer: {
                   ref: d,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${C}px`,
+                    height: `${O}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    transform: `translateY(${x[p.startIndex] || 0}px)`
+                    transform: `translateY(${P[p.startIndex] || 0}px)`
                   }
                 }
               };
               return {
-                virtualState: L,
-                virtualizerProps: O,
-                scrollToBottom: k,
-                scrollToIndex: F
+                virtualState: k,
+                virtualizerProps: z,
+                scrollToBottom: F,
+                scrollToIndex: R
               };
             };
           if (l === "stateSort")
             return (t) => {
               const s = [...u()].sort(
                 (d, p) => t(d.item, p.item)
-              ), c = s.map(({ item: d }) => d), h = {
-                ...f,
+              ), c = s.map(({ item: d }) => d), g = {
+                ...S,
                 validIndices: s.map(
                   ({ originalIndex: d }) => d
                 )
               };
-              return a(c, n, h);
+              return a(c, n, g);
             };
           if (l === "stateFilter")
             return (t) => {
               const s = u().filter(
                 ({ item: d }, p) => t(d, p)
-              ), c = s.map(({ item: d }) => d), h = {
-                ...f,
+              ), c = s.map(({ item: d }) => d), g = {
+                ...S,
                 validIndices: s.map(
                   ({ originalIndex: d }) => d
                 )
               };
-              return a(c, n, h);
+              return a(c, n, g);
             };
           if (l === "stateMap")
             return (t) => {
               const o = r.getState().getNestedState(e, n);
-              return Array.isArray(o) ? (f?.validIndices || Array.from({ length: o.length }, (c, h) => h)).map((c, h) => {
-                const d = o[c], p = [...n, c.toString()], E = a(d, p, f);
-                return t(d, E, {
+              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, g) => g)).map((c, g) => {
+                const d = o[c], p = [...n, c.toString()], A = a(d, p, S);
+                return t(d, A, {
                   register: () => {
-                    const [, V] = ee({}), P = `${S}-${n.join(".")}-${c}`;
-                    ie(() => {
-                      const M = `${e}////${P}`, G = r.getState().stateComponents.get(e) || {
+                    const [, N] = te({}), C = `${m}-${n.join(".")}-${c}`;
+                    ce(() => {
+                      const _ = `${e}////${C}`, W = r.getState().stateComponents.get(e) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return G.components.set(M, {
-                        forceUpdate: () => V({}),
+                      return W.components.set(_, {
+                        forceUpdate: () => N({}),
                         paths: /* @__PURE__ */ new Set([p.join(".")])
-                      }), r.getState().stateComponents.set(e, G), () => {
-                        const z = r.getState().stateComponents.get(e);
-                        z && z.components.delete(M);
+                      }), r.getState().stateComponents.set(e, W), () => {
+                        const Y = r.getState().stateComponents.get(e);
+                        Y && Y.components.delete(_);
                       };
-                    }, [e, P]);
+                    }, [e, C]);
                   },
-                  index: h,
+                  index: g,
                   originalIndex: c
                 });
               }) : (console.warn(
@@ -815,19 +815,19 @@ function fe(e, i, S, g) {
             };
           if (l === "stateMapNoRender")
             return (t) => v.map((s, c) => {
-              let h;
-              f?.validIndices && f.validIndices[c] !== void 0 ? h = f.validIndices[c] : h = c;
-              const d = [...n, h.toString()], p = a(s, d, f);
+              let g;
+              S?.validIndices && S.validIndices[c] !== void 0 ? g = S.validIndices[c] : g = c;
+              const d = [...n, g.toString()], p = a(s, d, S);
               return t(
                 s,
                 p,
                 c,
                 v,
-                a(v, n, f)
+                a(v, n, S)
               );
             });
           if (l === "$stateMap")
-            return (t) => ce(Xe, {
+            return (t) => le(Xe, {
               proxy: {
                 _stateKey: e,
                 _path: n,
@@ -839,19 +839,19 @@ function fe(e, i, S, g) {
           if (l === "stateList")
             return (t) => {
               const o = r.getState().getNestedState(e, n);
-              return Array.isArray(o) ? (f?.validIndices || Array.from({ length: o.length }, (c, h) => h)).map((c, h) => {
-                const d = o[c], p = [...n, c.toString()], E = a(d, p, f), A = `${S}-${n.join(".")}-${c}`;
-                return ce(Ke, {
+              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, g) => g)).map((c, g) => {
+                const d = o[c], p = [...n, c.toString()], A = a(d, p, S), $ = `${m}-${n.join(".")}-${c}`;
+                return le(Ke, {
                   key: c,
                   stateKey: e,
-                  itemComponentId: A,
+                  itemComponentId: $,
                   itemPath: p,
                   children: t(
                     d,
-                    E,
-                    h,
+                    A,
+                    g,
                     o,
-                    a(o, n, f)
+                    a(o, n, S)
                   )
                 });
               }) : (console.warn(
@@ -868,7 +868,7 @@ function fe(e, i, S, g) {
               return a(
                 s,
                 [...n, "[*]", t],
-                f
+                S
               );
             };
           if (l === "index")
@@ -884,36 +884,36 @@ function fe(e, i, S, g) {
               return a(s, c);
             };
           if (l === "insert")
-            return (t) => (w(n), ye(i, t, n, e), a(
+            return (t) => (T(n), ye(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), h = X(t) ? t(c) : t;
+              const c = r.getState().getNestedState(e, n), g = Q(t) ? t(c) : t;
               let d = null;
-              if (!c.some((E) => {
+              if (!c.some((A) => {
                 if (o) {
-                  const V = o.every(
-                    (P) => B(E[P], h[P])
+                  const N = o.every(
+                    (C) => B(A[C], g[C])
                   );
-                  return V && (d = E), V;
+                  return N && (d = A), N;
                 }
-                const A = B(E, h);
-                return A && (d = E), A;
+                const $ = B(A, g);
+                return $ && (d = A), $;
               }))
-                w(n), ye(i, h, n, e);
+                T(n), ye(i, g, n, e);
               else if (s && d) {
-                const E = s(d), A = c.map(
-                  (V) => B(V, d) ? E : V
+                const A = s(d), $ = c.map(
+                  (N) => B(N, d) ? A : N
                 );
-                w(n), se(i, A, n);
+                T(n), ie(i, $, n);
               }
             };
           if (l === "cut")
             return (t, o) => {
               if (!o?.waitForSync)
-                return w(n), ue(i, n, e, t), a(
+                return T(n), ge(i, n, e, t), a(
                   r.getState().getNestedState(e, n),
                   n
                 );
@@ -921,21 +921,21 @@ function fe(e, i, S, g) {
           if (l === "cutByValue")
             return (t) => {
               for (let o = 0; o < v.length; o++)
-                v[o] === t && ue(i, n, e, o);
+                v[o] === t && ge(i, n, e, o);
             };
           if (l === "toggleByValue")
             return (t) => {
               const o = v.findIndex((s) => s === t);
-              o > -1 ? ue(i, n, e, o) : ye(i, t, n, e);
+              o > -1 ? ge(i, n, e, o) : ye(i, t, n, e);
             };
           if (l === "stateFind")
             return (t) => {
               const s = u().find(
-                ({ item: h }, d) => t(h, d)
+                ({ item: g }, d) => t(g, d)
               );
               if (!s) return;
               const c = [...n, s.originalIndex.toString()];
-              return a(s.item, c, f);
+              return a(s.item, c, S);
             };
           if (l === "findWith")
             return (t, o) => {
@@ -943,26 +943,26 @@ function fe(e, i, S, g) {
                 ({ item: d }) => d[t] === o
               );
               if (!c) return;
-              const h = [...n, c.originalIndex.toString()];
-              return a(c.item, h, f);
+              const g = [...n, c.originalIndex.toString()];
+              return a(c.item, g, S);
             };
         }
-        const Q = n[n.length - 1];
-        if (!isNaN(Number(Q))) {
+        const K = n[n.length - 1];
+        if (!isNaN(Number(K))) {
           const u = n.slice(0, -1), t = r.getState().getNestedState(e, u);
           if (Array.isArray(t) && l === "cut")
-            return () => ue(
+            return () => ge(
               i,
               u,
               e,
-              Number(Q)
+              Number(K)
             );
         }
         if (l === "get")
           return () => {
-            if (f?.validIndices && Array.isArray(v)) {
+            if (S?.validIndices && Array.isArray(v)) {
               const u = r.getState().getNestedState(e, n);
-              return f.validIndices.map((t) => u[t]);
+              return S.validIndices.map((t) => u[t]);
             }
             return r.getState().getNestedState(e, n);
           };
@@ -982,7 +982,7 @@ function fe(e, i, S, g) {
           return r.getState().getSyncInfo(u);
         }
         if (l == "getLocalStorage")
-          return (u) => Se(g + "-" + e + "-" + u);
+          return (u) => me(f + "-" + e + "-" + u);
         if (l === "_selected") {
           const u = n.slice(0, -1), t = u.join("."), o = r.getState().getNestedState(e, u);
           return Array.isArray(o) ? Number(n[n.length - 1]) === r.getState().getSelectedIndex(e, t) : void 0;
@@ -992,7 +992,7 @@ function fe(e, i, S, g) {
             const t = n.slice(0, -1), o = Number(n[n.length - 1]), s = t.join(".");
             u ? r.getState().setSelectedIndex(e, s, o) : r.getState().setSelectedIndex(e, s, void 0);
             const c = r.getState().getNestedState(e, [...t]);
-            se(i, c, t), w(t);
+            ie(i, c, t), T(t);
           };
         if (l === "toggleSelected")
           return () => {
@@ -1003,73 +1003,73 @@ function fe(e, i, S, g) {
               s === t ? void 0 : t
             );
             const c = r.getState().getNestedState(e, [...u]);
-            se(i, c, u), w(u);
+            ie(i, c, u), T(u);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (u) => {
-              const t = r.getState().cogsStateStore[e], s = Ge(t, u).newDocument;
+              const t = r.getState().cogsStateStore[e], s = We(t, u).newDocument;
               _e(
                 e,
                 r.getState().initialStateGlobal[e],
                 s,
                 i,
-                S,
-                g
+                m,
+                f
               );
               const c = r.getState().stateComponents.get(e);
               if (c) {
-                const h = we(t, s), d = new Set(h);
+                const g = we(t, s), d = new Set(g);
                 for (const [
                   p,
-                  E
+                  A
                 ] of c.components.entries()) {
-                  let A = !1;
-                  const V = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
-                  if (!V.includes("none")) {
-                    if (V.includes("all")) {
-                      E.forceUpdate();
+                  let $ = !1;
+                  const N = Array.isArray(A.reactiveType) ? A.reactiveType : [A.reactiveType || "component"];
+                  if (!N.includes("none")) {
+                    if (N.includes("all")) {
+                      A.forceUpdate();
                       continue;
                     }
-                    if (V.includes("component") && (E.paths.has("") && (A = !0), !A))
-                      for (const P of d) {
-                        if (E.paths.has(P)) {
-                          A = !0;
+                    if (N.includes("component") && (A.paths.has("") && ($ = !0), !$))
+                      for (const C of d) {
+                        if (A.paths.has(C)) {
+                          $ = !0;
                           break;
                         }
-                        let M = P.lastIndexOf(".");
-                        for (; M !== -1; ) {
-                          const G = P.substring(0, M);
-                          if (E.paths.has(G)) {
-                            A = !0;
+                        let _ = C.lastIndexOf(".");
+                        for (; _ !== -1; ) {
+                          const W = C.substring(0, _);
+                          if (A.paths.has(W)) {
+                            $ = !0;
                             break;
                           }
-                          const z = P.substring(
-                            M + 1
+                          const Y = C.substring(
+                            _ + 1
                           );
-                          if (!isNaN(Number(z))) {
-                            const T = G.lastIndexOf(".");
-                            if (T !== -1) {
-                              const C = G.substring(
+                          if (!isNaN(Number(Y))) {
+                            const V = W.lastIndexOf(".");
+                            if (V !== -1) {
+                              const w = W.substring(
                                 0,
-                                T
+                                V
                               );
-                              if (E.paths.has(C)) {
-                                A = !0;
+                              if (A.paths.has(w)) {
+                                $ = !0;
                                 break;
                               }
                             }
                           }
-                          M = G.lastIndexOf(".");
+                          _ = W.lastIndexOf(".");
                         }
-                        if (A) break;
+                        if ($) break;
                       }
-                    if (!A && V.includes("deps") && E.depsFunction) {
-                      const P = E.depsFunction(s);
-                      let M = !1;
-                      typeof P == "boolean" ? P && (M = !0) : B(E.deps, P) || (E.deps = P, M = !0), M && (A = !0);
+                    if (!$ && N.includes("deps") && A.depsFunction) {
+                      const C = A.depsFunction(s);
+                      let _ = !1;
+                      typeof C == "boolean" ? C && (_ = !0) : B(A.deps, C) || (A.deps = C, _ = !0), _ && ($ = !0);
                     }
-                    A && E.forceUpdate();
+                    $ && A.forceUpdate();
                   }
                 }
               }
@@ -1081,23 +1081,23 @@ function fe(e, i, S, g) {
                 throw new Error("Zod schema not found");
               if (!u?.key)
                 throw new Error("Validation key not found");
-              Z(u.key);
+              X(u.key);
               const o = r.getState().cogsStateStore[e];
               try {
                 const s = r.getState().getValidationErrors(u.key);
-                s && s.length > 0 && s.forEach(([h]) => {
-                  h && h.startsWith(u.key) && Z(h);
+                s && s.length > 0 && s.forEach(([g]) => {
+                  g && g.startsWith(u.key) && X(g);
                 });
                 const c = u.zodSchema.safeParse(o);
                 return c.success ? !0 : (c.error.errors.forEach((d) => {
-                  const p = d.path, E = d.message, A = [u.key, ...p].join(".");
-                  t(A, E);
-                }), me(e), !1);
+                  const p = d.path, A = d.message, $ = [u.key, ...p].join(".");
+                  t($, A);
+                }), he(e), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
             };
-          if (l === "_componentId") return S;
+          if (l === "_componentId") return m;
           if (l === "getComponents")
             return () => r().stateComponents.get(e);
           if (l === "getAllFormRefs")
@@ -1126,7 +1126,7 @@ function fe(e, i, S, g) {
               path: n,
               validationKey: r.getState().getInitialOptions(e)?.validation?.key || "",
               stateKey: e,
-              validIndices: f?.validIndices,
+              validIndices: S?.validIndices,
               children: u
             }
           );
@@ -1137,20 +1137,20 @@ function fe(e, i, S, g) {
           return (u, t) => {
             if (t?.debounce)
               je(() => {
-                se(i, u, n, "");
+                ie(i, u, n, "");
                 const o = r.getState().getNestedState(e, n);
                 t?.afterUpdate && t.afterUpdate(o);
               }, t.debounce);
             else {
-              se(i, u, n, "");
+              ie(i, u, n, "");
               const o = r.getState().getNestedState(e, n);
               t?.afterUpdate && t.afterUpdate(o);
             }
-            w(n);
+            T(n);
           };
         if (l === "formElement")
           return (u, t) => /* @__PURE__ */ Ie(
-            De,
+            Le,
             {
               setState: i,
               stateKey: e,
@@ -1159,11 +1159,11 @@ function fe(e, i, S, g) {
               formOpts: t
             }
           );
-        const _ = [...n, l], ae = r.getState().getNestedState(e, _);
-        return a(ae, _, f);
+        const M = [...n, l], se = r.getState().getNestedState(e, M);
+        return a(se, M, S);
       }
     }, H = new Proxy(U, j);
-    return y.set(W, {
+    return y.set(G, {
       proxy: H,
       stateVersion: b
     }), H;
@@ -1173,99 +1173,99 @@ function fe(e, i, S, g) {
   );
 }
 function xe(e) {
-  return ce(Qe, { proxy: e });
+  return le(Qe, { proxy: e });
 }
 function Xe({
   proxy: e,
   rebuildStateShape: i
 }) {
-  const S = r().getNestedState(e._stateKey, e._path);
-  return Array.isArray(S) ? i(
-    S,
+  const m = r().getNestedState(e._stateKey, e._path);
+  return Array.isArray(m) ? i(
+    m,
     e._path
   ).stateMapNoRender(
-    (y, b, w, I, a) => e._mapFn(y, b, w, I, a)
+    (y, b, T, I, a) => e._mapFn(y, b, T, I, a)
   ) : null;
 }
 function Qe({
   proxy: e
 }) {
-  const i = J(null), S = `${e._stateKey}-${e._path.join(".")}`;
-  return oe(() => {
-    const g = i.current;
-    if (!g || !g.parentElement) return;
-    const y = g.parentElement, w = Array.from(y.childNodes).indexOf(g);
+  const i = q(null), m = `${e._stateKey}-${e._path.join(".")}`;
+  return ae(() => {
+    const f = i.current;
+    if (!f || !f.parentElement) return;
+    const y = f.parentElement, T = Array.from(y.childNodes).indexOf(f);
     let I = y.getAttribute("data-parent-id");
     I || (I = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", I));
     const v = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: I,
-      position: w,
+      position: T,
       effect: e._effect
     };
-    r.getState().addSignalElement(S, v);
+    r.getState().addSignalElement(m, v);
     const n = r.getState().getNestedState(e._stateKey, e._path);
-    let f;
+    let S;
     if (e._effect)
       try {
-        f = new Function(
+        S = new Function(
           "state",
           `return (${e._effect})(state)`
         )(n);
       } catch (U) {
-        console.error("Error evaluating effect function during mount:", U), f = n;
+        console.error("Error evaluating effect function during mount:", U), S = n;
       }
     else
-      f = n;
-    f !== null && typeof f == "object" && (f = JSON.stringify(f));
-    const W = document.createTextNode(String(f));
-    g.replaceWith(W);
-  }, [e._stateKey, e._path.join("."), e._effect]), ce("span", {
+      S = n;
+    S !== null && typeof S == "object" && (S = JSON.stringify(S));
+    const G = document.createTextNode(String(S));
+    f.replaceWith(G);
+  }, [e._stateKey, e._path.join("."), e._effect]), le("span", {
     ref: i,
     style: { display: "none" },
-    "data-signal-id": S
+    "data-signal-id": m
   });
 }
 function St(e) {
   const i = Oe(
-    (S) => {
-      const g = r.getState().stateComponents.get(e._stateKey) || {
+    (m) => {
+      const f = r.getState().stateComponents.get(e._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return g.components.set(e._stateKey, {
-        forceUpdate: S,
+      return f.components.set(e._stateKey, {
+        forceUpdate: m,
         paths: /* @__PURE__ */ new Set([e._path.join(".")])
-      }), () => g.components.delete(e._stateKey);
+      }), () => f.components.delete(e._stateKey);
     },
     () => r.getState().getNestedState(e._stateKey, e._path)
   );
-  return ce("text", {}, String(i));
+  return le("text", {}, String(i));
 }
 function Ke({
   stateKey: e,
   itemComponentId: i,
-  itemPath: S,
-  children: g
+  itemPath: m,
+  children: f
 }) {
-  const [, y] = ee({}), [b, w] = We(), I = J(null);
-  return oe(() => {
-    w.height > 0 && w.height !== I.current && (I.current = w.height, r.getState().setShadowMetadata(e, S, {
+  const [, y] = te({}), [b, T] = Ge(), I = q(null);
+  return ae(() => {
+    T.height > 0 && T.height !== I.current && (I.current = T.height, r.getState().setShadowMetadata(e, m, {
       virtualizer: {
-        itemHeight: w.height
+        itemHeight: T.height
       }
     }));
-  }, [w.height, e, S]), ie(() => {
+  }, [T.height, e, m]), ce(() => {
     const a = `${e}////${i}`, v = r.getState().stateComponents.get(e) || {
       components: /* @__PURE__ */ new Map()
     };
     return v.components.set(a, {
       forceUpdate: () => y({}),
-      paths: /* @__PURE__ */ new Set([S.join(".")])
+      paths: /* @__PURE__ */ new Set([m.join(".")])
     }), r.getState().stateComponents.set(e, v), () => {
       const n = r.getState().stateComponents.get(e);
       n && n.components.delete(a);
     };
-  }, [e, i, S.join(".")]), /* @__PURE__ */ Ie("div", { ref: b, children: g });
+  }, [e, i, m.join(".")]), /* @__PURE__ */ Ie("div", { ref: b, children: f });
 }
 export {
   xe as $cogsSignal,