@solidjs/signals 0.10.2 → 0.10.4

package/dist/node.cjs

@@ -101,12 +101,12 @@ function markNode(e, r = n) {
   if ((i & (t | n)) >= r) return;
   e.m = (i & -4) | r;
   for (let n = e.O; n !== null; n = n.P) {
-    markNode(n.A, t);
+    markNode(n.k, t);
   }
-  if (e.k !== null) {
-    for (let n = e.k; n !== null; n = n.C) {
+  if (e.C !== null) {
+    for (let n = e.C; n !== null; n = n.A) {
       for (let e = n.O; e !== null; e = e.P) {
-        markNode(e.A, t);
+        markNode(e.k, t);
       }
     }
   }
@@ -134,19 +134,19 @@ function adjustHeight(e, t) {
   if (e.o !== n) {
     e.o = n;
     for (let n = e.O; n !== null; n = n.P) {
-      insertIntoHeapHeight(n.A, t);
+      insertIntoHeapHeight(n.k, t);
     }
   }
 }
 const m = new Set();
-const b = { l: new Array(2e3).fill(undefined), _: false, W: 0, S: 0 };
 const _ = { l: new Array(2e3).fill(undefined), _: false, W: 0, S: 0 };
+const b = { l: new Array(2e3).fill(undefined), _: false, W: 0, S: 0 };
 let O = 0;
 let x = null;
 let v = false;
 let P = false;
 function runLaneEffects(e) {
-  for (const t of C) {
+  for (const t of A) {
     if (t.R || t.T.size > 0) continue;
     const n = t.M[e - 1];
     if (n.length) {
@@ -161,7 +161,7 @@ function setProjectionWriteActive(e) {
 function schedule() {
   if (v) return;
   v = true;
-  if (!A.q) queueMicrotask(flush);
+  if (!k.q) queueMicrotask(flush);
 }
 class Queue {
   i = null;
@@ -238,12 +238,12 @@ class GlobalQueue extends Queue {
     if (this.q) return;
     this.q = true;
     try {
-      runHeap(b, GlobalQueue.K);
+      runHeap(_, GlobalQueue.K);
       if (x) {
         const e = transitionComplete(x);
         if (!e) {
           let e = x;
-          runHeap(_, GlobalQueue.K);
+          runHeap(b, GlobalQueue.K);
           this.D = [];
           this.B = [];
           this.G = new Set();
@@ -251,7 +251,7 @@ class GlobalQueue extends Queue {
           runLaneEffects(p);
           this.stashQueues(x.X);
           O++;
-          v = b.S >= b.W;
+          v = _.S >= _.W;
           reassignPendingTransition(x.D);
           x = null;
           finalizePureQueue(null, true);
@@ -265,11 +265,11 @@ class GlobalQueue extends Queue {
         reassignPendingTransition(this.D);
         finalizePureQueue(t);
       } else {
-        if (m.size) runHeap(_, GlobalQueue.K);
+        if (m.size) runHeap(b, GlobalQueue.K);
         finalizePureQueue();
       }
       O++;
-      v = b.S >= b.W;
+      v = _.S >= _.W;
       runLaneEffects(d);
       this.run(d);
       runLaneEffects(p);
@@ -310,7 +310,7 @@ class GlobalQueue extends Queue {
       const t = x;
       t.te = e;
       e.ee.push(...t.ee);
-      for (const n of C) {
+      for (const n of A) {
         if (n.ne === t) n.ne = e;
       }
       e.B.push(...t.B);
@@ -334,7 +334,7 @@ class GlobalQueue extends Queue {
       x.B.push(t);
     }
     this.B = x.B;
-    for (const e of C) {
+    for (const e of A) {
       if (!e.ne) e.ne = x;
     }
     for (const e of this.G) x.G.add(e);
@@ -345,13 +345,13 @@ function insertSubs(e, t = false) {
   const n = e.re || R;
   for (let r = e.O; r !== null; r = r.P) {
     if (t && n) {
-      r.A.m |= f;
-      assignOrMergeLane(r.A, n);
+      r.k.m |= f;
+      assignOrMergeLane(r.k, n);
     } else if (t) {
-      r.A.m |= f;
-      r.A.re = undefined;
+      r.k.m |= f;
+      r.k.re = undefined;
     }
-    const e = r.A;
+    const e = r.k;
     if (e.ie === h) {
       if (!e.se) {
         e.se = true;
@@ -359,17 +359,17 @@ function insertSubs(e, t = false) {
       }
       continue;
     }
-    const i = r.A.m & o ? _ : b;
-    if (i.W > r.A.o) i.W = r.A.o;
-    insertIntoHeap(r.A, i);
+    const i = r.k.m & o ? b : _;
+    if (i.W > r.k.o) i.W = r.k.o;
+    insertIntoHeap(r.k, i);
   }
 }
 function finalizePureQueue(e = null, t = false) {
   let n = !t;
-  if (!t) checkBoundaryChildren(A);
-  if (b.S >= b.W) runHeap(b, GlobalQueue.K);
+  if (!t) checkBoundaryChildren(k);
+  if (_.S >= _.W) runHeap(_, GlobalQueue.K);
   if (n) {
-    const t = A.D;
+    const t = k.D;
     for (let e = 0; e < t.length; e++) {
       const n = t[e];
       if (n.fe !== y) {
@@ -381,7 +381,7 @@ function finalizePureQueue(e = null, t = false) {
       if (n.H) GlobalQueue.U(n, false, true);
     }
     t.length = 0;
-    const n = e ? e.B : A.B;
+    const n = e ? e.B : k.B;
     for (let e = 0; e < n.length; e++) {
       const t = n[e];
       const r = t.fe;
@@ -394,7 +394,7 @@ function finalizePureQueue(e = null, t = false) {
       t.ne = null;
     }
     n.length = 0;
-    const r = e ? e.G : A.G;
+    const r = e ? e.G : k.G;
     if (GlobalQueue.J && r.size) {
       for (const e of r) {
         GlobalQueue.J(e);
@@ -402,7 +402,7 @@ function finalizePureQueue(e = null, t = false) {
       r.clear();
       schedule();
     }
-    for (const t of C) {
+    for (const t of A) {
       const n = e ? t.ne === e : !t.ne;
       if (!n) continue;
       if (!t.R) {
@@ -413,8 +413,8 @@ function finalizePureQueue(e = null, t = false) {
       t.T.clear();
       t.M[0].length = 0;
       t.M[1].length = 0;
-      C.delete(t);
-      k.delete(t.ae);
+      A.delete(t);
+      C.delete(t.ae);
     }
   }
 }
@@ -425,7 +425,7 @@ function checkBoundaryChildren(e) {
   }
 }
 function trackOptimisticStore(e) {
-  A.G.add(e);
+  k.G.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
@@ -433,10 +433,10 @@ function reassignPendingTransition(e) {
     e[t].ne = x;
   }
 }
-const A = new GlobalQueue();
+const k = new GlobalQueue();
 function flush() {
   while (v) {
-    A.flush();
+    k.flush();
   }
 }
 function runQueue(e, t) {
@@ -472,18 +472,18 @@ function runInTransition(e, t) {
     x = n;
   }
 }
-const k = new WeakMap();
-const C = new Set();
+const C = new WeakMap();
+const A = new Set();
 function getOrCreateLane(e) {
-  let t = k.get(e);
+  let t = C.get(e);
   if (t) {
     return findLane(t);
   }
   const n = e.de;
   const r = n?.re ? findLane(n.re) : null;
   t = { ae: e, T: new Set(), M: [[], []], R: null, ne: x, pe: r };
-  k.set(e, t);
-  C.add(t);
+  C.set(e, t);
+  A.add(t);
   e.he = e.ye || 0;
   return t;
 }
@@ -505,7 +505,7 @@ function resolveLane(e) {
   const t = e.re;
   if (!t) return undefined;
   const n = findLane(t);
-  if (C.has(n)) return n;
+  if (A.has(n)) return n;
   e.re = undefined;
   return undefined;
 }
@@ -521,7 +521,7 @@ function assignOrMergeLane(e, t) {
       return;
     }
     const i = findLane(r);
-    if (C.has(i)) {
+    if (A.has(i)) {
       if (i !== n && !hasActiveOverride(e)) {
         if (n.pe && findLane(n.pe) === i) {
           e.re = t;
@@ -545,14 +545,14 @@ function handleAsync(e, t, r) {
   let u;
   const handleError = n => {
     if (e.we !== t) return;
-    A.initTransition(e.ne);
+    k.initTransition(e.ne);
     notifyStatus(e, n instanceof NotReadyError ? l : c, n);
     e.$ = O;
   };
   const asyncWrite = (i, s) => {
     if (e.we !== t) return;
     if (e.m & (n | f)) return;
-    A.initTransition(e.ne);
+    k.initTransition(e.ne);
     clearStatus(e);
     const o = resolveLane(e);
     if (o) o.T.delete(e);
@@ -599,7 +599,7 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      A.initTransition(e.ne);
+      k.initTransition(e.ne);
       throw new NotReadyError(Q);
     }
   }
@@ -631,7 +631,7 @@ function handleAsync(e, t, r) {
     };
     const i = iterate();
     if (!r && !i) {
-      A.initTransition(e.ne);
+      k.initTransition(e.ne);
       throw new NotReadyError(Q);
     }
   }
@@ -641,7 +641,7 @@ function clearStatus(e) {
   e.ce = e.ce & a;
   e.Y = null;
   updatePendingSignal(e);
-  e.be?.();
+  e._e?.();
 }
 function notifyStatus(e, t, n, r, i) {
   if (t === c && !(n instanceof StatusError) && !(n instanceof NotReadyError))
@@ -665,122 +665,100 @@ function notifyStatus(e, t, n, r, i) {
   }
   const f = r || u;
   const d = r || o ? undefined : i;
-  if (e.be) {
+  if (e._e) {
     if (f) {
-      e.be(t, n);
+      e._e(t, n);
     } else {
-      e.be();
+      e._e();
     }
     return;
   }
   for (let r = e.O; r !== null; r = r.P) {
-    r.A.$ = O;
-    if (r.A.Y !== n) {
-      !r.A.ne && A.D.push(r.A);
-      notifyStatus(r.A, t, n, f, d);
+    r.k.$ = O;
+    if (r.k.Y !== n) {
+      !r.k.ne && k.D.push(r.k);
+      notifyStatus(r.k, t, n, f, d);
     }
   }
-  for (let r = e.k; r !== null; r = r.C) {
+  for (let r = e.C; r !== null; r = r.A) {
     for (let e = r.O; e !== null; e = e.P) {
-      e.A.$ = O;
-      if (e.A.Y !== n) {
-        !e.A.ne && A.D.push(e.A);
-        notifyStatus(e.A, t, n, f, d);
+      e.k.$ = O;
+      if (e.k.Y !== n) {
+        !e.k.ne && k.D.push(e.k);
+        notifyStatus(e.k, t, n, f, d);
       }
     }
   }
 }
-function effect(e, t, n, r, i) {
-  let s = false;
-  const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
-    ...i,
-    equals: () => {
-      o.se = !o.Y;
-      if (s) o.oe.enqueue(o.ie, runEffect.bind(o));
-      return false;
-    },
-    lazy: true
-  });
-  o._e = r;
-  o.Oe = t;
-  o.xe = n;
-  o.ve = undefined;
-  o.ie = i?.render ? d : p;
-  o.be = (e, t) => {
-    const n = e !== undefined ? e : o.ce;
-    const r = t !== undefined ? t : o.Y;
-    if (n & c) {
-      let e = r;
-      o.oe.notify(o, l, 0);
-      if (o.ie === p) {
-        try {
-          return o.xe
-            ? o.xe(e, () => {
-                o.ve?.();
-                o.ve = undefined;
-              })
-            : console.error(e);
-        } catch (t) {
-          e = t;
-        }
-      }
-      if (!o.oe.notify(o, c, c)) throw e;
-    } else if (o.ie === d) o.oe.notify(o, l | c, n, r);
-  };
-  recompute(o, true);
-  !i?.defer && (o.ie === p ? o.oe.enqueue(o.ie, runEffect.bind(o)) : runEffect.call(o));
-  s = true;
-  onCleanup(() => o.ve?.());
+function unlinkSubs(e) {
+  const t = e.L;
+  const n = e.N;
+  const r = e.P;
+  const i = e.be;
+  if (r !== null) r.be = i;
+  else t.Oe = i;
+  if (i !== null) i.P = r;
+  else {
+    t.O = r;
+    if (r === null) {
+      t.xe?.();
+      t.H && !t.ve && unobserved(t);
+    }
+  }
+  return n;
 }
-function runEffect() {
-  if (!this.se || this.m & u) return;
-  this.ve?.();
-  this.ve = undefined;
-  try {
-    this.ve = this.Oe(this.le, this._e);
-  } catch (e) {
-    if (!this.oe.notify(this, c, c)) throw e;
-  } finally {
-    this._e = this.le;
-    this.se = false;
+function unobserved(e) {
+  deleteFromHeap(e, e.m & o ? b : _);
+  let t = e.j;
+  while (t !== null) {
+    t = unlinkSubs(t);
   }
+  e.j = null;
+  disposeChildren(e, true);
 }
-function trackedEffect(e, t) {
-  const run = () => {
-    if (!n.se || n.m & u) return;
-    n.se = false;
-    recompute(n);
-  };
-  const n = computed(
-    () => {
-      try {
-        n.ve?.();
-        n.ve = undefined;
-        n.ve = staleValues(e) || undefined;
-      } finally {
-      }
-    },
-    undefined,
-    { ...t, lazy: true, pureWrite: true }
-  );
-  n.ve = undefined;
-  n.se = true;
-  n.ie = h;
-  n.ue = run;
-  n.oe.enqueue(p, run);
-  onCleanup(() => n.ve?.());
+function link(e, t) {
+  const n = t.Pe;
+  if (n !== null && n.L === e) return;
+  let i = null;
+  const s = t.m & r;
+  if (s) {
+    i = n !== null ? n.N : t.j;
+    if (i !== null && i.L === e) {
+      t.Pe = i;
+      return;
+    }
+  }
+  const o = e.Oe;
+  if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
+  const u = (t.Pe = e.Oe = { L: e, k: t, N: i, be: o, P: null });
+  if (n !== null) n.N = u;
+  else t.j = u;
+  if (o !== null) o.P = u;
+  else e.O = u;
+}
+function isValidLink(e, t) {
+  const n = t.Pe;
+  if (n !== null) {
+    let r = t.j;
+    do {
+      if (r === e) return true;
+      if (r === n) break;
+      r = r.N;
+    } while (r !== null);
+  }
+  return false;
 }
 const W = {};
 function markDisposal(e) {
-  let t = e.Pe;
+  let t = e.ke;
   while (t) {
     t.m |= o;
     if (t.m & i) {
-      deleteFromHeap(t, b);
-      insertIntoHeap(t, _);
+      deleteFromHeap(t, _);
+      insertIntoHeap(t, b);
     }
     markDisposal(t);
-    t = t.Ae;
+    t = t.Ce;
   }
 }
 function dispose(e) {
@@ -789,33 +767,33 @@ function dispose(e) {
     t = unlinkSubs(t);
   } while (t !== null);
   e.j = null;
-  e.ke = null;
+  e.Pe = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
   if (e.m & u) return;
   if (t) e.m = u;
-  let r = n ? e.Ce : e.Pe;
+  let r = n ? e.Ae : e.ke;
   while (r) {
-    const e = r.Ae;
+    const e = r.Ce;
     if (r.j) {
       const e = r;
-      deleteFromHeap(e, e.m & o ? _ : b);
+      deleteFromHeap(e, e.m & o ? b : _);
       let t = e.j;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
       e.j = null;
-      e.ke = null;
+      e.Pe = null;
     }
     disposeChildren(r, true);
     r = e;
   }
   if (n) {
-    e.Ce = null;
-  } else {
-    e.Pe = null;
     e.Ae = null;
+  } else {
+    e.ke = null;
+    e.Ce = null;
     e.We = 0;
   }
   runDisposal(e, n);
@@ -833,10 +811,18 @@ function runDisposal(e, t) {
   }
   t ? (e.Ee = null) : (e.je = null);
 }
-function getNextChildId(e) {
-  if (e.id != null) return formatId(e.id, e.We++);
+function childId(e, t) {
+  let n = e;
+  while (n.Ne && n.i) n = n.i;
+  if (n.id != null) return formatId(n.id, t ? n.We++ : n.We);
   throw new Error("Cannot get child id from owner without an id");
 }
+function getNextChildId(e) {
+  return childId(e, true);
+}
+function peekNextChildId(e) {
+  return childId(e, false);
+}
 function formatId(e, t) {
   const n = t.toString(36),
     r = n.length - 1;
@@ -858,95 +844,119 @@ function onCleanup(e) {
 }
 function createOwner(e) {
   const t = Q;
-  const n = {
-    id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
+  const n = e?.transparent ?? false;
+  const r = {
+    id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
+    Ne: n || undefined,
     t: true,
     u: t?.t ? t.u : t,
-    Pe: null,
-    Ae: null,
+    ke: null,
+    Ce: null,
     je: null,
-    oe: t?.oe ?? A,
-    Ne: t?.Ne || w,
+    oe: t?.oe ?? k,
+    Le: t?.Le || w,
     We: 0,
     Ee: null,
-    Ce: null,
+    Ae: null,
     i: t,
     dispose(e = true) {
-      disposeChildren(n, e);
+      disposeChildren(r, e);
     }
   };
   if (t) {
-    const e = t.Pe;
+    const e = t.ke;
     if (e === null) {
-      t.Pe = n;
+      t.ke = r;
     } else {
-      n.Ae = e;
-      t.Pe = n;
+      r.Ce = e;
+      t.ke = r;
     }
   }
-  return n;
+  return r;
 }
 function createRoot(e, t) {
   const n = createOwner(t);
   return runWithOwner(n, () => e(n.dispose));
 }
-function unlinkSubs(e) {
-  const t = e.L;
-  const n = e.N;
-  const r = e.P;
-  const i = e.Le;
-  if (r !== null) r.Le = i;
-  else t.Ie = i;
-  if (i !== null) i.P = r;
-  else {
-    t.O = r;
-    if (r === null) {
-      t.He?.();
-      t.H && !t.Qe && unobserved(t);
-    }
-  }
-  return n;
-}
-function unobserved(e) {
-  deleteFromHeap(e, e.m & o ? _ : b);
-  let t = e.j;
-  while (t !== null) {
-    t = unlinkSubs(t);
-  }
-  e.j = null;
-  disposeChildren(e, true);
+function effect(e, t, n, r, i) {
+  let s = false;
+  const o = computed(i?.render ? t => staleValues(() => e(t)) : e, r, {
+    ...i,
+    equals: () => {
+      o.se = !o.Y;
+      if (s) o.oe.enqueue(o.ie, runEffect.bind(o));
+      return false;
+    },
+    lazy: true
+  });
+  o.Ie = r;
+  o.He = t;
+  o.Qe = n;
+  o.Re = undefined;
+  o.ie = i?.render ? d : p;
+  o._e = (e, t) => {
+    const n = e !== undefined ? e : o.ce;
+    const r = t !== undefined ? t : o.Y;
+    if (n & c) {
+      let e = r;
+      o.oe.notify(o, l, 0);
+      if (o.ie === p) {
+        try {
+          return o.Qe
+            ? o.Qe(e, () => {
+                o.Re?.();
+                o.Re = undefined;
+              })
+            : console.error(e);
+        } catch (t) {
+          e = t;
+        }
+      }
+      if (!o.oe.notify(o, c, c)) throw e;
+    } else if (o.ie === d) o.oe.notify(o, l | c, n, r);
+  };
+  recompute(o, true);
+  !i?.defer && (o.ie === p ? o.oe.enqueue(o.ie, runEffect.bind(o)) : runEffect.call(o));
+  s = true;
+  onCleanup(() => o.Re?.());
 }
-function link(e, t) {
-  const n = t.ke;
-  if (n !== null && n.L === e) return;
-  let i = null;
-  const s = t.m & r;
-  if (s) {
-    i = n !== null ? n.N : t.j;
-    if (i !== null && i.L === e) {
-      t.ke = i;
-      return;
-    }
+function runEffect() {
+  if (!this.se || this.m & u) return;
+  this.Re?.();
+  this.Re = undefined;
+  try {
+    this.Re = this.He(this.le, this.Ie);
+  } catch (e) {
+    if (!this.oe.notify(this, c, c)) throw e;
+  } finally {
+    this.Ie = this.le;
+    this.se = false;
   }
-  const o = e.Ie;
-  if (o !== null && o.A === t && (!s || isValidLink(o, t))) return;
-  const u = (t.ke = e.Ie = { L: e, A: t, N: i, Le: o, P: null });
-  if (n !== null) n.N = u;
-  else t.j = u;
-  if (o !== null) o.P = u;
-  else e.O = u;
 }
-function isValidLink(e, t) {
-  const n = t.ke;
-  if (n !== null) {
-    let r = t.j;
-    do {
-      if (r === e) return true;
-      if (r === n) break;
-      r = r.N;
-    } while (r !== null);
-  }
-  return false;
+function trackedEffect(e, t) {
+  const run = () => {
+    if (!n.se || n.m & u) return;
+    n.se = false;
+    recompute(n);
+  };
+  const n = computed(
+    () => {
+      try {
+        n.Re?.();
+        n.Re = undefined;
+        n.Re = staleValues(e) || undefined;
+      } finally {
+      }
+    },
+    undefined,
+    { ...t, lazy: true, pureWrite: true }
+  );
+  n.Re = undefined;
+  n.se = true;
+  n.ie = h;
+  n.ue = run;
+  n.oe.enqueue(p, run);
+  onCleanup(() => n.Re?.());
 }
 GlobalQueue.K = recompute;
 GlobalQueue.U = disposeChildren;
@@ -961,15 +971,15 @@ let R = null;
 function recompute(t, n = false) {
   const i = t.ie;
   if (!n) {
-    if (t.ne && (!i || x) && x !== t.ne) A.initTransition(t.ne);
-    deleteFromHeap(t, t.m & o ? _ : b);
+    if (t.ne && (!i || x) && x !== t.ne) k.initTransition(t.ne);
+    deleteFromHeap(t, t.m & o ? b : _);
     if (t.ne || i === h) disposeChildren(t);
     else {
       markDisposal(t);
       t.Ee = t.je;
-      t.Ce = t.Pe;
+      t.Ae = t.ke;
       t.je = null;
-      t.Pe = null;
+      t.ke = null;
       t.We = 0;
     }
   }
@@ -978,7 +988,7 @@ function recompute(t, n = false) {
   const a = !!(t.ce & l);
   const d = Q;
   Q = t;
-  t.ke = null;
+  t.Pe = null;
   t.m = r;
   t.$ = O;
   let p = t.fe === y ? t.le : t.fe;
@@ -1020,7 +1030,7 @@ function recompute(t, n = false) {
     Q = d;
   }
   if (!t.Y) {
-    const e = t.ke;
+    const e = t.Pe;
     let r = e !== null ? e.N : t.j;
     if (r !== null) {
       do {
@@ -1047,12 +1057,12 @@ function recompute(t, n = false) {
       t.fe = p;
     } else if (t.o != g) {
       for (let e = t.O; e !== null; e = e.P) {
-        insertIntoHeapHeight(e.A, e.A.m & o ? _ : b);
+        insertIntoHeapHeight(e.k, e.k.m & o ? b : _);
       }
     }
   }
   R = S;
-  (!n || t.ce & l) && !t.ne && !(x && t.ge) && A.D.push(t);
+  (!n || t.ce & l) && !t.ne && !(x && t.ge) && k.D.push(t);
   t.ne && i && x !== t.ne && runInTransition(t.ne, () => recompute(t));
 }
 function updateIfNecessary(r) {
@@ -1074,66 +1084,68 @@ function updateIfNecessary(r) {
   r.m = e;
 }
 function computed(t, n, r) {
-  const i = {
-    id: r?.id ?? (Q?.id != null ? getNextChildId(Q) : undefined),
+  const i = r?.transparent ?? false;
+  const s = {
+    id: r?.id ?? (i ? Q?.id : Q?.id != null ? getNextChildId(Q) : undefined),
+    Ne: i || undefined,
     Se: r?.equals != null ? r.equals : isEqual,
-    Re: !!r?.pureWrite,
-    He: r?.unobserved,
+    Te: !!r?.pureWrite,
+    xe: r?.unobserved,
     je: null,
-    oe: Q?.oe ?? A,
-    Ne: Q?.Ne ?? w,
+    oe: Q?.oe ?? k,
+    Le: Q?.Le ?? w,
     We: 0,
     H: t,
     le: n,
     o: 0,
-    k: null,
+    C: null,
     h: undefined,
     p: null,
     j: null,
-    ke: null,
+    Pe: null,
     O: null,
-    Ie: null,
+    Oe: null,
     i: Q,
-    Ae: null,
-    Pe: null,
+    Ce: null,
+    ke: null,
     m: e,
     ce: a,
     $: O,
     fe: y,
     Ee: null,
-    Ce: null,
+    Ae: null,
     we: null,
     ne: null
   };
-  i.p = i;
-  const s = Q?.t ? Q.u : Q;
+  s.p = s;
+  const o = Q?.t ? Q.u : Q;
   if (Q) {
-    const e = Q.Pe;
+    const e = Q.ke;
     if (e === null) {
-      Q.Pe = i;
+      Q.ke = s;
     } else {
-      i.Ae = e;
-      Q.Pe = i;
+      s.Ce = e;
+      Q.ke = s;
     }
   }
-  if (s) i.o = s.o + 1;
-  !r?.lazy && recompute(i, true);
-  return i;
+  if (o) s.o = o.o + 1;
+  !r?.lazy && recompute(s, true);
+  return s;
 }
 function signal(e, t, n = null) {
   const r = {
     Se: t?.equals != null ? t.equals : isEqual,
-    Re: !!t?.pureWrite,
-    He: t?.unobserved,
+    Te: !!t?.pureWrite,
+    xe: t?.unobserved,
     le: e,
     O: null,
-    Ie: null,
+    Oe: null,
     $: O,
     I: n,
-    C: n?.k || null,
+    A: n?.C || null,
     fe: y
   };
-  n && (n.k = r);
+  n && (n.C = r);
   return r;
 }
 function optimisticSignal(e, t) {
@@ -1195,9 +1207,9 @@ function read(e) {
     const n = e.I || e;
     if (n.H) {
       const r = e.m & o;
-      if (n.o >= (r ? _.W : b.W)) {
+      if (n.o >= (r ? b.W : _.W)) {
         markNode(t);
-        markHeap(r ? _ : b);
+        markHeap(r ? b : _);
         updateIfNecessary(n);
       }
       const i = n.o;
@@ -1229,7 +1241,7 @@ function read(e) {
   return !t || R !== null || e.fe === y || (j && e.ne && x !== e.ne) ? e.le : e.fe;
 }
 function setSignal(e, t) {
-  if (e.ne && x !== e.ne) A.initTransition(e.ne);
+  if (e.ne && x !== e.ne) k.initTransition(e.ne);
   const n = e.ge && !P;
   const r = n ? e.le : e.fe === y ? e.le : e.fe;
   if (typeof t === "function") t = t(r);
@@ -1242,22 +1254,22 @@ function setSignal(e, t) {
     return t;
   }
   if (n) {
-    const n = A.B.includes(e);
+    const n = k.B.includes(e);
     if (e.ne && n) {
-      A.initTransition(e.ne);
+      k.initTransition(e.ne);
     }
     if (e.fe === y) {
       e.fe = e.le;
     }
     if (!n) {
-      A.B.push(e);
+      k.B.push(e);
     }
     e.ye = (e.ye || 0) + 1;
     const r = getOrCreateLane(e);
     e.re = r;
     e.le = t;
   } else {
-    if (e.fe === y) A.D.push(e);
+    if (e.fe === y) k.D.push(e);
     e.fe = t;
   }
   updatePendingSignal(e);
@@ -1282,14 +1294,14 @@ function runWithOwner(e, t) {
   }
 }
 function getPendingSignal(e) {
-  if (!e.Te) {
-    e.Te = optimisticSignal(false, { pureWrite: true });
+  if (!e.Me) {
+    e.Me = optimisticSignal(false, { pureWrite: true });
     if (e.de) {
-      e.Te.de = e;
+      e.Me.de = e;
     }
-    if (computePendingState(e)) setSignal(e.Te, true);
+    if (computePendingState(e)) setSignal(e.Me, true);
   }
-  return e.Te;
+  return e.Me;
 }
 function computePendingState(e) {
   const t = e;
@@ -1305,9 +1317,9 @@ function computePendingState(e) {
   return !!(t.ce & l && !(t.ce & a));
 }
 function updatePendingSignal(e) {
-  if (e.Te) {
+  if (e.Me) {
     const t = computePendingState(e);
-    const n = e.Te;
+    const n = e.Me;
     setSignal(n, t);
     if (!t && n.re) {
       const t = resolveLane(e);
@@ -1317,7 +1329,7 @@ function updatePendingSignal(e) {
           mergeLanes(t, e);
         }
       }
-      k.delete(n);
+      C.delete(n);
       n.re = undefined;
     }
   }
@@ -1397,7 +1409,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.Ne[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Le[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1407,16 +1419,16 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Ne = { ...n.Ne, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Le = { ...n.Le, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.Ne[e.id]);
+  return !isUndefined(t?.Le[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
 }
 function restoreTransition(e, t) {
-  A.initTransition(e);
+  k.initTransition(e);
   const n = t();
   flush();
   return n;
@@ -1425,7 +1437,7 @@ function action(e) {
   return (...t) =>
     new Promise((n, r) => {
       const i = e(...t);
-      A.initTransition();
+      k.initTransition();
       let s = x;
       s.ee.push(i);
       const done = (e, t) => {
@@ -1522,7 +1534,7 @@ function createOptimistic(e, t, n) {
 function onSettled(e) {
   getOwner()
     ? createTrackedEffect(() => untrack(e))
-    : A.enqueue(p, () => {
+    : k.enqueue(p, () => {
         const t = e();
         t?.();
       });
@@ -1692,7 +1704,7 @@ function createProjectionInternal(e, t = {}, n) {
       i !== r && i !== undefined && reconcile(i, n?.key || "id", n?.all)(s);
     });
   });
-  r.Qe = true;
+  r.ve = true;
   return { store: s, node: r };
 }
 function createProjection(e, t = {}, n) {
@@ -1871,7 +1883,7 @@ const re = {
       if (e[$]) {
         const t = e[Z];
         if (t?.ne) {
-          A.initTransition(t.ne);
+          k.initTransition(t.ne);
         }
       }
       untrack(() => {
@@ -2120,7 +2132,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
         setProjectionWriteActive(false);
       }
     });
-    r.Qe = true;
+    r.ve = true;
   }
   return { store: s, node: r };
 }
@@ -2301,68 +2313,68 @@ function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
   return createMemo(
     updateKeyedMap.bind({
-      Me: createOwner(),
-      qe: 0,
-      Fe: e,
-      Ve: [],
-      De: t,
-      Be: [],
+      qe: createOwner(),
+      Fe: 0,
+      Ve: e,
+      De: [],
+      Be: t,
       Ge: [],
-      Ke: r,
-      ze: r || n?.keyed === false ? [] : undefined,
-      Ue: t.length > 1 ? [] : undefined,
-      Je: n?.fallback
+      Ke: [],
+      ze: r,
+      Ue: r || n?.keyed === false ? [] : undefined,
+      Je: t.length > 1 ? [] : undefined,
+      Xe: n?.fallback
     })
   );
 }
 const oe = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.Fe() || [],
+  const e = this.Ve() || [],
     t = e.length;
   e[M];
-  runWithOwner(this.Me, () => {
+  runWithOwner(this.qe, () => {
     let n,
       r,
-      i = this.ze
+      i = this.Ue
         ? () => {
-            this.ze[r] = signal(e[r], oe);
-            this.Ue && (this.Ue[r] = signal(r, oe));
-            return this.De(
-              read.bind(null, this.ze[r]),
-              this.Ue ? read.bind(null, this.Ue[r]) : undefined
+            this.Ue[r] = signal(e[r], oe);
+            this.Je && (this.Je[r] = signal(r, oe));
+            return this.Be(
+              read.bind(null, this.Ue[r]),
+              this.Je ? read.bind(null, this.Je[r]) : undefined
             );
           }
-        : this.Ue
+        : this.Je
           ? () => {
               const t = e[r];
-              this.Ue[r] = signal(r, oe);
-              return this.De(() => t, read.bind(null, this.Ue[r]));
+              this.Je[r] = signal(r, oe);
+              return this.Be(() => t, read.bind(null, this.Je[r]));
             }
           : () => {
               const t = e[r];
-              return this.De(() => t);
+              return this.Be(() => t);
             };
     if (t === 0) {
-      if (this.qe !== 0) {
-        this.Me.dispose(false);
+      if (this.Fe !== 0) {
+        this.qe.dispose(false);
+        this.Ke = [];
+        this.De = [];
         this.Ge = [];
-        this.Ve = [];
-        this.Be = [];
-        this.qe = 0;
-        this.ze && (this.ze = []);
+        this.Fe = 0;
         this.Ue && (this.Ue = []);
+        this.Je && (this.Je = []);
       }
-      if (this.Je && !this.Be[0]) {
-        this.Be[0] = runWithOwner((this.Ge[0] = createOwner()), this.Je);
+      if (this.Xe && !this.Ge[0]) {
+        this.Ge[0] = runWithOwner((this.Ke[0] = createOwner()), this.Xe);
       }
-    } else if (this.qe === 0) {
-      if (this.Ge[0]) this.Ge[0].dispose();
-      this.Be = new Array(t);
+    } else if (this.Fe === 0) {
+      if (this.Ke[0]) this.Ke[0].dispose();
+      this.Ge = new Array(t);
       for (r = 0; r < t; r++) {
-        this.Ve[r] = e[r];
-        this.Be[r] = runWithOwner((this.Ge[r] = createOwner()), i);
+        this.De[r] = e[r];
+        this.Ge[r] = runWithOwner((this.Ke[r] = createOwner()), i);
       }
-      this.qe = t;
+      this.Fe = t;
     } else {
       let s,
         o,
@@ -2373,144 +2385,144 @@ function updateKeyedMap() {
         a,
         d = new Array(t),
         p = new Array(t),
-        h = this.ze ? new Array(t) : undefined,
-        y = this.Ue ? new Array(t) : undefined;
+        h = this.Ue ? new Array(t) : undefined,
+        y = this.Je ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.qe, t);
-        s < o && (this.Ve[s] === e[s] || (this.ze && compare(this.Ke, this.Ve[s], e[s])));
+        s = 0, o = Math.min(this.Fe, t);
+        s < o && (this.De[s] === e[s] || (this.Ue && compare(this.ze, this.De[s], e[s])));
         s++
       ) {
-        if (this.ze) setSignal(this.ze[s], e[s]);
+        if (this.Ue) setSignal(this.Ue[s], e[s]);
       }
       for (
-        o = this.qe - 1, u = t - 1;
+        o = this.Fe - 1, u = t - 1;
         o >= s &&
         u >= s &&
-        (this.Ve[o] === e[u] || (this.ze && compare(this.Ke, this.Ve[o], e[u])));
+        (this.De[o] === e[u] || (this.Ue && compare(this.ze, this.De[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.Be[o];
-        p[u] = this.Ge[o];
-        h && (h[u] = this.ze[o]);
-        y && (y[u] = this.Ue[o]);
+        d[u] = this.Ge[o];
+        p[u] = this.Ke[o];
+        h && (h[u] = this.Ue[o]);
+        y && (y[u] = this.Je[o]);
       }
       c = new Map();
       a = new Array(u + 1);
       for (r = u; r >= s; r--) {
         f = e[r];
-        l = this.Ke ? this.Ke(f) : f;
+        l = this.ze ? this.ze(f) : f;
         n = c.get(l);
         a[r] = n === undefined ? -1 : n;
         c.set(l, r);
       }
       for (n = s; n <= o; n++) {
-        f = this.Ve[n];
-        l = this.Ke ? this.Ke(f) : f;
+        f = this.De[n];
+        l = this.ze ? this.ze(f) : f;
         r = c.get(l);
         if (r !== undefined && r !== -1) {
-          d[r] = this.Be[n];
-          p[r] = this.Ge[n];
-          h && (h[r] = this.ze[n]);
-          y && (y[r] = this.Ue[n]);
+          d[r] = this.Ge[n];
+          p[r] = this.Ke[n];
+          h && (h[r] = this.Ue[n]);
+          y && (y[r] = this.Je[n]);
           r = a[r];
           c.set(l, r);
-        } else this.Ge[n].dispose();
+        } else this.Ke[n].dispose();
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.Be[r] = d[r];
-          this.Ge[r] = p[r];
+          this.Ge[r] = d[r];
+          this.Ke[r] = p[r];
           if (h) {
-            this.ze[r] = h[r];
-            setSignal(this.ze[r], e[r]);
+            this.Ue[r] = h[r];
+            setSignal(this.Ue[r], e[r]);
           }
           if (y) {
-            this.Ue[r] = y[r];
-            setSignal(this.Ue[r], r);
+            this.Je[r] = y[r];
+            setSignal(this.Je[r], r);
           }
         } else {
-          this.Be[r] = runWithOwner((this.Ge[r] = createOwner()), i);
+          this.Ge[r] = runWithOwner((this.Ke[r] = createOwner()), i);
         }
       }
-      this.Be = this.Be.slice(0, (this.qe = t));
-      this.Ve = e.slice(0);
+      this.Ge = this.Ge.slice(0, (this.Fe = t));
+      this.De = e.slice(0);
     }
   });
-  return this.Be;
+  return this.Ge;
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
-    Me: createOwner(),
-    qe: 0,
-    Xe: 0,
-    Ye: e,
-    De: t,
+    qe: createOwner(),
+    Fe: 0,
+    Ye: 0,
+    Ze: e,
+    Be: t,
+    Ke: [],
     Ge: [],
-    Be: [],
-    Ze: n?.from,
-    Je: n?.fallback
+    $e: n?.from,
+    Xe: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.Ye();
-  const t = this.Ze?.() || 0;
-  runWithOwner(this.Me, () => {
+  const e = this.Ze();
+  const t = this.$e?.() || 0;
+  runWithOwner(this.qe, () => {
     if (e === 0) {
-      if (this.qe !== 0) {
-        this.Me.dispose(false);
+      if (this.Fe !== 0) {
+        this.qe.dispose(false);
+        this.Ke = [];
         this.Ge = [];
-        this.Be = [];
-        this.qe = 0;
+        this.Fe = 0;
       }
-      if (this.Je && !this.Be[0]) {
-        this.Be[0] = runWithOwner((this.Ge[0] = createOwner()), this.Je);
+      if (this.Xe && !this.Ge[0]) {
+        this.Ge[0] = runWithOwner((this.Ke[0] = createOwner()), this.Xe);
       }
       return;
     }
     const n = t + e;
-    const r = this.Xe + this.qe;
-    if (this.qe === 0 && this.Ge[0]) this.Ge[0].dispose();
-    for (let e = n; e < r; e++) this.Ge[e - this.Xe].dispose();
-    if (this.Xe < t) {
-      let e = this.Xe;
-      while (e < t && e < this.qe) this.Ge[e++].dispose();
-      this.Ge.splice(0, t - this.Xe);
-      this.Be.splice(0, t - this.Xe);
-    } else if (this.Xe > t) {
-      let n = r - this.Xe - 1;
-      let i = this.Xe - t;
-      this.Ge.length = this.Be.length = e;
+    const r = this.Ye + this.Fe;
+    if (this.Fe === 0 && this.Ke[0]) this.Ke[0].dispose();
+    for (let e = n; e < r; e++) this.Ke[e - this.Ye].dispose();
+    if (this.Ye < t) {
+      let e = this.Ye;
+      while (e < t && e < this.Fe) this.Ke[e++].dispose();
+      this.Ke.splice(0, t - this.Ye);
+      this.Ge.splice(0, t - this.Ye);
+    } else if (this.Ye > t) {
+      let n = r - this.Ye - 1;
+      let i = this.Ye - t;
+      this.Ke.length = this.Ge.length = e;
       while (n >= i) {
+        this.Ke[n] = this.Ke[n - i];
         this.Ge[n] = this.Ge[n - i];
-        this.Be[n] = this.Be[n - i];
         n--;
       }
       for (let e = 0; e < i; e++) {
-        this.Be[e] = runWithOwner((this.Ge[e] = createOwner()), () => this.De(e + t));
+        this.Ge[e] = runWithOwner((this.Ke[e] = createOwner()), () => this.Be(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.Be[e - t] = runWithOwner((this.Ge[e - t] = createOwner()), () => this.De(e));
+      this.Ge[e - t] = runWithOwner((this.Ke[e - t] = createOwner()), () => this.Be(e));
     }
-    this.Be = this.Be.slice(0, e);
-    this.Xe = t;
-    this.qe = e;
+    this.Ge = this.Ge.slice(0, e);
+    this.Ye = t;
+    this.Fe = e;
   });
-  return this.Be;
+  return this.Ge;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n.be = (e, t) => {
+  n._e = (e, t) => {
     const r = e !== undefined ? e : n.ce;
     const i = t !== undefined ? t : n.Y;
-    n.ce &= ~n.$e;
-    n.oe.notify(n, n.$e, r, i);
+    n.ce &= ~n.et;
+    n.oe.notify(n, n.et, r, i);
   };
-  n.$e = t;
-  n.Qe = true;
+  n.et = t;
+  n.ve = true;
   recompute(n, true);
   return n;
 }
@@ -2524,36 +2536,36 @@ function createBoundChildren(e, t, n, r) {
   });
 }
 class CollectionQueue extends Queue {
-  et;
-  tt = new Set();
-  nt = signal(false, { pureWrite: true });
-  rt = false;
+  tt;
+  nt = new Set();
+  rt = signal(false, { pureWrite: true });
+  it = false;
   constructor(e) {
     super();
-    this.et = e;
+    this.tt = e;
   }
   run(e) {
-    if (!e || read(this.nt)) return;
+    if (!e || read(this.rt)) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
-    if (!(t & this.et) || (this.et & l && this.rt)) return super.notify(e, t, n, r);
-    if (n & this.et) {
+    if (!(t & this.tt) || (this.tt & l && this.it)) return super.notify(e, t, n, r);
+    if (n & this.tt) {
       const t = r?.source || e.Y?.source;
       if (t) {
-        const e = this.tt.size === 0;
-        this.tt.add(t);
-        if (e) setSignal(this.nt, true);
+        const e = this.nt.size === 0;
+        this.nt.add(t);
+        if (e) setSignal(this.rt, true);
       }
     }
-    t &= ~this.et;
+    t &= ~this.tt;
     return t ? super.notify(e, t, n, r) : true;
   }
   checkSources() {
-    for (const e of this.tt) {
-      if (!(e.ce & this.et)) this.tt.delete(e);
+    for (const e of this.nt) {
+      if (!(e.ce & this.tt)) this.nt.delete(e);
     }
-    if (!this.tt.size) setSignal(this.nt, false);
+    if (!this.nt.size) setSignal(this.rt, false);
   }
 }
 function createCollectionBoundary(e, t, n) {
@@ -2561,10 +2573,10 @@ function createCollectionBoundary(e, t, n) {
   const i = new CollectionQueue(e);
   const s = createBoundChildren(r, t, i, e);
   const o = computed(() => {
-    if (!read(i.nt)) {
+    if (!read(i.rt)) {
       const e = read(s);
-      if (!untrack(() => read(i.nt))) {
-        i.rt = true;
+      if (!untrack(() => read(i.rt))) {
+        i.it = true;
         return e;
       }
     }
@@ -2577,10 +2589,10 @@ function createLoadBoundary(e, t) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(c, e, e => {
-    let n = e.tt.values().next().value;
+    let n = e.nt.values().next().value;
     const r = n.Y?.cause ?? n.Y;
     return t(r, () => {
-      for (const t of e.tt) recompute(t);
+      for (const t of e.nt) recompute(t);
       schedule();
     });
   });
@@ -2673,6 +2685,7 @@ exports.merge = merge;
 exports.omit = omit;
 exports.onCleanup = onCleanup;
 exports.onSettled = onSettled;
+exports.peekNextChildId = peekNextChildId;
 exports.pending = pending;
 exports.reconcile = reconcile;
 exports.refresh = refresh;