cogsbox-state 0.5.326 → 0.5.328

package/dist/CogsState.jsx

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