@solidjs/signals 2.0.0-beta.16 → 2.0.0-beta.17

package/dist/node.cjs

@@ -13,6 +13,9 @@ class StatusError extends Error {
     this.source = e;
   }
 }
+function unwrapStatusError(e) {
+  return e instanceof StatusError ? e.cause : e;
+}
 class NoOwnerError extends Error {
   constructor() {
     super("");
@@ -134,8 +137,8 @@ function assignOrMergeLane(e, t) {
   }
   e.i = t;
 }
-const I = new Set();
-const T = { _: new Array(2e3).fill(undefined), O: false, P: 0, C: 0 };
+const T = new Set();
+const I = { _: new Array(2e3).fill(undefined), O: false, P: 0, C: 0 };
 const L = { _: new Array(2e3).fill(undefined), O: false, P: 0, C: 0 };
 let H = 0;
 let M = null;
@@ -151,7 +154,7 @@ function registerTransientStoreNode(e) {
 }
 function canUseSimpleSyncFlush(e) {
   return (
-    I.size === 0 &&
+    T.size === 0 &&
     R.size === 0 &&
     e.N.length === 0 &&
     e.k.length === 0 &&
@@ -187,8 +190,8 @@ function runLaneEffects(e) {
   }
 }
 function queueStashedOptimisticEffects(e) {
-  for (let t = e.A; t !== null; t = t.I) {
-    const e = t.T;
+  for (let t = e.A; t !== null; t = t.T) {
+    const e = t.I;
     if (!e.L) continue;
     if (e.L === P) {
       if (!e.H) {
@@ -197,7 +200,7 @@ function queueStashedOptimisticEffects(e) {
       }
       continue;
     }
-    const n = e.q & o ? L : T;
+    const n = e.q & o ? L : I;
     if (n.P > e.V) n.P = e.V;
     insertIntoHeap(e, n);
   }
@@ -355,7 +358,7 @@ class GlobalQueue extends Queue {
     this.X = true;
     try {
       if (false);
-      runHeap(T, GlobalQueue.re);
+      runHeap(I, GlobalQueue.re);
       if (M) {
         const e = transitionComplete(M);
         if (!e) {
@@ -369,7 +372,7 @@ class GlobalQueue extends Queue {
           runLaneEffects(v);
           this.stashQueues(e.ue);
           H++;
-          K = T.C >= T.P;
+          K = I.C >= I.P;
           reassignPendingTransition(e.ne);
           M = null;
           if (!e.D.length && !e.G.size && e.k.length) {
@@ -390,7 +393,7 @@ class GlobalQueue extends Queue {
         }
         this.ne !== M.ne && this.ne.push(...M.ne);
         this.restoreQueues(M.ue);
-        I.delete(M);
+        T.delete(M);
         const t = M;
         M = null;
         reassignPendingTransition(this.ne);
@@ -398,23 +401,23 @@ class GlobalQueue extends Queue {
       } else {
         if (canUseSimpleSyncFlush(this)) {
           commitPendingNodes();
-          if (T.C >= T.P) {
-            runHeap(T, GlobalQueue.re);
+          if (I.C >= I.P) {
+            runHeap(I, GlobalQueue.re);
             commitPendingNodes();
           }
         } else {
-          if (I.size) runHeap(L, GlobalQueue.re);
+          if (T.size) runHeap(L, GlobalQueue.re);
           finalizePureQueue();
         }
       }
       H++;
-      K = T.C >= T.P;
+      K = I.C >= I.P;
       R.size && runLaneEffects(O);
       this.run(O);
       R.size && runLaneEffects(v);
       this.run(v);
       if (false);
-      if (false && !K && !M && I.size === 0 && R.size === 0);
+      if (false && !K && !M && T.size === 0 && R.size === 0);
       if (false);
     } finally {
       this.X = false;
@@ -456,10 +459,10 @@ class GlobalQueue extends Queue {
     } else if (e) {
       const t = M;
       mergeTransitionState(e, t);
-      I.delete(t);
+      T.delete(t);
       M = e;
     }
-    I.add(M);
+    T.add(M);
     M.ae = H;
     if (this.te !== null) {
       this.te.h = M;
@@ -509,19 +512,19 @@ function queuePendingNode(e) {
 function insertSubs(e, t = false) {
   const n = e.i || ee;
   const r = e.de !== undefined;
-  for (let i = e.A; i !== null; i = i.I) {
-    if (r && i.T.le & y) {
-      i.T.q |= l;
+  for (let i = e.A; i !== null; i = i.T) {
+    if (r && i.I.le & y) {
+      i.I.q |= l;
       continue;
     }
     if (t && n) {
-      i.T.q |= f;
-      assignOrMergeLane(i.T, n);
+      i.I.q |= f;
+      assignOrMergeLane(i.I, n);
     } else if (t) {
-      i.T.q |= f;
-      i.T.i = undefined;
+      i.I.q |= f;
+      i.I.i = undefined;
     }
-    const e = i.T;
+    const e = i.I;
     if (e.L === P) {
       if (!e.H) {
         e.H = true;
@@ -529,9 +532,9 @@ function insertSubs(e, t = false) {
       }
       continue;
     }
-    const s = i.T.q & o ? L : T;
-    if (s.P > i.T.V) s.P = i.T.V;
-    insertIntoHeap(i.T, s);
+    const s = i.I.q & o ? L : I;
+    if (s.P > i.I.V) s.P = i.I.V;
+    insertIntoHeap(i.I, s);
   }
 }
 function commitPendingNode(e) {
@@ -569,8 +572,8 @@ function finalizePureQueue(e = null, t = false) {
   const n = !t;
   if (n) commitPendingNodes();
   if (!t && B.N.length) checkBoundaryChildren(B);
-  const r = T.C >= T.P;
-  if (r) runHeap(T, GlobalQueue.re);
+  const r = I.C >= I.P;
+  if (r) runHeap(I, GlobalQueue.re);
   if (n) {
     if (r) commitPendingNodes();
     resolveOptimisticNodes(e ? e.k : B.k);
@@ -584,7 +587,7 @@ function finalizePureQueue(e = null, t = false) {
           }
           continue;
         }
-        const e = t.q & o ? L : T;
+        const e = t.q & o ? L : I;
         if (e.P > t.V) e.P = t.V;
         insertIntoHeap(t, e);
       }
@@ -759,13 +762,13 @@ function markNode(e, r = n) {
   const i = e.q;
   if ((i & (t | n)) >= r) return;
   e.q = (i & -4) | r;
-  for (let n = e.A; n !== null; n = n.I) {
-    markNode(n.T, t);
+  for (let n = e.A; n !== null; n = n.T) {
+    markNode(n.I, t);
   }
   if (e.Ce !== null) {
     for (let n = e.Ce; n !== null; n = n.xe) {
-      for (let e = n.A; e !== null; e = e.I) {
-        markNode(e.T, t);
+      for (let e = n.A; e !== null; e = e.T) {
+        markNode(e.I, t);
       }
     }
   }
@@ -792,8 +795,8 @@ function adjustHeight(e, t) {
   }
   if (e.V !== n) {
     e.V = n;
-    for (let t = e.A; t !== null; t = t.I) {
-      insertIntoHeapHeight(t.T, t.T.q & o ? L : T);
+    for (let t = e.A; t !== null; t = t.T) {
+      insertIntoHeapHeight(t.I, t.I.q & o ? L : I);
     }
   }
 }
@@ -804,7 +807,7 @@ function markDisposal(e) {
     const e = t.q;
     t.q = e | o;
     if (e & (i | s)) {
-      deleteFromHeap(t, e & o ? L : T);
+      deleteFromHeap(t, e & o ? L : I);
       if (e & i) insertIntoHeap(t, L);
       else insertIntoHeapHeight(t, L);
     }
@@ -835,7 +838,7 @@ function disposeChildren(e, t = false, n) {
     const e = i.Ne;
     if (i.ge) {
       const e = i;
-      deleteFromHeap(e, e.q & o ? L : T);
+      deleteFromHeap(e, e.q & o ? L : I);
       let t = e.ge;
       do {
         t = unlinkSubs(t);
@@ -868,7 +871,7 @@ function disposeChildren(e, t = false, n) {
   }
 }
 function runDisposal(e, t) {
-  let n = t ? e.he : e.Ie;
+  let n = t ? e.he : e.Te;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -878,7 +881,7 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.he = null) : (e.Ie = null);
+  t ? (e.he = null) : (e.Te = null);
 }
 function childId(e, t) {
   let n = e;
@@ -906,9 +909,9 @@ function getOwner() {
 }
 function cleanup(e) {
   if (!Z) return e;
-  if (!Z.Ie) Z.Ie = e;
-  else if (Array.isArray(Z.Ie)) Z.Ie.push(e);
-  else Z.Ie = [Z.Ie, e];
+  if (!Z.Te) Z.Te = e;
+  else if (Array.isArray(Z.Te)) Z.Te.push(e);
+  else Z.Te = [Z.Te, e];
   return e;
 }
 function isDisposed(e) {
@@ -928,9 +931,9 @@ function createOwner(e) {
     Ee: null,
     Ne: null,
     je: null,
-    Ie: null,
+    Te: null,
     M: t?.M ?? B,
-    Te: t?.Te || k,
+    Ie: t?.Ie || k,
     Ae: 0,
     he: null,
     pe: null,
@@ -956,11 +959,11 @@ function createRoot(e, t) {
 function unlinkSubs(e) {
   const t = e.we;
   const n = e.me;
-  const r = e.I;
+  const r = e.T;
   const i = e.Le;
   if (r !== null) r.Le = i;
   else t.He = i;
-  if (i !== null) i.I = r;
+  if (i !== null) i.T = r;
   else {
     t.A = r;
     if (r === null) {
@@ -983,7 +986,7 @@ function trimStaleDeps(e) {
   }
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.q & o ? L : T);
+  deleteFromHeap(e, e.q & o ? L : I);
   let t = e.ge;
   while (t !== null) {
     t = unlinkSubs(t);
@@ -1010,14 +1013,14 @@ function link(e, t, n = false) {
     }
   }
   const u = e.He;
-  if (u !== null && u.T === t && (!o || u.Ke === t.qe)) {
+  if (u !== null && u.I === t && (!o || u.Ke === t.qe)) {
     u.Me = n;
     return;
   }
-  const f = (t.ke = e.He = { we: e, T: t, me: s, Le: u, I: null, Ke: t.qe, Me: n });
+  const f = (t.ke = e.He = { we: e, I: t, me: s, Le: u, T: null, Ke: t.qe, Me: n });
   if (i !== null) i.me = f;
   else t.ge = f;
-  if (u !== null) u.I = f;
+  if (u !== null) u.T = f;
   else e.A = f;
 }
 function addPendingSource(e, t) {
@@ -1069,9 +1072,9 @@ function setPendingError(e, t, n) {
   }
 }
 function forEachDependent(e, t) {
-  for (let n = e.A; n !== null; n = n.I) t(n.T, n);
+  for (let n = e.A; n !== null; n = n.T) t(n.I, n);
   for (let n = e.Ce; n !== null; n = n.xe) {
-    for (let e = n.A; e !== null; e = e.I) t(e.T, e);
+    for (let e = n.A; e !== null; e = e.T) t(e.I, e);
   }
 }
 function enqueueForRerun(e) {
@@ -1082,7 +1085,7 @@ function enqueueForRerun(e) {
       t.M.enqueue(v, t.K);
     }
   } else {
-    const t = e.q & o ? L : T;
+    const t = e.q & o ? L : I;
     if (t.P > e.V) t.P = e.V;
     insertIntoHeap(e, t);
   }
@@ -1213,6 +1216,7 @@ function handleAsync(e, t, r) {
     const n = t[Symbol.asyncIterator]();
     let r = false;
     let i = false;
+    let s = true;
     cleanup(() => {
       if (i) return;
       i = true;
@@ -1222,41 +1226,59 @@ function handleAsync(e, t, r) {
       } catch {}
     });
     const iterate = () => {
-      let s,
-        u = false,
-        f = true;
+      let u,
+        f,
+        l = false,
+        c = false,
+        a = true;
       n.next().then(
         n => {
-          if (f) {
-            s = n;
-            u = true;
+          if (a) {
+            u = n;
+            l = true;
             if (n.done) i = true;
           } else if (e.We !== t) {
             return;
-          } else if (!n.done) asyncWrite(n.value, iterate);
-          else {
+          } else if (!n.done) {
+            r = true;
+            asyncWrite(n.value, iterate);
+          } else {
             i = true;
-            schedule();
-            flush();
+            if (r) {
+              schedule();
+              flush();
+            } else {
+              asyncWrite(undefined);
+            }
           }
         },
         n => {
-          if (!f && e.We === t) {
+          if (a) {
+            f = n;
+            c = true;
+          } else if (e.We === t) {
             i = true;
             handleError(n);
           }
         }
       );
-      f = false;
-      if (u && !s.done) {
-        o = s.value;
+      a = false;
+      if (c) {
+        i = true;
+        handleError(f);
+        if (s) throw f;
+        return true;
+      }
+      if (l && !u.done) {
+        o = u.value;
         r = true;
         return iterate();
       }
-      return u && s.done;
+      return l && u.done;
     };
-    const s = iterate();
-    if (!r && !s) {
+    const u = iterate();
+    s = false;
+    if (!r && !u) {
       B.initTransition(resolveTransition(e));
       throw new NotReadyError(Z);
     }
@@ -1390,8 +1412,8 @@ function releaseSubtree(e) {
       if (e.q & l) {
         e.q &= ~l;
         e.q |= n;
-        if (T.P > e.V) T.P = e.V;
-        insertIntoHeap(e, T);
+        if (I.P > e.V) I.P = e.V;
+        insertIntoHeap(e, I);
       }
     }
     releaseSubtree(t);
@@ -1412,14 +1434,14 @@ function recompute(t, n = false) {
   const i = t.L;
   if (!n) {
     if (t.h && (!i || M) && M !== t.h) B.initTransition(t.h);
-    deleteFromHeap(t, t.q & o ? L : T);
+    deleteFromHeap(t, t.q & o ? L : I);
     t.We = null;
     if (t.h || i === P) disposeChildren(t);
-    else if (t.Ee !== null || t.Ie !== null) {
+    else if (t.Ee !== null || t.Te !== null) {
       markDisposal(t);
-      t.he = t.Ie;
+      t.he = t.Te;
       t.pe = t.Ee;
-      t.Ie = null;
+      t.Te = null;
       t.Ee = null;
       t.Ae = 0;
     } else;
@@ -1534,8 +1556,8 @@ function recompute(t, n = false) {
       if (t.j === C) queuePendingNode(t);
       t.j = d;
     } else if (t.V != p) {
-      for (let e = t.A; e !== null; e = e.I) {
-        insertIntoHeapHeight(e.T, e.T.q & o ? L : T);
+      for (let e = t.A; e !== null; e = e.T) {
+        insertIntoHeapHeight(e.I, e.I.q & o ? L : I);
       }
     }
   }
@@ -1575,9 +1597,9 @@ function computed(t, n) {
       (ne && ownerInSnapshotScope(Z) ? y : 0),
     Fe: n?.equals != null ? n.equals : isEqual,
     R: n?.unobserved,
-    Ie: null,
+    Te: null,
     M: Z?.M ?? B,
-    Te: Z?.Te ?? k,
+    Ie: Z?.Ie ?? k,
     Ae: 0,
     fe: t,
     Y: undefined,
@@ -1617,9 +1639,9 @@ function createEffectNode(e, t, n, r, i, s) {
       (ne && ownerInSnapshotScope(Z) ? y : 0),
     Fe: false,
     R: s?.unobserved,
-    Ie: null,
+    Te: null,
     M: Z?.M ?? B,
-    Te: Z?.Te ?? k,
+    Ie: Z?.Ie ?? k,
     Ae: 0,
     fe: e,
     Y: undefined,
@@ -1804,9 +1826,9 @@ function read(e) {
     link(e, t, J);
     if (i.fe) {
       const n = e.q & o;
-      if (i.V >= (n ? L.P : T.P)) {
+      if (i.V >= (n ? L.P : I.P)) {
         markNode(t);
-        markHeap(n ? L : T);
+        markHeap(n ? L : I);
         updateIfNecessary(i);
       }
       const r = i.V;
@@ -1903,7 +1925,7 @@ function setSignal(e, t) {
   return t;
 }
 function suppressComputedRecompute(e) {
-  deleteFromHeap(e, e.q & o ? L : T);
+  deleteFromHeap(e, e.q & o ? L : I);
   if (!(e.q & a) && e.j === C) {
     queuePendingNode(e);
     schedule();
@@ -1991,7 +2013,7 @@ function snapCompanionsToState(e) {
   if (i && !(i.q & u)) {
     if ((i.m === undefined || i.m === C) && i.j === C && !Object.is(i.Y, e.Y) && !(i.q & (n | t))) {
       i.q |= n;
-      insertIntoHeap(i, i.q & o ? L : T);
+      insertIntoHeap(i, i.q & o ? L : I);
       insertSubs(i);
       schedule();
     }
@@ -2070,7 +2092,7 @@ function refresh(e) {
   }
   if (typeof r.fe === "function" && !(r.q & (u | a))) {
     r.q = (r.q & ~t) | n;
-    insertIntoHeap(r, r.q & o ? L : T);
+    insertIntoHeap(r, r.q & o ? L : I);
     schedule();
   }
 }
@@ -2081,7 +2103,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.Te[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Ie[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -2091,10 +2113,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Te = { ...n.Te, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Ie = { ...n.Ie, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.Te[e.id]);
+  return !isUndefined(t?.Ie[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -2129,7 +2151,7 @@ function notifyEffectStatus(e, t) {
 function runEffect(e) {
   if (!e.H || e.q & u) return;
   if (e.U & b && e.L === v) {
-    const t = e.ce instanceof StatusError ? (e.ce.cause ?? e.ce) : e.ce;
+    const t = unwrapStatusError(e.ce);
     e.ze = e.Y;
     e.H = false;
     try {
@@ -2218,22 +2240,22 @@ function action(e) {
       B.initTransition();
       let s = M;
       s.D.push(i);
-      const done = (e, t) => {
+      const done = (e, t, o = false) => {
         s = currentTransition(s);
-        const o = s.D.indexOf(i);
-        if (o >= 0) s.D.splice(o, 1);
+        const u = s.D.indexOf(i);
+        if (u >= 0) s.D.splice(u, 1);
         setActiveTransition(s);
         schedule();
-        t ? r(t) : n(e);
+        o ? r(t) : n(e);
       };
       const step = (e, t) => {
         let n;
         try {
           n = t ? i.throw(e) : i.next(e);
         } catch (e) {
-          return done(undefined, e);
+          return done(undefined, e, true);
         }
-        if (isThenable(n)) return void n.then(run, e => done(undefined, e));
+        if (isThenable(n)) return void n.then(run, e => done(undefined, e, true));
         run(n);
       };
       const run = e => {
@@ -2281,11 +2303,17 @@ function createReaction(e, t) {
   let n = undefined;
   cleanup(() => n?.());
   const r = getOwner();
-  return i => {
+  let i;
+  return s => {
+    if (i) {
+      dispose(i);
+      i = undefined;
+    }
     runWithOwner(r, () => {
       effect(
-        () => (i(), getOwner()),
+        () => (s(), (i = getOwner())),
         t => {
+          i = undefined;
           n?.();
           const r = (e.effect || e)?.();
           if (false && r !== undefined && typeof r !== "function");
@@ -2917,7 +2945,9 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
   return (e[t] = u);
 }
 function trackSelf(e, t = se) {
-  getObserver() && read(getNode(getNodes(e, de), t, undefined, e[ge], false, e[me]));
+  if (!getObserver()) return;
+  read(getNode(getNodes(e, de), t, undefined, e[ge], false, e[me]));
+  if (t === se && !e[ce] && !e[ae] && e[le][oe]) e[le][se];
 }
 function notifySelf(e) {
   const t = e[de]?.[se];
@@ -3118,17 +3148,19 @@ const Ce = {
         const f = u ? u[t] : i;
         const l = u ? u[t] !== fe : t in e[le];
         const c = unwrapStoreValue(n);
-        const a = Array.isArray(o) && t !== "length" && typeof t !== "symbol";
-        const d = a ? parseInt(t) + 1 : 0;
-        const p = a && (getOverlayLayer(e, "length") ?? o).length;
-        const h = a && d > p ? d : undefined;
-        if (f === c && h === undefined) return true;
+        const a = typeof t === "string" ? Number(t) : -1;
+        const d =
+          Array.isArray(o) && Number.isInteger(a) && a >= 0 && a < 4294967295 && String(a) === t;
+        const p = d ? a + 1 : 0;
+        const h = d && (getOverlayLayer(e, "length") ?? o).length;
+        const y = d && p > h ? p : undefined;
+        if (f === c && y === undefined) return true;
         armOptimisticStoreWrite(e, r);
-        if (c !== undefined && c === i && h === undefined) delete e[s]?.[t];
+        if (c !== undefined && c === i && y === undefined) delete e[s]?.[t];
         else {
           const n = e[s] || (e[s] = Object.create(null));
           n[t] = c;
-          if (h !== undefined) n.length = h;
+          if (y !== undefined) n.length = y;
         }
         notifyStoreProperty(e, t, "set", c, f, l);
         if (
@@ -3147,13 +3179,13 @@ const Ce = {
             notifyStoreProperty(e, n, "delete", undefined, r, true);
           }
         }
-        if (Array.isArray(o) && t !== "length" && h !== undefined) {
+        if (Array.isArray(o) && t !== "length" && y !== undefined) {
           const t = getNodes(e, de);
           if (t.length) {
-            setSignal(t.length, h);
+            setSignal(t.length, y);
           } else if (!Q && !e[me]) {
-            const n = upsertStoreNode(e, t, "length", p, e[E]);
-            setSignal(n, h);
+            const n = upsertStoreNode(e, t, "length", h, e[E]);
+            setSignal(n, y);
           }
         }
         if (false);
@@ -4074,9 +4106,6 @@ class CollectionQueue extends Queue {
         this.yt.clear();
       }
     }
-    if (this.Wt & w && n & b) {
-      return super.notify(e, b, n, r);
-    }
     if (this.Wt & w && this.Ot) return super.notify(e, t, n, r);
     if (n & this.Wt) {
       this.St = true;
@@ -4086,7 +4115,7 @@ class CollectionQueue extends Queue {
         this.yt.add(t);
         if (e) setSignal(this.gt, true);
         if (this.Wt & b) {
-          setSignal(this.ce, t.ce?.cause ?? t.ce);
+          setSignal(this.ce, unwrapStatusError(t.ce));
         }
       }
     }
@@ -4235,13 +4264,13 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-const Ie = undefined;
+const Te = undefined;
 exports.$PROXY = ue;
 exports.$REFRESH = W;
 exports.$TARGET = oe;
 exports.$TRACK = se;
 exports.ContextNotFoundError = ContextNotFoundError;
-exports.DEV = Ie;
+exports.DEV = Te;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
 exports.SUPPORTS_PROXY = N;