@solidjs/signals 0.9.3 → 0.9.5

package/dist/prod.js

@@ -201,8 +201,8 @@ class Queue {
 }
 class GlobalQueue extends Queue {
   k = false;
-  $ = [];
   L = [];
+  $ = [];
   static F;
   static W;
   flush() {
@@ -214,7 +214,7 @@ class GlobalQueue extends Queue {
         if (!transitionComplete(activeTransition)) {
           let e = activeTransition;
           runHeap(zombieQueue, GlobalQueue.F);
-          this.$ = [];
+          this.L = [];
           this.stashQueues(activeTransition.queueStash);
           clock++;
           scheduled = false;
@@ -223,13 +223,13 @@ class GlobalQueue extends Queue {
           runOptimistic(e);
           return;
         }
-        this.$.push(...activeTransition.pendingNodes);
-        this.L !== activeTransition.optimisticNodes &&
-          this.L.push(...activeTransition.optimisticNodes);
+        this.L !== activeTransition.pendingNodes && this.L.push(...activeTransition.pendingNodes);
+        this.$ !== activeTransition.optimisticNodes &&
+          this.$.push(...activeTransition.optimisticNodes);
         this.restoreQueues(activeTransition.queueStash);
         transitions.delete(activeTransition);
         activeTransition = null;
-        runTransitionPending(this.$, false);
+        runTransitionPending(this.L, false);
       } else if (transitions.size) runHeap(zombieQueue, GlobalQueue.F);
       runOptimistic();
       clock++;
@@ -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,21 +266,26 @@ 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;
-    for (let e = 0; e < this.$.length; e++) {
-      const t = this.$[e];
+    for (let e = 0; e < this.L.length; e++) {
+      const t = this.L[e];
       t.K = activeTransition;
       activeTransition.pendingNodes.push(t);
     }
-    for (let e = 0; e < this.L.length; e++) {
-      const t = this.L[e];
+    for (let e = 0; e < this.$.length; e++) {
+      const t = this.$[e];
       t.K = activeTransition;
       activeTransition.optimisticNodes.push(t);
     }
-    this.$ = activeTransition.pendingNodes;
-    this.L = activeTransition.optimisticNodes;
+    this.L = activeTransition.pendingNodes;
+    this.$ = activeTransition.optimisticNodes;
   }
 }
 function notifySubs(e) {
@@ -290,7 +297,7 @@ function notifySubs(e) {
 }
 function runOptimistic(e = null) {
   let t = !e;
-  const n = globalQueue.L;
+  const n = globalQueue.$;
   optimisticRun = true;
   for (let t = 0; t < n.length; t++) {
     const i = n[t];
@@ -301,13 +308,13 @@ function runOptimistic(e = null) {
     i.K = e;
     notifySubs(i);
   }
-  globalQueue.L = [];
+  globalQueue.$ = [];
   if (dirtyQueue.h >= dirtyQueue.C) {
     t = true;
     runHeap(dirtyQueue, GlobalQueue.F);
   }
   optimisticRun = false;
-  t && runPending(globalQueue.$);
+  t && runPending(globalQueue.L);
 }
 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 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) {
@@ -459,8 +476,8 @@ function recompute(e, t = false) {
       insertIntoHeapHeight(t.A, t.A.S & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     }
   }
-  e.oe && !optimisticRun && globalQueue.L.push(e);
-  (!t || e.J & STATUS_PENDING) && !e.K && globalQueue.$.push(e);
+  e.oe && !optimisticRun && globalQueue.$.push(e);
+  (!t || e.J & STATUS_PENDING) && !e.K && globalQueue.L.push(e);
   e.K && n && runInTransition(e.K, () => recompute(e));
 }
 function handleAsync(e, t, n) {
@@ -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);
   }
@@ -813,14 +831,14 @@ function setSignal(e, t) {
   if (n) {
     if (e.oe) e.Y = t;
     else {
-      if (e.M === NOT_PENDING) globalQueue.$.push(e);
+      if (e.M === NOT_PENDING) globalQueue.L.push(e);
       e.M = t;
     }
     if (e.ce) setSignal(e.ce, t);
   }
   setStatusFlags(e, STATUS_NONE);
   e.se = clock;
-  e.oe && !optimisticRun ? globalQueue.L.push(e) : notifySubs(e);
+  e.oe && !optimisticRun ? globalQueue.$.push(e) : notifySubs(e);
   schedule();
   return t;
 }
@@ -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) {
@@ -968,8 +989,8 @@ function effect(e, t, n, i, r) {
     pe: {
       X: true,
       Ae: i,
-      ge: t,
-      Ne: n,
+      Ne: t,
+      ge: n,
       Ie: undefined,
       B: r?.render ? EFFECT_RENDER : EFFECT_USER,
       le(e, t) {
@@ -983,8 +1004,8 @@ function effect(e, t, n, i, r) {
           this._e.notify(this, STATUS_PENDING, 0);
           if (this.B === EFFECT_USER) {
             try {
-              return this.Ne
-                ? this.Ne(e, () => {
+              return this.ge
+                ? this.ge(e, () => {
                     this.Ie?.();
                     this.Ie = undefined;
                   })
@@ -1012,7 +1033,7 @@ function runEffect() {
   this.Ie?.();
   this.Ie = undefined;
   try {
-    this.Ie = this.ge(this.Y, this.Ae);
+    this.Ie = this.Ne(this.Y, this.Ae);
   } catch (e) {
     if (!this._e.notify(this, STATUS_ERROR, STATUS_ERROR)) throw e;
   } finally {
@@ -1025,10 +1046,8 @@ function createSignal(e, t, n) {
     const i = computed(e, t, n);
     return [read.bind(null, i), setSignal.bind(null, i)];
   }
-  const i = getOwner();
-  const r = i?.id != null;
-  const s = signal(e, r ? { id: getNextChildId(i), ...t } : t);
-  return [read.bind(null, s), setSignal.bind(null, s)];
+  const i = signal(e, t);
+  return [read.bind(null, i), setSignal.bind(null, i)];
 }
 function createMemo(e, t, n) {
   let i = computed(e, t, n);
@@ -1080,8 +1099,10 @@ function createOptimistic(e, t, n) {
   if (typeof e === "function") {
     const i = computed(
       t => {
-        let n = i || getOwner();
-        n.M = e(t);
+        const n = getOwner();
+        const i = e(t);
+        if (n.J & STATUS_UNINITIALIZED) return i;
+        n.M = i;
         return t;
       },
       t,
@@ -1090,15 +1111,13 @@ function createOptimistic(e, t, n) {
     i.oe = true;
     return [read.bind(null, i), setSignal.bind(null, i)];
   }
-  const i = getOwner();
-  const r = i?.id != null;
-  const s = signal(e, r ? { id: getNextChildId(i), ...t } : t);
-  s.oe = true;
+  const i = signal(e, t);
+  i.oe = true;
   return [
-    read.bind(null, s),
+    read.bind(null, i),
     t => {
-      s.M = e;
-      return setSignal(s, t);
+      i.M = e;
+      return setSignal(i, t);
     }
   ];
 }
@@ -1266,13 +1285,13 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const s = wrapProjection(t);
   i = computed(() => {
-    const t = i || getOwner();
-    storeSetter(new Proxy(s, writeTraps), r => {
-      const o = handleAsync(t, e(r), e => {
+    const t = getOwner();
+    storeSetter(new Proxy(s, writeTraps), i => {
+      const r = handleAsync(t, e(i), e => {
         e !== s && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
-        setSignal(i, undefined);
+        setSignal(t, undefined);
       });
-      o !== s && o !== undefined && reconcile(o, n?.key || "id", n?.all)(s);
+      r !== s && r !== undefined && reconcile(r, n?.key || "id", n?.all)(s);
     });
   });
   i.Te = true;
@@ -1779,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
     })
   );
 }
@@ -1795,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];
@@ -1819,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();
@@ -1843,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])));
@@ -1861,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);
@@ -1880,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();
@@ -1894,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);
@@ -1917,7 +1936,7 @@ function repeat(e, t, n) {
     Ve: [],
     be: [],
     He: n?.from,
-    ve: n?.fallback
+    ke: n?.fallback
   });
 }
 function updateRepeat() {
@@ -1931,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;
     }
@@ -1998,30 +2017,30 @@ function createBoundChildren(e, t, n, i) {
   });
 }
 class ConditionalQueue extends Queue {
-  $e;
-  Le = new Set();
-  $ = new Set();
+  Le;
+  $e = new Set();
+  L = new Set();
   constructor(e) {
     super();
-    this.$e = e;
+    this.Le = e;
   }
   run(e) {
-    if (!e || read(this.$e)) return;
+    if (!e || read(this.Le)) return;
     return super.run(e);
   }
   notify(e, t, n) {
-    if (read(this.$e)) {
+    if (read(this.Le)) {
       if (t & STATUS_PENDING) {
         if (n & STATUS_PENDING) {
-          this.$.add(e);
+          this.L.add(e);
           t &= ~STATUS_PENDING;
-        } else if (this.$.delete(e)) t &= ~STATUS_PENDING;
+        } else if (this.L.delete(e)) t &= ~STATUS_PENDING;
       }
       if (t & STATUS_ERROR) {
         if (n & STATUS_ERROR) {
-          this.Le.add(e);
+          this.$e.add(e);
           t &= ~STATUS_ERROR;
-        } else if (this.Le.delete(e)) t &= ~STATUS_ERROR;
+        } else if (this.$e.delete(e)) t &= ~STATUS_ERROR;
       }
     }
     return t ? super.notify(e, t, n) : true;
@@ -2030,24 +2049,24 @@ class ConditionalQueue extends Queue {
 class CollectionQueue extends Queue {
   Fe;
   Ve = new Set();
-  $e = signal(false, { pureWrite: true });
+  Le = signal(false, { pureWrite: true });
   We = false;
   constructor(e) {
     super();
     this.Fe = e;
   }
   run(e) {
-    if (!e || read(this.$e)) return;
+    if (!e || read(this.Le)) return;
     return super.run(e);
   }
   notify(e, t, n) {
     if (!(t & this.Fe) || (this.Fe & STATUS_PENDING && this.We)) return super.notify(e, t, n);
     if (n & this.Fe) {
       this.Ve.add(e);
-      if (this.Ve.size === 1) setSignal(this.$e, true);
+      if (this.Ve.size === 1) setSignal(this.Le, true);
     } else if (this.Ve.size > 0) {
       this.Ve.delete(e);
-      if (this.Ve.size === 0) setSignal(this.$e, false);
+      if (this.Ve.size === 0) setSignal(this.Le, false);
     }
     t &= ~this.Fe;
     return t ? super.notify(e, t, n) : true;
@@ -2063,25 +2082,25 @@ function createBoundary(e, t) {
   const i = new ConditionalQueue(computed(() => t() === BoundaryMode.HIDDEN));
   const r = createBoundChildren(n, e, i, 0);
   computed(() => {
-    const e = read(i.$e);
+    const e = read(i.Le);
     r.Qe = e ? STATUS_ERROR | STATUS_PENDING : 0;
     if (!e) {
-      i.$.forEach(e => i.notify(e, STATUS_PENDING, STATUS_PENDING));
-      i.Le.forEach(e => i.notify(e, STATUS_ERROR, STATUS_ERROR));
-      i.$.clear();
-      i.Le.clear();
+      i.L.forEach(e => i.notify(e, STATUS_PENDING, STATUS_PENDING));
+      i.$e.forEach(e => i.notify(e, STATUS_ERROR, STATUS_ERROR));
+      i.L.clear();
+      i.$e.clear();
     }
   });
-  return () => (read(i.$e) ? undefined : read(r));
+  return () => (read(i.Le) ? undefined : read(r));
 }
 function createCollectionBoundary(e, t, n) {
   const i = createOwner();
   const r = new CollectionQueue(e);
   const s = createBoundChildren(i, t, r, e);
   const o = computed(() => {
-    if (!read(r.$e)) {
+    if (!read(r.Le)) {
       const e = read(s);
-      if (!untrack(() => read(r.$e))) r.We = true;
+      if (!untrack(() => read(r.Le))) r.We = true;
       return e;
     }
     return n(r);

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.3",
+  "version": "0.9.5",
   "description": "",
   "author": "Ryan Carniato",
   "license": "MIT",