cogsbox-state 0.5.359 → 0.5.360

package/dist/CogsState.jsx

@@ -1,61 +1,61 @@
 "use client";
-import { jsx as mt } from "react/jsx-runtime";
-import { useState as Y, useRef as X, useEffect as tt, useLayoutEffect as lt, useMemo as ht, createElement as st, useSyncExternalStore as Pt, startTransition as Vt, useCallback as pt } from "react";
-import { transformStateFunc as xt, isDeepEqual as B, isFunction as Z, getNestedValue as z, getDifferences as vt, debounce as _t } from "./utility.js";
-import { pushFunc as St, updateFn as at, cutFunc as ct, ValidationWrapper as Ot, FormControlComponent as Mt } from "./Functions.jsx";
-import Rt from "superjson";
-import { v4 as It } from "uuid";
+import { jsx as wt } from "react/jsx-runtime";
+import { useState as et, useRef as z, useEffect as it, useLayoutEffect as St, useMemo as Et, createElement as ct, useSyncExternalStore as Dt, startTransition as Ft, useCallback as bt } from "react";
+import { transformStateFunc as Lt, isDeepEqual as H, isFunction as Q, getNestedValue as q, getDifferences as At, debounce as Gt } from "./utility.js";
+import { pushFunc as pt, updateFn as st, cutFunc as ft, ValidationWrapper as Wt, FormControlComponent as Ht } from "./Functions.jsx";
+import Bt from "superjson";
+import { v4 as Tt } from "uuid";
 import "zod";
-import { getGlobalStore as r, formRefStore as wt } from "./store.js";
-import { useCogsConfig as $t } from "./CogsStateClient.jsx";
-import { applyPatch as Ut } from "fast-json-patch";
-import jt from "react-use-measure";
-function Et(t, c) {
-  const m = r.getState().getInitialOptions, u = r.getState().setInitialStateOptions, I = m(t) || {};
-  u(t, {
-    ...I,
-    ...c
+import { getGlobalStore as r, formRefStore as xt } from "./store.js";
+import { useCogsConfig as Rt } from "./CogsStateClient.jsx";
+import { applyPatch as zt } from "fast-json-patch";
+import qt from "react-use-measure";
+function Vt(t, i) {
+  const m = r.getState().getInitialOptions, g = r.getState().setInitialStateOptions, y = m(t) || {};
+  g(t, {
+    ...y,
+    ...i
   });
 }
-function At({
+function Pt({
   stateKey: t,
-  options: c,
+  options: i,
   initialOptionsPart: m
 }) {
-  const u = nt(t) || {}, I = m[t] || {}, b = r.getState().setInitialStateOptions, w = { ...I, ...u };
-  let p = !1;
-  if (c)
-    for (const a in c)
-      w.hasOwnProperty(a) ? (a == "localStorage" && c[a] && w[a].key !== c[a]?.key && (p = !0, w[a] = c[a]), a == "initialState" && c[a] && w[a] !== c[a] && // Different references
-      !B(w[a], c[a]) && (p = !0, w[a] = c[a])) : (p = !0, w[a] = c[a]);
-  p && b(t, w);
+  const g = ot(t) || {}, y = m[t] || {}, C = r.getState().setInitialStateOptions, p = { ...y, ...g };
+  let I = !1;
+  if (i)
+    for (const a in i)
+      p.hasOwnProperty(a) ? (a == "localStorage" && i[a] && p[a].key !== i[a]?.key && (I = !0, p[a] = i[a]), a == "initialState" && i[a] && p[a] !== i[a] && // Different references
+      !H(p[a], i[a]) && (I = !0, p[a] = i[a])) : (I = !0, p[a] = i[a]);
+  I && C(t, p);
 }
-function se(t, { formElements: c, validation: m }) {
-  return { initialState: t, formElements: c, validation: m };
+function me(t, { formElements: i, validation: m }) {
+  return { initialState: t, formElements: i, validation: m };
 }
-const ie = (t, c) => {
+const he = (t, i) => {
   let m = t;
-  const [u, I] = xt(m);
-  (Object.keys(I).length > 0 || c && Object.keys(c).length > 0) && Object.keys(I).forEach((p) => {
-    I[p] = I[p] || {}, I[p].formElements = {
-      ...c?.formElements,
+  const [g, y] = Lt(m);
+  (Object.keys(y).length > 0 || i && Object.keys(i).length > 0) && Object.keys(y).forEach((I) => {
+    y[I] = y[I] || {}, y[I].formElements = {
+      ...i?.formElements,
       // Global defaults first
-      ...c?.validation,
-      ...I[p].formElements || {}
+      ...i?.validation,
+      ...y[I].formElements || {}
       // State-specific overrides
-    }, nt(p) || r.getState().setInitialStateOptions(p, I[p]);
-  }), r.getState().setInitialStates(u), r.getState().setCreatedState(u);
-  const b = (p, a) => {
-    const [v] = Y(a?.componentId ?? It());
-    At({
-      stateKey: p,
+    }, ot(I) || r.getState().setInitialStateOptions(I, y[I]);
+  }), r.getState().setInitialStates(g), r.getState().setCreatedState(g);
+  const C = (I, a) => {
+    const [v] = et(a?.componentId ?? Tt());
+    Pt({
+      stateKey: I,
       options: a,
-      initialOptionsPart: I
+      initialOptionsPart: y
     });
-    const n = r.getState().cogsStateStore[p] || u[p], f = a?.modifyState ? a.modifyState(n) : n, [F, U] = Bt(
-      f,
+    const n = r.getState().cogsStateStore[I] || g[I], S = a?.modifyState ? a.modifyState(n) : n, [L, O] = te(
+      S,
       {
-        stateKey: p,
+        stateKey: I,
         syncUpdate: a?.syncUpdate,
         componentId: v,
         localStorage: a?.localStorage,
@@ -68,111 +68,111 @@ const ie = (t, c) => {
         serverState: a?.serverState
       }
     );
-    return U;
+    return O;
   };
-  function w(p, a) {
-    At({ stateKey: p, options: a, initialOptionsPart: I }), a.localStorage && Wt(p, a), ft(p);
+  function p(I, a) {
+    Pt({ stateKey: I, options: a, initialOptionsPart: y }), a.localStorage && Qt(I, a), yt(I);
   }
-  return { useCogsState: b, setCogsOptions: w };
+  return { useCogsState: C, setCogsOptions: p };
 }, {
-  setUpdaterState: dt,
-  setState: et,
-  getInitialOptions: nt,
-  getKeyState: Nt,
-  getValidationErrors: Lt,
-  setStateLog: Dt,
-  updateInitialStateGlobal: yt,
-  addValidationError: Ft,
-  removeValidationError: J,
-  setServerSyncActions: Gt
-} = r.getState(), Tt = (t, c, m, u, I) => {
+  setUpdaterState: mt,
+  setState: nt,
+  getInitialOptions: ot,
+  getKeyState: Ot,
+  getValidationErrors: Jt,
+  setStateLog: Yt,
+  updateInitialStateGlobal: kt,
+  addValidationError: Zt,
+  removeValidationError: X,
+  setServerSyncActions: Xt
+} = r.getState(), _t = (t, i, m, g, y) => {
   m?.log && console.log(
     "saving to localstorage",
-    c,
+    i,
     m.localStorage?.key,
-    u
+    g
   );
-  const b = Z(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
-  if (b && u) {
-    const w = `${u}-${c}-${b}`;
-    let p;
+  const C = Q(m?.localStorage?.key) ? m.localStorage?.key(t) : m?.localStorage?.key;
+  if (C && g) {
+    const p = `${g}-${i}-${C}`;
+    let I;
     try {
-      p = gt(w)?.lastSyncedWithServer;
+      I = vt(p)?.lastSyncedWithServer;
     } catch {
     }
     const a = {
       state: t,
       lastUpdated: Date.now(),
-      lastSyncedWithServer: I ?? p
-    }, v = Rt.serialize(a);
+      lastSyncedWithServer: y ?? I
+    }, v = Bt.serialize(a);
     window.localStorage.setItem(
-      w,
+      p,
       JSON.stringify(v.json)
     );
   }
-}, gt = (t) => {
+}, vt = (t) => {
   if (!t) return null;
   try {
-    const c = window.localStorage.getItem(t);
-    return c ? JSON.parse(c) : null;
-  } catch (c) {
-    return console.error("Error loading from localStorage:", c), null;
+    const i = window.localStorage.getItem(t);
+    return i ? JSON.parse(i) : null;
+  } catch (i) {
+    return console.error("Error loading from localStorage:", i), null;
   }
-}, Wt = (t, c) => {
-  const m = r.getState().cogsStateStore[t], { sessionId: u } = $t(), I = Z(c?.localStorage?.key) ? c.localStorage.key(m) : c?.localStorage?.key;
-  if (I && u) {
-    const b = gt(
-      `${u}-${t}-${I}`
+}, Qt = (t, i) => {
+  const m = r.getState().cogsStateStore[t], { sessionId: g } = Rt(), y = Q(i?.localStorage?.key) ? i.localStorage.key(m) : i?.localStorage?.key;
+  if (y && g) {
+    const C = vt(
+      `${g}-${t}-${y}`
     );
-    if (b && b.lastUpdated > (b.lastSyncedWithServer || 0))
-      return et(t, b.state), ft(t), !0;
+    if (C && C.lastUpdated > (C.lastSyncedWithServer || 0))
+      return nt(t, C.state), yt(t), !0;
   }
   return !1;
-}, Ct = (t, c, m, u, I, b) => {
-  const w = {
-    initialState: c,
-    updaterState: ut(
+}, Ut = (t, i, m, g, y, C) => {
+  const p = {
+    initialState: i,
+    updaterState: ht(
       t,
-      u,
-      I,
-      b
+      g,
+      y,
+      C
     ),
     state: m
   };
-  yt(t, w.initialState), dt(t, w.updaterState), et(t, w.state);
-}, ft = (t) => {
-  const c = r.getState().stateComponents.get(t);
-  if (!c) return;
+  kt(t, p.initialState), mt(t, p.updaterState), nt(t, p.state);
+}, yt = (t) => {
+  const i = r.getState().stateComponents.get(t);
+  if (!i) return;
   const m = /* @__PURE__ */ new Set();
-  c.components.forEach((u) => {
-    (u ? Array.isArray(u.reactiveType) ? u.reactiveType : [u.reactiveType || "component"] : null)?.includes("none") || m.add(() => u.forceUpdate());
+  i.components.forEach((g) => {
+    (g ? Array.isArray(g.reactiveType) ? g.reactiveType : [g.reactiveType || "component"] : null)?.includes("none") || m.add(() => g.forceUpdate());
   }), queueMicrotask(() => {
-    m.forEach((u) => u());
+    m.forEach((g) => g());
   });
-}, ce = (t, c) => {
+}, ve = (t, i) => {
   const m = r.getState().stateComponents.get(t);
   if (m) {
-    const u = `${t}////${c}`, I = m.components.get(u);
-    if ((I ? Array.isArray(I.reactiveType) ? I.reactiveType : [I.reactiveType || "component"] : null)?.includes("none"))
+    const g = `${t}////${i}`, y = m.components.get(g);
+    if ((y ? Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"] : null)?.includes("none"))
       return;
-    I && I.forceUpdate();
+    y && y.forceUpdate();
   }
-}, Ht = (t, c, m, u) => {
+}, Kt = (t, i, m, g) => {
   switch (t) {
     case "update":
       return {
-        oldValue: z(c, u),
-        newValue: z(m, u)
+        oldValue: q(i, g),
+        newValue: q(m, g)
       };
     case "insert":
       return {
         oldValue: null,
         // or undefined
-        newValue: z(m, u)
+        newValue: q(m, g)
       };
     case "cut":
       return {
-        oldValue: z(c, u),
+        oldValue: q(i, g),
         newValue: null
         // or undefined
       };
@@ -180,27 +180,27 @@ const ie = (t, c) => {
       return { oldValue: null, newValue: null };
   }
 };
-function Bt(t, {
-  stateKey: c,
+function te(t, {
+  stateKey: i,
   serverSync: m,
-  localStorage: u,
-  formElements: I,
-  reactiveDeps: b,
-  reactiveType: w,
-  componentId: p,
+  localStorage: g,
+  formElements: y,
+  reactiveDeps: C,
+  reactiveType: p,
+  componentId: I,
   initialState: a,
   syncUpdate: v,
   dependencies: n,
-  serverState: f
+  serverState: S
 } = {}) {
-  const [F, U] = Y({}), { sessionId: j } = $t();
-  let G = !c;
-  const [h] = Y(c ?? It()), l = r.getState().stateLog[h], it = X(/* @__PURE__ */ new Set()), Q = X(p ?? It()), O = X(
+  const [L, O] = et({}), { sessionId: U } = Rt();
+  let G = !i;
+  const [h] = et(i ?? Tt()), l = r.getState().stateLog[h], lt = z(/* @__PURE__ */ new Set()), K = z(I ?? Tt()), _ = z(
     null
   );
-  O.current = nt(h) ?? null, tt(() => {
+  _.current = ot(h) ?? null, it(() => {
     if (v && v.stateKey === h && v.path?.[0]) {
-      et(h, (o) => ({
+      nt(h, (o) => ({
         ...o,
         [v.path[0]]: v.newValue
       }));
@@ -210,263 +210,263 @@ function Bt(t, {
         userId: v.userId
       });
     }
-  }, [v]), tt(() => {
+  }, [v]), it(() => {
     if (a) {
-      Et(h, {
+      Vt(h, {
         initialState: a
       });
-      const e = O.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, i = r.getState().initialStateGlobal[h];
-      if (!(i && !B(i, a) || !i) && !s)
+      const e = _.current, s = e?.serverState?.id !== void 0 && e?.serverState?.status === "success" && e?.serverState?.data, c = r.getState().initialStateGlobal[h];
+      if (!(c && !H(c, a) || !c) && !s)
         return;
-      let g = null;
-      const A = Z(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
-      A && j && (g = gt(`${j}-${h}-${A}`));
-      let y = a, T = !1;
-      const P = s ? Date.now() : 0, C = g?.lastUpdated || 0, N = g?.lastSyncedWithServer || 0;
-      s && P > C ? (y = e.serverState.data, T = !0) : g && C > N && (y = g.state, e?.localStorage?.onChange && e?.localStorage?.onChange(y)), r.getState().initializeShadowState(h, a), Ct(
+      let u = null;
+      const w = Q(e?.localStorage?.key) ? e?.localStorage?.key(a) : e?.localStorage?.key;
+      w && U && (u = vt(`${U}-${h}-${w}`));
+      let E = a, T = !1;
+      const b = s ? Date.now() : 0, N = u?.lastUpdated || 0, P = u?.lastSyncedWithServer || 0;
+      s && b > N ? (E = e.serverState.data, T = !0) : u && N > P && (E = u.state, e?.localStorage?.onChange && e?.localStorage?.onChange(E)), r.getState().initializeShadowState(h, a), Ut(
         h,
         a,
-        y,
-        rt,
-        Q.current,
-        j
-      ), T && A && j && Tt(y, h, e, j, Date.now()), ft(h), (Array.isArray(w) ? w : [w || "component"]).includes("none") || U({});
+        E,
+        at,
+        K.current,
+        U
+      ), T && w && U && _t(E, h, e, U, Date.now()), yt(h), (Array.isArray(p) ? p : [p || "component"]).includes("none") || O({});
     }
   }, [
     a,
-    f?.status,
-    f?.data,
+    S?.status,
+    S?.data,
     ...n || []
-  ]), lt(() => {
-    G && Et(h, {
+  ]), St(() => {
+    G && Vt(h, {
       serverSync: m,
-      formElements: I,
+      formElements: y,
       initialState: a,
-      localStorage: u,
-      middleware: O.current?.middleware
+      localStorage: g,
+      middleware: _.current?.middleware
     });
-    const e = `${h}////${Q.current}`, o = r.getState().stateComponents.get(h) || {
+    const e = `${h}////${K.current}`, o = r.getState().stateComponents.get(h) || {
       components: /* @__PURE__ */ new Map()
     };
     return o.components.set(e, {
-      forceUpdate: () => U({}),
+      forceUpdate: () => O({}),
       paths: /* @__PURE__ */ new Set(),
       deps: [],
-      depsFunction: b || void 0,
-      reactiveType: w ?? ["component", "deps"]
-    }), r.getState().stateComponents.set(h, o), U({}), () => {
+      depsFunction: C || void 0,
+      reactiveType: p ?? ["component", "deps"]
+    }), r.getState().stateComponents.set(h, o), O({}), () => {
       o && (o.components.delete(e), o.components.size === 0 && r.getState().stateComponents.delete(h));
     };
   }, []);
-  const rt = (e, o, s, i) => {
+  const at = (e, o, s, c) => {
     if (Array.isArray(o)) {
-      const g = `${h}-${o.join(".")}`;
-      it.current.add(g);
+      const u = `${h}-${o.join(".")}`;
+      lt.current.add(u);
     }
-    const S = r.getState();
-    et(h, (g) => {
-      const A = Z(e) ? e(g) : e, y = `${h}-${o.join(".")}`;
-      if (y) {
-        let V = !1, k = S.signalDomElements.get(y);
-        if ((!k || k.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
-          const M = o.slice(0, -1), _ = z(A, M);
-          if (Array.isArray(_)) {
-            V = !0;
+    const f = r.getState();
+    nt(h, (u) => {
+      const w = Q(e) ? e(u) : e, E = `${h}-${o.join(".")}`;
+      if (E) {
+        let x = !1, A = f.signalDomElements.get(E);
+        if ((!A || A.size === 0) && (s.updateType === "insert" || s.updateType === "cut")) {
+          const M = o.slice(0, -1), V = q(w, M);
+          if (Array.isArray(V)) {
+            x = !0;
             const $ = `${h}-${M.join(".")}`;
-            k = S.signalDomElements.get($);
+            A = f.signalDomElements.get($);
           }
         }
-        if (k) {
-          const M = V ? z(A, o.slice(0, -1)) : z(A, o);
-          k.forEach(({ parentId: _, position: $, effect: L }) => {
+        if (A) {
+          const M = x ? q(w, o.slice(0, -1)) : q(w, o);
+          A.forEach(({ parentId: V, position: $, effect: j }) => {
             const R = document.querySelector(
-              `[data-parent-id="${_}"]`
+              `[data-parent-id="${V}"]`
             );
             if (R) {
-              const H = Array.from(R.childNodes);
-              if (H[$]) {
-                const E = L ? new Function("state", `return (${L})(state)`)(M) : M;
-                H[$].textContent = String(E);
+              const W = Array.from(R.childNodes);
+              if (W[$]) {
+                const k = j ? new Function("state", `return (${j})(state)`)(M) : M;
+                W[$].textContent = String(k);
               }
             }
           });
         }
       }
-      console.log("shadowState", S.shadowStateStore), s.updateType === "update" && (i || O.current?.validation?.key) && o && J(
-        (i || O.current?.validation?.key) + "." + o.join(".")
+      console.log("shadowState", f.shadowStateStore), s.updateType === "update" && (c || _.current?.validation?.key) && o && X(
+        (c || _.current?.validation?.key) + "." + o.join(".")
       );
       const T = o.slice(0, o.length - 1);
-      s.updateType === "cut" && O.current?.validation?.key && J(
-        O.current?.validation?.key + "." + T.join(".")
-      ), s.updateType === "insert" && O.current?.validation?.key && Lt(
-        O.current?.validation?.key + "." + T.join(".")
-      ).filter(([k, M]) => {
-        let _ = k?.split(".").length;
-        if (k == T.join(".") && _ == T.length - 1) {
-          let $ = k + "." + T;
-          J(k), Ft($, M);
+      s.updateType === "cut" && _.current?.validation?.key && X(
+        _.current?.validation?.key + "." + T.join(".")
+      ), s.updateType === "insert" && _.current?.validation?.key && Jt(
+        _.current?.validation?.key + "." + T.join(".")
+      ).filter(([A, M]) => {
+        let V = A?.split(".").length;
+        if (A == T.join(".") && V == T.length - 1) {
+          let $ = A + "." + T;
+          X(A), Zt($, M);
         }
       });
-      const P = S.stateComponents.get(h);
-      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", P), P) {
-        const V = vt(g, A), k = new Set(V), M = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
+      const b = f.stateComponents.get(h);
+      if (console.log("stateEntry >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>", b), b) {
+        const x = At(u, w), A = new Set(x), M = s.updateType === "update" ? o.join(".") : o.slice(0, -1).join(".") || "";
         for (const [
-          _,
+          V,
           $
-        ] of P.components.entries()) {
-          let L = !1;
+        ] of b.components.entries()) {
+          let j = !1;
           const R = Array.isArray($.reactiveType) ? $.reactiveType : [$.reactiveType || "component"];
           if (console.log("component", $), !R.includes("none")) {
             if (R.includes("all")) {
               $.forceUpdate();
               continue;
             }
-            if (R.includes("component") && (($.paths.has(M) || $.paths.has("")) && (L = !0), !L))
-              for (const H of k) {
-                let E = H;
+            if (R.includes("component") && (($.paths.has(M) || $.paths.has("")) && (j = !0), !j))
+              for (const W of A) {
+                let k = W;
                 for (; ; ) {
-                  if ($.paths.has(E)) {
-                    L = !0;
+                  if ($.paths.has(k)) {
+                    j = !0;
                     break;
                   }
-                  const x = E.lastIndexOf(".");
-                  if (x !== -1) {
-                    const W = E.substring(
+                  const D = k.lastIndexOf(".");
+                  if (D !== -1) {
+                    const B = k.substring(
                       0,
-                      x
+                      D
                     );
                     if (!isNaN(
-                      Number(E.substring(x + 1))
-                    ) && $.paths.has(W)) {
-                      L = !0;
+                      Number(k.substring(D + 1))
+                    ) && $.paths.has(B)) {
+                      j = !0;
                       break;
                     }
-                    E = W;
+                    k = B;
                   } else
-                    E = "";
-                  if (E === "")
+                    k = "";
+                  if (k === "")
                     break;
                 }
-                if (L) break;
+                if (j) break;
               }
-            if (!L && R.includes("deps") && $.depsFunction) {
-              const H = $.depsFunction(A);
-              let E = !1;
-              typeof H == "boolean" ? H && (E = !0) : B($.deps, H) || ($.deps = H, E = !0), E && (L = !0);
+            if (!j && R.includes("deps") && $.depsFunction) {
+              const W = $.depsFunction(w);
+              let k = !1;
+              typeof W == "boolean" ? W && (k = !0) : H($.deps, W) || ($.deps = W, k = !0), k && (j = !0);
             }
-            L && $.forceUpdate();
+            j && $.forceUpdate();
           }
         }
       }
-      const C = Date.now();
-      o = o.map((V, k) => {
-        const M = o.slice(0, -1), _ = z(A, M);
-        return k === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (_.length - 1).toString() : V;
+      const N = Date.now();
+      o = o.map((x, A) => {
+        const M = o.slice(0, -1), V = q(w, M);
+        return A === o.length - 1 && ["insert", "cut"].includes(s.updateType) ? (V.length - 1).toString() : x;
       });
-      const { oldValue: N, newValue: D } = Ht(
+      const { oldValue: P, newValue: F } = Kt(
         s.updateType,
-        g,
-        A,
+        u,
+        w,
         o
-      ), q = {
-        timeStamp: C,
+      ), J = {
+        timeStamp: N,
         stateKey: h,
         path: o,
         updateType: s.updateType,
         status: "new",
-        oldValue: N,
-        newValue: D
+        oldValue: P,
+        newValue: F
       };
       switch (s.updateType) {
         case "update":
-          S.updateShadowAtPath(h, o, A);
+          f.updateShadowAtPath(h, o, w);
           break;
         case "insert":
-          const V = o.slice(0, -1);
-          S.insertShadowArrayElement(h, V, D);
+          const x = o.slice(0, -1);
+          f.insertShadowArrayElement(h, x, F);
           break;
         case "cut":
-          const k = o.slice(0, -1), M = parseInt(o[o.length - 1]);
-          S.removeShadowArrayElement(h, k, M);
+          const A = o.slice(0, -1), M = parseInt(o[o.length - 1]);
+          f.removeShadowArrayElement(h, A, M);
           break;
       }
-      if (Dt(h, (V) => {
-        const M = [...V ?? [], q].reduce((_, $) => {
-          const L = `${$.stateKey}:${JSON.stringify($.path)}`, R = _.get(L);
-          return R ? (R.timeStamp = Math.max(R.timeStamp, $.timeStamp), R.newValue = $.newValue, R.oldValue = R.oldValue ?? $.oldValue, R.updateType = $.updateType) : _.set(L, { ...$ }), _;
+      if (Yt(h, (x) => {
+        const M = [...x ?? [], J].reduce((V, $) => {
+          const j = `${$.stateKey}:${JSON.stringify($.path)}`, R = V.get(j);
+          return R ? (R.timeStamp = Math.max(R.timeStamp, $.timeStamp), R.newValue = $.newValue, R.oldValue = R.oldValue ?? $.oldValue, R.updateType = $.updateType) : V.set(j, { ...$ }), V;
         }, /* @__PURE__ */ new Map());
         return Array.from(M.values());
-      }), Tt(
-        A,
+      }), _t(
+        w,
         h,
-        O.current,
-        j
-      ), O.current?.middleware && O.current.middleware({
+        _.current,
+        U
+      ), _.current?.middleware && _.current.middleware({
         updateLog: l,
-        update: q
-      }), O.current?.serverSync) {
-        const V = S.serverState[h], k = O.current?.serverSync;
-        Gt(h, {
-          syncKey: typeof k.syncKey == "string" ? k.syncKey : k.syncKey({ state: A }),
-          rollBackState: V,
-          actionTimeStamp: Date.now() + (k.debounce ?? 3e3),
+        update: J
+      }), _.current?.serverSync) {
+        const x = f.serverState[h], A = _.current?.serverSync;
+        Xt(h, {
+          syncKey: typeof A.syncKey == "string" ? A.syncKey : A.syncKey({ state: w }),
+          rollBackState: x,
+          actionTimeStamp: Date.now() + (A.debounce ?? 3e3),
           status: "waiting"
         });
       }
-      return A;
+      return w;
     });
   };
-  r.getState().updaterState[h] || (dt(
+  r.getState().updaterState[h] || (mt(
     h,
-    ut(
+    ht(
       h,
-      rt,
-      Q.current,
-      j
+      at,
+      K.current,
+      U
     )
-  ), r.getState().cogsStateStore[h] || et(h, t), r.getState().initialStateGlobal[h] || yt(h, t));
-  const d = ht(() => ut(
+  ), r.getState().cogsStateStore[h] || nt(h, t), r.getState().initialStateGlobal[h] || kt(h, t));
+  const d = Et(() => ht(
     h,
-    rt,
-    Q.current,
-    j
-  ), [h, j]);
-  return [Nt(h), d];
+    at,
+    K.current,
+    U
+  ), [h, U]);
+  return [Ot(h), d];
 }
-function ut(t, c, m, u) {
-  const I = /* @__PURE__ */ new Map();
-  let b = 0;
-  const w = (v) => {
+function ht(t, i, m, g) {
+  const y = /* @__PURE__ */ new Map();
+  let C = 0;
+  const p = (v) => {
     const n = v.join(".");
-    for (const [f] of I)
-      (f === n || f.startsWith(n + ".")) && I.delete(f);
-    b++;
-  }, p = {
+    for (const [S] of y)
+      (S === n || S.startsWith(n + ".")) && y.delete(S);
+    C++;
+  }, I = {
     removeValidation: (v) => {
-      v?.validationKey && J(v.validationKey);
+      v?.validationKey && X(v.validationKey);
     },
     revertToInitialState: (v) => {
       const n = r.getState().getInitialOptions(t)?.validation;
-      n?.key && J(n?.key), v?.validationKey && J(v.validationKey);
-      const f = r.getState().initialStateGlobal[t];
-      r.getState().clearSelectedIndexesForState(t), I.clear(), b++;
-      const F = a(f, []), U = nt(t), j = Z(U?.localStorage?.key) ? U?.localStorage?.key(f) : U?.localStorage?.key, G = `${u}-${t}-${j}`;
-      G && localStorage.removeItem(G), dt(t, F), et(t, f);
+      n?.key && X(n?.key), v?.validationKey && X(v.validationKey);
+      const S = r.getState().initialStateGlobal[t];
+      r.getState().clearSelectedIndexesForState(t), y.clear(), C++;
+      const L = a(S, []), O = ot(t), U = Q(O?.localStorage?.key) ? O?.localStorage?.key(S) : O?.localStorage?.key, G = `${g}-${t}-${U}`;
+      G && localStorage.removeItem(G), mt(t, L), nt(t, S);
       const h = r.getState().stateComponents.get(t);
       return h && h.components.forEach((l) => {
         l.forceUpdate();
-      }), f;
+      }), S;
     },
     updateInitialState: (v) => {
-      I.clear(), b++;
-      const n = ut(
+      y.clear(), C++;
+      const n = ht(
         t,
-        c,
+        i,
         m,
-        u
-      ), f = r.getState().initialStateGlobal[t], F = nt(t), U = Z(F?.localStorage?.key) ? F?.localStorage?.key(f) : F?.localStorage?.key, j = `${u}-${t}-${U}`;
-      return localStorage.getItem(j) && localStorage.removeItem(j), Vt(() => {
-        yt(t, v), r.getState().initializeShadowState(t, v), dt(t, n), et(t, v);
+        g
+      ), S = r.getState().initialStateGlobal[t], L = ot(t), O = Q(L?.localStorage?.key) ? L?.localStorage?.key(S) : L?.localStorage?.key, U = `${g}-${t}-${O}`;
+      return localStorage.getItem(U) && localStorage.removeItem(U), Ft(() => {
+        kt(t, v), r.getState().initializeShadowState(t, v), mt(t, n), nt(t, v);
         const G = r.getState().stateComponents.get(t);
         G && G.components.forEach((h) => {
           h.forceUpdate();
@@ -480,27 +480,27 @@ function ut(t, c, m, u) {
     _isLoading: r.getState().isLoadingGlobal[t],
     _isServerSynced: () => {
       const v = r.getState().serverState[t];
-      return !!(v && B(v, Nt(t)));
+      return !!(v && H(v, Ot(t)));
     }
   };
-  function a(v, n = [], f) {
-    const F = n.map(String).join(".");
-    I.get(F);
-    const U = function() {
+  function a(v, n = [], S) {
+    const L = n.map(String).join(".");
+    y.get(L);
+    const O = function() {
       return r().getNestedState(t, n);
     };
-    Object.keys(p).forEach((h) => {
-      U[h] = p[h];
+    Object.keys(I).forEach((h) => {
+      O[h] = I[h];
     });
-    const j = {
-      apply(h, l, it) {
+    const U = {
+      apply(h, l, lt) {
         return console.log(
           `PROXY APPLY TRAP HIT: stateKey=${t}, path=${n.join(".")}`
         ), console.trace("Apply trap stack trace"), r().getNestedState(t, n);
       },
       get(h, l) {
-        f?.validIndices && !Array.isArray(v) && (f = { ...f, validIndices: void 0 });
-        const it = /* @__PURE__ */ new Set([
+        S?.validIndices && !Array.isArray(v) && (S = { ...S, validIndices: void 0 });
+        const lt = /* @__PURE__ */ new Set([
           "insert",
           "cut",
           "cutByValue",
@@ -523,24 +523,24 @@ function ut(t, c, m, u) {
           "_stateKey",
           "getComponents"
         ]);
-        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !it.has(l)) {
+        if (l !== "then" && !l.startsWith("$") && l !== "stateMapNoRender" && !lt.has(l)) {
           const d = `${t}////${m}`, e = r.getState().stateComponents.get(t);
           if (e) {
             const o = e.components.get(d);
             if (o && !o.paths.has("")) {
               const s = n.join(".");
-              let i = !0;
-              for (const S of o.paths)
-                if (s.startsWith(S) && (s === S || s[S.length] === ".")) {
-                  i = !1;
+              let c = !0;
+              for (const f of o.paths)
+                if (s.startsWith(f) && (s === f || s[f.length] === ".")) {
+                  c = !1;
                   break;
                 }
-              i && o.paths.add(s);
+              c && o.paths.add(s);
             }
           }
         }
         if (l === "getDifferences")
-          return () => vt(
+          return () => At(
             r.getState().cogsStateStore[t],
             r.getState().initialStateGlobal[t]
           );
@@ -551,37 +551,37 @@ function ut(t, c, m, u) {
               return console.error(`No mutation defined for state key "${t}"`), { success: !1, error: "No mutation defined" };
             const o = r.getState().getNestedState(t, []), s = d?.validation?.key;
             try {
-              const i = await e.action(o);
-              if (i && !i.success && i.errors && s) {
-                r.getState().removeValidationError(s), i.errors.forEach((g) => {
-                  const A = [s, ...g.path].join(".");
-                  r.getState().addValidationError(A, g.message);
+              const c = await e.action(o);
+              if (c && !c.success && c.errors && s) {
+                r.getState().removeValidationError(s), c.errors.forEach((u) => {
+                  const w = [s, ...u.path].join(".");
+                  r.getState().addValidationError(w, u.message);
                 });
-                const S = r.getState().stateComponents.get(t);
-                S && S.components.forEach((g) => {
-                  g.forceUpdate();
+                const f = r.getState().stateComponents.get(t);
+                f && f.components.forEach((u) => {
+                  u.forceUpdate();
                 });
               }
-              return i?.success && e.onSuccess ? e.onSuccess(i.data) : !i?.success && e.onError && e.onError(i.error), i;
-            } catch (i) {
-              return e.onError && e.onError(i), { success: !1, error: i };
+              return c?.success && e.onSuccess ? e.onSuccess(c.data) : !c?.success && e.onError && e.onError(c.error), c;
+            } catch (c) {
+              return e.onError && e.onError(c), { success: !1, error: c };
             }
           };
         if (l === "_status") {
-          const d = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = z(e, n);
-          return B(d, o) ? "fresh" : "stale";
+          const d = r.getState().getNestedState(t, n), e = r.getState().initialStateGlobal[t], o = q(e, n);
+          return H(d, o) ? "fresh" : "stale";
         }
         if (l === "getStatus")
           return function() {
             const d = r().getNestedState(
               t,
               n
-            ), e = r.getState().initialStateGlobal[t], o = z(e, n);
-            return B(d, o) ? "fresh" : "stale";
+            ), e = r.getState().initialStateGlobal[t], o = q(e, n);
+            return H(d, o) ? "fresh" : "stale";
           };
         if (l === "removeStorage")
           return () => {
-            const d = r.getState().initialStateGlobal[t], e = nt(t), o = Z(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${u}-${t}-${o}`;
+            const d = r.getState().initialStateGlobal[t], e = ot(t), o = Q(e?.localStorage?.key) ? e?.localStorage?.key(d) : e?.localStorage?.key, s = `${g}-${t}-${o}`;
             s && localStorage.removeItem(s);
           };
         if (l === "showValidationErrors")
@@ -592,9 +592,9 @@ function ut(t, c, m, u) {
             return r.getState().getValidationErrors(d.key + "." + n.join("."));
           };
         if (Array.isArray(v)) {
-          const d = () => f?.validIndices ? v.map((o, s) => ({
+          const d = () => S?.validIndices ? v.map((o, s) => ({
             item: o,
-            originalIndex: f.validIndices[s]
+            originalIndex: S.validIndices[s]
           })) : r.getState().getNestedState(t, n).map((o, s) => ({
             item: o,
             originalIndex: s
@@ -606,7 +606,7 @@ function ut(t, c, m, u) {
                 return a(
                   v[e],
                   [...n, e.toString()],
-                  f
+                  S
                 );
             };
           if (l === "clearSelected")
@@ -620,109 +620,115 @@ function ut(t, c, m, u) {
               const {
                 itemHeight: o = 50,
                 overscan: s = 6,
-                stickToBottom: i = !1,
-                dependencies: S = []
-              } = e, [g, A] = Y(0), y = X(null), [T, P] = Y({
+                stickToBottom: c = !1,
+                dependencies: f = []
+              } = e, u = z(null), [w, E] = et({
                 startIndex: 0,
                 endIndex: 10
-              }), C = X(i), N = X(null), [D, q] = Y(0);
-              tt(() => r.getState().subscribeToShadowState(t, () => {
-                q((x) => x + 1);
+              }), T = z(c), b = z(!1), N = z(f), P = z(0), [F, J] = et(0);
+              it(() => r.getState().subscribeToShadowState(t, () => {
+                J((D) => D + 1);
               }), [t]);
-              const V = r().getNestedState(
+              const x = r().getNestedState(
                 t,
                 n
-              ), k = V.length, { totalHeight: M, positions: _ } = ht(() => {
-                const E = r.getState().getShadowMetadata(t, n) || [];
-                let x = 0;
-                const W = [];
-                for (let K = 0; K < k; K++) {
-                  W[K] = x;
-                  const ot = E[K]?.virtualizer?.itemHeight;
-                  x += ot || o;
+              ), A = x.length, { totalHeight: M, positions: V } = Et(() => {
+                const k = r.getState().getShadowMetadata(t, n) || [];
+                let D = 0;
+                const B = [];
+                for (let Z = 0; Z < A; Z++) {
+                  B[Z] = D;
+                  const tt = k[Z]?.virtualizer?.itemHeight;
+                  D += tt || o;
                 }
-                return { totalHeight: x, positions: W };
+                return { totalHeight: D, positions: B };
               }, [
-                k,
+                A,
                 t,
                 n.join("."),
                 o,
-                D
-              ]), $ = ht(() => {
-                const E = Math.max(0, T.startIndex), x = Math.min(k, T.endIndex), W = Array.from(
-                  { length: x - E },
-                  (ot, bt) => E + bt
-                ), K = W.map((ot) => V[ot]);
-                return a(K, n, {
-                  ...f,
-                  validIndices: W
+                F
+              ]), $ = Et(() => {
+                const k = Math.max(0, w.startIndex), D = Math.min(A, w.endIndex), B = Array.from(
+                  { length: D - k },
+                  (tt, Y) => k + Y
+                ), Z = B.map((tt) => x[tt]);
+                return a(Z, n, {
+                  ...S,
+                  validIndices: B
                 });
-              }, [T.startIndex, T.endIndex, V, k]);
-              lt(() => {
-                const E = y.current;
-                if (!E || !i || !C.current)
-                  return;
-                N.current && clearInterval(N.current), console.log("ALGORITHM: Starting..."), P({
-                  startIndex: Math.max(0, k - 10 - s),
-                  endIndex: k
-                }), console.log(
-                  "ALGORITHM: Starting LOOP to wait for measurement."
-                );
-                let x = 0;
-                return N.current = setInterval(() => {
-                  x++, console.log(`LOOP ${x}: Checking last item...`);
-                  const W = k - 1;
-                  if (W < 0) {
-                    clearInterval(N.current);
+              }, [w.startIndex, w.endIndex, x, A]);
+              St(() => {
+                const k = u.current;
+                if (!k) return;
+                const D = !H(
+                  f,
+                  N.current
+                ), B = A > P.current;
+                D && (console.log("DEPENDENCY CHANGE: Resetting scroll lock."), T.current = c);
+                const Z = T.current && (B || D), tt = () => {
+                  const { scrollTop: rt, clientHeight: Ct } = k;
+                  let dt = 0, ut = A - 1;
+                  for (; dt <= ut; ) {
+                    const It = Math.floor((dt + ut) / 2);
+                    V[It] < rt ? dt = It + 1 : ut = It - 1;
+                  }
+                  const Nt = Math.max(0, ut - s);
+                  let gt = Nt;
+                  const jt = rt + Ct;
+                  for (; gt < A && V[gt] < jt; )
+                    gt++;
+                  E({
+                    startIndex: Nt,
+                    endIndex: Math.min(A, gt + s)
+                  });
+                };
+                let Y;
+                Z ? (console.log("ALGORITHM: Starting..."), E({
+                  startIndex: Math.max(0, A - 10 - s),
+                  endIndex: A
+                }), Y = setInterval(() => {
+                  const rt = A - 1;
+                  if (rt < 0) {
+                    clearInterval(Y);
                     return;
                   }
-                  ((r.getState().getShadowMetadata(t, n) || [])[W]?.virtualizer?.itemHeight || 0) > 0 ? (console.log(
-                    "%cSUCCESS: Last item is measured. Scrolling.",
-                    "color: green; font-weight: bold;"
-                  ), clearInterval(N.current), N.current = null, E.scrollTo({
-                    top: E.scrollHeight,
+                  ((r.getState().getShadowMetadata(t, n) || [])[rt]?.virtualizer?.itemHeight || 0) > 0 && (clearInterval(Y), console.log("%cSUCCESS: Scrolling now.", "color: green;"), b.current = !0, k.scrollTo({
+                    top: k.scrollHeight,
                     behavior: "smooth"
-                  })) : (console.log("...WAITING. Height is not ready."), x > 30 && (console.error("LOOP TIMEOUT. Stopping."), clearInterval(N.current), N.current = null));
-                }, 100), () => {
-                  N.current && clearInterval(N.current);
-                };
-              }, [k, ...S]), tt(() => {
-                const E = y.current;
-                if (!E) return;
-                console.log(
-                  "DEPENDENCY CHANGE: Resetting scroll lock to:",
-                  i
-                ), C.current = i;
-                const x = () => {
-                  E.scrollHeight - E.scrollTop - E.clientHeight < 1 || C.current && (console.log("USER SCROLL: Lock broken."), C.current = !1, N.current && (clearInterval(N.current), N.current = null, console.log("...Auto-scroll loop terminated by user.")));
+                  }), setTimeout(() => {
+                    b.current = !1;
+                  }, 1e3));
+                }, 100)) : tt();
+                const $t = () => {
+                  if (b.current) return;
+                  !(k.scrollHeight - k.scrollTop - k.clientHeight < 1) && T.current && (console.log("USER SCROLL: Lock broken."), T.current = !1, Y && clearInterval(Y)), tt();
                 };
-                return E.addEventListener("scroll", x, {
+                return k.addEventListener("scroll", $t, {
                   passive: !0
-                }), () => E.removeEventListener("scroll", x);
-              }, [k, _]), tt(() => {
-                console.log(
-                  "DEPENDENCY CHANGE: Resetting scroll lock and scrolling to bottom."
-                ), y.current && (C.current = i, y.current.scrollTop = 0, P({ startIndex: 0, endIndex: 10 }));
-              }, S);
-              const L = pt(
-                (E = "smooth") => {
-                  y.current && (C.current = !0, console.log("USER ACTION: Scroll lock ENABLED."), y.current.scrollTo({
-                    top: y.current.scrollHeight,
-                    behavior: E
+                }), N.current = f, P.current = A, () => {
+                  k.removeEventListener("scroll", $t), Y && clearInterval(Y);
+                };
+              }, [A, V, ...f]);
+              const j = bt(
+                (k = "smooth") => {
+                  u.current && (T.current = !0, console.log("USER ACTION: Scroll lock ENABLED."), u.current.scrollTo({
+                    top: u.current.scrollHeight,
+                    behavior: k
                   }));
                 },
                 []
-              ), R = pt(
-                (E, x = "smooth") => {
-                  y.current && _[E] !== void 0 && (C.current = !1, console.log("USER ACTION: Scroll lock DISABLED."), y.current.scrollTo({
-                    top: _[E],
-                    behavior: x
+              ), R = bt(
+                (k, D = "smooth") => {
+                  u.current && V[k] !== void 0 && (T.current = !1, console.log("USER ACTION: Scroll lock DISABLED."), u.current.scrollTo({
+                    top: V[k],
+                    behavior: D
                   }));
                 },
-                [_]
-              ), H = {
+                [V]
+              ), W = {
                 outer: {
-                  ref: y,
+                  ref: u,
                   style: { overflowY: "auto", height: "100%" }
                 },
                 inner: {
@@ -733,64 +739,64 @@ function ut(t, c, m, u) {
                 },
                 list: {
                   style: {
-                    transform: `translateY(${_[T.startIndex] || 0}px)`
+                    transform: `translateY(${V[w.startIndex] || 0}px)`
                   }
                 }
               };
               return {
                 virtualState: $,
-                virtualizerProps: H,
-                scrollToBottom: L,
+                virtualizerProps: W,
+                scrollToBottom: j,
                 scrollToIndex: R
               };
             };
           if (l === "stateSort")
             return (e) => {
               const s = [...d()].sort(
-                (g, A) => e(g.item, A.item)
-              ), i = s.map(({ item: g }) => g), S = {
-                ...f,
+                (u, w) => e(u.item, w.item)
+              ), c = s.map(({ item: u }) => u), f = {
+                ...S,
                 validIndices: s.map(
-                  ({ originalIndex: g }) => g
+                  ({ originalIndex: u }) => u
                 )
               };
-              return a(i, n, S);
+              return a(c, n, f);
             };
           if (l === "stateFilter")
             return (e) => {
               const s = d().filter(
-                ({ item: g }, A) => e(g, A)
-              ), i = s.map(({ item: g }) => g), S = {
-                ...f,
+                ({ item: u }, w) => e(u, w)
+              ), c = s.map(({ item: u }) => u), f = {
+                ...S,
                 validIndices: s.map(
-                  ({ originalIndex: g }) => g
+                  ({ originalIndex: u }) => u
                 )
               };
-              return a(i, n, S);
+              return a(c, n, f);
             };
           if (l === "stateMap")
             return (e) => {
               const o = r.getState().getNestedState(t, n);
-              return Array.isArray(o) ? (f?.validIndices || Array.from({ length: o.length }, (i, S) => S)).map((i, S) => {
-                const g = o[i], A = [...n, i.toString()], y = a(g, A, f);
-                return e(g, y, {
+              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, f) => f)).map((c, f) => {
+                const u = o[c], w = [...n, c.toString()], E = a(u, w, S);
+                return e(u, E, {
                   register: () => {
-                    const [, P] = Y({}), C = `${m}-${n.join(".")}-${i}`;
-                    lt(() => {
-                      const N = `${t}////${C}`, D = r.getState().stateComponents.get(t) || {
+                    const [, b] = et({}), N = `${m}-${n.join(".")}-${c}`;
+                    St(() => {
+                      const P = `${t}////${N}`, F = r.getState().stateComponents.get(t) || {
                         components: /* @__PURE__ */ new Map()
                       };
-                      return D.components.set(N, {
-                        forceUpdate: () => P({}),
-                        paths: /* @__PURE__ */ new Set([A.join(".")])
-                      }), r.getState().stateComponents.set(t, D), () => {
-                        const q = r.getState().stateComponents.get(t);
-                        q && q.components.delete(N);
+                      return F.components.set(P, {
+                        forceUpdate: () => b({}),
+                        paths: /* @__PURE__ */ new Set([w.join(".")])
+                      }), r.getState().stateComponents.set(t, F), () => {
+                        const J = r.getState().stateComponents.get(t);
+                        J && J.components.delete(P);
                       };
-                    }, [t, C]);
+                    }, [t, N]);
                   },
-                  index: S,
-                  originalIndex: i
+                  index: f,
+                  originalIndex: c
                 });
               }) : (console.warn(
                 `stateMap called on a non-array value at path: ${n.join(".")}. The current value is:`,
@@ -798,20 +804,20 @@ function ut(t, c, m, u) {
               ), null);
             };
           if (l === "stateMapNoRender")
-            return (e) => v.map((s, i) => {
-              let S;
-              f?.validIndices && f.validIndices[i] !== void 0 ? S = f.validIndices[i] : S = i;
-              const g = [...n, S.toString()], A = a(s, g, f);
+            return (e) => v.map((s, c) => {
+              let f;
+              S?.validIndices && S.validIndices[c] !== void 0 ? f = S.validIndices[c] : f = c;
+              const u = [...n, f.toString()], w = a(s, u, S);
               return e(
                 s,
-                A,
-                i,
+                w,
+                c,
                 v,
-                a(v, n, f)
+                a(v, n, S)
               );
             });
           if (l === "$stateMap")
-            return (e) => st(zt, {
+            return (e) => ct(ee, {
               proxy: {
                 _stateKey: t,
                 _path: n,
@@ -823,19 +829,19 @@ function ut(t, c, m, u) {
           if (l === "stateList")
             return (e) => {
               const o = r.getState().getNestedState(t, n);
-              return Array.isArray(o) ? (f?.validIndices || Array.from({ length: o.length }, (i, S) => S)).map((i, S) => {
-                const g = o[i], A = [...n, i.toString()], y = a(g, A, f), T = `${m}-${n.join(".")}-${i}`;
-                return st(Jt, {
-                  key: i,
+              return Array.isArray(o) ? (S?.validIndices || Array.from({ length: o.length }, (c, f) => f)).map((c, f) => {
+                const u = o[c], w = [...n, c.toString()], E = a(u, w, S), T = `${m}-${n.join(".")}-${c}`;
+                return ct(re, {
+                  key: c,
                   stateKey: t,
                   itemComponentId: T,
-                  itemPath: A,
+                  itemPath: w,
                   children: e(
-                    g,
-                    y,
-                    S,
+                    u,
+                    E,
+                    f,
                     o,
-                    a(o, n, f)
+                    a(o, n, S)
                   )
                 });
               }) : (console.warn(
@@ -845,14 +851,14 @@ function ut(t, c, m, u) {
           if (l === "stateFlattenOn")
             return (e) => {
               const o = v;
-              I.clear(), b++;
+              y.clear(), C++;
               const s = o.flatMap(
-                (i) => i[e] ?? []
+                (c) => c[e] ?? []
               );
               return a(
                 s,
                 [...n, "[*]", e],
-                f
+                S
               );
             };
           if (l === "index")
@@ -864,40 +870,40 @@ function ut(t, c, m, u) {
             return () => {
               const e = r.getState().getNestedState(t, n);
               if (e.length === 0) return;
-              const o = e.length - 1, s = e[o], i = [...n, o.toString()];
-              return a(s, i);
+              const o = e.length - 1, s = e[o], c = [...n, o.toString()];
+              return a(s, c);
             };
           if (l === "insert")
-            return (e) => (w(n), St(c, e, n, t), a(
+            return (e) => (p(n), pt(i, e, n, t), a(
               r.getState().getNestedState(t, n),
               n
             ));
           if (l === "uniqueInsert")
             return (e, o, s) => {
-              const i = r.getState().getNestedState(t, n), S = Z(e) ? e(i) : e;
-              let g = null;
-              if (!i.some((y) => {
+              const c = r.getState().getNestedState(t, n), f = Q(e) ? e(c) : e;
+              let u = null;
+              if (!c.some((E) => {
                 if (o) {
-                  const P = o.every(
-                    (C) => B(y[C], S[C])
+                  const b = o.every(
+                    (N) => H(E[N], f[N])
                   );
-                  return P && (g = y), P;
+                  return b && (u = E), b;
                 }
-                const T = B(y, S);
-                return T && (g = y), T;
+                const T = H(E, f);
+                return T && (u = E), T;
               }))
-                w(n), St(c, S, n, t);
-              else if (s && g) {
-                const y = s(g), T = i.map(
-                  (P) => B(P, g) ? y : P
+                p(n), pt(i, f, n, t);
+              else if (s && u) {
+                const E = s(u), T = c.map(
+                  (b) => H(b, u) ? E : b
                 );
-                w(n), at(c, T, n);
+                p(n), st(i, T, n);
               }
             };
           if (l === "cut")
             return (e, o) => {
               if (!o?.waitForSync)
-                return w(n), ct(c, n, t, e), a(
+                return p(n), ft(i, n, t, e), a(
                   r.getState().getNestedState(t, n),
                   n
                 );
@@ -905,59 +911,59 @@ function ut(t, c, m, u) {
           if (l === "cutByValue")
             return (e) => {
               for (let o = 0; o < v.length; o++)
-                v[o] === e && ct(c, n, t, o);
+                v[o] === e && ft(i, n, t, o);
             };
           if (l === "toggleByValue")
             return (e) => {
               const o = v.findIndex((s) => s === e);
-              o > -1 ? ct(c, n, t, o) : St(c, e, n, t);
+              o > -1 ? ft(i, n, t, o) : pt(i, e, n, t);
             };
           if (l === "stateFind")
             return (e) => {
               const s = d().find(
-                ({ item: S }, g) => e(S, g)
+                ({ item: f }, u) => e(f, u)
               );
               if (!s) return;
-              const i = [...n, s.originalIndex.toString()];
-              return a(s.item, i, f);
+              const c = [...n, s.originalIndex.toString()];
+              return a(s.item, c, S);
             };
           if (l === "findWith")
             return (e, o) => {
-              const i = d().find(
-                ({ item: g }) => g[e] === o
+              const c = d().find(
+                ({ item: u }) => u[e] === o
               );
-              if (!i) return;
-              const S = [...n, i.originalIndex.toString()];
-              return a(i.item, S, f);
+              if (!c) return;
+              const f = [...n, c.originalIndex.toString()];
+              return a(c.item, f, S);
             };
         }
-        const Q = n[n.length - 1];
-        if (!isNaN(Number(Q))) {
+        const K = n[n.length - 1];
+        if (!isNaN(Number(K))) {
           const d = n.slice(0, -1), e = r.getState().getNestedState(t, d);
           if (Array.isArray(e) && l === "cut")
-            return () => ct(
-              c,
+            return () => ft(
+              i,
               d,
               t,
-              Number(Q)
+              Number(K)
             );
         }
         if (l === "get")
           return () => {
-            if (f?.validIndices && Array.isArray(v)) {
+            if (S?.validIndices && Array.isArray(v)) {
               const d = r.getState().getNestedState(t, n);
-              return f.validIndices.map((e) => d[e]);
+              return S.validIndices.map((e) => d[e]);
             }
             return r.getState().getNestedState(t, n);
           };
         if (l === "$derive")
-          return (d) => kt({
+          return (d) => Mt({
             _stateKey: t,
             _path: n,
             _effect: d.toString()
           });
         if (l === "$get")
-          return () => kt({
+          return () => Mt({
             _stateKey: t,
             _path: n
           });
@@ -966,7 +972,7 @@ function ut(t, c, m, u) {
           return r.getState().getSyncInfo(d);
         }
         if (l == "getLocalStorage")
-          return (d) => gt(u + "-" + t + "-" + d);
+          return (d) => vt(g + "-" + t + "-" + d);
         if (l === "_selected") {
           const d = n.slice(0, -1), e = d.join("."), o = r.getState().getNestedState(t, d);
           return Array.isArray(o) ? Number(n[n.length - 1]) === r.getState().getSelectedIndex(t, e) : void 0;
@@ -975,8 +981,8 @@ function ut(t, c, m, u) {
           return (d) => {
             const e = n.slice(0, -1), o = Number(n[n.length - 1]), s = e.join(".");
             d ? r.getState().setSelectedIndex(t, s, o) : r.getState().setSelectedIndex(t, s, void 0);
-            const i = r.getState().getNestedState(t, [...e]);
-            at(c, i, e), w(e);
+            const c = r.getState().getNestedState(t, [...e]);
+            st(i, c, e), p(e);
           };
         if (l === "toggleSelected")
           return () => {
@@ -986,74 +992,74 @@ function ut(t, c, m, u) {
               o,
               s === e ? void 0 : e
             );
-            const i = r.getState().getNestedState(t, [...d]);
-            at(c, i, d), w(d);
+            const c = r.getState().getNestedState(t, [...d]);
+            st(i, c, d), p(d);
           };
         if (n.length == 0) {
           if (l === "applyJsonPatch")
             return (d) => {
-              const e = r.getState().cogsStateStore[t], s = Ut(e, d).newDocument;
-              Ct(
+              const e = r.getState().cogsStateStore[t], s = zt(e, d).newDocument;
+              Ut(
                 t,
                 r.getState().initialStateGlobal[t],
                 s,
-                c,
+                i,
                 m,
-                u
+                g
               );
-              const i = r.getState().stateComponents.get(t);
-              if (i) {
-                const S = vt(e, s), g = new Set(S);
+              const c = r.getState().stateComponents.get(t);
+              if (c) {
+                const f = At(e, s), u = new Set(f);
                 for (const [
-                  A,
-                  y
-                ] of i.components.entries()) {
+                  w,
+                  E
+                ] of c.components.entries()) {
                   let T = !1;
-                  const P = Array.isArray(y.reactiveType) ? y.reactiveType : [y.reactiveType || "component"];
-                  if (!P.includes("none")) {
-                    if (P.includes("all")) {
-                      y.forceUpdate();
+                  const b = Array.isArray(E.reactiveType) ? E.reactiveType : [E.reactiveType || "component"];
+                  if (!b.includes("none")) {
+                    if (b.includes("all")) {
+                      E.forceUpdate();
                       continue;
                     }
-                    if (P.includes("component") && (y.paths.has("") && (T = !0), !T))
-                      for (const C of g) {
-                        if (y.paths.has(C)) {
+                    if (b.includes("component") && (E.paths.has("") && (T = !0), !T))
+                      for (const N of u) {
+                        if (E.paths.has(N)) {
                           T = !0;
                           break;
                         }
-                        let N = C.lastIndexOf(".");
-                        for (; N !== -1; ) {
-                          const D = C.substring(0, N);
-                          if (y.paths.has(D)) {
+                        let P = N.lastIndexOf(".");
+                        for (; P !== -1; ) {
+                          const F = N.substring(0, P);
+                          if (E.paths.has(F)) {
                             T = !0;
                             break;
                           }
-                          const q = C.substring(
-                            N + 1
+                          const J = N.substring(
+                            P + 1
                           );
-                          if (!isNaN(Number(q))) {
-                            const V = D.lastIndexOf(".");
-                            if (V !== -1) {
-                              const k = D.substring(
+                          if (!isNaN(Number(J))) {
+                            const x = F.lastIndexOf(".");
+                            if (x !== -1) {
+                              const A = F.substring(
                                 0,
-                                V
+                                x
                               );
-                              if (y.paths.has(k)) {
+                              if (E.paths.has(A)) {
                                 T = !0;
                                 break;
                               }
                             }
                           }
-                          N = D.lastIndexOf(".");
+                          P = F.lastIndexOf(".");
                         }
                         if (T) break;
                       }
-                    if (!T && P.includes("deps") && y.depsFunction) {
-                      const C = y.depsFunction(s);
-                      let N = !1;
-                      typeof C == "boolean" ? C && (N = !0) : B(y.deps, C) || (y.deps = C, N = !0), N && (T = !0);
+                    if (!T && b.includes("deps") && E.depsFunction) {
+                      const N = E.depsFunction(s);
+                      let P = !1;
+                      typeof N == "boolean" ? N && (P = !0) : H(E.deps, N) || (E.deps = N, P = !0), P && (T = !0);
                     }
-                    T && y.forceUpdate();
+                    T && E.forceUpdate();
                   }
                 }
               }
@@ -1065,18 +1071,18 @@ function ut(t, c, m, u) {
                 throw new Error("Zod schema not found");
               if (!d?.key)
                 throw new Error("Validation key not found");
-              J(d.key);
+              X(d.key);
               const o = r.getState().cogsStateStore[t];
               try {
                 const s = r.getState().getValidationErrors(d.key);
-                s && s.length > 0 && s.forEach(([S]) => {
-                  S && S.startsWith(d.key) && J(S);
+                s && s.length > 0 && s.forEach(([f]) => {
+                  f && f.startsWith(d.key) && X(f);
                 });
-                const i = d.zodSchema.safeParse(o);
-                return i.success ? !0 : (i.error.errors.forEach((g) => {
-                  const A = g.path, y = g.message, T = [d.key, ...A].join(".");
-                  e(T, y);
-                }), ft(t), !1);
+                const c = d.zodSchema.safeParse(o);
+                return c.success ? !0 : (c.error.errors.forEach((u) => {
+                  const w = u.path, E = u.message, T = [d.key, ...w].join(".");
+                  e(T, E);
+                }), yt(t), !1);
               } catch (s) {
                 return console.error("Zod schema validation failed", s), !1;
               }
@@ -1085,7 +1091,7 @@ function ut(t, c, m, u) {
           if (l === "getComponents")
             return () => r().stateComponents.get(t);
           if (l === "getAllFormRefs")
-            return () => wt.getState().getFormRefsByStateKey(t);
+            return () => xt.getState().getFormRefsByStateKey(t);
           if (l === "_initialState")
             return r.getState().initialStateGlobal[t];
           if (l === "_serverState")
@@ -1093,170 +1099,170 @@ function ut(t, c, m, u) {
           if (l === "_isLoading")
             return r.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 () => wt.getState().getFormRef(t + "." + n.join("."));
+          return () => xt.getState().getFormRef(t + "." + n.join("."));
         if (l === "validationWrapper")
           return ({
             children: d,
             hideMessage: e
-          }) => /* @__PURE__ */ mt(
-            Ot,
+          }) => /* @__PURE__ */ wt(
+            Wt,
             {
               formOpts: e ? { validation: { message: "" } } : void 0,
               path: n,
               validationKey: r.getState().getInitialOptions(t)?.validation?.key || "",
               stateKey: t,
-              validIndices: f?.validIndices,
+              validIndices: S?.validIndices,
               children: d
             }
           );
         if (l === "_stateKey") return t;
         if (l === "_path") return n;
-        if (l === "_isServerSynced") return p._isServerSynced;
+        if (l === "_isServerSynced") return I._isServerSynced;
         if (l === "update")
           return (d, e) => {
             if (e?.debounce)
-              _t(() => {
-                at(c, d, n, "");
+              Gt(() => {
+                st(i, d, n, "");
                 const o = r.getState().getNestedState(t, n);
                 e?.afterUpdate && e.afterUpdate(o);
               }, e.debounce);
             else {
-              at(c, d, n, "");
+              st(i, d, n, "");
               const o = r.getState().getNestedState(t, n);
               e?.afterUpdate && e.afterUpdate(o);
             }
-            w(n);
+            p(n);
           };
         if (l === "formElement")
-          return (d, e) => /* @__PURE__ */ mt(
-            Mt,
+          return (d, e) => /* @__PURE__ */ wt(
+            Ht,
             {
-              setState: c,
+              setState: i,
               stateKey: t,
               path: n,
               child: d,
               formOpts: e
             }
           );
-        const O = [...n, l], rt = r.getState().getNestedState(t, O);
-        return a(rt, O, f);
+        const _ = [...n, l], at = r.getState().getNestedState(t, _);
+        return a(at, _, S);
       }
-    }, G = new Proxy(U, j);
-    return I.set(F, {
+    }, G = new Proxy(O, U);
+    return y.set(L, {
       proxy: G,
-      stateVersion: b
+      stateVersion: C
     }), G;
   }
   return a(
     r.getState().getNestedState(t, [])
   );
 }
-function kt(t) {
-  return st(qt, { proxy: t });
+function Mt(t) {
+  return ct(ne, { proxy: t });
 }
-function zt({
+function ee({
   proxy: t,
-  rebuildStateShape: c
+  rebuildStateShape: i
 }) {
   const m = r().getNestedState(t._stateKey, t._path);
-  return Array.isArray(m) ? c(
+  return Array.isArray(m) ? i(
     m,
     t._path
   ).stateMapNoRender(
-    (I, b, w, p, a) => t._mapFn(I, b, w, p, a)
+    (y, C, p, I, a) => t._mapFn(y, C, p, I, a)
   ) : null;
 }
-function qt({
+function ne({
   proxy: t
 }) {
-  const c = X(null), m = `${t._stateKey}-${t._path.join(".")}`;
-  return tt(() => {
-    const u = c.current;
-    if (!u || !u.parentElement) return;
-    const I = u.parentElement, w = Array.from(I.childNodes).indexOf(u);
-    let p = I.getAttribute("data-parent-id");
-    p || (p = `parent-${crypto.randomUUID()}`, I.setAttribute("data-parent-id", p));
+  const i = z(null), m = `${t._stateKey}-${t._path.join(".")}`;
+  return it(() => {
+    const g = i.current;
+    if (!g || !g.parentElement) return;
+    const y = g.parentElement, p = Array.from(y.childNodes).indexOf(g);
+    let I = y.getAttribute("data-parent-id");
+    I || (I = `parent-${crypto.randomUUID()}`, y.setAttribute("data-parent-id", I));
     const v = {
       instanceId: `instance-${crypto.randomUUID()}`,
-      parentId: p,
-      position: w,
+      parentId: I,
+      position: p,
       effect: t._effect
     };
     r.getState().addSignalElement(m, v);
     const n = r.getState().getNestedState(t._stateKey, t._path);
-    let f;
+    let S;
     if (t._effect)
       try {
-        f = new Function(
+        S = new Function(
           "state",
           `return (${t._effect})(state)`
         )(n);
-      } catch (U) {
-        console.error("Error evaluating effect function during mount:", U), f = n;
+      } catch (O) {
+        console.error("Error evaluating effect function during mount:", O), S = n;
       }
     else
-      f = n;
-    f !== null && typeof f == "object" && (f = JSON.stringify(f));
-    const F = document.createTextNode(String(f));
-    u.replaceWith(F);
-  }, [t._stateKey, t._path.join("."), t._effect]), st("span", {
-    ref: c,
+      S = n;
+    S !== null && typeof S == "object" && (S = JSON.stringify(S));
+    const L = document.createTextNode(String(S));
+    g.replaceWith(L);
+  }, [t._stateKey, t._path.join("."), t._effect]), ct("span", {
+    ref: i,
     style: { display: "none" },
     "data-signal-id": m
   });
 }
-function le(t) {
-  const c = Pt(
+function ye(t) {
+  const i = Dt(
     (m) => {
-      const u = r.getState().stateComponents.get(t._stateKey) || {
+      const g = r.getState().stateComponents.get(t._stateKey) || {
         components: /* @__PURE__ */ new Map()
       };
-      return u.components.set(t._stateKey, {
+      return g.components.set(t._stateKey, {
         forceUpdate: m,
         paths: /* @__PURE__ */ new Set([t._path.join(".")])
-      }), () => u.components.delete(t._stateKey);
+      }), () => g.components.delete(t._stateKey);
     },
     () => r.getState().getNestedState(t._stateKey, t._path)
   );
-  return st("text", {}, String(c));
+  return ct("text", {}, String(i));
 }
-function Jt({
+function re({
   stateKey: t,
-  itemComponentId: c,
+  itemComponentId: i,
   itemPath: m,
-  children: u
+  children: g
 }) {
-  const [, I] = Y({}), [b, w] = jt(), p = X(null);
-  return tt(() => {
-    w.height > 0 && w.height !== p.current && (p.current = w.height, r.getState().setShadowMetadata(t, m, {
+  const [, y] = et({}), [C, p] = qt(), I = z(null);
+  return it(() => {
+    p.height > 0 && p.height !== I.current && (I.current = p.height, r.getState().setShadowMetadata(t, m, {
       virtualizer: {
-        itemHeight: w.height
+        itemHeight: p.height
       }
     }));
-  }, [w.height, t, m]), lt(() => {
-    const a = `${t}////${c}`, v = r.getState().stateComponents.get(t) || {
+  }, [p.height, t, m]), St(() => {
+    const a = `${t}////${i}`, v = r.getState().stateComponents.get(t) || {
       components: /* @__PURE__ */ new Map()
     };
     return v.components.set(a, {
-      forceUpdate: () => I({}),
+      forceUpdate: () => y({}),
       paths: /* @__PURE__ */ new Set([m.join(".")])
     }), r.getState().stateComponents.set(t, v), () => {
       const n = r.getState().stateComponents.get(t);
       n && n.components.delete(a);
     };
-  }, [t, c, m.join(".")]), /* @__PURE__ */ mt("div", { ref: b, children: u });
+  }, [t, i, m.join(".")]), /* @__PURE__ */ wt("div", { ref: C, children: g });
 }
 export {
-  kt as $cogsSignal,
-  le as $cogsSignalStore,
-  se as addStateOptions,
-  ie as createCogsState,
-  ce as notifyComponent,
-  Bt as useCogsStateFn
+  Mt as $cogsSignal,
+  ye as $cogsSignalStore,
+  me as addStateOptions,
+  he as createCogsState,
+  ve as notifyComponent,
+  te as useCogsStateFn
 };
 //# sourceMappingURL=CogsState.jsx.map