cogsbox-state 0.5.288 → 0.5.290

package/dist/CogsState.jsx

@@ -1,116 +1,116 @@
 "use client";
-import { jsx as vt } from "react/jsx-runtime";
-import { useState as rt, useRef as Z, useEffect as lt, useLayoutEffect as dt, useMemo as yt, createElement as st, useSyncExternalStore as xt, startTransition as Pt, useCallback as mt } from "react";
-import { transformStateFunc as _t, isDeepEqual as H, isFunction as X, getNestedValue as z, getDifferences as It, debounce as Mt } from "./utility.js";
-import { pushFunc as ht, updateFn as at, cutFunc as ct, ValidationWrapper as jt, FormControlComponent as Ot } from "./Functions.jsx";
-import Rt from "superjson";
-import { v4 as pt } from "uuid";
+import { jsx as mt } from "react/jsx-runtime";
+import { useState as K, useRef as q, useEffect as st, useLayoutEffect as it, useMemo as Tt, createElement as rt, useSyncExternalStore as Ct, startTransition as Vt, useCallback as ft } from "react";
+import { transformStateFunc as bt, isDeepEqual as L, isFunction as J, getNestedValue as z, getDifferences as ht, debounce as xt } from "./utility.js";
+import { pushFunc as St, updateFn as nt, cutFunc as ot, ValidationWrapper as Pt, FormControlComponent as _t } from "./Functions.jsx";
+import Mt from "superjson";
+import { v4 as yt } from "uuid";
 import "zod";
-import { getGlobalStore as o, formRefStore as Et } from "./store.js";
-import { useCogsConfig as Nt } from "./CogsStateClient.jsx";
-import { applyPatch as Ft } from "fast-json-patch";
-import Ut from "react-use-measure";
-function At(t, c) {
-  const v = o.getState().getInitialOptions, f = o.getState().setInitialStateOptions, y = v(t) || {};
-  f(t, {
-    ...y,
+import { getGlobalStore as r, formRefStore as It } from "./store.js";
+import { useCogsConfig as $t } from "./CogsStateClient.jsx";
+import { applyPatch as jt } from "fast-json-patch";
+import Ot from "react-use-measure";
+function pt(t, c) {
+  const h = r.getState().getInitialOptions, g = r.getState().setInitialStateOptions, v = h(t) || {};
+  g(t, {
+    ...v,
     ...c
   });
 }
-function Tt({
+function wt({
   stateKey: t,
   options: c,
-  initialOptionsPart: v
+  initialOptionsPart: h
 }) {
-  const f = nt(t) || {}, y = v[t] || {}, k = o.getState().setInitialStateOptions, p = { ...y, ...f };
+  const g = Q(t) || {}, v = h[t] || {}, $ = r.getState().setInitialStateOptions, p = { ...v, ...g };
   let I = !1;
   if (c)
-    for (const a in c)
-      p.hasOwnProperty(a) ? (a == "localStorage" && c[a] && p[a].key !== c[a]?.key && (I = !0, p[a] = c[a]), a == "initialState" && c[a] && p[a] !== c[a] && // Different references
-      !H(p[a], c[a]) && (I = !0, p[a] = c[a])) : (I = !0, p[a] = c[a]);
-  I && k(t, p);
+    for (const o in c)
+      p.hasOwnProperty(o) ? (o == "localStorage" && c[o] && p[o].key !== c[o]?.key && (I = !0, p[o] = c[o]), o == "initialState" && c[o] && p[o] !== c[o] && // Different references
+      !L(p[o], c[o]) && (I = !0, p[o] = c[o])) : (I = !0, p[o] = c[o]);
+  I && $(t, p);
 }
-function ie(t, { formElements: c, validation: v }) {
-  return { initialState: t, formElements: c, validation: v };
+function ae(t, { formElements: c, validation: h }) {
+  return { initialState: t, formElements: c, validation: h };
 }
-const ce = (t, c) => {
-  let v = t;
-  const [f, y] = _t(v);
-  (Object.keys(y).length > 0 || c && Object.keys(c).length > 0) && Object.keys(y).forEach((I) => {
-    y[I] = y[I] || {}, y[I].formElements = {
+const oe = (t, c) => {
+  let h = t;
+  const [g, v] = bt(h);
+  (Object.keys(v).length > 0 || c && Object.keys(c).length > 0) && Object.keys(v).forEach((I) => {
+    v[I] = v[I] || {}, v[I].formElements = {
       ...c?.formElements,
       // Global defaults first
       ...c?.validation,
-      ...y[I].formElements || {}
+      ...v[I].formElements || {}
       // State-specific overrides
-    }, nt(I) || o.getState().setInitialStateOptions(I, y[I]);
-  }), o.getState().setInitialStates(f), o.getState().setCreatedState(f);
-  const k = (I, a) => {
-    const [m] = rt(a?.componentId ?? pt());
-    Tt({
+    }, Q(I) || r.getState().setInitialStateOptions(I, v[I]);
+  }), r.getState().setInitialStates(g), r.getState().setCreatedState(g);
+  const $ = (I, o) => {
+    const [y] = K(o?.componentId ?? yt());
+    wt({
       stateKey: I,
-      options: a,
-      initialOptionsPart: y
+      options: o,
+      initialOptionsPart: v
     });
-    const n = o.getState().cogsStateStore[I] || f[I], S = a?.modifyState ? a.modifyState(n) : n, [W, F] = Bt(
+    const a = r.getState().cogsStateStore[I] || g[I], S = o?.modifyState ? o.modifyState(a) : a, [D, O] = Lt(
       S,
       {
         stateKey: I,
-        syncUpdate: a?.syncUpdate,
-        componentId: m,
-        localStorage: a?.localStorage,
-        middleware: a?.middleware,
-        enabledSync: a?.enabledSync,
-        reactiveType: a?.reactiveType,
-        reactiveDeps: a?.reactiveDeps,
-        initialState: a?.initialState,
-        dependencies: a?.dependencies,
-        serverState: a?.serverState
+        syncUpdate: o?.syncUpdate,
+        componentId: y,
+        localStorage: o?.localStorage,
+        middleware: o?.middleware,
+        enabledSync: o?.enabledSync,
+        reactiveType: o?.reactiveType,
+        reactiveDeps: o?.reactiveDeps,
+        initialState: o?.initialState,
+        dependencies: o?.dependencies,
+        serverState: o?.serverState
       }
     );
-    return F;
+    return O;
   };
-  function p(I, a) {
-    Tt({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Ht(I, a), St(I);
+  function p(I, o) {
+    wt({ stateKey: I, options: o, initialOptionsPart: v }), o.localStorage && Wt(I, o), ut(I);
   }
-  return { useCogsState: k, setCogsOptions: p };
+  return { useCogsState: $, setCogsOptions: p };
 }, {
-  setUpdaterState: ut,
-  setState: tt,
-  getInitialOptions: nt,
-  getKeyState: bt,
-  getValidationErrors: Dt,
-  setStateLog: Wt,
-  updateInitialStateGlobal: wt,
-  addValidationError: Gt,
-  removeValidationError: Y,
-  setServerSyncActions: Lt
-} = o.getState(), $t = (t, c, v, f, y) => {
-  v?.log && console.log(
+  setUpdaterState: ct,
+  setState: Z,
+  getInitialOptions: Q,
+  getKeyState: kt,
+  getValidationErrors: Ut,
+  setStateLog: Rt,
+  updateInitialStateGlobal: vt,
+  addValidationError: Ft,
+  removeValidationError: H,
+  setServerSyncActions: Dt
+} = r.getState(), Et = (t, c, h, g, v) => {
+  h?.log && console.log(
     "saving to localstorage",
     c,
-    v.localStorage?.key,
-    f
+    h.localStorage?.key,
+    g
   );
-  const k = X(v?.localStorage?.key) ? v.localStorage?.key(t) : v?.localStorage?.key;
-  if (k && f) {
-    const p = `${f}-${c}-${k}`;
+  const $ = J(h?.localStorage?.key) ? h.localStorage?.key(t) : h?.localStorage?.key;
+  if ($ && g) {
+    const p = `${g}-${c}-${$}`;
     let I;
     try {
-      I = ft(p)?.lastSyncedWithServer;
+      I = dt(p)?.lastSyncedWithServer;
     } catch {
     }
-    const a = {
+    const o = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: y ?? I
-    }, m = Rt.serialize(a);
+      lastSyncedWithServer: v ?? I
+    }, y = Mt.serialize(o);
     window.localStorage.setItem(
       p,
-      JSON.stringify(m.json)
+      JSON.stringify(y.json)
     );
   }
-}, ft = (t) => {
+}, dt = (t) => {
   if (!t) return null;
   try {
     const c = window.localStorage.getItem(t);
@@ -118,61 +118,61 @@ const ce = (t, c) => {
   } catch (c) {
     return console.error("Error loading from localStorage:", c), null;
   }
-}, Ht = (t, c) => {
-  const v = o.getState().cogsStateStore[t], { sessionId: f } = Nt(), y = X(c?.localStorage?.key) ? c.localStorage.key(v) : c?.localStorage?.key;
-  if (y && f) {
-    const k = ft(
-      `${f}-${t}-${y}`
+}, Wt = (t, c) => {
+  const h = r.getState().cogsStateStore[t], { sessionId: g } = $t(), v = J(c?.localStorage?.key) ? c.localStorage.key(h) : c?.localStorage?.key;
+  if (v && g) {
+    const $ = dt(
+      `${g}-${t}-${v}`
     );
-    if (k && k.lastUpdated > (k.lastSyncedWithServer || 0))
-      return tt(t, k.state), St(t), !0;
+    if ($ && $.lastUpdated > ($.lastSyncedWithServer || 0))
+      return Z(t, $.state), ut(t), !0;
   }
   return !1;
-}, Ct = (t, c, v, f, y, k) => {
+}, Nt = (t, c, h, g, v, $) => {
   const p = {
     initialState: c,
-    updaterState: gt(
+    updaterState: lt(
       t,
-      f,
-      y,
-      k
+      g,
+      v,
+      $
     ),
-    state: v
+    state: h
   };
-  wt(t, p.initialState), ut(t, p.updaterState), tt(t, p.state);
-}, St = (t) => {
-  const c = o.getState().stateComponents.get(t);
+  vt(t, p.initialState), ct(t, p.updaterState), Z(t, p.state);
+}, ut = (t) => {
+  const c = r.getState().stateComponents.get(t);
   if (!c) return;
-  const v = /* @__PURE__ */ new Set();
-  c.components.forEach((f) => {
-    (f ? Array.isArray(f.reactiveType) ? f.reactiveType : [f.reactiveType || "component"] : null)?.includes("none") || v.add(() => f.forceUpdate());
+  const h = /* @__PURE__ */ new Set();
+  c.components.forEach((g) => {
+    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || h.add(() => g.forceUpdate());
   }), queueMicrotask(() => {
-    v.forEach((f) => f());
+    h.forEach((g) => g());
   });
-}, le = (t, c) => {
-  const v = o.getState().stateComponents.get(t);
-  if (v) {
-    const f = `${t}////${c}`, y = v.components.get(f);
-    if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
+}, se = (t, c) => {
+  const h = r.getState().stateComponents.get(t);
+  if (h) {
+    const g = `${t}////${c}`, v = h.components.get(g);
+    if ((v ? Array.isArray(v.reactiveType) ? v.reactiveType : [v.reactiveType || "component"] : null)?.includes("none"))
       return;
-    y && y.forceUpdate();
+    v && v.forceUpdate();
   }
-}, zt = (t, c, v, f) => {
+}, Gt = (t, c, h, g) => {
   switch (t) {
     case "update":
       return {
-        oldValue: z(c, f),
-        newValue: z(v, f)
+        oldValue: z(c, g),
+        newValue: z(h, g)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: z(v, f)
+        newValue: z(h, g)
       };
     case "cut":
       return {
-        oldValue: z(c, f),
+        oldValue: z(c, g),
         newValue: null
         // or undefined
       };
@@ -180,327 +180,328 @@ const ce = (t, c) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Bt(t, {
+function Lt(t, {
   stateKey: c,
-  serverSync: v,
-  localStorage: f,
-  formElements: y,
-  reactiveDeps: k,
+  serverSync: h,
+  localStorage: g,
+  formElements: v,
+  reactiveDeps: $,
   reactiveType: p,
   componentId: I,
-  initialState: a,
-  syncUpdate: m,
-  dependencies: n,
+  initialState: o,
+  syncUpdate: y,
+  dependencies: a,
   serverState: S
 } = {}) {
-  const [W, F] = rt({}), { sessionId: U } = Nt();
-  let G = !c;
-  const [h] = rt(c ?? pt()), l = o.getState().stateLog[h], it = Z(/* @__PURE__ */ new Set()), Q = Z(I ?? pt()), O = Z(
+  const [D, O] = K({}), { sessionId: U } = $t();
+  let W = !c;
+  const [m] = K(c ?? yt()), l = r.getState().stateLog[m], at = q(/* @__PURE__ */ new Set()), Y = q(I ?? yt()), j = q(
     null
   );
-  O.current = nt(h) ?? null, lt(() => {
-    if (m && m.stateKey === h && m.path?.[0]) {
-      tt(h, (r) => ({
-        ...r,
-        [m.path[0]]: m.newValue
+  j.current = Q(m) ?? null, st(() => {
+    if (y && y.stateKey === m && y.path?.[0]) {
+      Z(m, (n) => ({
+        ...n,
+        [y.path[0]]: y.newValue
       }));
-      const e = `${m.stateKey}:${m.path.join(".")}`;
-      o.getState().setSyncInfo(e, {
-        timeStamp: m.timeStamp,
-        userId: m.userId
+      const e = `${y.stateKey}:${y.path.join(".")}`;
+      r.getState().setSyncInfo(e, {
+        timeStamp: y.timeStamp,
+        userId: y.userId
       });
     }
-  }, [m]), lt(() => {
-    if (a) {
-      At(h, {
-        initialState: a
+  }, [y]), st(() => {
+    if (o) {
+      pt(m, {
+        initialState: o
       });
-      const e = O.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = o.getState().initialStateGlobal[h];
-      if (!(i && !H(i, a) || !i) && !s)
+      const e = j.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = r.getState().initialStateGlobal[m];
+      if (!(i && !L(i, o) || !i) && !s)
         return;
-      let u = null;
-      const A = X(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      A && U && (u = ft(`${U}-${h}-${A}`));
-      let w = a, T = !1;
-      const x = s ? Date.now() : 0, V = u?.lastUpdated || 0, _ = u?.lastSyncedWithServer || 0;
-      s && x > V ? (w = e.serverState.data, T = !0) : u && V > _ && (w = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), o.getState().initializeShadowState(h, a), Ct(
-        h,
-        a,
+      let d = null;
+      const k = J(e?.localStorage?.key) ? e?.localStorage?.key(o) : e?.localStorage?.key;
+      k && U && (d = dt(`${U}-${m}-${k}`));
+      let w = o, T = !1;
+      const x = s ? Date.now() : 0, C = d?.lastUpdated || 0, V = d?.lastSyncedWithServer || 0;
+      s && x > C ? (w = e.serverState.data, T = !0) : d && C > V && (w = d.state, e?.localStorage?.onChange && e?.localStorage?.onChange(w)), r.getState().initializeShadowState(m, o), Nt(
+        m,
+        o,
         w,
-        ot,
-        Q.current,
+        tt,
+        Y.current,
         U
-      ), T && A && U && $t(w, h, e, U, Date.now()), St(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || F({});
+      ), T && k && U && Et(w, m, e, U, Date.now()), ut(m), (Array.isArray(p) ? p : [p || "component"]).includes("none") || O({});
     }
   }, [
-    a,
+    o,
     S?.status,
     S?.data,
-    ...n || []
-  ]), dt(() => {
-    G && At(h, {
-      serverSync: v,
-      formElements: y,
-      initialState: a,
-      localStorage: f,
-      middleware: O.current?.middleware
+    ...a || []
+  ]), it(() => {
+    W && pt(m, {
+      serverSync: h,
+      formElements: v,
+      initialState: o,
+      localStorage: g,
+      middleware: j.current?.middleware
     });
-    const e = `${h}////${Q.current}`, r = o.getState().stateComponents.get(h) || {
+    const e = `${m}////${Y.current}`, n = r.getState().stateComponents.get(m) || {
       components: /* @__PURE__ */ new Map()
     };
-    return r.components.set(e, {
-      forceUpdate: () => F({}),
+    return n.components.set(e, {
+      forceUpdate: () => O({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: k || void 0,
+      depsFunction: $ || void 0,
       reactiveType: p ?? ["component", "deps"]
-    }), o.getState().stateComponents.set(h, r), F({}), () => {
-      r && (r.components.delete(e), r.components.size === 0 && o.getState().stateComponents.delete(h));
+    }), r.getState().stateComponents.set(m, n), O({}), () => {
+      n && (n.components.delete(e), n.components.size === 0 && r.getState().stateComponents.delete(m));
     };
   }, []);
-  const ot = (e, r, s, i) => {
-    if (Array.isArray(r)) {
-      const u = `${h}-${r.join(".")}`;
-      it.current.add(u);
+  const tt = (e, n, s, i) => {
+    if (Array.isArray(n)) {
+      const f = `${m}-${n.join(".")}`;
+      at.current.add(f);
     }
-    const g = o.getState();
-    tt(h, (u) => {
-      const A = X(e) ? e(u) : e, w = `${h}-${r.join(".")}`;
-      if (w) {
-        let N = !1, b = g.signalDomElements.get(w);
-        if ((!b || b.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const R = r.slice(0, -1), D = z(A, R);
-          if (Array.isArray(D)) {
-            N = !0;
-            const $ = `${h}-${R.join(".")}`;
-            b = g.signalDomElements.get($);
+    Z(m, (f) => {
+      const d = J(e) ? e(f) : e, k = `${m}-${n.join(".")}`;
+      if (k) {
+        let _ = !1, N = r.getState().signalDomElements.get(k);
+        if ((!N || N.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const A = n.slice(0, -1), P = z(d, A);
+          if (Array.isArray(P)) {
+            _ = !0;
+            const E = `${m}-${A.join(".")}`;
+            N = r.getState().signalDomElements.get(E);
           }
         }
-        if (b) {
-          const R = N ? z(A, r.slice(0, -1)) : z(A, r);
-          b.forEach(({ parentId: D, position: $, effect: E }) => {
-            const C = document.querySelector(
-              `[data-parent-id="${D}"]`
+        if (N) {
+          const A = _ ? z(d, n.slice(0, -1)) : z(d, n);
+          N.forEach(({ parentId: P, position: E, effect: M }) => {
+            const b = document.querySelector(
+              `[data-parent-id="${P}"]`
             );
-            if (C) {
-              const M = Array.from(C.childNodes);
-              if (M[$]) {
-                const j = E ? new Function("state", `return (${E})(state)`)(R) : R;
-                M[$].textContent = String(j);
+            if (b) {
+              const F = Array.from(b.childNodes);
+              if (F[E]) {
+                const R = M ? new Function("state", `return (${M})(state)`)(A) : A;
+                F[E].textContent = String(R);
               }
             }
           });
         }
       }
-      console.log("shadowState", g.shadowStateStore), s.updateType === "update" && (i || O.current?.validation?.key) && r && Y(
-        (i || O.current?.validation?.key) + "." + r.join(".")
+      (() => {
+        const _ = r.getState();
+        switch (s.updateType) {
+          case "update":
+            _.updateShadowAtPath(m, n, d);
+            break;
+          case "insert":
+            const N = n.slice(0, -1);
+            _.insertShadowArrayElement(m, N);
+            break;
+          case "cut":
+            const A = n.slice(0, -1), P = parseInt(n[n.length - 1]);
+            _.removeShadowArrayElement(m, A, P);
+            break;
+        }
+      })(), console.log("shadowState", r.getState().shadowStateStore), s.updateType === "update" && (i || j.current?.validation?.key) && n && H(
+        (i || j.current?.validation?.key) + "." + n.join(".")
       );
-      const T = r.slice(0, r.length - 1);
-      s.updateType === "cut" && O.current?.validation?.key && Y(
-        O.current?.validation?.key + "." + T.join(".")
-      ), s.updateType === "insert" && O.current?.validation?.key && Dt(
-        O.current?.validation?.key + "." + T.join(".")
-      ).filter(([b, R]) => {
-        let D = b?.split(".").length;
-        if (b == T.join(".") && D == T.length - 1) {
-          let $ = b + "." + T;
-          Y(b), Gt($, R);
+      const T = n.slice(0, n.length - 1);
+      s.updateType === "cut" && j.current?.validation?.key && H(
+        j.current?.validation?.key + "." + T.join(".")
+      ), s.updateType === "insert" && j.current?.validation?.key && Ut(
+        j.current?.validation?.key + "." + T.join(".")
+      ).filter(([N, A]) => {
+        let P = N?.split(".").length;
+        if (N == T.join(".") && P == T.length - 1) {
+          let E = N + "." + T;
+          H(N), Ft(E, A);
         }
       });
-      const x = g.stateComponents.get(h);
+      const x = r.getState().stateComponents.get(m);
       if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", x), x) {
-        const N = It(u, A), b = new Set(N), R = s.updateType === "update" ? r.join(".") : r.slice(0, -1).join(".") || "";
+        const _ = ht(f, d), N = new Set(_), A = s.updateType === "update" ? n.join(".") : n.slice(0, -1).join(".") || "";
         for (const [
-          D,
-          $
+          P,
+          E
         ] of x.components.entries()) {
-          let E = !1;
-          const C = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
-          if (console.log("component", $), !C.includes("none")) {
-            if (C.includes("all")) {
-              $.forceUpdate();
+          let M = !1;
+          const b = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
+          if (console.log("component", E), !b.includes("none")) {
+            if (b.includes("all")) {
+              E.forceUpdate();
               continue;
             }
-            if (C.includes("component") && (($.paths.has(R) || $.paths.has("")) && (E = !0), !E))
-              for (const M of b) {
-                let j = M;
+            if (b.includes("component") && ((E.paths.has(A) || E.paths.has("")) && (M = !0), !M))
+              for (const F of N) {
+                let R = F;
                 for (; ; ) {
-                  if ($.paths.has(j)) {
-                    E = !0;
+                  if (E.paths.has(R)) {
+                    M = !0;
                     break;
                   }
-                  const L = j.lastIndexOf(".");
-                  if (L !== -1) {
-                    const K = j.substring(
+                  const X = R.lastIndexOf(".");
+                  if (X !== -1) {
+                    const et = R.substring(
                       0,
-                      L
+                      X
                     );
                     if (!isNaN(
-                      Number(j.substring(L + 1))
-                    ) && $.paths.has(K)) {
-                      E = !0;
+                      Number(R.substring(X + 1))
+                    ) && E.paths.has(et)) {
+                      M = !0;
                       break;
                     }
-                    j = K;
+                    R = et;
                   } else
-                    j = "";
-                  if (j === "")
+                    R = "";
+                  if (R === "")
                     break;
                 }
-                if (E) break;
+                if (M) break;
               }
-            if (!E && C.includes("deps") && $.depsFunction) {
-              const M = $.depsFunction(A);
-              let j = !1;
-              typeof M == "boolean" ? M && (j = !0) : H($.deps, M) || ($.deps = M, j = !0), j && (E = !0);
+            if (!M && b.includes("deps") && E.depsFunction) {
+              const F = E.depsFunction(d);
+              let R = !1;
+              typeof F == "boolean" ? F && (R = !0) : L(E.deps, F) || (E.deps = F, R = !0), R && (M = !0);
             }
-            E && $.forceUpdate();
+            M && E.forceUpdate();
           }
         }
       }
-      const V = Date.now();
-      r = r.map((N, b) => {
-        const R = r.slice(0, -1), D = z(A, R);
-        return b === r.length - 1 && ["insert", "cut"].includes(s.updateType) ? (D.length - 1).toString() : N;
+      const C = Date.now();
+      n = n.map((_, N) => {
+        const A = n.slice(0, -1), P = z(d, A);
+        return N === n.length - 1 && ["insert", "cut"].includes(s.updateType) ? (P.length - 1).toString() : _;
       });
-      const { oldValue: _, newValue: P } = zt(
+      const { oldValue: V, newValue: G } = Gt(
         s.updateType,
-        u,
-        A,
-        r
+        f,
+        d,
+        n
       ), B = {
-        timeStamp: V,
-        stateKey: h,
-        path: r,
+        timeStamp: C,
+        stateKey: m,
+        path: n,
         updateType: s.updateType,
         status: "new",
-        oldValue: _,
-        newValue: P
+        oldValue: V,
+        newValue: G
       };
-      switch (s.updateType) {
-        case "update":
-          g.updateShadowAtPath(h, r, A);
-          break;
-        case "insert":
-          const N = r.slice(0, -1);
-          g.insertShadowArrayElement(h, N, P);
-          break;
-        case "cut":
-          const b = r.slice(0, -1), R = parseInt(r[r.length - 1]);
-          g.removeShadowArrayElement(h, b, R);
-          break;
-      }
-      if (Wt(h, (N) => {
-        const R = [...N ?? [], B].reduce((D, $) => {
-          const E = `${$.stateKey}:${JSON.stringify($.path)}`, C = D.get(E);
-          return C ? (C.timeStamp = Math.max(C.timeStamp, $.timeStamp), C.newValue = $.newValue, C.oldValue = C.oldValue ?? $.oldValue, C.updateType = $.updateType) : D.set(E, { ...$ }), D;
+      if (Rt(m, (_) => {
+        const A = [..._ ?? [], B].reduce((P, E) => {
+          const M = `${E.stateKey}:${JSON.stringify(E.path)}`, b = P.get(M);
+          return b ? (b.timeStamp = Math.max(b.timeStamp, E.timeStamp), b.newValue = E.newValue, b.oldValue = b.oldValue ?? E.oldValue, b.updateType = E.updateType) : P.set(M, { ...E }), P;
         }, /* @__PURE__ */ new Map());
-        return Array.from(R.values());
-      }), $t(
-        A,
-        h,
-        O.current,
+        return Array.from(A.values());
+      }), Et(
+        d,
+        m,
+        j.current,
         U
-      ), O.current?.middleware && O.current.middleware({
+      ), j.current?.middleware && j.current.middleware({
         updateLog: l,
         update: B
-      }), O.current?.serverSync) {
-        const N = g.serverState[h], b = O.current?.serverSync;
-        Lt(h, {
-          syncKey: typeof b.syncKey == "string" ? b.syncKey : b.syncKey({ state: A }),
-          rollBackState: N,
-          actionTimeStamp: Date.now() + (b.debounce ?? 3e3),
+      }), j.current?.serverSync) {
+        const _ = r.getState().serverState[m], N = j.current?.serverSync;
+        Dt(m, {
+          syncKey: typeof N.syncKey == "string" ? N.syncKey : N.syncKey({ state: d }),
+          rollBackState: _,
+          actionTimeStamp: Date.now() + (N.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return A;
+      return d;
     });
   };
-  o.getState().updaterState[h] || (ut(
-    h,
-    gt(
-      h,
-      ot,
-      Q.current,
+  r.getState().updaterState[m] || (ct(
+    m,
+    lt(
+      m,
+      tt,
+      Y.current,
       U
     )
-  ), o.getState().cogsStateStore[h] || tt(h, t), o.getState().initialStateGlobal[h] || wt(h, t));
-  const d = yt(() => gt(
-    h,
-    ot,
-    Q.current,
+  ), r.getState().cogsStateStore[m] || Z(m, t), r.getState().initialStateGlobal[m] || vt(m, t));
+  const u = Tt(() => lt(
+    m,
+    tt,
+    Y.current,
     U
-  ), [h, U]);
-  return [bt(h), d];
+  ), [m, U]);
+  return [kt(m), u];
 }
-function gt(t, c, v, f) {
-  const y = /* @__PURE__ */ new Map();
-  let k = 0;
-  const p = (m) => {
-    const n = m.join(".");
-    for (const [S] of y)
-      (S === n || S.startsWith(n + ".")) && y.delete(S);
-    k++;
+function lt(t, c, h, g) {
+  const v = /* @__PURE__ */ new Map();
+  let $ = 0;
+  const p = (y) => {
+    const a = y.join(".");
+    for (const [S] of v)
+      (S === a || S.startsWith(a + ".")) && v.delete(S);
+    $++;
   }, I = {
-    removeValidation: (m) => {
-      m?.validationKey && Y(m.validationKey);
+    removeValidation: (y) => {
+      y?.validationKey && H(y.validationKey);
     },
-    revertToInitialState: (m) => {
-      const n = o.getState().getInitialOptions(t)?.validation;
-      n?.key && Y(n?.key), m?.validationKey && Y(m.validationKey);
-      const S = o.getState().initialStateGlobal[t];
-      o.getState().clearSelectedIndexesForState(t), y.clear(), k++;
-      const W = a(S, []), F = nt(t), U = X(F?.localStorage?.key) ? F?.localStorage?.key(S) : F?.localStorage?.key, G = `${f}-${t}-${U}`;
-      G && localStorage.removeItem(G), ut(t, W), tt(t, S);
-      const h = o.getState().stateComponents.get(t);
-      return h && h.components.forEach((l) => {
+    revertToInitialState: (y) => {
+      const a = r.getState().getInitialOptions(t)?.validation;
+      a?.key && H(a?.key), y?.validationKey && H(y.validationKey);
+      const S = r.getState().initialStateGlobal[t];
+      r.getState().clearSelectedIndexesForState(t), v.clear(), $++;
+      const D = o(S, []), O = Q(t), U = J(O?.localStorage?.key) ? O?.localStorage?.key(S) : O?.localStorage?.key, W = `${g}-${t}-${U}`;
+      W && localStorage.removeItem(W), ct(t, D), Z(t, S);
+      const m = r.getState().stateComponents.get(t);
+      return m && m.components.forEach((l) => {
         l.forceUpdate();
       }), S;
     },
-    updateInitialState: (m) => {
-      y.clear(), k++;
-      const n = gt(
+    updateInitialState: (y) => {
+      v.clear(), $++;
+      const a = lt(
         t,
         c,
-        v,
-        f
-      ), S = o.getState().initialStateGlobal[t], W = nt(t), F = X(W?.localStorage?.key) ? W?.localStorage?.key(S) : W?.localStorage?.key, U = `${f}-${t}-${F}`;
-      return localStorage.getItem(U) && localStorage.removeItem(U), console.log("udpating intial State", t, m), Pt(() => {
-        wt(t, m), o.getState().initializeShadowState(t, m), ut(t, n), tt(t, m);
-        const G = o.getState().stateComponents.get(t);
-        G && G.components.forEach((h) => {
-          h.forceUpdate();
+        h,
+        g
+      ), S = r.getState().initialStateGlobal[t], D = Q(t), O = J(D?.localStorage?.key) ? D?.localStorage?.key(S) : D?.localStorage?.key, U = `${g}-${t}-${O}`;
+      return localStorage.getItem(U) && localStorage.removeItem(U), Vt(() => {
+        vt(t, y), r.getState().initializeShadowState(t, y), ct(t, a), Z(t, y);
+        const W = r.getState().stateComponents.get(t);
+        W && W.components.forEach((m) => {
+          m.forceUpdate();
         });
       }), {
-        fetchId: (G) => n.get()[G]
+        fetchId: (W) => a.get()[W]
       };
     },
-    _initialState: o.getState().initialStateGlobal[t],
-    _serverState: o.getState().serverState[t],
-    _isLoading: o.getState().isLoadingGlobal[t],
+    _initialState: r.getState().initialStateGlobal[t],
+    _serverState: r.getState().serverState[t],
+    _isLoading: r.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
-      const m = o.getState().serverState[t];
-      return !!(m && H(m, bt(t)));
+      const y = r.getState().serverState[t];
+      return !!(y && L(y, kt(t)));
     }
   };
-  function a(m, n = [], S) {
-    const W = n.map(String).join(".");
-    y.get(W);
-    const F = function() {
-      return o().getNestedState(t, n);
+  function o(y, a = [], S) {
+    const D = a.map(String).join(".");
+    v.get(D);
+    const O = function() {
+      return r().getNestedState(t, a);
     };
-    Object.keys(I).forEach((h) => {
-      F[h] = I[h];
+    Object.keys(I).forEach((m) => {
+      O[m] = I[m];
     });
     const U = {
-      apply(h, l, it) {
+      apply(m, l, at) {
         return console.log(
-          `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
-        ), console.trace("Apply trap stack trace"), o().getNestedState(t, n);
+          `PROXY APPLY TRAP HIT: stateKey=${t}, path=${a.join(".")}`
+        ), console.trace("Apply trap stack trace"), r().getNestedState(t, a);
       },
-      get(h, l) {
-        S?.validIndices && !Array.isArray(m) && (S = { ...S, validIndices: void 0 });
-        const it = /* @__PURE__ */ new Set([
+      get(m, l) {
+        S?.validIndices && !Array.isArray(y) && (S = { ...S, validIndices: void 0 });
+        const at = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,43 +524,43 @@ function gt(t, c, v, f) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !it.has(l)) {
-          const d = `${t}////${v}`, e = o.getState().stateComponents.get(t);
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !at.has(l)) {
+          const u = `${t}////${h}`, e = r.getState().stateComponents.get(t);
           if (e) {
-            const r = e.components.get(d);
-            if (r && !r.paths.has("")) {
-              const s = n.join(".");
+            const n = e.components.get(u);
+            if (n && !n.paths.has("")) {
+              const s = a.join(".");
               let i = !0;
-              for (const g of r.paths)
-                if (s.startsWith(g) && (s === g || s[g.length] === ".")) {
+              for (const f of n.paths)
+                if (s.startsWith(f) && (s === f || s[f.length] === ".")) {
                   i = !1;
                   break;
                 }
-              i && r.paths.add(s);
+              i && n.paths.add(s);
             }
           }
         }
         if (l === "getDifferences")
-          return () => It(
-            o.getState().cogsStateStore[t],
-            o.getState().initialStateGlobal[t]
+          return () => ht(
+            r.getState().cogsStateStore[t],
+            r.getState().initialStateGlobal[t]
           );
-        if (l === "sync" && n.length === 0)
+        if (l === "sync" && a.length === 0)
           return async function() {
-            const d = o.getState().getInitialOptions(t), e = d?.sync;
+            const u = r.getState().getInitialOptions(t), e = u?.sync;
             if (!e)
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
-            const r = o.getState().getNestedState(t, []), s = d?.validation?.key;
+            const n = r.getState().getNestedState(t, []), s = u?.validation?.key;
             try {
-              const i = await e.action(r);
+              const i = await e.action(n);
               if (i && !i.success && i.errors && s) {
-                o.getState().removeValidationError(s), i.errors.forEach((u) => {
-                  const A = [s, ...u.path].join(".");
-                  o.getState().addValidationError(A, u.message);
+                r.getState().removeValidationError(s), i.errors.forEach((d) => {
+                  const k = [s, ...d.path].join(".");
+                  r.getState().addValidationError(k, d.message);
                 });
-                const g = o.getState().stateComponents.get(t);
-                g && g.components.forEach((u) => {
-                  u.forceUpdate();
+                const f = r.getState().stateComponents.get(t);
+                f && f.components.forEach((d) => {
+                  d.forceUpdate();
                 });
               }
               return i?.success && e.onSuccess ? e.onSuccess(i.data) : !i?.success && e.onError && e.onError(i.error), i;
@@ -568,422 +569,408 @@ function gt(t, c, v, f) {
             }
           };
         if (l === "_status") {
-          const d = o.getState().getNestedState(t, n), e = o.getState().initialStateGlobal[t], r = z(e, n);
-          return H(d, r) ? "fresh" : "stale";
+          const u = r.getState().getNestedState(t, a), e = r.getState().initialStateGlobal[t], n = z(e, a);
+          return L(u, n) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
-            const d = o().getNestedState(
+            const u = r().getNestedState(
               t,
-              n
-            ), e = o.getState().initialStateGlobal[t], r = z(e, n);
-            return H(d, r) ? "fresh" : "stale";
+              a
+            ), e = r.getState().initialStateGlobal[t], n = z(e, a);
+            return L(u, n) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = o.getState().initialStateGlobal[t], e = nt(t), r = X(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${f}-${t}-${r}`;
+            const u = r.getState().initialStateGlobal[t], e = Q(t), n = J(e?.localStorage?.key) ? e?.localStorage?.key(u) : e?.localStorage?.key, s = `${g}-${t}-${n}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
           return () => {
-            const d = o.getState().getInitialOptions(t)?.validation;
-            if (!d?.key)
+            const u = r.getState().getInitialOptions(t)?.validation;
+            if (!u?.key)
               throw new Error("Validation key not found");
-            return o.getState().getValidationErrors(d.key + "." + n.join("."));
+            return r.getState().getValidationErrors(u.key + "." + a.join("."));
           };
-        if (Array.isArray(m)) {
-          const d = () => S?.validIndices ? m.map((r, s) => ({
-            item: r,
+        if (Array.isArray(y)) {
+          const u = () => S?.validIndices ? y.map((n, s) => ({
+            item: n,
             originalIndex: S.validIndices[s]
-          })) : o.getState().getNestedState(t, n).map((r, s) => ({
-            item: r,
+          })) : r.getState().getNestedState(t, a).map((n, s) => ({
+            item: n,
             originalIndex: s
           }));
           if (l === "getSelected")
             return () => {
-              const e = o.getState().getSelectedIndex(t, n.join("."));
+              const e = r.getState().getSelectedIndex(t, a.join("."));
               if (e !== void 0)
-                return a(
-                  m[e],
-                  [...n, e.toString()],
+                return o(
+                  y[e],
+                  [...a, e.toString()],
                   S
                 );
             };
           if (l === "clearSelected")
             return () => {
-              o.getState().clearSelectedIndex({ stateKey: t, path: n });
+              r.getState().clearSelectedIndex({ stateKey: t, path: a });
             };
           if (l === "getSelectedIndex")
-            return () => o.getState().getSelectedIndex(t, n.join(".")) ?? -1;
+            return () => r.getState().getSelectedIndex(t, a.join(".")) ?? -1;
           if (l === "useVirtualView")
             return (e) => {
               const {
-                itemHeight: r = 50,
-                // Serves as a fallback for unmeasured items
+                itemHeight: n,
                 overscan: s = 5,
                 stickToBottom: i = !1
-              } = e, g = Z(null), [u, A] = rt({
+              } = e, f = q(null), [d, k] = K({
                 startIndex: 0,
                 endIndex: 10
-              }), w = mt(
-                (E) => o.getState().getShadowMetadata(t, [...n, E.toString()])?.virtualizer?.itemHeight || r,
-                [r, t, n]
-              ), T = Z(i), x = Z(0), V = Z(!0), _ = o().getNestedState(
+              });
+              ft((A) => r.getState().getShadowMetadata(t, [...a, A.toString()])?.virtualizer?.itemHeight || e.itemHeight, []);
+              const w = q(i), T = q(0), x = q(!0), C = r().getNestedState(
                 t,
-                n
-              ), P = _.length, { totalHeight: B, positions: N } = yt(() => {
-                let E = 0;
-                const C = [];
-                for (let M = 0; M < P; M++)
-                  C[M] = E, E += w(M);
-                return { totalHeight: E, positions: C };
-              }, [P, w]), b = yt(() => {
-                const E = Math.max(0, u.startIndex), C = Math.min(P, u.endIndex), M = Array.from(
-                  { length: C - E },
-                  (L, K) => E + K
-                ), j = M.map((L) => _[L]);
-                return a(j, n, {
+                a
+              ), V = C.length, G = Tt(() => {
+                const A = Math.max(0, d.startIndex), P = Math.min(V, d.endIndex), E = Array.from(
+                  { length: P - A },
+                  (b, F) => A + F
+                ), M = E.map((b) => C[b]);
+                return o(M, a, {
                   ...S,
-                  validIndices: M
+                  validIndices: E
                 });
-              }, [u.startIndex, u.endIndex, _, P]);
-              dt(() => {
-                const E = g.current;
-                if (!E) return;
-                const C = T.current, M = P > x.current;
-                x.current = P;
-                const j = () => {
-                  const { scrollTop: L, clientHeight: K, scrollHeight: Vt } = E;
-                  T.current = Vt - L - K < 10;
-                  let et = 0;
-                  for (let J = 0; J < N.length; J++)
-                    if (N[J] >= L) {
-                      et = J;
-                      break;
-                    }
-                  let q = et;
-                  for (; q < P && N[q] && N[q] < L + K; )
-                    q++;
-                  et = Math.max(0, et - s), q = Math.min(P, q + s), A((J) => J.startIndex !== et || J.endIndex !== q ? { startIndex: et, endIndex: q } : J);
+              }, [d.startIndex, d.endIndex, C, V]);
+              it(() => {
+                const A = f.current;
+                if (!A) return;
+                const P = w.current, E = V > T.current;
+                T.current = V;
+                const M = () => {
+                  const { scrollTop: b, clientHeight: F, scrollHeight: R } = A;
+                  w.current = R - b - F < 10;
+                  const X = Math.max(
+                    0,
+                    Math.floor(b / n) - s
+                  ), et = Math.min(
+                    V,
+                    Math.ceil((b + F) / n) + s
+                  );
+                  k((gt) => gt.startIndex !== X || gt.endIndex !== et ? { startIndex: X, endIndex: et } : gt);
                 };
-                return E.addEventListener("scroll", j, {
+                return A.addEventListener("scroll", M, {
                   passive: !0
-                }), i && (V.current ? E.scrollTo({
-                  top: E.scrollHeight,
+                }), i && (x.current ? A.scrollTo({
+                  top: A.scrollHeight,
                   behavior: "auto"
-                }) : C && M && requestAnimationFrame(() => {
-                  E.scrollTo({
-                    top: E.scrollHeight,
+                }) : P && E && requestAnimationFrame(() => {
+                  A.scrollTo({
+                    top: A.scrollHeight,
                     behavior: "smooth"
                   });
-                })), V.current = !1, j(), () => E.removeEventListener("scroll", j);
-              }, [P, s, i, N]);
-              const R = mt(
-                (E = "smooth") => {
-                  g.current && g.current.scrollTo({
-                    top: g.current.scrollHeight,
-                    behavior: E
+                })), x.current = !1, M(), () => A.removeEventListener("scroll", M);
+              }, [V, n, s, i]);
+              const B = ft(
+                (A = "smooth") => {
+                  f.current && f.current.scrollTo({
+                    top: f.current.scrollHeight,
+                    behavior: A
                   });
                 },
                 []
-              ), D = mt(
-                (E, C = "smooth") => {
-                  g.current && N[E] !== void 0 && g.current.scrollTo({
-                    top: N[E],
-                    // Instead of `index * itemHeight`
-                    behavior: C
+              ), _ = ft(
+                (A, P = "smooth") => {
+                  f.current && f.current.scrollTo({
+                    top: A * n,
+                    behavior: P
                   });
                 },
-                [N]
-                // Depends on `positions` now instead of `itemHeight`
-              ), $ = {
+                [n]
+              ), N = {
                 outer: {
-                  ref: g,
+                  ref: f,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
                   style: {
-                    height: `${B}px`,
-                    // Use calculated total height
+                    height: `${V * n}px`,
                     position: "relative"
                   }
                 },
                 list: {
                   style: {
-                    // Use the pre-calculated position of the first visible item
-                    transform: `translateY(${N[u.startIndex] || 0}px)`
+                    transform: `translateY(${d.startIndex * n}px)`
                   }
                 }
               };
               return {
-                virtualState: b,
-                virtualizerProps: $,
-                scrollToBottom: R,
-                scrollToIndex: D
+                virtualState: G,
+                virtualizerProps: N,
+                scrollToBottom: B,
+                scrollToIndex: _
               };
             };
           if (l === "stateSort")
             return (e) => {
-              const s = [...d()].sort(
-                (u, A) => e(u.item, A.item)
-              ), i = s.map(({ item: u }) => u), g = {
+              const s = [...u()].sort(
+                (d, k) => e(d.item, k.item)
+              ), i = s.map(({ item: d }) => d), f = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: u }) => u
+                  ({ originalIndex: d }) => d
                 )
               };
-              return a(i, n, g);
+              return o(i, a, f);
             };
           if (l === "stateFilter")
             return (e) => {
-              const s = d().filter(
-                ({ item: u }, A) => e(u, A)
-              ), i = s.map(({ item: u }) => u), g = {
+              const s = u().filter(
+                ({ item: d }, k) => e(d, k)
+              ), i = s.map(({ item: d }) => d), f = {
                 ...S,
                 validIndices: s.map(
-                  ({ originalIndex: u }) => u
+                  ({ originalIndex: d }) => d
                 )
               };
-              return a(i, n, g);
+              return o(i, a, f);
             };
           if (l === "stateMap")
             return (e) => {
-              const r = o.getState().getNestedState(t, n);
-              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, g) => g)).map((i, g) => {
-                const u = r[i], A = [...n, i.toString()], w = a(u, A, S);
-                return e(u, w, {
+              const n = r.getState().getNestedState(t, a);
+              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
+                const d = n[i], k = [...a, i.toString()], w = o(d, k, S);
+                return e(d, w, {
                   register: () => {
-                    const [, x] = rt({}), V = `${v}-${n.join(".")}-${i}`;
-                    dt(() => {
-                      const _ = `${t}////${V}`, P = o.getState().stateComponents.get(t) || {
+                    const [, x] = K({}), C = `${h}-${a.join(".")}-${i}`;
+                    it(() => {
+                      const V = `${t}////${C}`, G = r.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return P.components.set(_, {
+                      return G.components.set(V, {
                         forceUpdate: () => x({}),
-                        paths: /* @__PURE__ */ new Set([A.join(".")])
-                      }), o.getState().stateComponents.set(t, P), () => {
-                        const B = o.getState().stateComponents.get(t);
-                        B && B.components.delete(_);
+                        paths: /* @__PURE__ */ new Set([k.join(".")])
+                      }), r.getState().stateComponents.set(t, G), () => {
+                        const B = r.getState().stateComponents.get(t);
+                        B && B.components.delete(V);
                       };
-                    }, [t, V]);
+                    }, [t, C]);
                   },
-                  index: g,
+                  index: f,
                   originalIndex: i
                 });
               }) : (console.warn(
-                `stateMap called on a non-array value at path: ${n.join(".")}. The current value is:`,
-                r
+                `stateMap called on a non-array value at path: ${a.join(".")}. The current value is:`,
+                n
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => m.map((s, i) => {
-              let g;
-              S?.validIndices && S.validIndices[i] !== void 0 ? g = S.validIndices[i] : g = i;
-              const u = [...n, g.toString()], A = a(s, u, S);
+            return (e) => y.map((s, i) => {
+              let f;
+              S?.validIndices && S.validIndices[i] !== void 0 ? f = S.validIndices[i] : f = i;
+              const d = [...a, f.toString()], k = o(s, d, S);
               return e(
                 s,
-                A,
+                k,
                 i,
-                m,
-                a(m, n, S)
+                y,
+                o(y, a, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => st(qt, {
+            return (e) => rt(zt, {
               proxy: {
                 _stateKey: t,
-                _path: n,
+                _path: a,
                 _mapFn: e
                 // Pass the actual function, not string
               },
-              rebuildStateShape: a
+              rebuildStateShape: o
             });
           if (l === "stateList")
             return (e) => {
-              const r = o.getState().getNestedState(t, n);
-              return Array.isArray(r) ? (S?.validIndices || Array.from({ length: r.length }, (i, g) => g)).map((i, g) => {
-                const u = r[i], A = [...n, i.toString()], w = a(u, A, S), T = `${v}-${n.join(".")}-${i}`;
-                return st(Yt, {
+              const n = r.getState().getNestedState(t, a);
+              return Array.isArray(n) ? (S?.validIndices || Array.from({ length: n.length }, (i, f) => f)).map((i, f) => {
+                const d = n[i], k = [...a, i.toString()], w = o(d, k, S), T = `${h}-${a.join(".")}-${i}`;
+                return rt(Ht, {
                   key: i,
                   stateKey: t,
                   itemComponentId: T,
-                  itemPath: A,
+                  itemPath: k,
                   children: e(
-                    u,
+                    d,
                     w,
-                    g,
-                    r,
-                    a(r, n, S)
+                    f,
+                    n,
+                    o(n, a, S)
                   )
                 });
               }) : (console.warn(
-                `stateList called on a non-array value at path: ${n.join(".")}.`
+                `stateList called on a non-array value at path: ${a.join(".")}.`
               ), null);
             };
           if (l === "stateFlattenOn")
             return (e) => {
-              const r = m;
-              y.clear(), k++;
-              const s = r.flatMap(
+              const n = y;
+              v.clear(), $++;
+              const s = n.flatMap(
                 (i) => i[e] ?? []
               );
-              return a(
+              return o(
                 s,
-                [...n, "[*]", e],
+                [...a, "[*]", e],
                 S
               );
             };
           if (l === "index")
             return (e) => {
-              const r = m[e];
-              return a(r, [...n, e.toString()]);
+              const n = y[e];
+              return o(n, [...a, e.toString()]);
             };
           if (l === "last")
             return () => {
-              const e = o.getState().getNestedState(t, n);
+              const e = r.getState().getNestedState(t, a);
               if (e.length === 0) return;
-              const r = e.length - 1, s = e[r], i = [...n, r.toString()];
-              return a(s, i);
+              const n = e.length - 1, s = e[n], i = [...a, n.toString()];
+              return o(s, i);
             };
           if (l === "insert")
-            return (e) => (p(n), ht(c, e, n, t), a(
-              o.getState().getNestedState(t, n),
-              n
+            return (e) => (p(a), St(c, e, a, t), o(
+              r.getState().getNestedState(t, a),
+              a
             ));
           if (l === "uniqueInsert")
-            return (e, r, s) => {
-              const i = o.getState().getNestedState(t, n), g = X(e) ? e(i) : e;
-              let u = null;
+            return (e, n, s) => {
+              const i = r.getState().getNestedState(t, a), f = J(e) ? e(i) : e;
+              let d = null;
               if (!i.some((w) => {
-                if (r) {
-                  const x = r.every(
-                    (V) => H(w[V], g[V])
+                if (n) {
+                  const x = n.every(
+                    (C) => L(w[C], f[C])
                   );
-                  return x && (u = w), x;
+                  return x && (d = w), x;
                 }
-                const T = H(w, g);
-                return T && (u = w), T;
+                const T = L(w, f);
+                return T && (d = w), T;
               }))
-                p(n), ht(c, g, n, t);
-              else if (s && u) {
-                const w = s(u), T = i.map(
-                  (x) => H(x, u) ? w : x
+                p(a), St(c, f, a, t);
+              else if (s && d) {
+                const w = s(d), T = i.map(
+                  (x) => L(x, d) ? w : x
                 );
-                p(n), at(c, T, n);
+                p(a), nt(c, T, a);
               }
             };
           if (l === "cut")
-            return (e, r) => {
-              if (!r?.waitForSync)
-                return p(n), ct(c, n, t, e), a(
-                  o.getState().getNestedState(t, n),
-                  n
+            return (e, n) => {
+              if (!n?.waitForSync)
+                return p(a), ot(c, a, t, e), o(
+                  r.getState().getNestedState(t, a),
+                  a
                 );
             };
           if (l === "cutByValue")
             return (e) => {
-              for (let r = 0; r < m.length; r++)
-                m[r] === e && ct(c, n, t, r);
+              for (let n = 0; n < y.length; n++)
+                y[n] === e && ot(c, a, t, n);
             };
           if (l === "toggleByValue")
             return (e) => {
-              const r = m.findIndex((s) => s === e);
-              r > -1 ? ct(c, n, t, r) : ht(c, e, n, t);
+              const n = y.findIndex((s) => s === e);
+              n > -1 ? ot(c, a, t, n) : St(c, e, a, t);
             };
           if (l === "stateFind")
             return (e) => {
-              const s = d().find(
-                ({ item: g }, u) => e(g, u)
+              const s = u().find(
+                ({ item: f }, d) => e(f, d)
               );
               if (!s) return;
-              const i = [...n, s.originalIndex.toString()];
-              return a(s.item, i, S);
+              const i = [...a, s.originalIndex.toString()];
+              return o(s.item, i, S);
             };
           if (l === "findWith")
-            return (e, r) => {
-              const i = d().find(
-                ({ item: u }) => u[e] === r
+            return (e, n) => {
+              const i = u().find(
+                ({ item: d }) => d[e] === n
               );
               if (!i) return;
-              const g = [...n, i.originalIndex.toString()];
-              return a(i.item, g, S);
+              const f = [...a, i.originalIndex.toString()];
+              return o(i.item, f, S);
             };
         }
-        const Q = n[n.length - 1];
-        if (!isNaN(Number(Q))) {
-          const d = n.slice(0, -1), e = o.getState().getNestedState(t, d);
+        const Y = a[a.length - 1];
+        if (!isNaN(Number(Y))) {
+          const u = a.slice(0, -1), e = r.getState().getNestedState(t, u);
           if (Array.isArray(e) && l === "cut")
-            return () => ct(
+            return () => ot(
               c,
-              d,
+              u,
               t,
-              Number(Q)
+              Number(Y)
             );
         }
         if (l === "get")
           return () => {
-            if (S?.validIndices && Array.isArray(m)) {
-              const d = o.getState().getNestedState(t, n);
-              return S.validIndices.map((e) => d[e]);
+            if (S?.validIndices && Array.isArray(y)) {
+              const u = r.getState().getNestedState(t, a);
+              return S.validIndices.map((e) => u[e]);
             }
-            return o.getState().getNestedState(t, n);
+            return r.getState().getNestedState(t, a);
           };
         if (l === "$derive")
-          return (d) => kt({
+          return (u) => At({
             _stateKey: t,
-            _path: n,
-            _effect: d.toString()
+            _path: a,
+            _effect: u.toString()
           });
         if (l === "$get")
-          return () => kt({
+          return () => At({
             _stateKey: t,
-            _path: n
+            _path: a
           });
         if (l === "lastSynced") {
-          const d = `${t}:${n.join(".")}`;
-          return o.getState().getSyncInfo(d);
+          const u = `${t}:${a.join(".")}`;
+          return r.getState().getSyncInfo(u);
         }
         if (l == "getLocalStorage")
-          return (d) => ft(f + "-" + t + "-" + d);
+          return (u) => dt(g + "-" + t + "-" + u);
         if (l === "_selected") {
-          const d = n.slice(0, -1), e = d.join("."), r = o.getState().getNestedState(t, d);
-          return Array.isArray(r) ? Number(n[n.length - 1]) === o.getState().getSelectedIndex(t, e) : void 0;
+          const u = a.slice(0, -1), e = u.join("."), n = r.getState().getNestedState(t, u);
+          return Array.isArray(n) ? Number(a[a.length - 1]) === r.getState().getSelectedIndex(t, e) : void 0;
         }
         if (l === "setSelected")
-          return (d) => {
-            const e = n.slice(0, -1), r = Number(n[n.length - 1]), s = e.join(".");
-            d ? o.getState().setSelectedIndex(t, s, r) : o.getState().setSelectedIndex(t, s, void 0);
-            const i = o.getState().getNestedState(t, [...e]);
-            at(c, i, e), p(e);
+          return (u) => {
+            const e = a.slice(0, -1), n = Number(a[a.length - 1]), s = e.join(".");
+            u ? r.getState().setSelectedIndex(t, s, n) : r.getState().setSelectedIndex(t, s, void 0);
+            const i = r.getState().getNestedState(t, [...e]);
+            nt(c, i, e), p(e);
           };
         if (l === "toggleSelected")
           return () => {
-            const d = n.slice(0, -1), e = Number(n[n.length - 1]), r = d.join("."), s = o.getState().getSelectedIndex(t, r);
-            o.getState().setSelectedIndex(
+            const u = a.slice(0, -1), e = Number(a[a.length - 1]), n = u.join("."), s = r.getState().getSelectedIndex(t, n);
+            r.getState().setSelectedIndex(
               t,
-              r,
+              n,
               s === e ? void 0 : e
             );
-            const i = o.getState().getNestedState(t, [...d]);
-            at(c, i, d), p(d);
+            const i = r.getState().getNestedState(t, [...u]);
+            nt(c, i, u), p(u);
           };
-        if (n.length == 0) {
+        if (a.length == 0) {
           if (l === "applyJsonPatch")
-            return (d) => {
-              const e = o.getState().cogsStateStore[t], s = Ft(e, d).newDocument;
-              Ct(
+            return (u) => {
+              const e = r.getState().cogsStateStore[t], s = jt(e, u).newDocument;
+              Nt(
                 t,
-                o.getState().initialStateGlobal[t],
+                r.getState().initialStateGlobal[t],
                 s,
                 c,
-                v,
-                f
+                h,
+                g
               );
-              const i = o.getState().stateComponents.get(t);
+              const i = r.getState().stateComponents.get(t);
               if (i) {
-                const g = It(e, s), u = new Set(g);
+                const f = ht(e, s), d = new Set(f);
                 for (const [
-                  A,
+                  k,
                   w
                 ] of i.components.entries()) {
                   let T = !1;
@@ -994,42 +981,42 @@ function gt(t, c, v, f) {
                       continue;
                     }
                     if (x.includes("component") && (w.paths.has("") && (T = !0), !T))
-                      for (const V of u) {
-                        if (w.paths.has(V)) {
+                      for (const C of d) {
+                        if (w.paths.has(C)) {
                           T = !0;
                           break;
                         }
-                        let _ = V.lastIndexOf(".");
-                        for (; _ !== -1; ) {
-                          const P = V.substring(0, _);
-                          if (w.paths.has(P)) {
+                        let V = C.lastIndexOf(".");
+                        for (; V !== -1; ) {
+                          const G = C.substring(0, V);
+                          if (w.paths.has(G)) {
                             T = !0;
                             break;
                           }
-                          const B = V.substring(
-                            _ + 1
+                          const B = C.substring(
+                            V + 1
                           );
                           if (!isNaN(Number(B))) {
-                            const N = P.lastIndexOf(".");
-                            if (N !== -1) {
-                              const b = P.substring(
+                            const _ = G.lastIndexOf(".");
+                            if (_ !== -1) {
+                              const N = G.substring(
                                 0,
-                                N
+                                _
                               );
-                              if (w.paths.has(b)) {
+                              if (w.paths.has(N)) {
                                 T = !0;
                                 break;
                               }
                             }
                           }
-                          _ = P.lastIndexOf(".");
+                          V = G.lastIndexOf(".");
                         }
                         if (T) break;
                       }
                     if (!T && x.includes("deps") && w.depsFunction) {
-                      const V = w.depsFunction(s);
-                      let _ = !1;
-                      typeof V == "boolean" ? V && (_ = !0) : H(w.deps, V) || (w.deps = V, _ = !0), _ && (T = !0);
+                      const C = w.depsFunction(s);
+                      let V = !1;
+                      typeof C == "boolean" ? C && (V = !0) : L(w.deps, C) || (w.deps = C, V = !0), V && (T = !0);
                     }
                     T && w.forceUpdate();
                   }
@@ -1038,203 +1025,203 @@ function gt(t, c, v, f) {
             };
           if (l === "validateZodSchema")
             return () => {
-              const d = o.getState().getInitialOptions(t)?.validation, e = o.getState().addValidationError;
-              if (!d?.zodSchema)
+              const u = r.getState().getInitialOptions(t)?.validation, e = r.getState().addValidationError;
+              if (!u?.zodSchema)
                 throw new Error("Zod schema not found");
-              if (!d?.key)
+              if (!u?.key)
                 throw new Error("Validation key not found");
-              Y(d.key);
-              const r = o.getState().cogsStateStore[t];
+              H(u.key);
+              const n = r.getState().cogsStateStore[t];
               try {
-                const s = o.getState().getValidationErrors(d.key);
-                s && s.length > 0 && s.forEach(([g]) => {
-                  g && g.startsWith(d.key) && Y(g);
+                const s = r.getState().getValidationErrors(u.key);
+                s && s.length > 0 && s.forEach(([f]) => {
+                  f && f.startsWith(u.key) && H(f);
                 });
-                const i = d.zodSchema.safeParse(r);
-                return i.success ? !0 : (i.error.errors.forEach((u) => {
-                  const A = u.path, w = u.message, T = [d.key, ...A].join(".");
+                const i = u.zodSchema.safeParse(n);
+                return i.success ? !0 : (i.error.errors.forEach((d) => {
+                  const k = d.path, w = d.message, T = [u.key, ...k].join(".");
                   e(T, w);
-                }), St(t), !1);
+                }), ut(t), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
             };
-          if (l === "_componentId") return v;
+          if (l === "_componentId") return h;
           if (l === "getComponents")
-            return () => o().stateComponents.get(t);
+            return () => r().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => Et.getState().getFormRefsByStateKey(t);
+            return () => It.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
-            return o.getState().initialStateGlobal[t];
+            return r.getState().initialStateGlobal[t];
           if (l === "_serverState")
-            return o.getState().serverState[t];
+            return r.getState().serverState[t];
           if (l === "_isLoading")
-            return o.getState().isLoadingGlobal[t];
+            return r.getState().isLoadingGlobal[t];
           if (l === "revertToInitialState")
             return I.revertToInitialState;
           if (l === "updateInitialState") return I.updateInitialState;
           if (l === "removeValidation") return I.removeValidation;
         }
         if (l === "getFormRef")
-          return () => Et.getState().getFormRef(t + "." + n.join("."));
+          return () => It.getState().getFormRef(t + "." + a.join("."));
         if (l === "validationWrapper")
           return ({
-            children: d,
+            children: u,
             hideMessage: e
-          }) => /* @__PURE__ */ vt(
-            jt,
+          }) => /* @__PURE__ */ mt(
+            Pt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
-              path: n,
-              validationKey: o.getState().getInitialOptions(t)?.validation?.key || "",
+              path: a,
+              validationKey: r.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
               validIndices: S?.validIndices,
-              children: d
+              children: u
             }
           );
         if (l === "_stateKey") return t;
-        if (l === "_path") return n;
+        if (l === "_path") return a;
         if (l === "_isServerSynced") return I._isServerSynced;
         if (l === "update")
-          return (d, e) => {
+          return (u, e) => {
             if (e?.debounce)
-              Mt(() => {
-                at(c, d, n, "");
-                const r = o.getState().getNestedState(t, n);
-                e?.afterUpdate && e.afterUpdate(r);
+              xt(() => {
+                nt(c, u, a, "");
+                const n = r.getState().getNestedState(t, a);
+                e?.afterUpdate && e.afterUpdate(n);
               }, e.debounce);
             else {
-              at(c, d, n, "");
-              const r = o.getState().getNestedState(t, n);
-              e?.afterUpdate && e.afterUpdate(r);
+              nt(c, u, a, "");
+              const n = r.getState().getNestedState(t, a);
+              e?.afterUpdate && e.afterUpdate(n);
             }
-            p(n);
+            p(a);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ vt(
-            Ot,
+          return (u, e) => /* @__PURE__ */ mt(
+            _t,
             {
               setState: c,
               stateKey: t,
-              path: n,
-              child: d,
+              path: a,
+              child: u,
               formOpts: e
             }
           );
-        const O = [...n, l], ot = o.getState().getNestedState(t, O);
-        return a(ot, O, S);
+        const j = [...a, l], tt = r.getState().getNestedState(t, j);
+        return o(tt, j, S);
       }
-    }, G = new Proxy(F, U);
-    return y.set(W, {
-      proxy: G,
-      stateVersion: k
-    }), G;
+    }, W = new Proxy(O, U);
+    return v.set(D, {
+      proxy: W,
+      stateVersion: $
+    }), W;
   }
-  return a(
-    o.getState().getNestedState(t, [])
+  return o(
+    r.getState().getNestedState(t, [])
   );
 }
-function kt(t) {
-  return st(Jt, { proxy: t });
+function At(t) {
+  return rt(Bt, { proxy: t });
 }
-function qt({
+function zt({
   proxy: t,
   rebuildStateShape: c
 }) {
-  const v = o().getNestedState(t._stateKey, t._path);
-  return Array.isArray(v) ? c(
-    v,
+  const h = r().getNestedState(t._stateKey, t._path);
+  return Array.isArray(h) ? c(
+    h,
     t._path
   ).stateMapNoRender(
-    (y, k, p, I, a) => t._mapFn(y, k, p, I, a)
+    (v, $, p, I, o) => t._mapFn(v, $, p, I, o)
   ) : null;
 }
-function Jt({
+function Bt({
   proxy: t
 }) {
-  const c = Z(null), v = `${t._stateKey}-${t._path.join(".")}`;
-  return lt(() => {
-    const f = c.current;
-    if (!f || !f.parentElement) return;
-    const y = f.parentElement, p = 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 m = {
+  const c = q(null), h = `${t._stateKey}-${t._path.join(".")}`;
+  return st(() => {
+    const g = c.current;
+    if (!g || !g.parentElement) return;
+    const v = g.parentElement, p = Array.from(v.childNodes).indexOf(g);
+    let I = v.getAttribute("data-parent-id");
+    I || (I = `parent-${crypto.randomUUID()}`, v.setAttribute("data-parent-id", I));
+    const y = {
       instanceId: `instance-${crypto.randomUUID()}`,
       parentId: I,
       position: p,
       effect: t._effect
     };
-    o.getState().addSignalElement(v, m);
-    const n = o.getState().getNestedState(t._stateKey, t._path);
+    r.getState().addSignalElement(h, y);
+    const a = r.getState().getNestedState(t._stateKey, t._path);
     let S;
     if (t._effect)
       try {
         S = new Function(
           "state",
           `return (${t._effect})(state)`
-        )(n);
-      } catch (F) {
-        console.error("Error evaluating effect function during mount:", F), S = n;
+        )(a);
+      } catch (O) {
+        console.error("Error evaluating effect function during mount:", O), S = a;
       }
     else
-      S = n;
+      S = a;
     S !== null && typeof S == "object" && (S = JSON.stringify(S));
-    const W = document.createTextNode(String(S));
-    f.replaceWith(W);
-  }, [t._stateKey, t._path.join("."), t._effect]), st("span", {
+    const D = document.createTextNode(String(S));
+    g.replaceWith(D);
+  }, [t._stateKey, t._path.join("."), t._effect]), rt("span", {
     ref: c,
     style: { display: "none" },
-    "data-signal-id": v
+    "data-signal-id": h
   });
 }
-function de(t) {
-  const c = xt(
-    (v) => {
-      const f = o.getState().stateComponents.get(t._stateKey) || {
+function ie(t) {
+  const c = Ct(
+    (h) => {
+      const g = r.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return f.components.set(t._stateKey, {
-        forceUpdate: v,
+      return g.components.set(t._stateKey, {
+        forceUpdate: h,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
-      }), () => f.components.delete(t._stateKey);
+      }), () => g.components.delete(t._stateKey);
     },
-    () => o.getState().getNestedState(t._stateKey, t._path)
+    () => r.getState().getNestedState(t._stateKey, t._path)
   );
-  return st("text", {}, String(c));
+  return rt("text", {}, String(c));
 }
-function Yt({
+function Ht({
   stateKey: t,
   itemComponentId: c,
-  itemPath: v,
-  children: f
+  itemPath: h,
+  children: g
 }) {
-  const [, y] = rt({}), [k, p] = Ut();
-  return lt(() => {
-    p.height > 0 && o.getState().setShadowMetadata(t, v, {
+  const [, v] = K({}), [$, p] = Ot();
+  return st(() => {
+    p.height > 0 && r.getState().setShadowMetadata(t, h, {
       virtualizer: {
         itemHeight: p.height
       }
     });
-  }, [p.height]), dt(() => {
-    const I = `${t}////${c}`, a = o.getState().stateComponents.get(t) || {
+  }, [p.height]), it(() => {
+    const I = `${t}////${c}`, o = r.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
-    return a.components.set(I, {
-      forceUpdate: () => y({}),
-      paths: /* @__PURE__ */ new Set([v.join(".")])
-    }), o.getState().stateComponents.set(t, a), () => {
-      const m = o.getState().stateComponents.get(t);
-      m && m.components.delete(I);
+    return o.components.set(I, {
+      forceUpdate: () => v({}),
+      paths: /* @__PURE__ */ new Set([h.join(".")])
+    }), r.getState().stateComponents.set(t, o), () => {
+      const y = r.getState().stateComponents.get(t);
+      y && y.components.delete(I);
     };
-  }, [t, c, v.join(".")]), /* @__PURE__ */ vt("div", { ref: k, children: f });
+  }, [t, c, h.join(".")]), /* @__PURE__ */ mt("div", { ref: $, children: g });
 }
 export {
-  kt as $cogsSignal,
-  de as $cogsSignalStore,
-  ie as addStateOptions,
-  ce as createCogsState,
-  le as notifyComponent,
-  Bt as useCogsStateFn
+  At as $cogsSignal,
+  ie as $cogsSignalStore,
+  ae as addStateOptions,
+  oe as createCogsState,
+  se as notifyComponent,
+  Lt as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map