cogsbox-state 0.5.251 → 0.5.253

package/dist/CogsState.jsx

@@ -1,62 +1,62 @@
 "use client";
-import { jsx as yt } from "react/jsx-runtime";
-import { useState as et, useRef as Z, useEffect as ft, useLayoutEffect as ot, useMemo as Tt, createElement as st, useSyncExternalStore as kt, startTransition as At, useCallback as ut } from "react";
-import { transformStateFunc as Vt, isDeepEqual as L, isFunction as z, getNestedValue as H, getDifferences as St, debounce as Nt } from "./utility.js";
-import { pushFunc as gt, updateFn as tt, cutFunc as rt, ValidationWrapper as Ct, FormControlComponent as Pt } from "./Functions.jsx";
-import _t from "superjson";
+import { jsx as It } from "react/jsx-runtime";
+import { useState as X, useRef as Y, useEffect as st, useLayoutEffect as at, useMemo as Vt, createElement as ct, useSyncExternalStore as At, startTransition as Nt, useCallback as gt } from "react";
+import { transformStateFunc as Ct, isDeepEqual as H, isFunction as J, getNestedValue as B, getDifferences as St, debounce as Pt } from "./utility.js";
+import { pushFunc as ft, updateFn as tt, cutFunc as ot, ValidationWrapper as _t, FormControlComponent as Ot } from "./Functions.jsx";
+import Mt from "superjson";
 import { v4 as mt } from "uuid";
 import "zod";
-import { getGlobalStore as r, formRefStore as ht } from "./store.js";
-import { useCogsConfig as $t } from "./CogsStateClient.jsx";
-import { applyPatch as Ot } from "fast-json-patch";
-function It(t, s) {
-  const y = r.getState().getInitialOptions, g = r.getState().setInitialStateOptions, v = y(t) || {};
+import { getGlobalStore as n, formRefStore as pt } from "./store.js";
+import { useCogsConfig as bt } from "./CogsStateClient.jsx";
+import { applyPatch as jt } from "fast-json-patch";
+function wt(t, s) {
+  const v = n.getState().getInitialOptions, g = n.getState().setInitialStateOptions, h = v(t) || {};
   g(t, {
-    ...v,
+    ...h,
     ...s
   });
 }
-function pt({
+function Et({
   stateKey: t,
   options: s,
-  initialOptionsPart: y
+  initialOptionsPart: v
 }) {
-  const g = X(t) || {}, v = y[t] || {}, x = r.getState().setInitialStateOptions, E = { ...v, ...g };
-  let p = !1;
+  const g = Q(t) || {}, h = v[t] || {}, V = n.getState().setInitialStateOptions, E = { ...h, ...g };
+  let I = !1;
   if (s)
     for (const i in s)
-      E.hasOwnProperty(i) ? (i == "localStorage" && s[i] && E[i].key !== s[i]?.key && (p = !0, E[i] = s[i]), i == "initialState" && s[i] && E[i] !== s[i] && // Different references
-      !L(E[i], s[i]) && (p = !0, E[i] = s[i])) : (p = !0, E[i] = s[i]);
-  p && x(t, E);
+      E.hasOwnProperty(i) ? (i == "localStorage" && s[i] && E[i].key !== s[i]?.key && (I = !0, E[i] = s[i]), i == "initialState" && s[i] && E[i] !== s[i] && // Different references
+      !H(E[i], s[i]) && (I = !0, E[i] = s[i])) : (I = !0, E[i] = s[i]);
+  I && V(t, E);
 }
-function te(t, { formElements: s, validation: y }) {
-  return { initialState: t, formElements: s, validation: y };
+function ne(t, { formElements: s, validation: v }) {
+  return { initialState: t, formElements: s, validation: v };
 }
-const ee = (t, s) => {
-  let y = t;
-  const [g, v] = Vt(y);
-  (Object.keys(v).length > 0 || s && Object.keys(s).length > 0) && Object.keys(v).forEach((p) => {
-    v[p] = v[p] || {}, v[p].formElements = {
+const re = (t, s) => {
+  let v = t;
+  const [g, h] = Ct(v);
+  (Object.keys(h).length > 0 || s && Object.keys(s).length > 0) && Object.keys(h).forEach((I) => {
+    h[I] = h[I] || {}, h[I].formElements = {
       ...s?.formElements,
       // Global defaults first
       ...s?.validation,
-      ...v[p].formElements || {}
+      ...h[I].formElements || {}
       // State-specific overrides
-    }, X(p) || r.getState().setInitialStateOptions(p, v[p]);
-  }), r.getState().setInitialStates(g), r.getState().setCreatedState(g);
-  const x = (p, i) => {
-    const [h] = et(i?.componentId ?? mt());
-    pt({
-      stateKey: p,
+    }, Q(I) || n.getState().setInitialStateOptions(I, h[I]);
+  }), n.getState().setInitialStates(g), n.getState().setCreatedState(g);
+  const V = (I, i) => {
+    const [y] = X(i?.componentId ?? mt());
+    Et({
+      stateKey: I,
       options: i,
-      initialOptionsPart: v
+      initialOptionsPart: h
     });
-    const o = r.getState().cogsStateStore[p] || g[p], S = i?.modifyState ? i.modifyState(o) : o, [W, j] = Wt(
+    const o = n.getState().cogsStateStore[I] || g[I], S = i?.modifyState ? i.modifyState(o) : o, [G, M] = Lt(
       S,
       {
-        stateKey: p,
+        stateKey: I,
         syncUpdate: i?.syncUpdate,
-        componentId: h,
+        componentId: y,
         localStorage: i?.localStorage,
         middleware: i?.middleware,
         enabledSync: i?.enabledSync,
@@ -67,49 +67,49 @@ const ee = (t, s) => {
         serverState: i?.serverState
       }
     );
-    return j;
+    return M;
   };
-  function E(p, i) {
-    pt({ stateKey: p, options: i, initialOptionsPart: v }), i.localStorage && Ut(p, i), lt(p);
+  function E(I, i) {
+    Et({ stateKey: I, options: i, initialOptionsPart: h }), i.localStorage && Wt(I, i), dt(I);
   }
-  return { useCogsState: x, setCogsOptions: E };
+  return { useCogsState: V, setCogsOptions: E };
 }, {
-  setUpdaterState: at,
-  setState: J,
-  getInitialOptions: X,
-  getKeyState: bt,
-  getValidationErrors: Mt,
-  setStateLog: Rt,
+  setUpdaterState: it,
+  setState: Z,
+  getInitialOptions: Q,
+  getKeyState: kt,
+  getValidationErrors: Rt,
+  setStateLog: Ut,
   updateInitialStateGlobal: vt,
-  addValidationError: jt,
-  removeValidationError: q,
-  setServerSyncActions: Ft
-} = r.getState(), wt = (t, s, y, g, v) => {
-  y?.log && console.log(
+  addValidationError: Ft,
+  removeValidationError: z,
+  setServerSyncActions: Dt
+} = n.getState(), $t = (t, s, v, g, h) => {
+  v?.log && console.log(
     "saving to localstorage",
     s,
-    y.localStorage?.key,
+    v.localStorage?.key,
     g
   );
-  const x = z(y?.localStorage?.key) ? y.localStorage?.key(t) : y?.localStorage?.key;
-  if (x && g) {
-    const E = `${g}-${s}-${x}`;
-    let p;
+  const V = J(v?.localStorage?.key) ? v.localStorage?.key(t) : v?.localStorage?.key;
+  if (V && g) {
+    const E = `${g}-${s}-${V}`;
+    let I;
     try {
-      p = ct(E)?.lastSyncedWithServer;
+      I = lt(E)?.lastSyncedWithServer;
     } catch {
     }
     const i = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: v ?? p
-    }, h = _t.serialize(i);
+      lastSyncedWithServer: h ?? I
+    }, y = Mt.serialize(i);
     window.localStorage.setItem(
       E,
-      JSON.stringify(h.json)
+      JSON.stringify(y.json)
     );
   }
-}, ct = (t) => {
+}, lt = (t) => {
   if (!t) return null;
   try {
     const s = window.localStorage.getItem(t);
@@ -117,61 +117,61 @@ const ee = (t, s) => {
   } catch (s) {
     return console.error("Error loading from localStorage:", s), null;
   }
-}, Ut = (t, s) => {
-  const y = r.getState().cogsStateStore[t], { sessionId: g } = $t(), v = z(s?.localStorage?.key) ? s.localStorage.key(y) : s?.localStorage?.key;
-  if (v && g) {
-    const x = ct(
-      `${g}-${t}-${v}`
+}, Wt = (t, s) => {
+  const v = n.getState().cogsStateStore[t], { sessionId: g } = bt(), h = J(s?.localStorage?.key) ? s.localStorage.key(v) : s?.localStorage?.key;
+  if (h && g) {
+    const V = lt(
+      `${g}-${t}-${h}`
     );
-    if (x && x.lastUpdated > (x.lastSyncedWithServer || 0))
-      return J(t, x.state), lt(t), !0;
+    if (V && V.lastUpdated > (V.lastSyncedWithServer || 0))
+      return Z(t, V.state), dt(t), !0;
   }
   return !1;
-}, xt = (t, s, y, g, v, x) => {
+}, xt = (t, s, v, g, h, V) => {
   const E = {
     initialState: s,
-    updaterState: it(
+    updaterState: et(
       t,
       g,
-      v,
-      x
+      h,
+      V
     ),
-    state: y
+    state: v
   };
-  vt(t, E.initialState), at(t, E.updaterState), J(t, E.state);
-}, lt = (t) => {
-  const s = r.getState().stateComponents.get(t);
+  vt(t, E.initialState), it(t, E.updaterState), Z(t, E.state);
+}, dt = (t) => {
+  const s = n.getState().stateComponents.get(t);
   if (!s) return;
-  const y = /* @__PURE__ */ new Set();
+  const v = /* @__PURE__ */ new Set();
   s.components.forEach((g) => {
-    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || y.add(() => g.forceUpdate());
+    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || v.add(() => g.forceUpdate());
   }), queueMicrotask(() => {
-    y.forEach((g) => g());
+    v.forEach((g) => g());
   });
-}, ne = (t, s) => {
-  const y = r.getState().stateComponents.get(t);
-  if (y) {
-    const g = `${t}////${s}`, v = y.components.get(g);
-    if ((v ? Array.isArray(v.reactiveType) ? v.reactiveType : [v.reactiveType || "component"] : null)?.includes("none"))
+}, oe = (t, s) => {
+  const v = n.getState().stateComponents.get(t);
+  if (v) {
+    const g = `${t}////${s}`, h = v.components.get(g);
+    if ((h ? Array.isArray(h.reactiveType) ? h.reactiveType : [h.reactiveType || "component"] : null)?.includes("none"))
       return;
-    v && v.forceUpdate();
+    h && h.forceUpdate();
   }
-}, Dt = (t, s, y, g) => {
+}, Gt = (t, s, v, g) => {
   switch (t) {
     case "update":
       return {
-        oldValue: H(s, g),
-        newValue: H(y, g)
+        oldValue: B(s, g),
+        newValue: B(v, g)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: H(y, g)
+        newValue: B(v, g)
       };
     case "cut":
       return {
-        oldValue: H(s, g),
+        oldValue: B(s, g),
         newValue: null
         // or undefined
       };
@@ -179,313 +179,313 @@ const ee = (t, s) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Wt(t, {
+function Lt(t, {
   stateKey: s,
-  serverSync: y,
+  serverSync: v,
   localStorage: g,
-  formElements: v,
-  reactiveDeps: x,
+  formElements: h,
+  reactiveDeps: V,
   reactiveType: E,
-  componentId: p,
+  componentId: I,
   initialState: i,
-  syncUpdate: h,
+  syncUpdate: y,
   dependencies: o,
   serverState: S
 } = {}) {
-  const [W, j] = et({}), { sessionId: F } = $t();
-  let G = !s;
-  const [m] = et(s ?? mt()), l = r.getState().stateLog[m], nt = Z(/* @__PURE__ */ new Set()), B = Z(p ?? mt()), _ = Z(
+  const [G, M] = X({}), { sessionId: j } = bt();
+  let L = !s;
+  const [m] = X(s ?? mt()), l = n.getState().stateLog[m], nt = Y(/* @__PURE__ */ new Set()), q = Y(I ?? mt()), _ = Y(
     null
   );
-  _.current = X(m) ?? null, ft(() => {
-    if (h && h.stateKey === m && h.path?.[0]) {
-      J(m, (n) => ({
-        ...n,
-        [h.path[0]]: h.newValue
+  _.current = Q(m) ?? null, st(() => {
+    if (y && y.stateKey === m && y.path?.[0]) {
+      Z(m, (r) => ({
+        ...r,
+        [y.path[0]]: y.newValue
       }));
-      const e = `${h.stateKey}:${h.path.join(".")}`;
-      r.getState().setSyncInfo(e, {
-        timeStamp: h.timeStamp,
-        userId: h.userId
+      const e = `${y.stateKey}:${y.path.join(".")}`;
+      n.getState().setSyncInfo(e, {
+        timeStamp: y.timeStamp,
+        userId: y.userId
       });
     }
-  }, [h]), ft(() => {
+  }, [y]), st(() => {
     if (i) {
-      It(m, {
+      wt(m, {
         initialState: i
       });
-      const e = _.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = r.getState().initialStateGlobal[m];
-      if (!(c && !L(c, i) || !c) && !a)
+      const e = _.current, a = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = n.getState().initialStateGlobal[m];
+      if (!(c && !H(c, i) || !c) && !a)
         return;
       let u = null;
-      const T = z(e?.localStorage?.key) ? e?.localStorage?.key(i) : e?.localStorage?.key;
-      T && F && (u = ct(`${F}-${m}-${T}`));
-      let w = i, $ = !1;
-      const A = a ? Date.now() : 0, V = u?.lastUpdated || 0, O = u?.lastSyncedWithServer || 0;
-      a && A > V ? (w = e.serverState.data, $ = !0) : u && V > O && (w = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), xt(
+      const k = J(e?.localStorage?.key) ? e?.localStorage?.key(i) : e?.localStorage?.key;
+      k && j && (u = lt(`${j}-${m}-${k}`));
+      let p = i, w = !1;
+      const N = a ? Date.now() : 0, A = u?.lastUpdated || 0, C = u?.lastSyncedWithServer || 0;
+      a && N > A ? (p = e.serverState.data, w = !0) : u && A > C && (p = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(p)), xt(
         m,
         i,
-        w,
-        Q,
-        B.current,
-        F
-      ), $ && T && F && wt(w, m, e, F, Date.now()), lt(m), (Array.isArray(E) ? E : [E || "component"]).includes("none") || j({});
+        p,
+        K,
+        q.current,
+        j
+      ), w && k && j && $t(p, m, e, j, Date.now()), dt(m), (Array.isArray(E) ? E : [E || "component"]).includes("none") || M({});
     }
   }, [
     i,
     S?.status,
     S?.data,
     ...o || []
-  ]), ot(() => {
-    G && It(m, {
-      serverSync: y,
-      formElements: v,
+  ]), at(() => {
+    L && wt(m, {
+      serverSync: v,
+      formElements: h,
       initialState: i,
       localStorage: g,
       middleware: _.current?.middleware
     });
-    const e = `${m}////${B.current}`, n = r.getState().stateComponents.get(m) || {
+    const e = `${m}////${q.current}`, r = n.getState().stateComponents.get(m) || {
       components: /* @__PURE__ */ new Map()
     };
-    return n.components.set(e, {
-      forceUpdate: () => j({}),
+    return r.components.set(e, {
+      forceUpdate: () => M({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: x || void 0,
+      depsFunction: V || void 0,
       reactiveType: E ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(m, n), j({}), () => {
-      const a = `${m}////${B.current}`;
-      n && (n.components.delete(a), n.components.size === 0 && r.getState().stateComponents.delete(m));
+    }), n.getState().stateComponents.set(m, r), M({}), () => {
+      const a = `${m}////${q.current}`;
+      r && (r.components.delete(a), r.components.size === 0 && n.getState().stateComponents.delete(m));
     };
   }, []);
-  const Q = (e, n, a, c) => {
-    if (Array.isArray(n)) {
-      const f = `${m}-${n.join(".")}`;
+  const K = (e, r, a, c) => {
+    if (Array.isArray(r)) {
+      const f = `${m}-${r.join(".")}`;
       nt.current.add(f);
     }
-    J(m, (f) => {
-      const u = z(e) ? e(f) : e, T = `${m}-${n.join(".")}`;
-      if (T) {
-        let M = !1, k = r.getState().signalDomElements.get(T);
-        if ((!k || k.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
-          const R = n.slice(0, -1), b = H(u, R);
-          if (Array.isArray(b)) {
-            M = !0;
-            const I = `${m}-${R.join(".")}`;
-            k = r.getState().signalDomElements.get(I);
+    Z(m, (f) => {
+      const u = J(e) ? e(f) : e, k = `${m}-${r.join(".")}`;
+      if (k) {
+        let U = !1, x = n.getState().signalDomElements.get(k);
+        if ((!x || x.size === 0) && (a.updateType === "insert" || a.updateType === "cut")) {
+          const O = r.slice(0, -1), D = B(u, O);
+          if (Array.isArray(D)) {
+            U = !0;
+            const T = `${m}-${O.join(".")}`;
+            x = n.getState().signalDomElements.get(T);
           }
         }
-        if (k) {
-          const R = M ? H(u, n.slice(0, -1)) : H(u, n);
-          k.forEach(({ parentId: b, position: I, effect: C }) => {
-            const N = document.querySelector(
-              `[data-parent-id="${b}"]`
+        if (x) {
+          const O = U ? B(u, r.slice(0, -1)) : B(u, r);
+          x.forEach(({ parentId: D, position: T, effect: $ }) => {
+            const b = document.querySelector(
+              `[data-parent-id="${D}"]`
             );
-            if (N) {
-              const P = Array.from(N.childNodes);
-              if (P[I]) {
-                const U = C ? new Function("state", `return (${C})(state)`)(R) : R;
-                P[I].textContent = String(U);
+            if (b) {
+              const F = Array.from(b.childNodes);
+              if (F[T]) {
+                const P = $ ? new Function("state", `return (${$})(state)`)(O) : O;
+                F[T].textContent = String(P);
               }
             }
           });
         }
       }
-      a.updateType === "update" && (c || _.current?.validation?.key) && n && q(
-        (c || _.current?.validation?.key) + "." + n.join(".")
+      a.updateType === "update" && (c || _.current?.validation?.key) && r && z(
+        (c || _.current?.validation?.key) + "." + r.join(".")
       );
-      const w = n.slice(0, n.length - 1);
-      a.updateType === "cut" && _.current?.validation?.key && q(
-        _.current?.validation?.key + "." + w.join(".")
-      ), a.updateType === "insert" && _.current?.validation?.key && Mt(
-        _.current?.validation?.key + "." + w.join(".")
-      ).filter(([k, R]) => {
-        let b = k?.split(".").length;
-        if (k == w.join(".") && b == w.length - 1) {
-          let I = k + "." + w;
-          q(k), jt(I, R);
+      const p = r.slice(0, r.length - 1);
+      a.updateType === "cut" && _.current?.validation?.key && z(
+        _.current?.validation?.key + "." + p.join(".")
+      ), a.updateType === "insert" && _.current?.validation?.key && Rt(
+        _.current?.validation?.key + "." + p.join(".")
+      ).filter(([x, O]) => {
+        let D = x?.split(".").length;
+        if (x == p.join(".") && D == p.length - 1) {
+          let T = x + "." + p;
+          z(x), Ft(T, O);
         }
       });
-      const $ = r.getState().stateComponents.get(m);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", $), $) {
-        const M = St(f, u), k = new Set(M), R = a.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
+      const w = n.getState().stateComponents.get(m);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", w), w) {
+        const U = St(f, u), x = new Set(U), O = a.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
         for (const [
-          b,
-          I
-        ] of $.components.entries()) {
-          let C = !1;
-          const N = Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"];
-          if (console.log("component", I), !N.includes("none")) {
-            if (N.includes("all")) {
-              I.forceUpdate();
+          D,
+          T
+        ] of w.components.entries()) {
+          let $ = !1;
+          const b = Array.isArray(T.reactiveType) ? T.reactiveType : [T.reactiveType || "component"];
+          if (console.log("component", T), !b.includes("none")) {
+            if (b.includes("all")) {
+              T.forceUpdate();
               continue;
             }
-            if (N.includes("component") && ((I.paths.has(R) || I.paths.has("")) && (C = !0), !C))
-              for (const P of k) {
-                let U = P;
+            if (b.includes("component") && ((T.paths.has(O) || T.paths.has("")) && ($ = !0), !$))
+              for (const F of x) {
+                let P = F;
                 for (; ; ) {
-                  if (I.paths.has(U)) {
-                    C = !0;
+                  if (T.paths.has(P)) {
+                    $ = !0;
                     break;
                   }
-                  const Y = U.lastIndexOf(".");
-                  if (Y !== -1) {
-                    const K = U.substring(
+                  const R = P.lastIndexOf(".");
+                  if (R !== -1) {
+                    const rt = P.substring(
                       0,
-                      Y
+                      R
                     );
                     if (!isNaN(
-                      Number(U.substring(Y + 1))
-                    ) && I.paths.has(K)) {
-                      C = !0;
+                      Number(P.substring(R + 1))
+                    ) && T.paths.has(rt)) {
+                      $ = !0;
                       break;
                     }
-                    U = K;
+                    P = rt;
                   } else
-                    U = "";
-                  if (U === "")
+                    P = "";
+                  if (P === "")
                     break;
                 }
-                if (C) break;
+                if ($) break;
               }
-            if (!C && N.includes("deps") && I.depsFunction) {
-              const P = I.depsFunction(u);
-              let U = !1;
-              typeof P == "boolean" ? P && (U = !0) : L(I.deps, P) || (I.deps = P, U = !0), U && (C = !0);
+            if (!$ && b.includes("deps") && T.depsFunction) {
+              const F = T.depsFunction(u);
+              let P = !1;
+              typeof F == "boolean" ? F && (P = !0) : H(T.deps, F) || (T.deps = F, P = !0), P && ($ = !0);
             }
-            C && I.forceUpdate();
+            $ && T.forceUpdate();
           }
         }
       }
-      const A = Date.now();
-      n = n.map((M, k) => {
-        const R = n.slice(0, -1), b = H(u, R);
-        return k === n.length - 1 && ["insert", "cut"].includes(a.updateType) ? (b.length - 1).toString() : M;
+      const N = Date.now();
+      r = r.map((U, x) => {
+        const O = r.slice(0, -1), D = B(u, O);
+        return x === r.length - 1 && ["insert", "cut"].includes(a.updateType) ? (D.length - 1).toString() : U;
       });
-      const { oldValue: V, newValue: O } = Dt(
+      const { oldValue: A, newValue: C } = Gt(
         a.updateType,
         f,
         u,
-        n
-      ), D = {
-        timeStamp: A,
+        r
+      ), W = {
+        timeStamp: N,
         stateKey: m,
-        path: n,
+        path: r,
         updateType: a.updateType,
         status: "new",
-        oldValue: V,
-        newValue: O
+        oldValue: A,
+        newValue: C
       };
-      if (Rt(m, (M) => {
-        const R = [...M ?? [], D].reduce((b, I) => {
-          const C = `${I.stateKey}:${JSON.stringify(I.path)}`, N = b.get(C);
-          return N ? (N.timeStamp = Math.max(N.timeStamp, I.timeStamp), N.newValue = I.newValue, N.oldValue = N.oldValue ?? I.oldValue, N.updateType = I.updateType) : b.set(C, { ...I }), b;
+      if (Ut(m, (U) => {
+        const O = [...U ?? [], W].reduce((D, T) => {
+          const $ = `${T.stateKey}:${JSON.stringify(T.path)}`, b = D.get($);
+          return b ? (b.timeStamp = Math.max(b.timeStamp, T.timeStamp), b.newValue = T.newValue, b.oldValue = b.oldValue ?? T.oldValue, b.updateType = T.updateType) : D.set($, { ...T }), D;
         }, /* @__PURE__ */ new Map());
-        return Array.from(R.values());
-      }), wt(
+        return Array.from(O.values());
+      }), $t(
         u,
         m,
         _.current,
-        F
+        j
       ), _.current?.middleware && _.current.middleware({
         updateLog: l,
-        update: D
+        update: W
       }), _.current?.serverSync) {
-        const M = r.getState().serverState[m], k = _.current?.serverSync;
-        Ft(m, {
-          syncKey: typeof k.syncKey == "string" ? k.syncKey : k.syncKey({ state: u }),
-          rollBackState: M,
-          actionTimeStamp: Date.now() + (k.debounce ?? 3e3),
+        const U = n.getState().serverState[m], x = _.current?.serverSync;
+        Dt(m, {
+          syncKey: typeof x.syncKey == "string" ? x.syncKey : x.syncKey({ state: u }),
+          rollBackState: U,
+          actionTimeStamp: Date.now() + (x.debounce ?? 3e3),
           status: "waiting"
         });
       }
       return u;
     });
   };
-  r.getState().updaterState[m] || (at(
+  n.getState().updaterState[m] || (it(
     m,
-    it(
+    et(
       m,
-      Q,
-      B.current,
-      F
+      K,
+      q.current,
+      j
     )
-  ), r.getState().cogsStateStore[m] || J(m, t), r.getState().initialStateGlobal[m] || vt(m, t));
-  const d = Tt(() => it(
+  ), n.getState().cogsStateStore[m] || Z(m, t), n.getState().initialStateGlobal[m] || vt(m, t));
+  const d = Vt(() => et(
     m,
-    Q,
-    B.current,
-    F
-  ), [m, F]);
-  return [bt(m), d];
+    K,
+    q.current,
+    j
+  ), [m, j]);
+  return [kt(m), d];
 }
-function it(t, s, y, g) {
-  const v = /* @__PURE__ */ new Map();
-  let x = 0;
-  const E = (h) => {
-    const o = h.join(".");
-    for (const [S] of v)
-      (S === o || S.startsWith(o + ".")) && v.delete(S);
-    x++;
-  }, p = {
-    removeValidation: (h) => {
-      h?.validationKey && q(h.validationKey);
+function et(t, s, v, g) {
+  const h = /* @__PURE__ */ new Map();
+  let V = 0;
+  const E = (y) => {
+    const o = y.join(".");
+    for (const [S] of h)
+      (S === o || S.startsWith(o + ".")) && h.delete(S);
+    V++;
+  }, I = {
+    removeValidation: (y) => {
+      y?.validationKey && z(y.validationKey);
     },
-    revertToInitialState: (h) => {
-      const o = r.getState().getInitialOptions(t)?.validation;
-      o?.key && q(o?.key), h?.validationKey && q(h.validationKey);
-      const S = r.getState().initialStateGlobal[t];
-      r.getState().clearSelectedIndexesForState(t), v.clear(), x++;
-      const W = i(S, []), j = X(t), F = z(j?.localStorage?.key) ? j?.localStorage?.key(S) : j?.localStorage?.key, G = `${g}-${t}-${F}`;
-      G && localStorage.removeItem(G), at(t, W), J(t, S);
-      const m = r.getState().stateComponents.get(t);
+    revertToInitialState: (y) => {
+      const o = n.getState().getInitialOptions(t)?.validation;
+      o?.key && z(o?.key), y?.validationKey && z(y.validationKey);
+      const S = n.getState().initialStateGlobal[t];
+      n.getState().clearSelectedIndexesForState(t), h.clear(), V++;
+      const G = i(S, []), M = Q(t), j = J(M?.localStorage?.key) ? M?.localStorage?.key(S) : M?.localStorage?.key, L = `${g}-${t}-${j}`;
+      L && localStorage.removeItem(L), it(t, G), Z(t, S);
+      const m = n.getState().stateComponents.get(t);
       return m && m.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
-    updateInitialState: (h) => {
-      v.clear(), x++;
-      const o = it(
+    updateInitialState: (y) => {
+      h.clear(), V++;
+      const o = et(
         t,
         s,
-        y,
+        v,
         g
-      ), S = r.getState().initialStateGlobal[t], W = X(t), j = z(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, F = `${g}-${t}-${j}`;
-      return localStorage.getItem(F) && localStorage.removeItem(F), At(() => {
-        vt(t, h), at(t, o), J(t, h);
-        const G = r.getState().stateComponents.get(t);
-        G && G.components.forEach((m) => {
+      ), S = n.getState().initialStateGlobal[t], G = Q(t), M = J(G?.localStorage?.key) ? G?.localStorage?.key(S) : G?.localStorage?.key, j = `${g}-${t}-${M}`;
+      return localStorage.getItem(j) && localStorage.removeItem(j), Nt(() => {
+        vt(t, y), it(t, o), Z(t, y);
+        const L = n.getState().stateComponents.get(t);
+        L && L.components.forEach((m) => {
           m.forceUpdate();
         });
       }), {
-        fetchId: (G) => o.get()[G]
+        fetchId: (L) => o.get()[L]
       };
     },
-    _initialState: r.getState().initialStateGlobal[t],
-    _serverState: r.getState().serverState[t],
-    _isLoading: r.getState().isLoadingGlobal[t],
+    _initialState: n.getState().initialStateGlobal[t],
+    _serverState: n.getState().serverState[t],
+    _isLoading: n.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const h = r.getState().serverState[t];
-      return !!(h && L(h, bt(t)));
+      const y = n.getState().serverState[t];
+      return !!(y && H(y, kt(t)));
     }
   };
-  function i(h, o = [], S) {
-    const W = o.map(String).join(".");
-    v.get(W);
-    const j = function() {
-      return r().getNestedState(t, o);
+  function i(y, o = [], S) {
+    const G = o.map(String).join(".");
+    h.get(G);
+    const M = function() {
+      return n().getNestedState(t, o);
     };
-    Object.keys(p).forEach((m) => {
-      j[m] = p[m];
+    Object.keys(I).forEach((m) => {
+      M[m] = I[m];
     });
-    const F = {
+    const j = {
       apply(m, l, nt) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${o.join(".")}`
-        ), console.trace("Apply trap stack trace"), r().getNestedState(t, o);
+        ), console.trace("Apply trap stack trace"), n().getNestedState(t, o);
       },
       get(m, l) {
-        S?.validIndices && !Array.isArray(h) && (S = { ...S, validIndices: void 0 });
+        S?.validIndices && !Array.isArray(y) && (S = { ...S, validIndices: void 0 });
         const nt = /* @__PURE__ */ new Set([
           "insert",
           "cut",
@@ -510,40 +510,40 @@ function it(t, s, y, g) {
           "getComponents"
         ]);
         if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !nt.has(l)) {
-          const d = `${t}////${y}`, e = r.getState().stateComponents.get(t);
+          const d = `${t}////${v}`, e = n.getState().stateComponents.get(t);
           if (e) {
-            const n = e.components.get(d);
-            if (n && !n.paths.has("")) {
+            const r = e.components.get(d);
+            if (r && !r.paths.has("")) {
               const a = o.join(".");
               let c = !0;
-              for (const f of n.paths)
+              for (const f of r.paths)
                 if (a.startsWith(f) && (a === f || a[f.length] === ".")) {
                   c = !1;
                   break;
                 }
-              c && n.paths.add(a);
+              c && r.paths.add(a);
             }
           }
         }
         if (l === "getDifferences")
           return () => St(
-            r.getState().cogsStateStore[t],
-            r.getState().initialStateGlobal[t]
+            n.getState().cogsStateStore[t],
+            n.getState().initialStateGlobal[t]
           );
         if (l === "sync" && o.length === 0)
           return async function() {
-            const d = r.getState().getInitialOptions(t), e = d?.sync;
+            const d = n.getState().getInitialOptions(t), e = d?.sync;
             if (!e)
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
-            const n = r.getState().getNestedState(t, []), a = d?.validation?.key;
+            const r = n.getState().getNestedState(t, []), a = d?.validation?.key;
             try {
-              const c = await e.action(n);
+              const c = await e.action(r);
               if (c && !c.success && c.errors && a) {
-                r.getState().removeValidationError(a), c.errors.forEach((u) => {
-                  const T = [a, ...u.path].join(".");
-                  r.getState().addValidationError(T, u.message);
+                n.getState().removeValidationError(a), c.errors.forEach((u) => {
+                  const k = [a, ...u.path].join(".");
+                  n.getState().addValidationError(k, u.message);
                 });
-                const f = r.getState().stateComponents.get(t);
+                const f = n.getState().stateComponents.get(t);
                 f && f.components.forEach((u) => {
                   u.forceUpdate();
                 });
@@ -554,139 +554,160 @@ function it(t, s, y, g) {
             }
           };
         if (l === "_status") {
-          const d = r.getState().getNestedState(t, o), e = r.getState().initialStateGlobal[t], n = H(e, o);
-          return L(d, n) ? "fresh" : "stale";
+          const d = n.getState().getNestedState(t, o), e = n.getState().initialStateGlobal[t], r = B(e, o);
+          return H(d, r) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
-            const d = r().getNestedState(
+            const d = n().getNestedState(
               t,
               o
-            ), e = r.getState().initialStateGlobal[t], n = H(e, o);
-            return L(d, n) ? "fresh" : "stale";
+            ), e = n.getState().initialStateGlobal[t], r = B(e, o);
+            return H(d, r) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = r.getState().initialStateGlobal[t], e = X(t), n = z(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${g}-${t}-${n}`;
+            const d = n.getState().initialStateGlobal[t], e = Q(t), r = J(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, a = `${g}-${t}-${r}`;
             a && localStorage.removeItem(a);
           };
         if (l === "showValidationErrors")
           return () => {
-            const d = r.getState().getInitialOptions(t)?.validation;
+            const d = n.getState().getInitialOptions(t)?.validation;
             if (!d?.key)
               throw new Error("Validation key not found");
-            return r.getState().getValidationErrors(d.key + "." + o.join("."));
+            return n.getState().getValidationErrors(d.key + "." + o.join("."));
           };
-        if (Array.isArray(h)) {
-          const d = () => S?.validIndices ? h.map((n, a) => ({
-            item: n,
+        if (Array.isArray(y)) {
+          const d = () => S?.validIndices ? y.map((r, a) => ({
+            item: r,
             originalIndex: S.validIndices[a]
-          })) : r.getState().getNestedState(t, o).map((n, a) => ({
-            item: n,
+          })) : n.getState().getNestedState(t, o).map((r, a) => ({
+            item: r,
             originalIndex: a
           }));
           if (l === "getSelected")
             return () => {
-              const e = r.getState().getSelectedIndex(t, o.join("."));
+              const e = n.getState().getSelectedIndex(t, o.join("."));
               if (e !== void 0)
                 return i(
-                  h[e],
+                  y[e],
                   [...o, e.toString()],
                   S
                 );
             };
           if (l === "clearSelected")
             return () => {
-              r.getState().clearSelectedIndex({ stateKey: t, path: o });
+              n.getState().clearSelectedIndex({ stateKey: t, path: o });
             };
           if (l === "getSelectedIndex")
-            return () => r.getState().getSelectedIndex(t, o.join(".")) ?? -1;
+            return () => n.getState().getSelectedIndex(t, o.join(".")) ?? -1;
           if (l === "useVirtualView")
             return (e) => {
               const {
-                itemHeight: n,
+                itemHeight: r,
                 overscan: a = 5,
                 stickToBottom: c = !1
               } = e;
-              if (typeof n != "number" || n <= 0)
+              if (typeof r != "number" || r <= 0)
                 throw new Error(
                   "[cogs-state] `useVirtualView` requires a positive number for `itemHeight` option."
                 );
-              const f = Z(null), u = Z(!0), [T, w] = et({
+              const f = Y(null), u = Y(!0), [k, p] = X({
                 startIndex: 0,
                 endIndex: 10
-                // Start with some visible items
-              }), $ = r().getNestedState(
+              }), w = Y(
+                `${t}-virtual-${o.join(".")}-${Math.random()}`
+              ).current, [, N] = X({}), A = n().getNestedState(
                 t,
                 o
-              ), A = $.length, V = A * n, O = Tt(() => {
-                const b = $.slice(
-                  T.startIndex,
-                  T.endIndex
-                ), I = {
-                  validIndices: Array.from(
-                    { length: T.endIndex - T.startIndex },
-                    (C, N) => T.startIndex + N
+              ), C = A.length, W = C * r;
+              at(() => {
+                const $ = A.slice(
+                  k.startIndex,
+                  k.endIndex
+                );
+                n.getState().setState(w, $), n.getState().updaterState[w] || n.getState().setUpdaterState(
+                  w,
+                  et(
+                    w,
+                    s,
+                    v,
+                    g
                   )
+                );
+                const b = `${t}////${v}-virtual`, F = n.getState().stateComponents.get(t) || {
+                  components: /* @__PURE__ */ new Map()
                 };
-                return i(
-                  b,
-                  o,
-                  I
+                return F.components.set(b, {
+                  forceUpdate: () => N({}),
+                  paths: /* @__PURE__ */ new Set([o.join(".")]),
+                  reactiveType: ["component"]
+                }), n.getState().stateComponents.set(t, F), () => {
+                  const P = n.getState().stateComponents.get(t);
+                  P && P.components.delete(b);
+                  const R = n.getState();
+                  delete R.cogsStateStore[w], delete R.updaterState[w], R.stateComponents.delete(w);
+                };
+              }, []), st(() => {
+                const $ = A.slice(
+                  k.startIndex,
+                  k.endIndex
                 );
-              }, [T.startIndex, T.endIndex, A]);
-              ot(() => {
-                const b = f.current;
-                if (!b) return;
-                const I = () => {
-                  const P = b.scrollTop, U = b.clientHeight, Y = Math.max(
+                n.getState().setState(w, $);
+              }, [
+                k.startIndex,
+                k.endIndex,
+                w,
+                A.length
+              ]), at(() => {
+                const $ = f.current;
+                if (!$) return;
+                const b = () => {
+                  const R = $.scrollTop, rt = $.clientHeight, ht = Math.max(
                     0,
-                    Math.floor(P / n) - a
-                  ), K = Math.min(
-                    A,
-                    Math.ceil((P + U) / n) + a
+                    Math.floor(R / r) - a
+                  ), yt = Math.min(
+                    C,
+                    Math.ceil((R + rt) / r) + a
                   );
-                  w((dt) => dt.startIndex === Y && dt.endIndex === K ? dt : { startIndex: Y, endIndex: K });
-                }, C = () => {
-                  const P = f.current;
-                  P && (u.current = P.scrollHeight > 0 && Math.abs(
-                    P.scrollHeight - P.scrollTop - P.clientHeight
-                  ) < 1, I());
+                  p((ut) => ut.startIndex === ht && ut.endIndex === yt ? ut : { startIndex: ht, endIndex: yt });
+                }, F = () => {
+                  const R = f.current;
+                  R && (u.current = R.scrollHeight > 0 && Math.abs(
+                    R.scrollHeight - R.scrollTop - R.clientHeight
+                  ) < 1, b());
                 };
-                I(), b.addEventListener("scroll", C, {
+                b(), $.addEventListener("scroll", F, {
                   passive: !0
                 });
-                const N = new ResizeObserver(() => {
-                  I();
-                });
-                return N.observe(b), () => {
-                  b.removeEventListener("scroll", C), N.disconnect();
+                const P = new ResizeObserver(b);
+                return P.observe($), c && u.current && $.scrollTo({
+                  top: $.scrollHeight,
+                  behavior: "auto"
+                }), () => {
+                  $.removeEventListener("scroll", F), P.disconnect();
                 };
-              }, [A, n, a]);
-              const D = ut(
-                (b, I = "auto") => {
-                  f.current?.scrollTo({ top: b, behavior: I });
+              }, [C, r, a, c]);
+              const U = n.getState().updaterState[w], x = gt(
+                ($, b = "auto") => {
+                  f.current?.scrollTo({ top: $, behavior: b });
                 },
                 []
-              ), M = ut(
-                (b = "smooth") => {
-                  const I = f.current;
-                  I && I.scrollTo({
-                    top: I.scrollHeight,
-                    behavior: b
+              ), O = gt(
+                ($ = "smooth") => {
+                  const b = f.current;
+                  b && b.scrollTo({
+                    top: b.scrollHeight,
+                    behavior: $
                   });
                 },
                 []
-              ), k = ut(
-                (b, I = "smooth") => {
-                  D(b * n, I);
+              ), D = gt(
+                ($, b = "smooth") => {
+                  x($ * r, b);
                 },
-                [D, n]
-              );
-              ot(() => {
-                c && u.current && M("auto");
-              }, [A, c, M]);
-              const R = {
+                [x, r]
+              ), T = {
                 outer: {
                   ref: f,
                   style: {
@@ -698,7 +719,7 @@ function it(t, s, y, g) {
                 inner: {
                   style: {
                     position: "relative",
-                    height: `${V}px`,
+                    height: `${W}px`,
                     width: "100%"
                   }
                 },
@@ -708,21 +729,21 @@ function it(t, s, y, g) {
                     top: 0,
                     left: 0,
                     right: 0,
-                    transform: `translateY(${T.startIndex * n}px)`
+                    transform: `translateY(${k.startIndex * r}px)`
                   }
                 }
               };
               return {
-                virtualState: O,
-                virtualizerProps: R,
-                scrollToBottom: M,
-                scrollToIndex: k
+                virtualState: U,
+                virtualizerProps: T,
+                scrollToBottom: O,
+                scrollToIndex: D
               };
             };
           if (l === "stateSort")
             return (e) => {
               const a = [...d()].sort(
-                (u, T) => e(u.item, T.item)
+                (u, k) => e(u.item, k.item)
               ), c = a.map(({ item: u }) => u), f = {
                 ...S,
                 validIndices: a.map(
@@ -734,7 +755,7 @@ function it(t, s, y, g) {
           if (l === "stateFilter")
             return (e) => {
               const a = d().filter(
-                ({ item: u }, T) => e(u, T)
+                ({ item: u }, k) => e(u, k)
               ), c = a.map(({ item: u }) => u), f = {
                 ...S,
                 validIndices: a.map(
@@ -745,51 +766,51 @@ function it(t, s, y, g) {
             };
           if (l === "stateMap")
             return (e) => {
-              const n = r.getState().getNestedState(t, o);
-              return Array.isArray(n) ? n.map((a, c) => {
+              const r = n.getState().getNestedState(t, o);
+              return Array.isArray(r) ? r.map((a, c) => {
                 let f;
                 S?.validIndices && S.validIndices[c] !== void 0 ? f = S.validIndices[c] : f = c;
-                const u = [...o, f.toString()], T = i(a, u, S);
-                return e(a, T, {
+                const u = [...o, f.toString()], k = i(a, u, S);
+                return e(a, k, {
                   register: () => {
-                    const [, $] = et({}), A = `${y}-${o.join(".")}-${f}`;
-                    ot(() => {
-                      const V = `${t}////${A}`, O = r.getState().stateComponents.get(t) || {
+                    const [, w] = X({}), N = `${v}-${o.join(".")}-${f}`;
+                    at(() => {
+                      const A = `${t}////${N}`, C = n.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return O.components.set(V, {
-                        forceUpdate: () => $({}),
+                      return C.components.set(A, {
+                        forceUpdate: () => w({}),
                         paths: /* @__PURE__ */ new Set([u.join(".")])
                         // ATOMIC: Subscribes only to this item's path.
-                      }), r.getState().stateComponents.set(t, O), () => {
-                        const D = r.getState().stateComponents.get(t);
-                        D && D.components.delete(V);
+                      }), n.getState().stateComponents.set(t, C), () => {
+                        const W = n.getState().stateComponents.get(t);
+                        W && W.components.delete(A);
                       };
-                    }, [t, A]);
+                    }, [t, N]);
                   },
                   index: c,
                   originalIndex: f
                 });
               }) : (console.warn(
                 `stateMap called on a non-array value at path: ${o.join(".")}. The current value is:`,
-                n
+                r
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => h.map((a, c) => {
+            return (e) => y.map((a, c) => {
               let f;
               S?.validIndices && S.validIndices[c] !== void 0 ? f = S.validIndices[c] : f = c;
-              const u = [...o, f.toString()], T = i(a, u, S);
+              const u = [...o, f.toString()], k = i(a, u, S);
               return e(
                 a,
-                T,
+                k,
                 c,
-                h,
-                i(h, o, S)
+                y,
+                i(y, o, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => st(Gt, {
+            return (e) => ct(Ht, {
               proxy: {
                 _stateKey: t,
                 _path: o,
@@ -800,9 +821,9 @@ function it(t, s, y, g) {
             });
           if (l === "stateFlattenOn")
             return (e) => {
-              const n = h;
-              v.clear(), x++;
-              const a = n.flatMap(
+              const r = y;
+              h.clear(), V++;
+              const a = r.flatMap(
                 (c) => c[e] ?? []
               );
               return i(
@@ -813,60 +834,60 @@ function it(t, s, y, g) {
             };
           if (l === "index")
             return (e) => {
-              const n = h[e];
-              return i(n, [...o, e.toString()]);
+              const r = y[e];
+              return i(r, [...o, e.toString()]);
             };
           if (l === "last")
             return () => {
-              const e = r.getState().getNestedState(t, o);
+              const e = n.getState().getNestedState(t, o);
               if (e.length === 0) return;
-              const n = e.length - 1, a = e[n], c = [...o, n.toString()];
+              const r = e.length - 1, a = e[r], c = [...o, r.toString()];
               return i(a, c);
             };
           if (l === "insert")
-            return (e) => (E(o), gt(s, e, o, t), i(
-              r.getState().getNestedState(t, o),
+            return (e) => (E(o), ft(s, e, o, t), i(
+              n.getState().getNestedState(t, o),
               o
             ));
           if (l === "uniqueInsert")
-            return (e, n, a) => {
-              const c = r.getState().getNestedState(t, o), f = z(e) ? e(c) : e;
+            return (e, r, a) => {
+              const c = n.getState().getNestedState(t, o), f = J(e) ? e(c) : e;
               let u = null;
-              if (!c.some((w) => {
-                if (n) {
-                  const A = n.every(
-                    (V) => L(w[V], f[V])
+              if (!c.some((p) => {
+                if (r) {
+                  const N = r.every(
+                    (A) => H(p[A], f[A])
                   );
-                  return A && (u = w), A;
+                  return N && (u = p), N;
                 }
-                const $ = L(w, f);
-                return $ && (u = w), $;
+                const w = H(p, f);
+                return w && (u = p), w;
               }))
-                E(o), gt(s, f, o, t);
+                E(o), ft(s, f, o, t);
               else if (a && u) {
-                const w = a(u), $ = c.map(
-                  (A) => L(A, u) ? w : A
+                const p = a(u), w = c.map(
+                  (N) => H(N, u) ? p : N
                 );
-                E(o), tt(s, $, o);
+                E(o), tt(s, w, o);
               }
             };
           if (l === "cut")
-            return (e, n) => {
-              if (!n?.waitForSync)
-                return E(o), rt(s, o, t, e), i(
-                  r.getState().getNestedState(t, o),
+            return (e, r) => {
+              if (!r?.waitForSync)
+                return E(o), ot(s, o, t, e), i(
+                  n.getState().getNestedState(t, o),
                   o
                 );
             };
           if (l === "cutByValue")
             return (e) => {
-              for (let n = 0; n < h.length; n++)
-                h[n] === e && rt(s, o, t, n);
+              for (let r = 0; r < y.length; r++)
+                y[r] === e && ot(s, o, t, r);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const n = h.findIndex((a) => a === e);
-              n > -1 ? rt(s, o, t, n) : gt(s, e, o, t);
+              const r = y.findIndex((a) => a === e);
+              r > -1 ? ot(s, o, t, r) : ft(s, e, o, t);
             };
           if (l === "stateFind")
             return (e) => {
@@ -878,187 +899,187 @@ function it(t, s, y, g) {
               return i(a.item, c, S);
             };
           if (l === "findWith")
-            return (e, n) => {
+            return (e, r) => {
               const c = d().find(
-                ({ item: u }) => u[e] === n
+                ({ item: u }) => u[e] === r
               );
               if (!c) return;
               const f = [...o, c.originalIndex.toString()];
               return i(c.item, f, S);
             };
         }
-        const B = o[o.length - 1];
-        if (!isNaN(Number(B))) {
-          const d = o.slice(0, -1), e = r.getState().getNestedState(t, d);
+        const q = o[o.length - 1];
+        if (!isNaN(Number(q))) {
+          const d = o.slice(0, -1), e = n.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => rt(
+            return () => ot(
               s,
               d,
               t,
-              Number(B)
+              Number(q)
             );
         }
         if (l === "get")
-          return () => r.getState().getNestedState(t, o);
+          return () => n.getState().getNestedState(t, o);
         if (l === "$derive")
-          return (d) => Et({
+          return (d) => Tt({
             _stateKey: t,
             _path: o,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => Et({
+          return () => Tt({
             _stateKey: t,
             _path: o
           });
         if (l === "lastSynced") {
           const d = `${t}:${o.join(".")}`;
-          return r.getState().getSyncInfo(d);
+          return n.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => ct(g + "-" + t + "-" + d);
+          return (d) => lt(g + "-" + t + "-" + d);
         if (l === "_selected") {
-          const d = o.slice(0, -1), e = d.join("."), n = r.getState().getNestedState(t, d);
-          return Array.isArray(n) ? Number(o[o.length - 1]) === r.getState().getSelectedIndex(t, e) : void 0;
+          const d = o.slice(0, -1), e = d.join("."), r = n.getState().getNestedState(t, d);
+          return Array.isArray(r) ? Number(o[o.length - 1]) === n.getState().getSelectedIndex(t, e) : void 0;
         }
         if (l === "setSelected")
           return (d) => {
-            const e = o.slice(0, -1), n = Number(o[o.length - 1]), a = e.join(".");
-            d ? r.getState().setSelectedIndex(t, a, n) : r.getState().setSelectedIndex(t, a, void 0);
-            const c = r.getState().getNestedState(t, [...e]);
+            const e = o.slice(0, -1), r = Number(o[o.length - 1]), a = e.join(".");
+            d ? n.getState().setSelectedIndex(t, a, r) : n.getState().setSelectedIndex(t, a, void 0);
+            const c = n.getState().getNestedState(t, [...e]);
             tt(s, c, e), E(e);
           };
         if (l === "toggleSelected")
           return () => {
-            const d = o.slice(0, -1), e = Number(o[o.length - 1]), n = d.join("."), a = r.getState().getSelectedIndex(t, n);
-            r.getState().setSelectedIndex(
+            const d = o.slice(0, -1), e = Number(o[o.length - 1]), r = d.join("."), a = n.getState().getSelectedIndex(t, r);
+            n.getState().setSelectedIndex(
               t,
-              n,
+              r,
               a === e ? void 0 : e
             );
-            const c = r.getState().getNestedState(t, [...d]);
+            const c = n.getState().getNestedState(t, [...d]);
             tt(s, c, d), E(d);
           };
         if (o.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
-              const e = r.getState().cogsStateStore[t], a = Ot(e, d).newDocument;
+              const e = n.getState().cogsStateStore[t], a = jt(e, d).newDocument;
               xt(
                 t,
-                r.getState().initialStateGlobal[t],
+                n.getState().initialStateGlobal[t],
                 a,
                 s,
-                y,
+                v,
                 g
               );
-              const c = r.getState().stateComponents.get(t);
+              const c = n.getState().stateComponents.get(t);
               if (c) {
                 const f = St(e, a), u = new Set(f);
                 for (const [
-                  T,
-                  w
+                  k,
+                  p
                 ] of c.components.entries()) {
-                  let $ = !1;
-                  const A = Array.isArray(w.reactiveType) ? w.reactiveType : [w.reactiveType || "component"];
-                  if (!A.includes("none")) {
-                    if (A.includes("all")) {
-                      w.forceUpdate();
+                  let w = !1;
+                  const N = Array.isArray(p.reactiveType) ? p.reactiveType : [p.reactiveType || "component"];
+                  if (!N.includes("none")) {
+                    if (N.includes("all")) {
+                      p.forceUpdate();
                       continue;
                     }
-                    if (A.includes("component") && (w.paths.has("") && ($ = !0), !$))
-                      for (const V of u) {
-                        if (w.paths.has(V)) {
-                          $ = !0;
+                    if (N.includes("component") && (p.paths.has("") && (w = !0), !w))
+                      for (const A of u) {
+                        if (p.paths.has(A)) {
+                          w = !0;
                           break;
                         }
-                        let O = V.lastIndexOf(".");
-                        for (; O !== -1; ) {
-                          const D = V.substring(0, O);
-                          if (w.paths.has(D)) {
-                            $ = !0;
+                        let C = A.lastIndexOf(".");
+                        for (; C !== -1; ) {
+                          const W = A.substring(0, C);
+                          if (p.paths.has(W)) {
+                            w = !0;
                             break;
                           }
-                          const M = V.substring(
-                            O + 1
+                          const U = A.substring(
+                            C + 1
                           );
-                          if (!isNaN(Number(M))) {
-                            const k = D.lastIndexOf(".");
-                            if (k !== -1) {
-                              const R = D.substring(
+                          if (!isNaN(Number(U))) {
+                            const x = W.lastIndexOf(".");
+                            if (x !== -1) {
+                              const O = W.substring(
                                 0,
-                                k
+                                x
                               );
-                              if (w.paths.has(R)) {
-                                $ = !0;
+                              if (p.paths.has(O)) {
+                                w = !0;
                                 break;
                               }
                             }
                           }
-                          O = D.lastIndexOf(".");
+                          C = W.lastIndexOf(".");
                         }
-                        if ($) break;
+                        if (w) break;
                       }
-                    if (!$ && A.includes("deps") && w.depsFunction) {
-                      const V = w.depsFunction(a);
-                      let O = !1;
-                      typeof V == "boolean" ? V && (O = !0) : L(w.deps, V) || (w.deps = V, O = !0), O && ($ = !0);
+                    if (!w && N.includes("deps") && p.depsFunction) {
+                      const A = p.depsFunction(a);
+                      let C = !1;
+                      typeof A == "boolean" ? A && (C = !0) : H(p.deps, A) || (p.deps = A, C = !0), C && (w = !0);
                     }
-                    $ && w.forceUpdate();
+                    w && p.forceUpdate();
                   }
                 }
               }
             };
           if (l === "validateZodSchema")
             return () => {
-              const d = r.getState().getInitialOptions(t)?.validation, e = r.getState().addValidationError;
+              const d = n.getState().getInitialOptions(t)?.validation, e = n.getState().addValidationError;
               if (!d?.zodSchema)
                 throw new Error("Zod schema not found");
               if (!d?.key)
                 throw new Error("Validation key not found");
-              q(d.key);
-              const n = r.getState().cogsStateStore[t];
+              z(d.key);
+              const r = n.getState().cogsStateStore[t];
               try {
-                const a = r.getState().getValidationErrors(d.key);
+                const a = n.getState().getValidationErrors(d.key);
                 a && a.length > 0 && a.forEach(([f]) => {
-                  f && f.startsWith(d.key) && q(f);
+                  f && f.startsWith(d.key) && z(f);
                 });
-                const c = d.zodSchema.safeParse(n);
+                const c = d.zodSchema.safeParse(r);
                 return c.success ? !0 : (c.error.errors.forEach((u) => {
-                  const T = u.path, w = u.message, $ = [d.key, ...T].join(".");
-                  e($, w);
-                }), lt(t), !1);
+                  const k = u.path, p = u.message, w = [d.key, ...k].join(".");
+                  e(w, p);
+                }), dt(t), !1);
               } catch (a) {
                 return console.error("Zod schema validation failed", a), !1;
               }
             };
-          if (l === "_componentId") return y;
+          if (l === "_componentId") return v;
           if (l === "getComponents")
-            return () => r().stateComponents.get(t);
+            return () => n().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => ht.getState().getFormRefsByStateKey(t);
+            return () => pt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
-            return r.getState().initialStateGlobal[t];
+            return n.getState().initialStateGlobal[t];
           if (l === "_serverState")
-            return r.getState().serverState[t];
+            return n.getState().serverState[t];
           if (l === "_isLoading")
-            return r.getState().isLoadingGlobal[t];
+            return n.getState().isLoadingGlobal[t];
           if (l === "revertToInitialState")
-            return p.revertToInitialState;
-          if (l === "updateInitialState") return p.updateInitialState;
-          if (l === "removeValidation") return p.removeValidation;
+            return I.revertToInitialState;
+          if (l === "updateInitialState") return I.updateInitialState;
+          if (l === "removeValidation") return I.removeValidation;
         }
         if (l === "getFormRef")
-          return () => ht.getState().getFormRef(t + "." + o.join("."));
+          return () => pt.getState().getFormRef(t + "." + o.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ yt(
-            Ct,
+          }) => /* @__PURE__ */ It(
+            _t,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: o,
-              validationKey: r.getState().getInitialOptions(t)?.validation?.key || "",
+              validationKey: n.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
               validIndices: S?.validIndices,
               children: d
@@ -1066,25 +1087,25 @@ function it(t, s, y, g) {
           );
         if (l === "_stateKey") return t;
         if (l === "_path") return o;
-        if (l === "_isServerSynced") return p._isServerSynced;
+        if (l === "_isServerSynced") return I._isServerSynced;
         if (l === "update")
           return (d, e) => {
             if (e?.debounce)
-              Nt(() => {
+              Pt(() => {
                 tt(s, d, o, "");
-                const n = r.getState().getNestedState(t, o);
-                e?.afterUpdate && e.afterUpdate(n);
+                const r = n.getState().getNestedState(t, o);
+                e?.afterUpdate && e.afterUpdate(r);
               }, e.debounce);
             else {
               tt(s, d, o, "");
-              const n = r.getState().getNestedState(t, o);
-              e?.afterUpdate && e.afterUpdate(n);
+              const r = n.getState().getNestedState(t, o);
+              e?.afterUpdate && e.afterUpdate(r);
             }
             E(o);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ yt(
-            Pt,
+          return (d, e) => /* @__PURE__ */ It(
+            Ot,
             {
               setState: s,
               stateKey: t,
@@ -1093,52 +1114,52 @@ function it(t, s, y, g) {
               formOpts: e
             }
           );
-        const _ = [...o, l], Q = r.getState().getNestedState(t, _);
-        return i(Q, _, S);
+        const _ = [...o, l], K = n.getState().getNestedState(t, _);
+        return i(K, _, S);
       }
-    }, G = new Proxy(j, F);
-    return v.set(W, {
-      proxy: G,
-      stateVersion: x
-    }), G;
+    }, L = new Proxy(M, j);
+    return h.set(G, {
+      proxy: L,
+      stateVersion: V
+    }), L;
   }
   return i(
-    r.getState().getNestedState(t, [])
+    n.getState().getNestedState(t, [])
   );
 }
-function Et(t) {
-  return st(Lt, { proxy: t });
+function Tt(t) {
+  return ct(Bt, { proxy: t });
 }
-function Gt({
+function Ht({
   proxy: t,
   rebuildStateShape: s
 }) {
-  const y = r().getNestedState(t._stateKey, t._path);
-  return Array.isArray(y) ? s(
-    y,
+  const v = n().getNestedState(t._stateKey, t._path);
+  return Array.isArray(v) ? s(
+    v,
     t._path
   ).stateMapNoRender(
-    (v, x, E, p, i) => t._mapFn(v, x, E, p, i)
+    (h, V, E, I, i) => t._mapFn(h, V, E, I, i)
   ) : null;
 }
-function Lt({
+function Bt({
   proxy: t
 }) {
-  const s = Z(null), y = `${t._stateKey}-${t._path.join(".")}`;
-  return ft(() => {
+  const s = Y(null), v = `${t._stateKey}-${t._path.join(".")}`;
+  return st(() => {
     const g = s.current;
     if (!g || !g.parentElement) return;
-    const v = g.parentElement, E = Array.from(v.childNodes).indexOf(g);
-    let p = v.getAttribute("data-parent-id");
-    p || (p = `parent-${crypto.randomUUID()}`, v.setAttribute("data-parent-id", p));
-    const h = {
+    const h = g.parentElement, E = Array.from(h.childNodes).indexOf(g);
+    let I = h.getAttribute("data-parent-id");
+    I || (I = `parent-${crypto.randomUUID()}`, h.setAttribute("data-parent-id", I));
+    const y = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: p,
+      parentId: I,
       position: E,
       effect: t._effect
     };
-    r.getState().addSignalElement(y, h);
-    const o = r.getState().getNestedState(t._stateKey, t._path);
+    n.getState().addSignalElement(v, y);
+    const o = n.getState().getNestedState(t._stateKey, t._path);
     let S;
     if (t._effect)
       try {
@@ -1146,41 +1167,41 @@ function Lt({
           "state",
           `return (${t._effect})(state)`
         )(o);
-      } catch (j) {
-        console.error("Error evaluating effect function during mount:", j), S = o;
+      } catch (M) {
+        console.error("Error evaluating effect function during mount:", M), S = o;
       }
     else
       S = o;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const W = document.createTextNode(String(S));
-    g.replaceWith(W);
-  }, [t._stateKey, t._path.join("."), t._effect]), st("span", {
+    const G = document.createTextNode(String(S));
+    g.replaceWith(G);
+  }, [t._stateKey, t._path.join("."), t._effect]), ct("span", {
     ref: s,
     style: { display: "none" },
-    "data-signal-id": y
+    "data-signal-id": v
   });
 }
-function re(t) {
-  const s = kt(
-    (y) => {
-      const g = r.getState().stateComponents.get(t._stateKey) || {
+function ae(t) {
+  const s = At(
+    (v) => {
+      const g = n.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
       return g.components.set(t._stateKey, {
-        forceUpdate: y,
+        forceUpdate: v,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
       }), () => g.components.delete(t._stateKey);
     },
-    () => r.getState().getNestedState(t._stateKey, t._path)
+    () => n.getState().getNestedState(t._stateKey, t._path)
   );
-  return st("text", {}, String(s));
+  return ct("text", {}, String(s));
 }
 export {
-  Et as $cogsSignal,
-  re as $cogsSignalStore,
-  te as addStateOptions,
-  ee as createCogsState,
-  ne as notifyComponent,
-  Wt as useCogsStateFn
+  Tt as $cogsSignal,
+  ae as $cogsSignalStore,
+  ne as addStateOptions,
+  re as createCogsState,
+  oe as notifyComponent,
+  Lt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map