@solidjs/signals 0.9.4 → 0.9.5

package/dist/dev.js

@@ -226,7 +226,8 @@ class GlobalQueue extends Queue {
           runOptimistic(t);
           return;
         }
-        this._pendingNodes.push(...activeTransition.pendingNodes);
+        this._pendingNodes !== activeTransition.pendingNodes &&
+          this._pendingNodes.push(...activeTransition.pendingNodes);
         this._optimisticNodes !== activeTransition.optimisticNodes &&
           this._optimisticNodes.push(...activeTransition.optimisticNodes);
         this.restoreQueues(activeTransition.queueStash);
@@ -255,10 +256,12 @@ class GlobalQueue extends Queue {
     }
     return false;
   }
-  initTransition(node) {
-    if (activeTransition && activeTransition.time === clock) return;
+  initTransition(transition) {
+    if (transition) transition = currentTransition(transition);
+    if (transition && transition === activeTransition) return;
+    if (!transition && activeTransition && activeTransition.time === clock) return;
     if (!activeTransition) {
-      activeTransition = node?._transition ?? {
+      activeTransition = transition ?? {
         time: clock,
         pendingNodes: [],
         asyncNodes: [],
@@ -267,6 +270,11 @@ class GlobalQueue extends Queue {
         queueStash: { _queues: [[], []], _children: [] },
         done: false
       };
+    } else if (transition) {
+      activeTransition.done = transition;
+      transition.actions.push(...activeTransition.actions);
+      transitions.delete(activeTransition);
+      activeTransition = transition;
     }
     transitions.add(activeTransition);
     activeTransition.time = clock;
@@ -333,7 +341,10 @@ function runTransitionPending(pendingNodes, value) {
   for (let i = 0; i < p.length; i++) {
     const n = p[i];
     n._transition = activeTransition;
-    if (n._pendingCheck) n._pendingCheck._set(value);
+    if (n._pendingCheck) {
+      n._pendingCheck._transition = activeTransition;
+      n._pendingCheck._set(value);
+    }
   }
 }
 const globalQueue = new GlobalQueue();
@@ -360,10 +371,15 @@ function transitionComplete(transition) {
   done && (transition.done = true);
   return done;
 }
+function currentTransition(transition) {
+  while (transition.done && typeof transition.done === "object") transition = transition.done;
+  return transition;
+}
 function runInTransition(transition, fn) {
   const prevTransition = activeTransition;
+  activeTransition = null;
   try {
-    activeTransition = transition;
+    activeTransition = currentTransition(transition);
     return fn();
   } finally {
     activeTransition = prevTransition;
@@ -382,6 +398,7 @@ function action(genFn) {
     };
     const process = result => {
       if (result.done) {
+        ctx = currentTransition(ctx);
         ctx.actions.splice(ctx.actions.indexOf(iterator), 1);
         activeTransition = ctx;
         schedule();
@@ -389,7 +406,7 @@ function action(genFn) {
         return;
       }
       const yielded = result.value;
-      if (yielded instanceof Promise) return yielded.then(step);
+      if (yielded instanceof Promise) return yielded.then(v => runInTransition(ctx, () => step(v)));
       runInTransition(ctx, () => step(yielded));
     };
     runInTransition(ctx, () => step());
@@ -407,7 +424,7 @@ function recompute(el, create = false) {
   const honoraryOptimistic = el._type && el._transition != activeTransition;
   if (!create) {
     if (el._transition && activeTransition !== el._transition && !honoraryOptimistic)
-      globalQueue.initTransition(el);
+      globalQueue.initTransition(el._transition);
     deleteFromHeap(el, el._flags & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     if (el._transition) disposeChildren(el);
     else {
@@ -466,6 +483,8 @@ function recompute(el, create = false) {
       value
     );
   const statusFlagsChanged = el._statusFlags !== prevStatusFlags || el._error !== prevError;
+  if (el._child && el._statusFlags & STATUS_PENDING && activeTransition)
+    activeTransition.asyncNodes.push(el);
   el._notifyQueue?.(statusFlagsChanged, prevStatusFlags);
   if (valueChanged || statusFlagsChanged) {
     if (valueChanged) {
@@ -498,13 +517,13 @@ function handleAsync(el, result, setter) {
     result
       .then(value => {
         if (el._inFlight !== result) return;
-        globalQueue.initTransition(el);
-        setter?.(value) ?? setSignal(el, () => value);
+        globalQueue.initTransition(el._transition);
+        setter ? setter(value) : setSignal(el, () => value);
         flush();
       })
       .catch(e => {
         if (el._inFlight !== result) return;
-        globalQueue.initTransition(el);
+        globalQueue.initTransition(el._transition);
         setStatusFlags(el, STATUS_ERROR, e);
         el._time = clock;
         notifySubs(el);
@@ -516,13 +535,13 @@ function handleAsync(el, result, setter) {
       try {
         for await (let value of result) {
           if (el._inFlight !== result) return;
-          globalQueue.initTransition(el);
-          setter?.(value) ?? setSignal(el, () => value);
+          globalQueue.initTransition(el._transition);
+          setter ? setter(value) : setSignal(el, () => value);
           flush();
         }
       } catch (error) {
         if (el._inFlight !== result) return;
-        globalQueue.initTransition(el);
+        globalQueue.initTransition(el._transition);
         setStatusFlags(el, STATUS_ERROR, error);
         el._time = clock;
         notifySubs(el);
@@ -531,7 +550,7 @@ function handleAsync(el, result, setter) {
       }
     })();
   }
-  globalQueue.initTransition(el);
+  globalQueue.initTransition(el._transition);
   throw new NotReadyError(context);
 }
 function updateIfNecessary(el) {
@@ -840,6 +859,8 @@ function read(el) {
 function setSignal(el, v) {
   if (!el._pureWrite && context && el._firewall !== context)
     console.warn("A Signal was written to in an owned scope.");
+  if (el._transition && activeTransition !== el._transition)
+    globalQueue.initTransition(el._transition);
   if (typeof v === "function") {
     v = v(
       el._pendingValue === NOT_PENDING || (el._optimistic && el._transition)
@@ -924,11 +945,14 @@ function createRoot(init, options) {
 }
 function runWithOwner(owner, fn) {
   const oldContext = context;
+  const prevTracking = tracking;
   context = owner;
+  tracking = false;
   try {
     return fn();
   } finally {
     context = oldContext;
+    tracking = prevTracking;
   }
 }
 function staleValues(fn, set = true) {

package/dist/node.cjs

@@ -144,17 +144,17 @@ function schedule() {
 }
 class Queue {
   i = null;
-  V = [[], []];
-  q = [];
+  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() {
@@ -215,7 +215,7 @@ class GlobalQueue extends Queue {
         if (!transitionComplete(x)) {
           let e = x;
           runHeap(m, GlobalQueue.D);
-          this.M = [];
+          this.q = [];
           this.stashQueues(x.queueStash);
           O++;
           v = false;
@@ -224,12 +224,12 @@ class GlobalQueue extends Queue {
           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);
+        runTransitionPending(this.q, false);
       } else if (_.size) runHeap(m, GlobalQueue.D);
       runOptimistic();
       O++;
@@ -253,32 +253,39 @@ class GlobalQueue extends Queue {
     return false;
   }
   initTransition(e) {
-    if (x && x.time === O) return;
+    if (e) e = currentTransition(e);
+    if (e && e === x) return;
+    if (!e && x && x.time === O) return;
     if (!x) {
-      x = e?.G ?? {
+      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 = O;
-    for (let e = 0; e < this.M.length; e++) {
-      const t = this.M[e];
+    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) {
@@ -290,7 +297,7 @@ function notifySubs(e) {
 }
 function runOptimistic(e = null) {
   let t = !e;
-  const n = C.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);
   }
-  C.T = [];
+  C.M = [];
   if (b._ >= b.P) {
     t = true;
     runHeap(b, GlobalQueue.D);
   }
   S = false;
-  t && runPending(C.M);
+  t && runPending(C.q);
 }
 function runPending(e) {
   for (let t = 0; t < e.length; t++) {
@@ -326,7 +333,10 @@ 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 C = new GlobalQueue();
@@ -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;
@@ -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,7 +413,7 @@ let A = null;
 function recompute(t, n = false) {
   const i = t.J && t.G != x;
   if (!n) {
-    if (t.G && x !== t.G && !i) C.initTransition(t);
+    if (t.G && x !== t.G && !i) C.initTransition(t.G);
     deleteFromHeap(t, t.S & o ? m : b);
     if (t.G) disposeChildren(t);
     else {
@@ -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) {
@@ -459,8 +476,8 @@ function recompute(t, n = false) {
       insertIntoHeapHeight(e.N, e.N.S & o ? m : b);
     }
   }
-  t.oe && !S && C.T.push(t);
-  (!n || t.$ & f) && !t.G && C.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,12 +492,12 @@ function handleAsync(e, t, n) {
   if (i) {
     t.then(r => {
       if (e.ce !== t) return;
-      C.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;
-      C.initTransition(e);
+      C.initTransition(e.G);
       setStatusFlags(e, c, n);
       e.se = O;
       notifySubs(e);
@@ -492,13 +509,13 @@ function handleAsync(e, t, n) {
       try {
         for await (let r of t) {
           if (e.ce !== t) return;
-          C.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;
-        C.initTransition(e);
+        C.initTransition(e.G);
         setStatusFlags(e, c, n);
         e.se = O;
         notifySubs(e);
@@ -507,7 +524,7 @@ function handleAsync(e, t, n) {
       }
     })();
   }
-  C.initTransition(e);
+  C.initTransition(e.G);
   throw new NotReadyError(A);
 }
 function updateIfNecessary(r) {
@@ -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) C.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 = O;
-  e.oe && !S ? C.T.push(e) : notifySubs(e);
+  e.oe && !S ? C.M.push(e) : notifySubs(e);
   schedule();
   return t;
 }
@@ -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) {
@@ -1105,7 +1126,7 @@ function onSettled(e) {
   });
 }
 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];
@@ -1118,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");
@@ -1151,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);
@@ -1184,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) {
@@ -1307,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",
@@ -1360,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)));
@@ -1391,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);
@@ -1413,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()) {
@@ -1424,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;
   },
@@ -1432,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;
@@ -1459,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);
       });
@@ -1481,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) {
@@ -1523,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;
@@ -1541,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;
@@ -1581,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);
@@ -1898,13 +1919,13 @@ function repeat(e, t, n) {
     Pe: t,
     Ae: [],
     We: [],
-    Ve: n?.from,
+    Te: n?.from,
     He: n?.fallback
   });
 }
 function updateRepeat() {
   const e = this.Re();
-  const t = this.Ve?.() || 0;
+  const t = this.Te?.() || 0;
   runWithOwner(this.Ce, () => {
     if (e === 0) {
       if (this.Ne !== 0) {
@@ -1957,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;
 }
@@ -1980,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;
@@ -2012,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;
@@ -2045,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);

package/dist/prod.js

@@ -223,7 +223,7 @@ class GlobalQueue extends Queue {
           runOptimistic(e);
           return;
         }
-        this.L.push(...activeTransition.pendingNodes);
+        this.L !== activeTransition.pendingNodes && this.L.push(...activeTransition.pendingNodes);
         this.$ !== activeTransition.optimisticNodes &&
           this.$.push(...activeTransition.optimisticNodes);
         this.restoreQueues(activeTransition.queueStash);
@@ -253,9 +253,11 @@ class GlobalQueue extends Queue {
     return false;
   }
   initTransition(e) {
-    if (activeTransition && activeTransition.time === clock) return;
+    if (e) e = currentTransition(e);
+    if (e && e === activeTransition) return;
+    if (!e && activeTransition && activeTransition.time === clock) return;
     if (!activeTransition) {
-      activeTransition = e?.K ?? {
+      activeTransition = e ?? {
         time: clock,
         pendingNodes: [],
         asyncNodes: [],
@@ -264,6 +266,11 @@ class GlobalQueue extends Queue {
         queueStash: { G: [[], []], H: [] },
         done: false
       };
+    } else if (e) {
+      activeTransition.done = e;
+      e.actions.push(...activeTransition.actions);
+      transitions.delete(activeTransition);
+      activeTransition = e;
     }
     transitions.add(activeTransition);
     activeTransition.time = clock;
@@ -326,7 +333,10 @@ function runTransitionPending(e, t) {
   for (let e = 0; e < n.length; e++) {
     const i = n[e];
     i.K = activeTransition;
-    if (i.q) i.q.Z(t);
+    if (i.q) {
+      i.q.K = activeTransition;
+      i.q.Z(t);
+    }
   }
 }
 const globalQueue = new GlobalQueue();
@@ -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 = activeTransition;
+  activeTransition = null;
   try {
-    activeTransition = e;
+    activeTransition = currentTransition(e);
     return t();
   } finally {
     activeTransition = n;
@@ -373,6 +388,7 @@ function action(e) {
     };
     const process = e => {
       if (e.done) {
+        i = currentTransition(i);
         i.actions.splice(i.actions.indexOf(n), 1);
         activeTransition = i;
         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(i, () => step(e)));
       runInTransition(i, () => step(t));
     };
     runInTransition(i, () => step());
@@ -397,7 +413,7 @@ let context = null;
 function recompute(e, t = false) {
   const n = e.B && e.K != activeTransition;
   if (!t) {
-    if (e.K && activeTransition !== e.K && !n) globalQueue.initTransition(e);
+    if (e.K && activeTransition !== e.K && !n) globalQueue.initTransition(e.K);
     deleteFromHeap(e, e.S & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     if (e.K) disposeChildren(e);
     else {
@@ -446,6 +462,7 @@ function recompute(e, t = false) {
   }
   const c = !e.ue || !e.ue(e.M === NOT_PENDING || (e.oe && e.K) || n ? e.Y : e.M, r);
   const a = e.J !== o || e.j !== u;
+  if (e.N && e.J & STATUS_PENDING && activeTransition) activeTransition.asyncNodes.push(e);
   e.le?.(a, o);
   if (c || a) {
     if (c) {
@@ -475,12 +492,12 @@ function handleAsync(e, t, n) {
   if (r) {
     t.then(i => {
       if (e.ae !== t) return;
-      globalQueue.initTransition(e);
-      n?.(i) ?? setSignal(e, () => i);
+      globalQueue.initTransition(e.K);
+      n ? n(i) : setSignal(e, () => i);
       flush();
     }).catch(n => {
       if (e.ae !== t) return;
-      globalQueue.initTransition(e);
+      globalQueue.initTransition(e.K);
       setStatusFlags(e, STATUS_ERROR, n);
       e.se = clock;
       notifySubs(e);
@@ -492,13 +509,13 @@ function handleAsync(e, t, n) {
       try {
         for await (let i of t) {
           if (e.ae !== t) return;
-          globalQueue.initTransition(e);
-          n?.(i) ?? setSignal(e, () => i);
+          globalQueue.initTransition(e.K);
+          n ? n(i) : setSignal(e, () => i);
           flush();
         }
       } catch (n) {
         if (e.ae !== t) return;
-        globalQueue.initTransition(e);
+        globalQueue.initTransition(e.K);
         setStatusFlags(e, STATUS_ERROR, n);
         e.se = clock;
         notifySubs(e);
@@ -507,7 +524,7 @@ function handleAsync(e, t, n) {
       }
     })();
   }
-  globalQueue.initTransition(e);
+  globalQueue.initTransition(e.K);
   throw new NotReadyError(context);
 }
 function updateIfNecessary(e) {
@@ -805,6 +822,7 @@ function read(e) {
     : e.M;
 }
 function setSignal(e, t) {
+  if (e.K && activeTransition !== e.K) globalQueue.initTransition(e.K);
   if (typeof t === "function") {
     t = t(e.M === NOT_PENDING || (e.oe && e.K) ? e.Y : e.M);
   }
@@ -878,11 +896,14 @@ function createRoot(e, t) {
 }
 function runWithOwner(e, t) {
   const n = context;
+  const i = tracking;
   context = e;
+  tracking = false;
   try {
     return t();
   } finally {
     context = n;
+    tracking = i;
   }
 }
 function staleValues(e, t = true) {
@@ -1777,8 +1798,8 @@ function mapArray(e, t, n) {
       Ve: [],
       me: i,
       Ue: i || n?.keyed === false ? [] : undefined,
-      ke: t.length > 1 ? [] : undefined,
-      ve: n?.fallback
+      ve: t.length > 1 ? [] : undefined,
+      ke: n?.fallback
     })
   );
 }
@@ -1793,17 +1814,17 @@ function updateKeyedMap() {
       r = this.Ue
         ? () => {
             this.Ue[i] = signal(e[i], pureOptions);
-            this.ke && (this.ke[i] = signal(i, pureOptions));
+            this.ve && (this.ve[i] = signal(i, pureOptions));
             return this.we(
               read.bind(null, this.Ue[i]),
-              this.ke ? read.bind(null, this.ke[i]) : undefined
+              this.ve ? read.bind(null, this.ve[i]) : undefined
             );
           }
-        : this.ke
+        : this.ve
           ? () => {
               const t = e[i];
-              this.ke[i] = signal(i, pureOptions);
-              return this.we(() => t, read.bind(null, this.ke[i]));
+              this.ve[i] = signal(i, pureOptions);
+              return this.we(() => t, read.bind(null, this.ve[i]));
             }
           : () => {
               const t = e[i];
@@ -1817,10 +1838,10 @@ function updateKeyedMap() {
         this.be = [];
         this.Ce = 0;
         this.Ue && (this.Ue = []);
-        this.ke && (this.ke = []);
+        this.ve && (this.ve = []);
       }
-      if (this.ve && !this.be[0]) {
-        this.be[0] = runWithOwner((this.Ve[0] = createOwner()), this.ve);
+      if (this.ke && !this.be[0]) {
+        this.be[0] = runWithOwner((this.Ve[0] = createOwner()), this.ke);
       }
     } else if (this.Ce === 0) {
       if (this.Ve[0]) this.Ve[0].dispose();
@@ -1841,7 +1862,7 @@ function updateKeyedMap() {
         E = new Array(t),
         d = new Array(t),
         T = this.Ue ? new Array(t) : undefined,
-        R = this.ke ? new Array(t) : undefined;
+        R = this.ve ? new Array(t) : undefined;
       for (
         s = 0, o = Math.min(this.Ce, t);
         s < o && (this.Pe[s] === e[s] || (this.Ue && compare(this.me, this.Pe[s], e[s])));
@@ -1859,7 +1880,7 @@ function updateKeyedMap() {
         E[u] = this.be[o];
         d[u] = this.Ve[o];
         T && (T[u] = this.Ue[o]);
-        R && (R[u] = this.ke[o]);
+        R && (R[u] = this.ve[o]);
       }
       a = new Map();
       f = new Array(u + 1);
@@ -1878,7 +1899,7 @@ function updateKeyedMap() {
           E[i] = this.be[n];
           d[i] = this.Ve[n];
           T && (T[i] = this.Ue[n]);
-          R && (R[i] = this.ke[n]);
+          R && (R[i] = this.ve[n]);
           i = f[i];
           a.set(c, i);
         } else this.Ve[n].dispose();
@@ -1892,8 +1913,8 @@ function updateKeyedMap() {
             setSignal(this.Ue[i], e[i]);
           }
           if (R) {
-            this.ke[i] = R[i];
-            setSignal(this.ke[i], i);
+            this.ve[i] = R[i];
+            setSignal(this.ve[i], i);
           }
         } else {
           this.be[i] = runWithOwner((this.Ve[i] = createOwner()), r);
@@ -1915,7 +1936,7 @@ function repeat(e, t, n) {
     Ve: [],
     be: [],
     He: n?.from,
-    ve: n?.fallback
+    ke: n?.fallback
   });
 }
 function updateRepeat() {
@@ -1929,8 +1950,8 @@ function updateRepeat() {
         this.be = [];
         this.Ce = 0;
       }
-      if (this.ve && !this.be[0]) {
-        this.be[0] = runWithOwner((this.Ve[0] = createOwner()), this.ve);
+      if (this.ke && !this.be[0]) {
+        this.be[0] = runWithOwner((this.Ve[0] = createOwner()), this.ke);
       }
       return;
     }

package/dist/types/core/scheduler.d.ts

@@ -52,7 +52,7 @@ export declare class GlobalQueue extends Queue {
     static _dispose: (el: Computed<unknown>, self: boolean, zombie: boolean) => void;
     flush(): void;
     notify(node: Computed<any>, mask: number, flags: number): boolean;
-    initTransition(node?: Computed<any>): void;
+    initTransition(transition?: Transition | null): void;
 }
 export declare function notifySubs(node: Signal<any> | Computed<any>): void;
 export declare function runOptimistic(activeTransition?: Transition | null): void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.9.4",
+  "version": "0.9.5",
   "description": "",
   "author": "Ryan Carniato",
   "license": "MIT",