@solidjs/signals 0.9.3 → 0.9.5

package/dist/node.cjs

@@ -80,8 +80,8 @@ function deleteFromHeap(e, t) {
   e.p = undefined;
 }
 function markHeap(e) {
-  if (e.O) return;
-  e.O = true;
+  if (e.m) return;
+  e.m = true;
   for (let t = 0; t <= e._; t++) {
     for (let n = e.l[t]; n !== undefined; n = n.p) {
       if (n.S & i) markNode(n);
@@ -92,19 +92,19 @@ function markNode(e, r = n) {
   const i = e.S;
   if ((i & (t | n)) >= r) return;
   e.S = (i & -4) | r;
-  for (let n = e.m; n !== null; n = n.C) {
+  for (let n = e.O; n !== null; n = n.C) {
     markNode(n.N, t);
   }
   if (e.k !== null) {
     for (let n = e.k; n !== null; n = n.j) {
-      for (let e = n.m; e !== null; e = e.C) {
+      for (let e = n.O; e !== null; e = e.C) {
         markNode(e.N, t);
       }
     }
   }
 }
 function runHeap(e, t) {
-  e.O = false;
+  e.m = false;
   for (e.P = 0; e.P <= e._; e.P++) {
     let n = e.l[e.P];
     while (n !== undefined) {
@@ -125,36 +125,36 @@ function adjustHeight(e, t) {
   }
   if (e.o !== n) {
     e.o = n;
-    for (let n = e.m; n !== null; n = n.C) {
+    for (let n = e.O; n !== null; n = n.C) {
       insertIntoHeapHeight(n.N, t);
     }
   }
 }
 const _ = new Set();
 let S = false;
-const b = { l: new Array(2e3).fill(undefined), O: false, P: 0, _: 0 };
-const O = { l: new Array(2e3).fill(undefined), O: false, P: 0, _: 0 };
-let m = 0;
+const b = { l: new Array(2e3).fill(undefined), m: false, P: 0, _: 0 };
+const m = { l: new Array(2e3).fill(undefined), m: false, P: 0, _: 0 };
+let O = 0;
 let x = null;
-let C = false;
+let v = false;
 function schedule() {
-  if (C) return;
-  C = true;
-  if (!v.R) Promise.resolve().then(() => queueMicrotask(flush));
+  if (v) return;
+  v = true;
+  if (!C.R) Promise.resolve().then(() => queueMicrotask(flush));
 }
 class Queue {
   i = null;
-  V = [[], []];
-  q = [];
-  created = m;
+  T = [[], []];
+  V = [];
+  created = O;
   addChild(e) {
-    this.q.push(e);
+    this.V.push(e);
     e.i = this;
   }
   removeChild(e) {
-    const t = this.q.indexOf(e);
+    const t = this.V.indexOf(e);
     if (t >= 0) {
-      this.q.splice(t, 1);
+      this.V.splice(t, 1);
       e.i = null;
     }
   }
@@ -163,47 +163,47 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.V[e - 1].length) {
-      const t = this.V[e - 1];
-      this.V[e - 1] = [];
+    if (this.T[e - 1].length) {
+      const t = this.T[e - 1];
+      this.T[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.q.length; t++) {
-      this.q[t].run(e);
+    for (let t = 0; t < this.V.length; t++) {
+      this.V[t].run(e);
     }
   }
   enqueue(e, t) {
-    if (e) this.V[e - 1].push(t);
+    if (e) this.T[e - 1].push(t);
     schedule();
   }
   stashQueues(e) {
-    e.V[0].push(...this.V[0]);
-    e.V[1].push(...this.V[1]);
-    this.V = [[], []];
-    for (let t = 0; t < this.q.length; t++) {
-      let n = this.q[t];
-      let r = e.q[t];
+    e.T[0].push(...this.T[0]);
+    e.T[1].push(...this.T[1]);
+    this.T = [[], []];
+    for (let t = 0; t < this.V.length; t++) {
+      let n = this.V[t];
+      let r = e.V[t];
       if (!r) {
-        r = { V: [[], []], q: [] };
-        e.q[t] = r;
+        r = { T: [[], []], V: [] };
+        e.V[t] = r;
       }
       n.stashQueues(r);
     }
   }
   restoreQueues(e) {
-    this.V[0].push(...e.V[0]);
-    this.V[1].push(...e.V[1]);
-    for (let t = 0; t < e.q.length; t++) {
-      const n = e.q[t];
-      let r = this.q[t];
+    this.T[0].push(...e.T[0]);
+    this.T[1].push(...e.T[1]);
+    for (let t = 0; t < e.V.length; t++) {
+      const n = e.V[t];
+      let r = this.V[t];
       if (r) r.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
   R = false;
+  q = [];
   M = [];
-  T = [];
   static D;
   static B;
   flush() {
@@ -214,26 +214,26 @@ class GlobalQueue extends Queue {
       if (x) {
         if (!transitionComplete(x)) {
           let e = x;
-          runHeap(O, GlobalQueue.D);
-          this.M = [];
+          runHeap(m, GlobalQueue.D);
+          this.q = [];
           this.stashQueues(x.queueStash);
-          m++;
-          C = false;
+          O++;
+          v = false;
           runTransitionPending(x.pendingNodes, true);
           x = null;
           runOptimistic(e);
           return;
         }
-        this.M.push(...x.pendingNodes);
-        this.T !== x.optimisticNodes && this.T.push(...x.optimisticNodes);
+        this.q !== x.pendingNodes && this.q.push(...x.pendingNodes);
+        this.M !== x.optimisticNodes && this.M.push(...x.optimisticNodes);
         this.restoreQueues(x.queueStash);
         _.delete(x);
         x = null;
-        runTransitionPending(this.M, false);
-      } else if (_.size) runHeap(O, GlobalQueue.D);
+        runTransitionPending(this.q, false);
+      } else if (_.size) runHeap(m, GlobalQueue.D);
       runOptimistic();
-      m++;
-      C = false;
+      O++;
+      v = false;
       this.run(d);
       this.run(h);
     } finally {
@@ -253,44 +253,51 @@ class GlobalQueue extends Queue {
     return false;
   }
   initTransition(e) {
-    if (x && x.time === m) return;
+    if (e) e = currentTransition(e);
+    if (e && e === x) return;
+    if (!e && x && x.time === O) return;
     if (!x) {
-      x = e?.G ?? {
-        time: m,
+      x = e ?? {
+        time: O,
         pendingNodes: [],
         asyncNodes: [],
         optimisticNodes: [],
         actions: [],
-        queueStash: { V: [[], []], q: [] },
+        queueStash: { T: [[], []], V: [] },
         done: false
       };
+    } else if (e) {
+      x.done = e;
+      e.actions.push(...x.actions);
+      _.delete(x);
+      x = e;
     }
     _.add(x);
-    x.time = m;
-    for (let e = 0; e < this.M.length; e++) {
-      const t = this.M[e];
+    x.time = O;
+    for (let e = 0; e < this.q.length; e++) {
+      const t = this.q[e];
       t.G = x;
       x.pendingNodes.push(t);
     }
-    for (let e = 0; e < this.T.length; e++) {
-      const t = this.T[e];
+    for (let e = 0; e < this.M.length; e++) {
+      const t = this.M[e];
       t.G = x;
       x.optimisticNodes.push(t);
     }
-    this.M = x.pendingNodes;
-    this.T = x.optimisticNodes;
+    this.q = x.pendingNodes;
+    this.M = x.optimisticNodes;
   }
 }
 function notifySubs(e) {
-  for (let t = e.m; t !== null; t = t.C) {
-    const e = t.N.S & o ? O : b;
+  for (let t = e.O; t !== null; t = t.C) {
+    const e = t.N.S & o ? m : b;
     if (e.P > t.N.o) e.P = t.N.o;
     insertIntoHeap(t.N, e);
   }
 }
 function runOptimistic(e = null) {
   let t = !e;
-  const n = v.T;
+  const n = C.M;
   S = true;
   for (let t = 0; t < n.length; t++) {
     const r = n[t];
@@ -301,13 +308,13 @@ function runOptimistic(e = null) {
     r.G = e;
     notifySubs(r);
   }
-  v.T = [];
+  C.M = [];
   if (b._ >= b.P) {
     t = true;
     runHeap(b, GlobalQueue.D);
   }
   S = false;
-  t && runPending(v.M);
+  t && runPending(C.q);
 }
 function runPending(e) {
   for (let t = 0; t < e.length; t++) {
@@ -326,13 +333,16 @@ function runTransitionPending(e, t) {
   for (let e = 0; e < n.length; e++) {
     const r = n[e];
     r.G = x;
-    if (r.Y) r.Y.Z(t);
+    if (r.Y) {
+      r.Y.G = x;
+      r.Y.Z(t);
+    }
   }
 }
-const v = new GlobalQueue();
+const C = new GlobalQueue();
 function flush() {
-  while (C) {
-    v.flush();
+  while (v) {
+    C.flush();
   }
 }
 function runQueue(e, t) {
@@ -351,10 +361,15 @@ function transitionComplete(e) {
   t && (e.done = true);
   return t;
 }
+function currentTransition(e) {
+  while (e.done && typeof e.done === "object") e = e.done;
+  return e;
+}
 function runInTransition(e, t) {
   const n = x;
+  x = null;
   try {
-    x = e;
+    x = currentTransition(e);
     return t();
   } finally {
     x = n;
@@ -363,7 +378,7 @@ function runInTransition(e, t) {
 function action(e) {
   return (...t) => {
     const n = e(...t);
-    v.initTransition();
+    C.initTransition();
     let r = x;
     r.actions.push(n);
     const step = e => {
@@ -373,6 +388,7 @@ function action(e) {
     };
     const process = e => {
       if (e.done) {
+        r = currentTransition(r);
         r.actions.splice(r.actions.indexOf(n), 1);
         x = r;
         schedule();
@@ -380,7 +396,7 @@ function action(e) {
         return;
       }
       const t = e.value;
-      if (t instanceof Promise) return t.then(step);
+      if (t instanceof Promise) return t.then(e => runInTransition(r, () => step(e)));
       runInTransition(r, () => step(t));
     };
     runInTransition(r, () => step());
@@ -397,8 +413,8 @@ let A = null;
 function recompute(t, n = false) {
   const i = t.J && t.G != x;
   if (!n) {
-    if (t.G && x !== t.G && !i) v.initTransition(t);
-    deleteFromHeap(t, t.S & o ? O : b);
+    if (t.G && x !== t.G && !i) C.initTransition(t.G);
+    deleteFromHeap(t, t.S & o ? m : b);
     if (t.G) disposeChildren(t);
     else {
       markDisposal(t);
@@ -412,7 +428,7 @@ function recompute(t, n = false) {
   A = t;
   t.ie = null;
   t.S = r;
-  t.se = m;
+  t.se = O;
   let u = t.U === p || (t.oe && t.G) ? t.L : t.U;
   let d = t.o;
   let h = t.$;
@@ -446,6 +462,7 @@ function recompute(t, n = false) {
   }
   const w = !t.ue || !t.ue(t.U === p || (t.oe && t.G) || i ? t.L : t.U, u);
   const _ = t.$ !== h || t.K !== y;
+  if (t.k && t.$ & f && x) x.asyncNodes.push(t);
   t.le?.(_, h);
   if (w || _) {
     if (w) {
@@ -455,12 +472,12 @@ function recompute(t, n = false) {
     }
     (!t.oe || S) && notifySubs(t);
   } else if (t.o != d) {
-    for (let e = t.m; e !== null; e = e.C) {
-      insertIntoHeapHeight(e.N, e.N.S & o ? O : b);
+    for (let e = t.O; e !== null; e = e.C) {
+      insertIntoHeapHeight(e.N, e.N.S & o ? m : b);
     }
   }
-  t.oe && !S && v.T.push(t);
-  (!n || t.$ & f) && !t.G && v.M.push(t);
+  t.oe && !S && C.M.push(t);
+  (!n || t.$ & f) && !t.G && C.q.push(t);
   t.G && i && runInTransition(t.G, () => recompute(t));
 }
 function handleAsync(e, t, n) {
@@ -475,14 +492,14 @@ function handleAsync(e, t, n) {
   if (i) {
     t.then(r => {
       if (e.ce !== t) return;
-      v.initTransition(e);
-      n?.(r) ?? setSignal(e, () => r);
+      C.initTransition(e.G);
+      n ? n(r) : setSignal(e, () => r);
       flush();
     }).catch(n => {
       if (e.ce !== t) return;
-      v.initTransition(e);
+      C.initTransition(e.G);
       setStatusFlags(e, c, n);
-      e.se = m;
+      e.se = O;
       notifySubs(e);
       schedule();
       flush();
@@ -492,22 +509,22 @@ function handleAsync(e, t, n) {
       try {
         for await (let r of t) {
           if (e.ce !== t) return;
-          v.initTransition(e);
-          n?.(r) ?? setSignal(e, () => r);
+          C.initTransition(e.G);
+          n ? n(r) : setSignal(e, () => r);
           flush();
         }
       } catch (n) {
         if (e.ce !== t) return;
-        v.initTransition(e);
+        C.initTransition(e.G);
         setStatusFlags(e, c, n);
-        e.se = m;
+        e.se = O;
         notifySubs(e);
         schedule();
         flush();
       }
     })();
   }
-  v.initTransition(e);
+  C.initTransition(e.G);
   throw new NotReadyError(A);
 }
 function updateIfNecessary(r) {
@@ -537,7 +554,7 @@ function unlinkSubs(e) {
   else t.de = i;
   if (i !== null) i.C = r;
   else {
-    t.m = r;
+    t.O = r;
     if (r === null) {
       t.he?.();
       t.H && !t.pe && unobserved(t);
@@ -546,7 +563,7 @@ function unlinkSubs(e) {
   return n;
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.S & o ? O : b);
+  deleteFromHeap(e, e.S & o ? m : b);
   let t = e.W;
   while (t !== null) {
     t = unlinkSubs(t);
@@ -572,7 +589,7 @@ function link(e, t) {
   if (n !== null) n.A = u;
   else t.W = u;
   if (o !== null) o.C = u;
-  else e.m = u;
+  else e.O = u;
 }
 function isValidLink(e, t) {
   const n = t.ie;
@@ -596,7 +613,7 @@ function markDisposal(e) {
     t.S |= o;
     if (t.S & i) {
       deleteFromHeap(t, b);
-      insertIntoHeap(t, O);
+      insertIntoHeap(t, m);
     }
     markDisposal(t);
     t = t.ye;
@@ -619,7 +636,7 @@ function disposeChildren(e, t = false, n) {
     const e = r.ye;
     if (r.W) {
       const e = r;
-      deleteFromHeap(e, e.S & o ? O : b);
+      deleteFromHeap(e, e.S & o ? m : b);
       let t = e.W;
       do {
         t = unlinkSubs(t);
@@ -667,7 +684,7 @@ function computed(t, n, r) {
     we: !!r?.pureWrite,
     he: r?.unobserved,
     te: null,
-    _e: A?._e ?? v,
+    _e: A?._e ?? C,
     Se: A?.Se ?? g,
     ge: 0,
     H: t,
@@ -678,14 +695,14 @@ function computed(t, n, r) {
     h: null,
     W: null,
     ie: null,
-    m: null,
+    O: null,
     de: null,
     i: A,
     ye: null,
     re: null,
     S: e,
     $: a,
-    se: m,
+    se: O,
     U: p,
     ee: null,
     ne: null,
@@ -715,10 +732,10 @@ function signal(e, t, n = null) {
     we: !!t?.pureWrite,
     he: t?.unobserved,
     L: e,
-    m: null,
+    O: null,
     de: null,
     $: l,
-    se: m,
+    se: O,
     F: n,
     j: n?.k || null,
     U: p
@@ -748,9 +765,9 @@ function read(e) {
     const n = e.F || e;
     if (n.H) {
       const r = e.S & o;
-      if (n.o >= (r ? O.P : b.P)) {
+      if (n.o >= (r ? m.P : b.P)) {
         markNode(t);
-        markHeap(r ? O : b);
+        markHeap(r ? m : b);
         updateIfNecessary(n);
       }
       const i = n.o;
@@ -790,7 +807,7 @@ function read(e) {
     }
   }
   if (e.$ & c) {
-    if (e.se < m) {
+    if (e.se < O) {
       recompute(e, true);
       return read(e);
     } else {
@@ -800,6 +817,7 @@ function read(e) {
   return !t || e.oe || e.U === p || (k && !P && (t.oe || (e.G && x !== e.G))) ? e.L : e.U;
 }
 function setSignal(e, t) {
+  if (e.G && x !== e.G) C.initTransition(e.G);
   if (typeof t === "function") {
     t = t(e.U === p || (e.oe && e.G) ? e.L : e.U);
   }
@@ -808,14 +826,14 @@ function setSignal(e, t) {
   if (n) {
     if (e.oe) e.L = t;
     else {
-      if (e.U === p) v.M.push(e);
+      if (e.U === p) C.q.push(e);
       e.U = t;
     }
     if (e.fe) setSignal(e.fe, t);
   }
   setStatusFlags(e, l);
-  e.se = m;
-  e.oe && !S ? v.T.push(e) : notifySubs(e);
+  e.se = O;
+  e.oe && !S ? C.M.push(e) : notifySubs(e);
   schedule();
   return t;
 }
@@ -846,7 +864,7 @@ function createOwner(e) {
     ye: null,
     te: null,
     id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
-    _e: t?._e ?? v,
+    _e: t?._e ?? C,
     Se: t?.Se || g,
     ge: 0,
     ee: null,
@@ -873,11 +891,14 @@ function createRoot(e, t) {
 }
 function runWithOwner(e, t) {
   const n = A;
+  const r = N;
   A = e;
+  N = false;
   try {
     return t();
   } finally {
     A = n;
+    N = r;
   }
 }
 function staleValues(e, t = true) {
@@ -962,10 +983,10 @@ function effect(e, t, n, r, i) {
     ...i,
     be: {
       X: true,
-      Oe: r,
-      me: t,
+      me: r,
+      Oe: t,
       xe: n,
-      Ce: undefined,
+      ve: undefined,
       J: i?.render ? d : h,
       le(e, t) {
         if (s) {
@@ -980,8 +1001,8 @@ function effect(e, t, n, r, i) {
             try {
               return this.xe
                 ? this.xe(e, () => {
-                    this.Ce?.();
-                    this.Ce = undefined;
+                    this.ve?.();
+                    this.ve = undefined;
                   })
                 : console.error(e);
             } catch (t) {
@@ -1000,18 +1021,18 @@ function effect(e, t, n, r, i) {
   !i?.defer &&
     !(o.$ & (c | f)) &&
     (o.J === h ? o._e.enqueue(o.J, runEffect.bind(o)) : runEffect.call(o));
-  onCleanup(() => o.Ce?.());
+  onCleanup(() => o.ve?.());
 }
 function runEffect() {
   if (!this.X || this.S & u) return;
-  this.Ce?.();
-  this.Ce = undefined;
+  this.ve?.();
+  this.ve = undefined;
   try {
-    this.Ce = this.me(this.L, this.Oe);
+    this.ve = this.Oe(this.L, this.me);
   } catch (e) {
     if (!this._e.notify(this, c, c)) throw e;
   } finally {
-    this.Oe = this.L;
+    this.me = this.L;
     this.X = false;
   }
 }
@@ -1020,10 +1041,8 @@ function createSignal(e, t, n) {
     const r = computed(e, t, n);
     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);
-  return [read.bind(null, s), setSignal.bind(null, s)];
+  const r = signal(e, t);
+  return [read.bind(null, r), setSignal.bind(null, r)];
 }
 function createMemo(e, t, n) {
   let r = computed(e, t, n);
@@ -1075,8 +1094,10 @@ function createOptimistic(e, t, n) {
   if (typeof e === "function") {
     const r = computed(
       t => {
-        let n = r || getOwner();
-        n.U = e(t);
+        const n = getOwner();
+        const r = e(t);
+        if (n.$ & a) return r;
+        n.U = r;
         return t;
       },
       t,
@@ -1085,15 +1106,13 @@ function createOptimistic(e, 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;
+  const r = signal(e, t);
+  r.oe = true;
   return [
-    read.bind(null, s),
+    read.bind(null, r),
     t => {
-      s.U = e;
-      return setSignal(s, t);
+      r.U = e;
+      return setSignal(r, t);
     }
   ];
 }
@@ -1101,13 +1120,13 @@ function onSettled(e) {
   let t;
   const n = getOwner();
   if (n) onCleanup(() => t?.());
-  v.enqueue(h, () => {
+  C.enqueue(h, () => {
     t = e();
     !n && t?.();
   });
 }
 function unwrap(e) {
-  return e?.[H]?.[T] ?? e;
+  return e?.[H]?.[M] ?? e;
 }
 function getOverrideValue(e, t, n, r) {
   return t && r in t ? t[r] : e[r];
@@ -1120,13 +1139,13 @@ function getAllKeys(e, t, n) {
 function applyState(e, t, n, r) {
   const i = t?.[H];
   if (!i) return;
-  const s = i[q];
-  const o = i[M];
-  let u = i[T];
+  const s = i[V];
+  const o = i[q];
+  let u = i[M];
   if (e === s && !o) return;
   (i[K] || U).set(e, i[Q]);
-  i[q] = e;
-  i[M] = undefined;
+  i[V] = e;
+  i[q] = undefined;
   if (Array.isArray(s)) {
     let t = false;
     const l = getOverrideValue(s, o, u, "length");
@@ -1153,16 +1172,16 @@ function applyState(e, t, n, r) {
       if (a > h || a > d) {
         for (c = a; c <= h; c++) {
           t = true;
-          i[T][c] && setSignal(i[T][c], wrap(e[c], i));
+          i[M][c] && setSignal(i[M][c], wrap(e[c], i));
         }
         for (; c < e.length; c++) {
           t = true;
           const s = wrap(w[c], i);
-          i[T][c] && setSignal(i[T][c], s);
+          i[M][c] && setSignal(i[M][c], s);
           applyState(e[c], s, n, r);
         }
-        t && i[T][I] && setSignal(i[T][I], void 0);
-        l !== e.length && i[T].length && setSignal(i[T].length, e.length);
+        t && i[M][I] && setSignal(i[M][I], void 0);
+        l !== e.length && i[M].length && setSignal(i[M].length, e.length);
         return;
       }
       y = new Array(h + 1);
@@ -1186,22 +1205,22 @@ function applyState(e, t, n, r) {
       for (c = a; c < e.length; c++) {
         if (c in w) {
           const t = wrap(w[c], i);
-          i[T][c] && setSignal(i[T][c], t);
+          i[M][c] && setSignal(i[M][c], t);
           applyState(e[c], t, n, r);
-        } else i[T][c] && setSignal(i[T][c], wrap(e[c], i));
+        } else i[M][c] && setSignal(i[M][c], wrap(e[c], i));
       }
       if (a < e.length) t = true;
     } else if (e.length) {
       for (let t = 0, l = e.length; t < l; t++) {
         const l = getOverrideValue(s, o, u, t);
-        isWrappable(l) ? applyState(e[t], wrap(l, i), n, r) : i[T][t] && setSignal(i[T][t], e[t]);
+        isWrappable(l) ? applyState(e[t], wrap(l, i), n, r) : i[M][t] && setSignal(i[M][t], e[t]);
       }
     }
     if (l !== e.length) {
       t = true;
-      i[T].length && setSignal(i[T].length, e.length);
+      i[M].length && setSignal(i[M].length, e.length);
     }
-    t && i[T][I] && setSignal(i[T][I], void 0);
+    t && i[M][I] && setSignal(i[M][I], void 0);
     return;
   }
   if (u) {
@@ -1259,13 +1278,13 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const s = wrapProjection(t);
   r = computed(() => {
-    const t = r || getOwner();
-    storeSetter(new Proxy(s, E), i => {
-      const o = handleAsync(t, e(i), e => {
+    const t = getOwner();
+    storeSetter(new Proxy(s, E), r => {
+      const i = handleAsync(t, e(r), e => {
         e !== s && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
-        setSignal(r, undefined);
+        setSignal(t, undefined);
       });
-      o !== s && o !== undefined && reconcile(o, n?.key || "id", n?.all)(s);
+      i !== s && i !== undefined && reconcile(i, n?.key || "id", n?.all)(s);
     });
   });
   r.pe = true;
@@ -1309,10 +1328,10 @@ const I = Symbol(0),
   H = Symbol(0),
   Q = Symbol(0),
   R = Symbol(0);
-const V = new WeakMap();
-const q = "v",
-  M = "o",
-  T = "n",
+const T = new WeakMap();
+const V = "v",
+  q = "o",
+  M = "n",
   D = "h",
   B = "w",
   K = "l",
@@ -1362,7 +1381,7 @@ function getNode(e, t, n, r, i = isEqual) {
   ));
 }
 function trackSelf(e, t = I) {
-  getObserver() && read(getNode(getNodes(e, T), t, undefined, e[G], false));
+  getObserver() && read(getNode(getNodes(e, M), t, undefined, e[G], false));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -1393,11 +1412,11 @@ const J = {
       trackSelf(e, t);
       return n;
     }
-    const r = getNodes(e, T);
+    const r = getNodes(e, M);
     const i = r[t];
-    const s = e[M] && t in e[M];
-    const o = !!e[q][H];
-    const u = s ? e[M] : e[q];
+    const s = e[q] && t in e[q];
+    const o = !!e[V][H];
+    const u = s ? e[q] : e[V];
     if (!i) {
       const e = Object.getOwnPropertyDescriptor(u, t);
       if (e && e.get) return e.get.call(n);
@@ -1415,7 +1434,7 @@ const J = {
     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[V]) && (t = Object.getPrototypeOf(e[V])) && t !== Object.prototype
           ? l.bind(u)
           : l;
       } else if (getObserver()) {
@@ -1426,7 +1445,7 @@ const J = {
   },
   has(e, t) {
     if (t === Q || t === I || t === "__proto__") return true;
-    const n = e[M] && t in e[M] ? e[M][t] !== R : t in e[q];
+    const n = e[q] && t in e[q] ? e[q][t] !== R : t in e[V];
     getObserver() && read(getNode(getNodes(e, D), t, n, e[G]));
     return n;
   },
@@ -1434,22 +1453,22 @@ const J = {
     const r = e[Q];
     if (writeOnly(r)) {
       untrack(() => {
-        const i = e[q];
+        const i = e[V];
         const s = i[t];
-        const o = e[M] && t in e[M] ? e[M][t] : s;
-        const u = n?.[H]?.[q] ?? n;
+        const o = e[q] && t in e[q] ? e[q][t] : s;
+        const u = n?.[H]?.[V] ?? n;
         if (o === u) return true;
-        const l = e[M]?.length || i.length;
-        if (u !== undefined && u === s) delete e[M][t];
-        else (e[M] || (e[M] = Object.create(null)))[t] = u;
+        const l = e[q]?.length || i.length;
+        if (u !== undefined && u === s) delete e[q][t];
+        else (e[q] || (e[q] = Object.create(null)))[t] = u;
         const f = isWrappable(u);
         if (isWrappable(o)) {
-          const e = V.get(o);
-          e && (e instanceof Set ? e.delete(r) : V.delete(o));
+          const e = T.get(o);
+          e && (e instanceof Set ? e.delete(r) : T.delete(o));
         }
         if (recursivelyNotify(r, U) && f) recursivelyAddParent(u, r);
         e[D]?.[t] && setSignal(e[D][t], true);
-        const c = getNodes(e, T);
+        const c = getNodes(e, M);
         c[t] && setSignal(c[t], () => (f ? wrap(u, e) : u));
         if (Array.isArray(i)) {
           const e = parseInt(t) + 1;
@@ -1461,20 +1480,20 @@ const J = {
     return true;
   },
   deleteProperty(e, t) {
-    if (writeOnly(e[Q]) && e[M]?.[t] !== R) {
+    if (writeOnly(e[Q]) && e[q]?.[t] !== R) {
       untrack(() => {
-        const n = e[M] && t in e[M] ? e[M][t] : e[q][t];
-        if (t in e[q]) {
-          (e[M] || (e[M] = Object.create(null)))[t] = R;
-        } else if (e[M] && t in e[M]) {
-          delete e[M][t];
+        const n = e[q] && t in e[q] ? e[q][t] : e[V][t];
+        if (t in e[V]) {
+          (e[q] || (e[q] = Object.create(null)))[t] = R;
+        } else if (e[q] && t in e[q]) {
+          delete e[q][t];
         } else return true;
         if (isWrappable(n)) {
-          const t = V.get(n);
-          t && (t instanceof Set ? t.delete(e) : V.delete(n));
+          const t = T.get(n);
+          t && (t instanceof Set ? t.delete(e) : T.delete(n));
         }
         if (e[D]?.[t]) setSignal(e[D][t], false);
-        const r = getNodes(e, T);
+        const r = getNodes(e, M);
         r[t] && setSignal(r[t], undefined);
         r[I] && setSignal(r[I], undefined);
       });
@@ -1483,14 +1502,14 @@ const J = {
   },
   ownKeys(e) {
     trackSelf(e);
-    return getKeys(e[q], e[M], false);
+    return getKeys(e[V], e[q], false);
   },
   getOwnPropertyDescriptor(e, t) {
     if (t === Q) return { value: e[Q], writable: true, configurable: true };
-    return getPropertyDescriptor(e[q], e[M], t);
+    return getPropertyDescriptor(e[V], e[q], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[q]);
+    return Object.getPrototypeOf(e[V]);
   }
 };
 function storeSetter(e, t) {
@@ -1525,14 +1544,14 @@ function recursivelyNotify(e, t) {
   let n = e[H] || t?.get(e)?.[H];
   let r = false;
   if (n) {
-    const e = getNodes(n, T)[F];
+    const e = getNodes(n, M)[F];
     if (e) {
       setSignal(e, undefined);
       r = true;
     }
     t = n[K] || t;
   }
-  const i = V.get(n?.[q] || e);
+  const i = T.get(n?.[V] || e);
   if (!i) return r;
   if (i instanceof Set) {
     for (let e of i) r = recursivelyNotify(e, t) || r;
@@ -1543,14 +1562,14 @@ function recursivelyAddParent(e, t) {
   let n;
   const r = e[H];
   if (r) {
-    n = r[M];
-    e = r[q];
+    n = r[q];
+    e = r[V];
   }
   if (t) {
-    let n = V.get(e);
-    if (!n) V.set(e, t);
+    let n = T.get(e);
+    if (!n) T.set(e, t);
     else if (n !== t) {
-      if (!(n instanceof Set)) V.set(e, (n = new Set([n])));
+      if (!(n instanceof Set)) T.set(e, (n = new Set([n])));
       else if (n.has(t)) return;
       n.add(t);
     } else return;
@@ -1583,10 +1602,10 @@ function snapshot(e, t, n) {
   if (t && t.has(e)) return t.get(e);
   if (!t) t = new Map();
   if ((r = e[H] || n?.get(e)?.[H])) {
-    s = r[M];
-    i = Array.isArray(r[q]);
-    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[q]))) : r[q]);
-    e = r[q];
+    s = r[q];
+    i = Array.isArray(r[V]);
+    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[V]))) : r[V]);
+    e = r[V];
     n = U;
   } else {
     i = Array.isArray(e);
@@ -1754,7 +1773,7 @@ function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
   return createMemo(
     updateKeyedMap.bind({
-      ve: createOwner(),
+      Ce: createOwner(),
       Ne: 0,
       ke: e,
       je: [],
@@ -1773,7 +1792,7 @@ function updateKeyedMap() {
   const e = this.ke() || [],
     t = e.length;
   e[I];
-  runWithOwner(this.ve, () => {
+  runWithOwner(this.Ce, () => {
     let n,
       r,
       i = this.Ie
@@ -1797,7 +1816,7 @@ function updateKeyedMap() {
             };
     if (t === 0) {
       if (this.Ne !== 0) {
-        this.ve.dispose(false);
+        this.Ce.dispose(false);
         this.Ae = [];
         this.je = [];
         this.We = [];
@@ -1893,24 +1912,24 @@ function updateKeyedMap() {
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
-    ve: createOwner(),
+    Ce: createOwner(),
     Ne: 0,
     Qe: 0,
     Re: e,
     Pe: t,
     Ae: [],
     We: [],
-    Ve: n?.from,
+    Te: n?.from,
     He: n?.fallback
   });
 }
 function updateRepeat() {
   const e = this.Re();
-  const t = this.Ve?.() || 0;
-  runWithOwner(this.ve, () => {
+  const t = this.Te?.() || 0;
+  runWithOwner(this.Ce, () => {
     if (e === 0) {
       if (this.Ne !== 0) {
-        this.ve.dispose(false);
+        this.Ce.dispose(false);
         this.Ae = [];
         this.We = [];
         this.Ne = 0;
@@ -1959,16 +1978,16 @@ function boundaryComputed(e, t) {
     be: {
       le() {
         let e = this.$;
-        this.$ &= ~this.qe;
-        if (this.qe & f && !(this.$ & a)) {
+        this.$ &= ~this.Ve;
+        if (this.Ve & f && !(this.$ & a)) {
           e &= ~f;
         }
-        this._e.notify(this, this.qe, e);
+        this._e.notify(this, this.Ve, e);
       },
-      qe: t
+      Ve: t
     }
   });
-  n.qe = t;
+  n.Ve = t;
   n.pe = true;
   return n;
 }
@@ -1982,30 +2001,30 @@ function createBoundChildren(e, t, n, r) {
   });
 }
 class ConditionalQueue extends Queue {
-  Me;
-  Te = new Set();
-  M = new Set();
+  qe;
+  Me = new Set();
+  q = new Set();
   constructor(e) {
     super();
-    this.Me = e;
+    this.qe = e;
   }
   run(e) {
-    if (!e || read(this.Me)) return;
+    if (!e || read(this.qe)) return;
     return super.run(e);
   }
   notify(e, t, n) {
-    if (read(this.Me)) {
+    if (read(this.qe)) {
       if (t & f) {
         if (n & f) {
-          this.M.add(e);
+          this.q.add(e);
           t &= ~f;
-        } else if (this.M.delete(e)) t &= ~f;
+        } else if (this.q.delete(e)) t &= ~f;
       }
       if (t & c) {
         if (n & c) {
-          this.Te.add(e);
+          this.Me.add(e);
           t &= ~c;
-        } else if (this.Te.delete(e)) t &= ~c;
+        } else if (this.Me.delete(e)) t &= ~c;
       }
     }
     return t ? super.notify(e, t, n) : true;
@@ -2014,24 +2033,24 @@ class ConditionalQueue extends Queue {
 class CollectionQueue extends Queue {
   De;
   Ae = new Set();
-  Me = signal(false, { pureWrite: true });
+  qe = signal(false, { pureWrite: true });
   Be = false;
   constructor(e) {
     super();
     this.De = e;
   }
   run(e) {
-    if (!e || read(this.Me)) return;
+    if (!e || read(this.qe)) 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.Ae.add(e);
-      if (this.Ae.size === 1) setSignal(this.Me, true);
+      if (this.Ae.size === 1) setSignal(this.qe, true);
     } else if (this.Ae.size > 0) {
       this.Ae.delete(e);
-      if (this.Ae.size === 0) setSignal(this.Me, false);
+      if (this.Ae.size === 0) setSignal(this.qe, false);
     }
     t &= ~this.De;
     return t ? super.notify(e, t, n) : true;
@@ -2047,25 +2066,25 @@ function createBoundary(e, t) {
   const r = new ConditionalQueue(computed(() => t() === $.HIDDEN));
   const i = createBoundChildren(n, e, r, 0);
   computed(() => {
-    const e = read(r.Me);
-    i.qe = e ? c | f : 0;
+    const e = read(r.qe);
+    i.Ve = e ? c | f : 0;
     if (!e) {
-      r.M.forEach(e => r.notify(e, f, f));
-      r.Te.forEach(e => r.notify(e, c, c));
-      r.M.clear();
-      r.Te.clear();
+      r.q.forEach(e => r.notify(e, f, f));
+      r.Me.forEach(e => r.notify(e, c, c));
+      r.q.clear();
+      r.Me.clear();
     }
   });
-  return () => (read(r.Me) ? undefined : read(i));
+  return () => (read(r.qe) ? 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.Me)) {
+    if (!read(i.qe)) {
       const e = read(s);
-      if (!untrack(() => read(i.Me))) i.Be = true;
+      if (!untrack(() => read(i.qe))) i.Be = true;
       return e;
     }
     return n(i);