cogsbox-state 0.5.256 → 0.5.258

package/dist/CogsState.jsx

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