cogsbox-state 0.5.329 → 0.5.331

package/dist/CogsState.jsx

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