@solidjs/signals 0.9.1 → 0.9.2

package/dist/node.cjs

@@ -118,9 +118,9 @@ function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
   for (let t = e.P; t; t = t.W) {
-    const e = t.H;
-    const r = e.I || e;
-    if (r.F && r.o >= n) n = r.o + 1;
+    const e = t.I;
+    const r = e.F || e;
+    if (r.H && r.o >= n) n = r.o + 1;
   }
   if (e.o !== n) {
     e.o = n;
@@ -130,21 +130,22 @@ function adjustHeight(e, t) {
   }
 }
 const w = new Set();
-const _ = { l: new Array(2e3).fill(undefined), m: false, A: 0, _: 0 };
+let _ = false;
+const S = { l: new Array(2e3).fill(undefined), m: false, A: 0, _: 0 };
 const b = { l: new Array(2e3).fill(undefined), m: false, A: 0, _: 0 };
-let S = 0;
-let m = null;
+let m = 0;
+let O = null;
 let x = false;
 function schedule() {
   if (x) return;
   x = true;
-  if (!O.R) queueMicrotask(flush);
+  if (!C.R) queueMicrotask(flush);
 }
 class Queue {
   i = null;
   V = [[], []];
   q = [];
-  created = S;
+  created = m;
   addChild(e) {
     this.q.push(e);
     e.i = this;
@@ -201,37 +202,35 @@ class Queue {
 class GlobalQueue extends Queue {
   R = false;
   M = [];
-  static D;
+  D = [];
   static B;
+  static T;
   flush() {
     if (this.R) return;
     this.R = true;
     try {
-      runHeap(_, GlobalQueue.D);
-      if (m) {
-        if (!transitionComplete(m)) {
-          runHeap(b, GlobalQueue.D);
+      runHeap(S, GlobalQueue.B);
+      if (O) {
+        if (!transitionComplete(O)) {
+          let e = O;
+          runHeap(b, GlobalQueue.B);
           this.M = [];
-          this.stashQueues(m.queueStash);
-          S++;
+          this.stashQueues(O.queueStash);
+          m++;
           x = false;
-          runTransitionPending(m.pendingNodes, true);
-          m = null;
+          runTransitionPending(O.pendingNodes, true);
+          O = null;
+          runOptimistic(e);
           return;
         }
-        this.M.push(...m.pendingNodes);
-        this.restoreQueues(m.queueStash);
-        w.delete(m);
-        m = null;
+        this.M.push(...O.pendingNodes);
+        this.restoreQueues(O.queueStash);
+        w.delete(O);
+        O = null;
         runTransitionPending(this.M, false);
-        _._ >= _.A && runHeap(_, GlobalQueue.D);
-      } else if (w.size) runHeap(b, GlobalQueue.D);
-      runPending(this.M);
-      while (_._ >= _.A) {
-        runHeap(_, GlobalQueue.D);
-        runPending(this.M);
-      }
-      S++;
+      } else if (w.size) runHeap(b, GlobalQueue.B);
+      runOptimistic();
+      m++;
       x = false;
       this.run(d);
       this.run(h);
@@ -242,8 +241,8 @@ class GlobalQueue extends Queue {
   notify(e, t, n) {
     if (t & f) {
       if (n & f) {
-        if (m && !m.asyncNodes.includes(e.T.cause)) {
-          m.asyncNodes.push(e.T.cause);
+        if (O && !O.asyncNodes.includes(e.K.cause)) {
+          O.asyncNodes.push(e.K.cause);
           schedule();
         }
       }
@@ -252,30 +251,70 @@ class GlobalQueue extends Queue {
     return false;
   }
   initTransition(e) {
-    if (m && m.time === S) return;
-    if (!m) {
-      m = e.K ?? { time: S, pendingNodes: [], asyncNodes: [], queueStash: { V: [[], []], q: [] } };
+    if (O && O.time === m) return;
+    if (!O) {
+      O = e.G ?? {
+        time: m,
+        pendingNodes: [],
+        asyncNodes: [],
+        optimisticNodes: [],
+        queueStash: { V: [[], []], q: [] },
+        done: false
+      };
     }
-    w.add(m);
-    m.time = S;
+    w.add(O);
+    O.time = m;
     for (let e = 0; e < this.M.length; e++) {
       const t = this.M[e];
-      t.K = m;
-      m.pendingNodes.push(t);
+      t.G = O;
+      O.pendingNodes.push(t);
     }
-    this.M = m.pendingNodes;
+    for (let e = 0; e < this.D.length; e++) {
+      const t = this.D[e];
+      t.G = O;
+      O.optimisticNodes.push(t);
+    }
+    this.M = O.pendingNodes;
+    this.D = O.optimisticNodes;
+  }
+}
+function notifySubs(e) {
+  for (let t = e.O; t !== null; t = t.C) {
+    const e = t.N.S & o ? b : S;
+    if (e.A > t.N.o) e.A = t.N.o;
+    insertIntoHeap(t.N, e);
+  }
+}
+function runOptimistic(e = null) {
+  let t = !e;
+  const n = C.D;
+  _ = true;
+  for (let t = 0; t < n.length; t++) {
+    const r = n[t];
+    if (!e && (!r.G || r.G.done) && r.U !== p) {
+      r.L = r.U;
+      r.U = p;
+    }
+    r.G = e;
+    notifySubs(r);
+  }
+  C.D = [];
+  if (S._ >= S.A) {
+    t = true;
+    runHeap(S, GlobalQueue.B);
   }
+  _ = false;
+  t && runPending(C.M);
 }
 function runPending(e) {
   for (let t = 0; t < e.length; t++) {
     const n = e[t];
-    if (n.G !== p) {
-      n.U = n.G;
-      n.G = p;
-      if (n.L) n.J = true;
+    if (n.U !== p) {
+      n.L = n.U;
+      n.U = p;
+      if (n.J) n.X = true;
     }
-    if (n.X && n.X.G !== p) n.X.Y(n.X.G);
-    if (n.F) GlobalQueue.B(n, false, true);
+    if (n.H) GlobalQueue.T(n, false, true);
   }
   e.length = 0;
 }
@@ -283,24 +322,21 @@ function runTransitionPending(e, t) {
   const n = e.slice();
   for (let e = 0; e < n.length; e++) {
     const r = n[e];
-    r.K = m;
-    if (r.Z) r.Z.Y(t);
-    if (r.X && r.X.G !== p) {
-      r.X.Y(r.X.G);
-      r.X.G = p;
-    }
+    r.G = O;
+    if (r.Y) r.Y.Z(t);
   }
 }
-const O = new GlobalQueue();
+const C = new GlobalQueue();
 function flush() {
   while (x) {
-    O.flush();
+    C.flush();
   }
 }
 function runQueue(e, t) {
   for (let n = 0; n < e.length; n++) e[n](t);
 }
 function transitionComplete(e) {
+  if (e.done) return true;
   let t = true;
   for (let n = 0; n < e.asyncNodes.length; n++) {
     if (e.asyncNodes[n].$ & f) {
@@ -308,35 +344,29 @@ function transitionComplete(e) {
       break;
     }
   }
+  t && (e.done = true);
   return t;
 }
 function runInTransition(e, t) {
-  const n = m;
-  m = e.K;
+  const n = O;
+  O = e.G;
   t(e);
-  m = n;
+  O = n;
 }
-GlobalQueue.D = recompute;
-GlobalQueue.B = disposeChildren;
-let C = false;
-let v = false;
+GlobalQueue.B = recompute;
+GlobalQueue.T = disposeChildren;
 let N = false;
-let k = null;
-let j = false;
-let A = null;
-function notifySubs(e) {
-  for (let t = e.O; t !== null; t = t.C) {
-    const e = t.N.S & o ? b : _;
-    if (e.A > t.N.o) e.A = t.N.o;
-    insertIntoHeap(t.N, e);
-  }
-}
+let v = false;
+let k = false;
+let j = null;
+let A = false;
+let E = null;
 function recompute(t, n = false) {
-  const i = t.L && t.K != m;
+  const i = t.J && t.G != O;
   if (!n) {
-    if (t.K && m !== t.K && !i) O.initTransition(t);
-    deleteFromHeap(t, t.S & o ? b : _);
-    if (t.K) disposeChildren(t);
+    if (t.G && O !== t.G && !i) C.initTransition(t);
+    deleteFromHeap(t, t.S & o ? b : S);
+    if (t.G) disposeChildren(t);
     else {
       markDisposal(t);
       t.ee = t.te;
@@ -345,20 +375,20 @@ function recompute(t, n = false) {
       t.re = null;
     }
   }
-  const s = A;
-  A = t;
+  const s = E;
+  E = t;
   t.ie = null;
   t.S = r;
-  t.se = S;
-  let u = t.G === p ? t.U : t.G;
+  t.se = m;
+  let u = t.U === p || (t.oe && t.G) ? t.L : t.U;
   let d = t.o;
   let h = t.$;
-  let y = t.T;
-  let g = C;
+  let y = t.K;
+  let g = N;
   setStatusFlags(t, l | (h & a));
-  C = true;
+  N = true;
   try {
-    u = handleAsync(t, t.F(u));
+    u = handleAsync(t, t.H(u));
     t.$ &= ~a;
   } catch (e) {
     if (e instanceof NotReadyError) {
@@ -366,10 +396,10 @@ function recompute(t, n = false) {
       setStatusFlags(t, (h & ~c) | f, e);
     } else setStatusFlags(t, c, e);
   } finally {
-    C = g;
+    N = g;
   }
   t.S = e;
-  A = s;
+  E = s;
   if (!(t.$ & f)) {
     const e = t.ie;
     let n = e !== null ? e.W : t.P;
@@ -381,48 +411,45 @@ function recompute(t, n = false) {
       else t.P = null;
     }
   }
-  const w = !t.oe || !t.oe(t.G === p || t.ue || i ? t.U : t.G, u);
-  const x = t.$ !== h || t.T !== y;
+  const w = !t.ue || !t.ue(t.U === p || t.oe || i ? t.L : t.U, u);
+  const x = t.$ !== h || t.K !== y;
   t.le?.(x, h);
   if (w || x) {
     if (w) {
-      if (n || t.ue || i) t.U = u;
-      else t.G = u;
-      if (t.X) t.X.G = u;
-    }
-    for (let e = t.O; e !== null; e = e.C) {
-      const n = e.N.S & o ? b : _;
-      if (e.N.o < t.o && n.A > e.N.o) n.A = e.N.o;
-      insertIntoHeap(e.N, n);
+      if (n || t.oe || i) t.L = u;
+      else t.U = u;
+      if (t.fe) setSignal(t.fe, u);
     }
+    (!t.oe || _) && notifySubs(t);
   } else if (t.o != d) {
     for (let e = t.O; e !== null; e = e.C) {
-      insertIntoHeapHeight(e.N, e.N.S & o ? b : _);
+      insertIntoHeapHeight(e.N, e.N.S & o ? b : S);
     }
   }
-  if ((!n || t.$ & f) && !t.ue && !t.K) O.M.push(t);
-  if (t.K && i) runInTransition(t, recompute);
+  t.oe && !_ && C.D.push(t);
+  (!n || t.$ & f) && !t.G && C.M.push(t);
+  t.G && i && runInTransition(t, recompute);
 }
 function handleAsync(e, t, n) {
   const r = typeof t === "object" && t !== null;
   const i = r && t instanceof Promise;
   const s = r && untrack(() => t[Symbol.asyncIterator]);
   if (!i && !s) {
-    e.fe = null;
+    e.ce = null;
     return t;
   }
-  e.fe = t;
+  e.ce = t;
   if (i) {
     t.then(r => {
-      if (e.fe !== t) return;
-      O.initTransition(e);
+      if (e.ce !== t) return;
+      C.initTransition(e);
       n?.(r) ?? setSignal(e, () => r);
       flush();
     }).catch(n => {
-      if (e.fe !== t) return;
-      O.initTransition(e);
+      if (e.ce !== t) return;
+      C.initTransition(e);
       setStatusFlags(e, c, n);
-      e.se = S;
+      e.se = m;
       notifySubs(e);
       schedule();
       flush();
@@ -431,31 +458,31 @@ function handleAsync(e, t, n) {
     (async () => {
       try {
         for await (let r of t) {
-          if (e.fe !== t) return;
-          O.initTransition(e);
+          if (e.ce !== t) return;
+          C.initTransition(e);
           n?.(r) ?? setSignal(e, () => r);
           flush();
         }
       } catch (n) {
-        if (e.fe !== t) return;
-        O.initTransition(e);
+        if (e.ce !== t) return;
+        C.initTransition(e);
         setStatusFlags(e, c, n);
-        e.se = S;
+        e.se = m;
         notifySubs(e);
         schedule();
         flush();
       }
     })();
   }
-  O.initTransition(e);
-  throw new NotReadyError(A);
+  C.initTransition(e);
+  throw new NotReadyError(E);
 }
 function updateIfNecessary(r) {
   if (r.S & t) {
     for (let e = r.P; e; e = e.W) {
-      const t = e.H;
-      const i = t.I || t;
-      if (i.F) {
+      const t = e.I;
+      const i = t.F || t;
+      if (i.H) {
         updateIfNecessary(i);
       }
       if (r.S & n) {
@@ -469,24 +496,24 @@ function updateIfNecessary(r) {
   r.S = e;
 }
 function unlinkSubs(e) {
-  const t = e.H;
+  const t = e.I;
   const n = e.W;
   const r = e.C;
-  const i = e.ce;
-  if (r !== null) r.ce = i;
-  else t.ae = i;
+  const i = e.ae;
+  if (r !== null) r.ae = i;
+  else t.de = i;
   if (i !== null) i.C = r;
   else {
     t.O = r;
     if (r === null) {
-      t.de?.();
-      t.F && !t.he && unobserved(t);
+      t.he?.();
+      t.H && !t.pe && unobserved(t);
     }
   }
   return n;
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.S & o ? b : _);
+  deleteFromHeap(e, e.S & o ? b : S);
   let t = e.P;
   while (t !== null) {
     t = unlinkSubs(t);
@@ -496,19 +523,19 @@ function unobserved(e) {
 }
 function link(e, t) {
   const n = t.ie;
-  if (n !== null && n.H === e) return;
+  if (n !== null && n.I === e) return;
   let i = null;
   const s = t.S & r;
   if (s) {
     i = n !== null ? n.W : t.P;
-    if (i !== null && i.H === e) {
+    if (i !== null && i.I === e) {
       t.ie = i;
       return;
     }
   }
-  const o = e.ae;
+  const o = e.de;
   if (o !== null && o.N === t && (!s || isValidLink(o, t))) return;
-  const u = (t.ie = e.ae = { H: e, N: t, W: i, ce: o, C: null });
+  const u = (t.ie = e.de = { I: e, N: t, W: i, ae: o, C: null });
   if (n !== null) n.W = u;
   else t.P = u;
   if (o !== null) o.C = u;
@@ -528,18 +555,18 @@ function isValidLink(e, t) {
 }
 function setStatusFlags(e, t, n = null) {
   e.$ = t;
-  e.T = n;
+  e.K = n;
 }
 function markDisposal(e) {
   let t = e.re;
   while (t) {
     t.S |= o;
     if (t.S & i) {
-      deleteFromHeap(t, _);
+      deleteFromHeap(t, S);
       insertIntoHeap(t, b);
     }
     markDisposal(t);
-    t = t.pe;
+    t = t.ye;
   }
 }
 function dispose(e) {
@@ -556,10 +583,10 @@ function disposeChildren(e, t = false, n) {
   if (t) e.S = u;
   let r = n ? e.ne : e.re;
   while (r) {
-    const e = r.pe;
+    const e = r.ye;
     if (r.P) {
       const e = r;
-      deleteFromHeap(e, e.S & o ? b : _);
+      deleteFromHeap(e, e.S & o ? b : S);
       let t = e.P;
       do {
         t = unlinkSubs(t);
@@ -574,7 +601,7 @@ function disposeChildren(e, t = false, n) {
     e.ne = null;
   } else {
     e.re = null;
-    e.pe = null;
+    e.ye = null;
   }
   runDisposal(e, n);
 }
@@ -592,7 +619,7 @@ function runDisposal(e, t) {
   t ? (e.ee = null) : (e.te = null);
 }
 function getNextChildId(e) {
-  if (e.id != null) return formatId(e.id, e.ye++);
+  if (e.id != null) return formatId(e.id, e.ge++);
   throw new Error("Cannot get child id from owner without an id");
 }
 function formatId(e, t) {
@@ -602,16 +629,16 @@ function formatId(e, t) {
 }
 function computed(t, n, r) {
   const i = {
-    id: r?.id ?? (A?.id != null ? getNextChildId(A) : undefined),
-    oe: r?.equals != null ? r.equals : isEqual,
-    ge: !!r?.pureWrite,
-    de: r?.unobserved,
+    id: r?.id ?? (E?.id != null ? getNextChildId(E) : undefined),
+    ue: r?.equals != null ? r.equals : isEqual,
+    we: !!r?.pureWrite,
+    he: r?.unobserved,
     te: null,
-    we: A?.we ?? O,
-    _e: A?._e ?? g,
-    ye: 0,
-    F: t,
-    U: n,
+    _e: E?._e ?? C,
+    Se: E?.Se ?? g,
+    ge: 0,
+    H: t,
+    L: n,
     o: 0,
     k: null,
     p: undefined,
@@ -619,49 +646,49 @@ function computed(t, n, r) {
     P: null,
     ie: null,
     O: null,
-    ae: null,
-    i: A,
-    pe: null,
+    de: null,
+    i: E,
+    ye: null,
     re: null,
     S: e,
     $: a,
-    se: S,
-    G: p,
+    se: m,
+    U: p,
     ee: null,
     ne: null,
-    fe: null,
-    K: null
+    ce: null,
+    G: null
   };
   if (r?.be) Object.assign(i, r.be);
   i.h = i;
-  const s = A?.t ? A.u : A;
-  if (A) {
-    const e = A.re;
+  const s = E?.t ? E.u : E;
+  if (E) {
+    const e = E.re;
     if (e === null) {
-      A.re = i;
+      E.re = i;
     } else {
-      i.pe = e;
-      A.re = i;
+      i.ye = e;
+      E.re = i;
     }
   }
   if (s) i.o = s.o + 1;
-  recompute(i, true);
+  !r?.lazy && recompute(i, true);
   return i;
 }
 function signal(e, t, n = null) {
   const r = {
-    id: t?.id ?? (A?.id != null ? getNextChildId(A) : undefined),
-    oe: t?.equals != null ? t.equals : isEqual,
-    ge: !!t?.pureWrite,
-    de: t?.unobserved,
-    U: e,
+    id: t?.id ?? (E?.id != null ? getNextChildId(E) : undefined),
+    ue: t?.equals != null ? t.equals : isEqual,
+    we: !!t?.pureWrite,
+    he: t?.unobserved,
+    L: e,
     O: null,
-    ae: null,
+    de: null,
     $: l,
-    se: S,
-    I: n,
+    se: m,
+    F: n,
     j: n?.k || null,
-    G: p
+    U: p
   };
   n && (n.k = r);
   return r;
@@ -670,27 +697,27 @@ function isEqual(e, t) {
   return e === t;
 }
 function untrack(e) {
-  if (!C) return e();
-  C = false;
+  if (!N) return e();
+  N = false;
   try {
     return e();
   } finally {
-    C = true;
+    N = true;
   }
 }
 function read(e) {
-  let t = A;
+  let t = E;
   if (t?.t) t = t.u;
-  if (j && e.F) recompute(e);
-  if (t && C && !k && !N) {
-    if (e.F && e.S & u) recompute(e);
+  if (A && e.H) recompute(e);
+  if (t && N && !j && !k) {
+    if (e.H && e.S & u) recompute(e);
     link(e, t);
-    const n = e.I || e;
-    if (n.F) {
+    const n = e.F || e;
+    if (n.H) {
       const r = e.S & o;
-      if (n.o >= (r ? b.A : _.A)) {
+      if (n.o >= (r ? b.A : S.A)) {
         markNode(t);
-        markHeap(r ? b : _);
+        markHeap(r ? b : S);
         updateIfNecessary(n);
       }
       const i = n.o;
@@ -699,75 +726,74 @@ function read(e) {
       }
     }
   }
-  if (k) {
-    if (!e.Z) {
-      e.Z = signal(false);
-      e.Z.ue = true;
-      e.Z.Y = t => setSignal(e.Z, t);
-    }
-    const t = k;
-    k = null;
-    t.U = read(e.Z) || t.U;
-    k = t;
+  if (j) {
+    if (!e.Y) {
+      e.Y = signal(false);
+      e.Y.oe = true;
+      e.Y.Z = t => setSignal(e.Y, t);
+    }
+    const t = j;
+    j = null;
+    t.L = read(e.Y) || t.L;
+    j = t;
   }
-  if (N) {
-    if (!e.X) {
-      e.X = signal(e.U);
-      e.X.ue = true;
-      e.X.Y = t => setSignal(e.X, t);
+  if (k) {
+    if (!e.fe) {
+      e.fe = signal(e.L);
+      e.fe.oe = true;
     }
-    N = false;
+    k = false;
     try {
-      return read(e.X);
+      return read(e.fe);
     } finally {
-      N = true;
+      k = true;
     }
   }
-  if (e.$ & f && !k) {
-    if ((t && !v) || e.$ & a) throw e.T;
+  if (e.$ & f && !j) {
+    if ((t && !v) || e.$ & a) throw e.K;
     else if (t && v) {
-      setStatusFlags(t, t.$ | 1, e.T);
+      setStatusFlags(t, t.$ | 1, e.K);
     }
   }
   if (e.$ & c) {
-    if (e.se < S) {
+    if (e.se < m) {
       recompute(e, true);
       return read(e);
     } else {
-      throw e.T;
+      throw e.K;
     }
   }
-  return !t || e.ue || e.G === p || (v && !k && e.K && m !== e.K) ? e.U : e.G;
+  return !t || e.oe || e.U === p || (v && !j && (t.oe || (e.G && O !== e.G))) ? e.L : e.U;
 }
 function setSignal(e, t) {
   if (typeof t === "function") {
-    t = t(e.G === p ? e.U : e.G);
+    t = t(e.U === p || (e.oe && e.G) ? e.L : e.U);
   }
-  const n = !e.oe || !e.oe(e.G === p || e.ue ? e.U : e.G, t);
+  const n = !e.ue || !e.ue(e.U === p || e.oe ? e.L : e.U, t);
   if (!n && !e.$) return t;
   if (n) {
-    if (e.ue) e.U = t;
+    if (e.oe) e.L = t;
     else {
-      if (e.G === p) O.M.push(e);
-      e.G = t;
+      if (e.U === p) C.M.push(e);
+      e.U = t;
     }
-    if (e.X) e.X.G = t;
+    if (e.fe) setSignal(e.fe, t);
   }
   setStatusFlags(e, l);
-  e.se = S;
-  notifySubs(e);
+  e.se = m;
+  e.oe && !_ ? C.D.push(e) : notifySubs(e);
   schedule();
   return t;
 }
 function getObserver() {
-  return C ? A : null;
+  return N ? E : null;
 }
 function getOwner() {
-  return A;
+  return E;
 }
 function onCleanup(e) {
-  if (!A) return e;
-  const t = A;
+  if (!E) return e;
+  const t = E;
   if (!t.te) {
     t.te = e;
   } else if (Array.isArray(t.te)) {
@@ -778,17 +804,17 @@ function onCleanup(e) {
   return e;
 }
 function createOwner(e) {
-  const t = A;
+  const t = E;
   const n = {
     t: true,
     u: t?.t ? t.u : t,
     re: null,
-    pe: null,
+    ye: null,
     te: null,
     id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
-    we: t?.we ?? O,
-    _e: t?._e || g,
-    ye: 0,
+    _e: t?._e ?? C,
+    Se: t?.Se || g,
+    ge: 0,
     ee: null,
     ne: null,
     i: t,
@@ -801,7 +827,7 @@ function createOwner(e) {
     if (e === null) {
       t.re = n;
     } else {
-      n.pe = e;
+      n.ye = e;
       t.re = n;
     }
   }
@@ -812,12 +838,12 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(n.dispose));
 }
 function runWithOwner(e, t) {
-  const n = A;
-  A = e;
+  const n = E;
+  E = e;
   try {
     return t();
   } finally {
-    A = n;
+    E = n;
   }
 }
 function staleValues(e, t = true) {
@@ -830,34 +856,34 @@ function staleValues(e, t = true) {
   }
 }
 function pending(e) {
-  const t = N;
-  N = true;
+  const t = k;
+  k = true;
   try {
     return staleValues(e, false);
   } finally {
-    N = t;
+    k = t;
   }
 }
 function isPending(e) {
-  const t = k;
-  k = { U: false };
+  const t = j;
+  j = { L: false };
   try {
     staleValues(e);
-    return k.U;
+    return j.L;
   } catch (e) {
     if (!(e instanceof NotReadyError)) return false;
     throw e;
   } finally {
-    k = t;
+    j = t;
   }
 }
 function refresh(e) {
-  let t = j;
-  j = true;
+  let t = A;
+  A = true;
   try {
     return untrack(e);
   } finally {
-    j = t;
+    A = t;
     if (!t) {
       schedule();
       flush();
@@ -865,7 +891,7 @@ function refresh(e) {
   }
 }
 function isRefreshing() {
-  return j;
+  return A;
 }
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
@@ -874,7 +900,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t._e[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Se[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -884,10 +910,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n._e = { ...n._e, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Se = { ...n.Se, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?._e[e.id]);
+  return !isUndefined(t?.Se[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -897,58 +923,58 @@ function effect(e, t, n, r, i) {
   const o = computed(e, r, {
     ...i,
     be: {
-      J: true,
-      Se: r,
-      me: t,
+      X: true,
+      me: r,
+      Oe: t,
       xe: n,
-      Oe: undefined,
-      L: i?.render ? d : h,
+      Ce: undefined,
+      J: i?.render ? d : h,
       le(e, t) {
         if (s) {
           const n = this.$ && this.$ === t && e;
-          this.J = !(this.$ & c) && !(this.$ & f & ~t) && !n;
-          if (this.J) this.we.enqueue(this.L, runEffect.bind(this));
+          this.X = !(this.$ & c) && !(this.$ & f & ~t) && !n;
+          if (this.X) this._e.enqueue(this.J, runEffect.bind(this));
         }
         if (this.$ & c) {
-          let e = this.T;
-          this.we.notify(this, f, 0);
-          if (this.L === h) {
+          let e = this.K;
+          this._e.notify(this, f, 0);
+          if (this.J === h) {
             try {
               return this.xe
                 ? this.xe(e, () => {
-                    this.Oe?.();
-                    this.Oe = undefined;
+                    this.Ce?.();
+                    this.Ce = undefined;
                   })
                 : console.error(e);
             } catch (t) {
               e = t;
             }
           }
-          if (!this.we.notify(this, c, c)) throw e;
-        } else if (this.L === d) {
-          this.we.notify(this, f | c, this.$);
+          if (!this._e.notify(this, c, c)) throw e;
+        } else if (this.J === d) {
+          this._e.notify(this, f | c, this.$);
         }
       }
     }
   });
   s = true;
-  if (o.L === d) o.F = t => staleValues(() => e(t));
+  if (o.J === d) o.H = t => staleValues(() => e(t));
   !i?.defer &&
     !(o.$ & (c | f)) &&
-    (o.L === h ? o.we.enqueue(o.L, runEffect.bind(o)) : runEffect.call(o));
-  onCleanup(() => o.Oe?.());
+    (o.J === h ? o._e.enqueue(o.J, runEffect.bind(o)) : runEffect.call(o));
+  onCleanup(() => o.Ce?.());
 }
 function runEffect() {
-  if (!this.J || this.S & u) return;
-  this.Oe?.();
-  this.Oe = undefined;
+  if (!this.X || this.S & u) return;
+  this.Ce?.();
+  this.Ce = undefined;
   try {
-    this.Oe = this.me(this.U, this.Se);
+    this.Ce = this.Oe(this.L, this.me);
   } catch (e) {
-    if (!this.we.notify(this, c, c)) throw e;
+    if (!this._e.notify(this, c, c)) throw e;
   } finally {
-    this.Se = this.U;
-    this.J = false;
+    this.me = this.L;
+    this.X = false;
   }
 }
 function createSignal(e, t, n) {
@@ -1008,19 +1034,42 @@ function resolve(e) {
   });
 }
 function createOptimistic(e, t, n) {
-  return {};
+  if (typeof e === "function") {
+    const r = computed(
+      t => {
+        let n = r || getOwner();
+        n.U = e(t);
+        return t;
+      },
+      t,
+      n
+    );
+    r.oe = true;
+    return [read.bind(null, r), setSignal.bind(null, r)];
+  }
+  const r = getOwner();
+  const i = r?.id != null;
+  const s = signal(e, i ? { id: getNextChildId(r), ...t } : t);
+  s.oe = true;
+  return [
+    read.bind(null, s),
+    t => {
+      s.U = e;
+      return setSignal(s, t);
+    }
+  ];
 }
 function onSettled(e) {
   let t;
   const n = getOwner();
   if (n) onCleanup(() => t?.());
-  O.enqueue(h, () => {
+  C.enqueue(h, () => {
     t = e();
     !n && t?.();
   });
 }
 function unwrap(e) {
-  return e?.[W]?.[V] ?? e;
+  return e?.[I]?.[q] ?? e;
 }
 function getOverrideValue(e, t, n, r) {
   return n && r in n ? read(n[r]) : t && r in t ? t[r] : e[r];
@@ -1031,15 +1080,15 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n, r) {
-  const i = t?.[W];
+  const i = t?.[I];
   if (!i) return;
-  const s = i[Q];
-  const o = i[R];
-  let u = i[V];
+  const s = i[R];
+  const o = i[V];
+  let u = i[q];
   if (e === s && !o) return;
-  (i[D] || T).set(e, i[H]);
-  i[Q] = e;
-  i[R] = undefined;
+  (i[B] || K).set(e, i[F]);
+  i[R] = e;
+  i[V] = undefined;
   if (Array.isArray(s)) {
     let t = false;
     const l = getOverrideValue(s, o, u, "length");
@@ -1066,16 +1115,16 @@ function applyState(e, t, n, r) {
       if (a > h || a > d) {
         for (c = a; c <= h; c++) {
           t = true;
-          i[V][c] && setSignal(i[V][c], wrap(e[c], i));
+          i[q][c] && setSignal(i[q][c], wrap(e[c], i));
         }
         for (; c < e.length; c++) {
           t = true;
           const s = wrap(w[c], i);
-          i[V][c] && setSignal(i[V][c], s);
+          i[q][c] && setSignal(i[q][c], s);
           applyState(e[c], s, n, r);
         }
-        t && i[V][E] && setSignal(i[V][E], void 0);
-        l !== e.length && i[V].length && setSignal(i[V].length, e.length);
+        t && i[q][P] && setSignal(i[q][P], void 0);
+        l !== e.length && i[q].length && setSignal(i[q].length, e.length);
         return;
       }
       y = new Array(h + 1);
@@ -1099,9 +1148,9 @@ function applyState(e, t, n, r) {
       for (c = a; c < e.length; c++) {
         if (c in w) {
           const t = wrap(w[c], i);
-          i[V][c] && setSignal(i[V][c], t);
+          i[q][c] && setSignal(i[q][c], t);
           applyState(e[c], t, n, r);
-        } else i[V][c] && setSignal(i[V][c], wrap(e[c], i));
+        } else i[q][c] && setSignal(i[q][c], wrap(e[c], i));
       }
       if (a < e.length) t = true;
     } else if (l && e.length) {
@@ -1112,13 +1161,13 @@ function applyState(e, t, n, r) {
     }
     if (l !== e.length) {
       t = true;
-      i[V].length && setSignal(i[V].length, e.length);
+      i[q].length && setSignal(i[q].length, e.length);
     }
-    t && i[V][E] && setSignal(i[V][E], void 0);
+    t && i[q][P] && setSignal(i[q][P], void 0);
     return;
   }
   if (u) {
-    const t = u[E];
+    const t = u[P];
     const l = t || r ? getAllKeys(s, o, e) : Object.keys(u);
     for (let f = 0, c = l.length; f < c; f++) {
       const c = l[f];
@@ -1132,7 +1181,7 @@ function applyState(e, t, n, r) {
       } else applyState(h, wrap(d, i), n, r);
     }
   }
-  if ((u = i[q])) {
+  if ((u = i[M])) {
     const t = Object.keys(u);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -1155,11 +1204,11 @@ function createProjectionInternal(e, t = {}, n) {
   const i = new WeakMap();
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[W]?.[M] === wrapProjection) return e;
-    const t = createStoreProxy(e, G, {
-      [M]: wrapProjection,
-      [D]: i,
-      [B]() {
+    if (e[I]?.[D] === wrapProjection) return e;
+    const t = createStoreProxy(e, U, {
+      [D]: wrapProjection,
+      [B]: i,
+      [T]() {
         return r;
       }
     });
@@ -1181,33 +1230,33 @@ function createProjectionInternal(e, t = {}, n) {
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
 }
-const E = Symbol(0),
-  P = Symbol(0),
+const P = Symbol(0),
   W = Symbol(0),
-  H = Symbol(0),
-  I = Symbol(0);
-const F = new WeakMap();
-const Q = "v",
-  R = "o",
-  V = "n",
-  q = "h",
-  M = "w",
-  D = "l",
-  B = "f";
-function createStoreProxy(e, t = G, n) {
+  I = Symbol(0),
+  F = Symbol(0),
+  H = Symbol(0);
+const Q = new WeakMap();
+const R = "v",
+  V = "o",
+  q = "n",
+  M = "h",
+  D = "w",
+  B = "l",
+  T = "f";
+function createStoreProxy(e, t = U, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else r = { v: e };
   n && Object.assign(r, n);
-  return (r[H] = new Proxy(r, t));
+  return (r[F] = new Proxy(r, t));
 }
-const T = new WeakMap();
+const K = new WeakMap();
 function wrap(e, t) {
-  if (t?.[M]) return t[M](e, t);
-  let n = e[H] || T.get(e);
-  if (!n) T.set(e, (n = createStoreProxy(e)));
+  if (t?.[D]) return t[D](e, t);
+  let n = e[F] || K.get(e);
+  if (!n) K.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
@@ -1231,8 +1280,8 @@ function getNode(e, t, n, r, i = isEqual) {
     r
   ));
 }
-function trackSelf(e, t = E) {
-  getObserver() && read(getNode(getNodes(e, V), t, undefined, e[B]?.(), false));
+function trackSelf(e, t = P) {
+  getObserver() && read(getNode(getNodes(e, q), t, undefined, e[T]?.(), false));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -1240,7 +1289,7 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== I) i.add(e);
+    if (t[e] !== H) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
@@ -1248,124 +1297,124 @@ function getKeys(e, t, n = true) {
 function getPropertyDescriptor(e, t, n) {
   let r = e;
   if (t && n in t) {
-    if (r[n] === I) return void 0;
+    if (r[n] === H) return void 0;
     if (!(n in r)) r = t;
   }
   return Reflect.getOwnPropertyDescriptor(r, n);
 }
-let K = null;
-const G = {
+let G = null;
+const U = {
   get(e, t, n) {
-    if (t === W) return e;
-    if (t === H) return n;
-    if (t === E || t === P) {
+    if (t === I) return e;
+    if (t === F) return n;
+    if (t === P || t === W) {
       trackSelf(e, t);
       return n;
     }
-    const r = getNodes(e, V);
+    const r = getNodes(e, q);
     const i = r[t];
-    const s = e[R] && t in e[R];
-    const o = !!e[Q][W];
-    const u = s ? e[R] : e[Q];
+    const s = e[V] && t in e[V];
+    const o = !!e[R][I];
+    const u = s ? e[V] : e[R];
     if (!i) {
       const e = Object.getOwnPropertyDescriptor(u, t);
       if (e && e.get) return e.get.call(n);
     }
-    if (K?.has(n)) {
-      let n = i && (s || !o) ? (i.G !== p ? i.G : i.U) : u[t];
-      n === I && (n = undefined);
+    if (G?.has(n)) {
+      let n = i && (s || !o) ? (i.U !== p ? i.U : i.L) : u[t];
+      n === H && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      K.add(r);
+      G.add(r);
       return r;
     }
     let l = i ? (s || !o ? read(r[t]) : (read(r[t]), u[t])) : u[t];
-    l === I && (l = undefined);
+    l === H && (l = undefined);
     if (!i) {
       if (!s && typeof l === "function" && !u.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[Q]) && (t = Object.getPrototypeOf(e[Q])) && t !== Object.prototype
+        return !Array.isArray(e[R]) && (t = Object.getPrototypeOf(e[R])) && t !== Object.prototype
           ? l.bind(u)
           : l;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[B]?.()));
+        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[T]?.()));
       }
     }
     return isWrappable(l) ? wrap(l, e) : l;
   },
   has(e, t) {
-    if (t === H || t === E || t === "__proto__") return true;
-    const n = e[R] && t in e[R] ? e[R][t] !== I : t in e[Q];
-    getObserver() && read(getNode(getNodes(e, q), t, n, e[B]?.()));
+    if (t === F || t === P || t === "__proto__") return true;
+    const n = e[V] && t in e[V] ? e[V][t] !== H : t in e[R];
+    getObserver() && read(getNode(getNodes(e, M), t, n, e[T]?.()));
     return n;
   },
   set(e, t, n) {
-    const r = e[H];
-    if (K?.has(e[H])) {
+    const r = e[F];
+    if (G?.has(e[F])) {
       untrack(() => {
-        const i = e[Q];
+        const i = e[R];
         const s = i[t];
-        const o = e[R] && t in e[R] ? e[R][t] : s;
-        const u = n?.[W]?.[Q] ?? n;
+        const o = e[V] && t in e[V] ? e[V][t] : s;
+        const u = n?.[I]?.[R] ?? n;
         if (o === u) return true;
-        const l = e[R]?.length || i.length;
-        if (u !== undefined && u === s) delete e[R][t];
-        else (e[R] || (e[R] = Object.create(null)))[t] = u;
+        const l = e[V]?.length || i.length;
+        if (u !== undefined && u === s) delete e[V][t];
+        else (e[V] || (e[V] = Object.create(null)))[t] = u;
         const f = isWrappable(u);
         if (isWrappable(o)) {
-          const e = F.get(o);
-          e && (e instanceof Set ? e.delete(r) : F.delete(o));
+          const e = Q.get(o);
+          e && (e instanceof Set ? e.delete(r) : Q.delete(o));
         }
-        if (recursivelyNotify(r, T) && f) recursivelyAddParent(u, r);
-        e[q]?.[t] && setSignal(e[q][t], true);
-        const c = getNodes(e, V);
+        if (recursivelyNotify(r, K) && f) recursivelyAddParent(u, r);
+        e[M]?.[t] && setSignal(e[M][t], true);
+        const c = getNodes(e, q);
         c[t] && setSignal(c[t], () => (f ? wrap(u, e) : u));
         if (Array.isArray(i)) {
           const e = parseInt(t) + 1;
           if (e > l) c.length && setSignal(c.length, e);
         }
-        c[E] && setSignal(c[E], undefined);
+        c[P] && setSignal(c[P], undefined);
       });
     }
     return true;
   },
   deleteProperty(e, t) {
-    if (K?.has(e[H]) && e[R]?.[t] !== I) {
+    if (G?.has(e[F]) && e[V]?.[t] !== H) {
       untrack(() => {
-        const n = e[R] && t in e[R] ? e[R][t] : e[Q][t];
-        if (t in e[Q]) {
-          (e[R] || (e[R] = Object.create(null)))[t] = I;
-        } else if (e[R] && t in e[R]) {
-          delete e[R][t];
+        const n = e[V] && t in e[V] ? e[V][t] : e[R][t];
+        if (t in e[R]) {
+          (e[V] || (e[V] = Object.create(null)))[t] = H;
+        } else if (e[V] && t in e[V]) {
+          delete e[V][t];
         } else return true;
         if (isWrappable(n)) {
-          const t = F.get(n);
-          t && (t instanceof Set ? t.delete(e) : F.delete(n));
+          const t = Q.get(n);
+          t && (t instanceof Set ? t.delete(e) : Q.delete(n));
         }
-        if (e[q]?.[t]) setSignal(e[q][t], false);
-        const r = getNodes(e, V);
+        if (e[M]?.[t]) setSignal(e[M][t], false);
+        const r = getNodes(e, q);
         r[t] && setSignal(r[t], undefined);
-        r[E] && setSignal(r[E], undefined);
+        r[P] && setSignal(r[P], undefined);
       });
     }
     return true;
   },
   ownKeys(e) {
     trackSelf(e);
-    return getKeys(e[Q], e[R], false);
+    return getKeys(e[R], e[V], false);
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === H) return { value: e[H], writable: true, configurable: true };
-    return getPropertyDescriptor(e[Q], e[R], t);
+    if (t === F) return { value: e[F], writable: true, configurable: true };
+    return getPropertyDescriptor(e[R], e[V], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[Q]);
+    return Object.getPrototypeOf(e[R]);
   }
 };
 function storeSetter(e, t) {
-  const n = K;
-  K = new Set();
-  K.add(e);
+  const n = G;
+  G = new Set();
+  G.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -1381,8 +1430,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    K.clear();
-    K = n;
+    G.clear();
+    G = n;
   }
 }
 function createStore(e, t, n) {
@@ -1391,17 +1440,17 @@ function createStore(e, t, n) {
   return [i, e => storeSetter(i, e)];
 }
 function recursivelyNotify(e, t) {
-  let n = e[W] || t?.get(e)?.[W];
+  let n = e[I] || t?.get(e)?.[I];
   let r = false;
   if (n) {
-    const e = getNodes(n, V)[P];
+    const e = getNodes(n, q)[W];
     if (e) {
       setSignal(e, undefined);
       r = true;
     }
-    t = n[D] || t;
+    t = n[B] || t;
   }
-  const i = F.get(n?.[Q] || e);
+  const i = Q.get(n?.[R] || e);
   if (!i) return r;
   if (i instanceof Set) {
     for (let e of i) r = recursivelyNotify(e, t) || r;
@@ -1410,16 +1459,16 @@ function recursivelyNotify(e, t) {
 }
 function recursivelyAddParent(e, t) {
   let n;
-  const r = e[W];
+  const r = e[I];
   if (r) {
-    n = r[R];
-    e = r[Q];
+    n = r[V];
+    e = r[R];
   }
   if (t) {
-    let n = F.get(e);
-    if (!n) F.set(e, t);
+    let n = Q.get(e);
+    if (!n) Q.set(e, t);
     else if (n !== t) {
-      if (!(n instanceof Set)) F.set(e, (n = new Set([n])));
+      if (!(n instanceof Set)) Q.set(e, (n = new Set([n])));
       else if (n.has(t)) return;
       n.add(t);
     } else return;
@@ -1441,7 +1490,7 @@ function recursivelyAddParent(e, t) {
 }
 function deep(e) {
   recursivelyAddParent(e);
-  return e[P];
+  return e[W];
 }
 function createOptimisticStore(e, t, n) {
   return [];
@@ -1451,12 +1500,12 @@ function snapshot(e, t, n) {
   if (!isWrappable(e)) return e;
   if (t && t.has(e)) return t.get(e);
   if (!t) t = new Map();
-  if ((r = e[W] || n?.get(e)?.[W])) {
-    s = r[R];
-    i = Array.isArray(r[Q]);
-    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[Q]))) : r[Q]);
-    e = r[Q];
-    n = T;
+  if ((r = e[I] || n?.get(e)?.[I])) {
+    s = r[V];
+    i = Array.isArray(r[R]);
+    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[R]))) : r[R]);
+    e = r[R];
+    n = K;
   } else {
     i = Array.isArray(e);
     t.set(e, e);
@@ -1465,7 +1514,7 @@ function snapshot(e, t, n) {
     const r = s?.length || e.length;
     for (let i = 0; i < r; i++) {
       l = s && i in s ? s[i] : e[i];
-      if (l === I) continue;
+      if (l === H) continue;
       if ((u = snapshot(l, t, n)) !== l || o) {
         if (!o) t.set(e, (o = [...e]));
         o[i] = u;
@@ -1492,13 +1541,13 @@ function snapshot(e, t, n) {
 function trueFn() {
   return true;
 }
-const U = {
+const L = {
   get(e, t, n) {
-    if (t === H) return n;
+    if (t === F) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === H) return true;
+    if (t === F) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -1521,15 +1570,15 @@ const U = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const L = Symbol(0);
+const z = Symbol(0);
 function merge(...e) {
   if (e.length === 1 && typeof e[0] !== "function") return e[0];
   let t = false;
   const n = [];
   for (let r = 0; r < e.length; r++) {
     const i = e[r];
-    t = t || (!!i && H in i);
-    const s = !!i && i[L];
+    t = t || (!!i && F in i);
+    const s = !!i && i[z];
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
@@ -1537,7 +1586,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === L) return n;
+          if (e === z) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -1555,7 +1604,7 @@ function merge(...e) {
           return [...new Set(e)];
         }
       },
-      U
+      L
     );
   }
   const r = Object.create(null);
@@ -1587,12 +1636,12 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[L] = n;
+  o[z] = n;
   return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (y && H in e) {
+  if (y && F in e) {
     return new Proxy(
       {
         get(t) {
@@ -1605,7 +1654,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !n.has(e));
         }
       },
-      U
+      L
     );
   }
   const r = {};
@@ -1623,66 +1672,66 @@ function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
   return createMemo(
     updateKeyedMap.bind({
-      Ce: createOwner(),
+      Ne: createOwner(),
       ve: 0,
-      Ne: e,
-      ke: [],
-      je: t,
-      Ae: [],
+      ke: e,
+      je: [],
+      Ae: t,
       Ee: [],
-      Pe: r,
-      We: r || n?.keyed === false ? [] : undefined,
-      He: t.length > 1 ? [] : undefined,
-      Ie: n?.fallback
+      Pe: [],
+      We: r,
+      Ie: r || n?.keyed === false ? [] : undefined,
+      Fe: t.length > 1 ? [] : undefined,
+      He: n?.fallback
     })
   );
 }
-const z = { pureWrite: true };
+const J = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.Ne() || [],
+  const e = this.ke() || [],
     t = e.length;
-  e[E];
-  runWithOwner(this.Ce, () => {
+  e[P];
+  runWithOwner(this.Ne, () => {
     let n,
       r,
-      i = this.We
+      i = this.Ie
         ? () => {
-            this.We[r] = signal(e[r], z);
-            this.He && (this.He[r] = signal(r, z));
-            return this.je(
-              read.bind(null, this.We[r]),
-              this.He ? read.bind(null, this.He[r]) : undefined
+            this.Ie[r] = signal(e[r], J);
+            this.Fe && (this.Fe[r] = signal(r, J));
+            return this.Ae(
+              read.bind(null, this.Ie[r]),
+              this.Fe ? read.bind(null, this.Fe[r]) : undefined
             );
           }
-        : this.He
+        : this.Fe
           ? () => {
               const t = e[r];
-              this.He[r] = signal(r, z);
-              return this.je(() => t, read.bind(null, this.He[r]));
+              this.Fe[r] = signal(r, J);
+              return this.Ae(() => t, read.bind(null, this.Fe[r]));
             }
           : () => {
               const t = e[r];
-              return this.je(() => t);
+              return this.Ae(() => t);
             };
     if (t === 0) {
       if (this.ve !== 0) {
-        this.Ce.dispose(false);
+        this.Ne.dispose(false);
+        this.Pe = [];
+        this.je = [];
         this.Ee = [];
-        this.ke = [];
-        this.Ae = [];
         this.ve = 0;
-        this.We && (this.We = []);
-        this.He && (this.He = []);
+        this.Ie && (this.Ie = []);
+        this.Fe && (this.Fe = []);
       }
-      if (this.Ie && !this.Ae[0]) {
-        this.Ae[0] = runWithOwner((this.Ee[0] = createOwner()), this.Ie);
+      if (this.He && !this.Ee[0]) {
+        this.Ee[0] = runWithOwner((this.Pe[0] = createOwner()), this.He);
       }
     } else if (this.ve === 0) {
-      if (this.Ee[0]) this.Ee[0].dispose();
-      this.Ae = new Array(t);
+      if (this.Pe[0]) this.Pe[0].dispose();
+      this.Ee = new Array(t);
       for (r = 0; r < t; r++) {
-        this.ke[r] = e[r];
-        this.Ae[r] = runWithOwner((this.Ee[r] = createOwner()), i);
+        this.je[r] = e[r];
+        this.Ee[r] = runWithOwner((this.Pe[r] = createOwner()), i);
       }
       this.ve = t;
     } else {
@@ -1695,130 +1744,130 @@ function updateKeyedMap() {
         a,
         d = new Array(t),
         h = new Array(t),
-        p = this.We ? new Array(t) : undefined,
-        y = this.He ? new Array(t) : undefined;
+        p = this.Ie ? new Array(t) : undefined,
+        y = this.Fe ? new Array(t) : undefined;
       for (
         s = 0, o = Math.min(this.ve, t);
-        s < o && (this.ke[s] === e[s] || (this.We && compare(this.Pe, this.ke[s], e[s])));
+        s < o && (this.je[s] === e[s] || (this.Ie && compare(this.We, this.je[s], e[s])));
         s++
       ) {
-        if (this.We) setSignal(this.We[s], e[s]);
+        if (this.Ie) setSignal(this.Ie[s], e[s]);
       }
       for (
         o = this.ve - 1, u = t - 1;
         o >= s &&
         u >= s &&
-        (this.ke[o] === e[u] || (this.We && compare(this.Pe, this.ke[o], e[u])));
+        (this.je[o] === e[u] || (this.Ie && compare(this.We, this.je[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.Ae[o];
-        h[u] = this.Ee[o];
-        p && (p[u] = this.We[o]);
-        y && (y[u] = this.He[o]);
+        d[u] = this.Ee[o];
+        h[u] = this.Pe[o];
+        p && (p[u] = this.Ie[o]);
+        y && (y[u] = this.Fe[o]);
       }
       c = new Map();
       a = new Array(u + 1);
       for (r = u; r >= s; r--) {
         l = e[r];
-        f = this.Pe ? this.Pe(l) : l;
+        f = this.We ? this.We(l) : l;
         n = c.get(f);
         a[r] = n === undefined ? -1 : n;
         c.set(f, r);
       }
       for (n = s; n <= o; n++) {
-        l = this.ke[n];
-        f = this.Pe ? this.Pe(l) : l;
+        l = this.je[n];
+        f = this.We ? this.We(l) : l;
         r = c.get(f);
         if (r !== undefined && r !== -1) {
-          d[r] = this.Ae[n];
-          h[r] = this.Ee[n];
-          p && (p[r] = this.We[n]);
-          y && (y[r] = this.He[n]);
+          d[r] = this.Ee[n];
+          h[r] = this.Pe[n];
+          p && (p[r] = this.Ie[n]);
+          y && (y[r] = this.Fe[n]);
           r = a[r];
           c.set(f, r);
-        } else this.Ee[n].dispose();
+        } else this.Pe[n].dispose();
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.Ae[r] = d[r];
-          this.Ee[r] = h[r];
+          this.Ee[r] = d[r];
+          this.Pe[r] = h[r];
           if (p) {
-            this.We[r] = p[r];
-            setSignal(this.We[r], e[r]);
+            this.Ie[r] = p[r];
+            setSignal(this.Ie[r], e[r]);
           }
           if (y) {
-            this.He[r] = y[r];
-            setSignal(this.He[r], r);
+            this.Fe[r] = y[r];
+            setSignal(this.Fe[r], r);
           }
         } else {
-          this.Ae[r] = runWithOwner((this.Ee[r] = createOwner()), i);
+          this.Ee[r] = runWithOwner((this.Pe[r] = createOwner()), i);
         }
       }
-      this.Ae = this.Ae.slice(0, (this.ve = t));
-      this.ke = e.slice(0);
+      this.Ee = this.Ee.slice(0, (this.ve = t));
+      this.je = e.slice(0);
     }
   });
-  return this.Ae;
+  return this.Ee;
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
-    Ce: createOwner(),
+    Ne: createOwner(),
     ve: 0,
-    Fe: 0,
-    Qe: e,
-    je: t,
+    Qe: 0,
+    Re: e,
+    Ae: t,
+    Pe: [],
     Ee: [],
-    Ae: [],
-    Re: n?.from,
-    Ie: n?.fallback
+    Ve: n?.from,
+    He: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.Qe();
-  const t = this.Re?.() || 0;
-  runWithOwner(this.Ce, () => {
+  const e = this.Re();
+  const t = this.Ve?.() || 0;
+  runWithOwner(this.Ne, () => {
     if (e === 0) {
       if (this.ve !== 0) {
-        this.Ce.dispose(false);
+        this.Ne.dispose(false);
+        this.Pe = [];
         this.Ee = [];
-        this.Ae = [];
         this.ve = 0;
       }
-      if (this.Ie && !this.Ae[0]) {
-        this.Ae[0] = runWithOwner((this.Ee[0] = createOwner()), this.Ie);
+      if (this.He && !this.Ee[0]) {
+        this.Ee[0] = runWithOwner((this.Pe[0] = createOwner()), this.He);
       }
       return;
     }
     const n = t + e;
-    const r = this.Fe + this.ve;
-    if (this.ve === 0 && this.Ee[0]) this.Ee[0].dispose();
-    for (let e = n; e < r; e++) this.Ee[e - this.Fe].dispose();
-    if (this.Fe < t) {
-      let e = this.Fe;
-      while (e < t && e < this.ve) this.Ee[e++].dispose();
-      this.Ee.splice(0, t - this.Fe);
-      this.Ae.splice(0, t - this.Fe);
-    } else if (this.Fe > t) {
-      let n = r - this.Fe - 1;
-      let i = this.Fe - t;
-      this.Ee.length = this.Ae.length = e;
+    const r = this.Qe + this.ve;
+    if (this.ve === 0 && this.Pe[0]) this.Pe[0].dispose();
+    for (let e = n; e < r; e++) this.Pe[e - this.Qe].dispose();
+    if (this.Qe < t) {
+      let e = this.Qe;
+      while (e < t && e < this.ve) this.Pe[e++].dispose();
+      this.Pe.splice(0, t - this.Qe);
+      this.Ee.splice(0, t - this.Qe);
+    } else if (this.Qe > t) {
+      let n = r - this.Qe - 1;
+      let i = this.Qe - t;
+      this.Pe.length = this.Ee.length = e;
       while (n >= i) {
+        this.Pe[n] = this.Pe[n - i];
         this.Ee[n] = this.Ee[n - i];
-        this.Ae[n] = this.Ae[n - i];
         n--;
       }
       for (let e = 0; e < i; e++) {
-        this.Ae[e] = runWithOwner((this.Ee[e] = createOwner()), () => this.je(e + t));
+        this.Ee[e] = runWithOwner((this.Pe[e] = createOwner()), () => this.Ae(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.Ae[e - t] = runWithOwner((this.Ee[e - t] = createOwner()), () => this.je(e));
+      this.Ee[e - t] = runWithOwner((this.Pe[e - t] = createOwner()), () => this.Ae(e));
     }
-    this.Ae = this.Ae.slice(0, e);
-    this.Fe = t;
+    this.Ee = this.Ee.slice(0, e);
+    this.Qe = t;
     this.ve = e;
   });
-  return this.Ae;
+  return this.Ee;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
@@ -1828,42 +1877,42 @@ function boundaryComputed(e, t) {
     be: {
       le() {
         let e = this.$;
-        this.$ &= ~this.Ve;
-        if (this.Ve & f && !(this.$ & a)) {
+        this.$ &= ~this.qe;
+        if (this.qe & f && !(this.$ & a)) {
           e &= ~f;
         }
-        this.we.notify(this, this.Ve, e);
+        this._e.notify(this, this.qe, e);
       },
-      Ve: t
+      qe: t
     }
   });
-  n.Ve = t;
-  n.he = true;
+  n.qe = t;
+  n.pe = true;
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.we;
-  i.addChild((e.we = n));
-  onCleanup(() => i.removeChild(e.we));
+  const i = e._e;
+  i.addChild((e._e = n));
+  onCleanup(() => i.removeChild(e._e));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
 class ConditionalQueue extends Queue {
-  qe;
-  Me = new Set();
+  Me;
+  De = new Set();
   M = new Set();
   constructor(e) {
     super();
-    this.qe = e;
+    this.Me = e;
   }
   run(e) {
-    if (!e || read(this.qe)) return;
+    if (!e || read(this.Me)) return;
     return super.run(e);
   }
   notify(e, t, n) {
-    if (read(this.qe)) {
+    if (read(this.Me)) {
       if (t & f) {
         if (n & f) {
           this.M.add(e);
@@ -1872,69 +1921,69 @@ class ConditionalQueue extends Queue {
       }
       if (t & c) {
         if (n & c) {
-          this.Me.add(e);
+          this.De.add(e);
           t &= ~c;
-        } else if (this.Me.delete(e)) t &= ~c;
+        } else if (this.De.delete(e)) t &= ~c;
       }
     }
     return t ? super.notify(e, t, n) : true;
   }
 }
 class CollectionQueue extends Queue {
-  De;
-  Ee = new Set();
-  qe = signal(false, { pureWrite: true });
-  Be = false;
+  Be;
+  Pe = new Set();
+  Me = signal(false, { pureWrite: true });
+  Te = false;
   constructor(e) {
     super();
-    this.De = e;
+    this.Be = e;
   }
   run(e) {
-    if (!e || read(this.qe)) return;
+    if (!e || read(this.Me)) return;
     return super.run(e);
   }
   notify(e, t, n) {
-    if (!(t & this.De) || (this.De & f && this.Be)) return super.notify(e, t, n);
-    if (n & this.De) {
-      this.Ee.add(e);
-      if (this.Ee.size === 1) setSignal(this.qe, true);
-    } else if (this.Ee.size > 0) {
-      this.Ee.delete(e);
-      if (this.Ee.size === 0) setSignal(this.qe, false);
-    }
-    t &= ~this.De;
+    if (!(t & this.Be) || (this.Be & f && this.Te)) return super.notify(e, t, n);
+    if (n & this.Be) {
+      this.Pe.add(e);
+      if (this.Pe.size === 1) setSignal(this.Me, true);
+    } else if (this.Pe.size > 0) {
+      this.Pe.delete(e);
+      if (this.Pe.size === 0) setSignal(this.Me, false);
+    }
+    t &= ~this.Be;
     return t ? super.notify(e, t, n) : true;
   }
 }
-var J;
+var X;
 (function (e) {
   e["VISIBLE"] = "visible";
   e["HIDDEN"] = "hidden";
-})(J || (J = {}));
+})(X || (X = {}));
 function createBoundary(e, t) {
   const n = createOwner();
-  const r = new ConditionalQueue(computed(() => t() === J.HIDDEN));
+  const r = new ConditionalQueue(computed(() => t() === X.HIDDEN));
   const i = createBoundChildren(n, e, r, 0);
   computed(() => {
-    const e = read(r.qe);
-    i.Ve = e ? c | f : 0;
+    const e = read(r.Me);
+    i.qe = e ? c | f : 0;
     if (!e) {
       r.M.forEach(e => r.notify(e, f, f));
-      r.Me.forEach(e => r.notify(e, c, c));
+      r.De.forEach(e => r.notify(e, c, c));
       r.M.clear();
-      r.Me.clear();
+      r.De.clear();
     }
   });
-  return () => (read(r.qe) ? undefined : read(i));
+  return () => (read(r.Me) ? undefined : read(i));
 }
 function createCollectionBoundary(e, t, n) {
   const r = createOwner();
   const i = new CollectionQueue(e);
   const s = createBoundChildren(r, t, i, e);
   const o = computed(() => {
-    if (!read(i.qe)) {
+    if (!read(i.Me)) {
       const e = read(s);
-      if (!untrack(() => read(i.qe))) i.Be = true;
+      if (!untrack(() => read(i.Me))) i.Te = true;
       return e;
     }
     return n(i);
@@ -1948,7 +1997,7 @@ function collectErrorSources(e, t) {
   let n = true;
   let r = e.P;
   while (r !== null) {
-    const e = r.H;
+    const e = r.I;
     if (e.P && e.$ & c) {
       n = false;
       collectErrorSources(e, t);
@@ -1959,10 +2008,10 @@ function collectErrorSources(e, t) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(c, e, e => {
-    let n = e.Ee.values().next().value;
-    return t(n.T, () => {
+    let n = e.Pe.values().next().value;
+    return t(n.K, () => {
       const t = [];
-      for (const n of e.Ee) collectErrorSources(n, t);
+      for (const n of e.Pe) collectErrorSources(n, t);
       for (const e of t) recompute(e);
       schedule();
     });
@@ -2017,9 +2066,9 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-exports.$PROXY = H;
-exports.$TARGET = W;
-exports.$TRACK = E;
+exports.$PROXY = F;
+exports.$TARGET = I;
+exports.$TRACK = P;
 exports.ContextNotFoundError = ContextNotFoundError;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;