@solidjs/signals 0.13.13 → 2.0.0-beta.7

package/dist/node.cjs

@@ -172,7 +172,7 @@ function queueStashedOptimisticEffects(e) {
     if (e.D === g) {
       if (!e.F) {
         e.F = true;
-        e.M.enqueue(y, e.V);
+        e.V.enqueue(y, e.M);
       }
       continue;
     }
@@ -445,7 +445,7 @@ function insertSubs(e, t = false) {
     if (e.D === g) {
       if (!e.F) {
         e.F = true;
-        e.M.enqueue(y, e.V);
+        e.V.enqueue(y, e.M);
       }
       continue;
     }
@@ -667,6 +667,7 @@ function unobserved(e) {
     t = unlinkSubs(t);
   }
   e.A = null;
+  e.Pe = null;
   disposeChildren(e, true);
 }
 function link(e, t) {
@@ -782,24 +783,24 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (D || M) return I;
-  return H ? V : null;
+  if (D || V) return I;
+  return H ? M : null;
 }
 function getOwner() {
-  return V;
+  return M;
 }
 function cleanup(e) {
-  if (!V) return e;
-  if (!V.Ne) V.Ne = e;
-  else if (Array.isArray(V.Ne)) V.Ne.push(e);
-  else V.Ne = [V.Ne, e];
+  if (!M) return e;
+  if (!M.Ne) M.Ne = e;
+  else if (Array.isArray(M.Ne)) M.Ne.push(e);
+  else M.Ne = [M.Ne, e];
   return e;
 }
 function isDisposed(e) {
   return !!(e.m & (u | o));
 }
 function createOwner(e) {
-  const t = V;
+  const t = M;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
@@ -809,7 +810,7 @@ function createOwner(e) {
     ke: null,
     Ee: null,
     Ne: null,
-    M: t?.M ?? N,
+    V: t?.V ?? N,
     Le: t?.Le || _,
     je: 0,
     Ae: null,
@@ -908,7 +909,7 @@ function settlePendingSource(e) {
           const e = r;
           if (!e.F) {
             e.F = true;
-            e.M.enqueue(y, e.V);
+            e.V.enqueue(y, e.M);
           }
         } else {
           const e = r.m & o ? k : P;
@@ -993,7 +994,7 @@ function handleAsync(e, t, r) {
     r = false;
     if (!n) {
       N.initTransition(resolveTransition(e));
-      throw new NotReadyError(V);
+      throw new NotReadyError(M);
     }
   }
   if (s) {
@@ -1047,7 +1048,7 @@ function handleAsync(e, t, r) {
     const s = iterate();
     if (!r && !s) {
       N.initTransition(resolveTransition(e));
-      throw new NotReadyError(V);
+      throw new NotReadyError(M);
     }
   }
   return u;
@@ -1136,8 +1137,8 @@ let Q = false;
 let q = false;
 let D = false;
 let F = false;
-let M = false;
-let V = null;
+let V = false;
+let M = null;
 let B = null;
 let K = false;
 let G = null;
@@ -1211,8 +1212,8 @@ function recompute(t, n = false) {
   const u = t.ee !== undefined && t.ee !== S;
   const c = !!(t.ye & a);
   const p = !!(t.ye & h);
-  const y = V;
-  V = t;
+  const y = M;
+  M = t;
   t.Pe = null;
   t.m = r;
   t.de = E;
@@ -1253,7 +1254,7 @@ function recompute(t, n = false) {
   } finally {
     H = b;
     t.m = e | (n ? t.m & l : 0);
-    V = y;
+    M = y;
   }
   if (!t.ae) {
     const e = t.Pe;
@@ -1311,14 +1312,14 @@ function updateIfNecessary(e) {
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
   const s = {
-    id: r?.id ?? (i ? V?.id : V?.id != null ? getNextChildId(V) : undefined),
+    id: r?.id ?? (i ? M?.id : M?.id != null ? getNextChildId(M) : undefined),
     Re: i || undefined,
     Te: r?.equals != null ? r.equals : isEqual,
-    ce: !!r?.pureWrite,
+    ce: !!r?.ownedWrite,
     xe: r?.unobserved,
     Ne: null,
-    M: V?.M ?? N,
-    Le: V?.Le ?? _,
+    V: M?.V ?? N,
+    Le: M?.Le ?? _,
     je: 0,
     I: t,
     $: n,
@@ -1330,7 +1331,7 @@ function computed(t, n, r) {
     Pe: null,
     O: null,
     Oe: null,
-    i: V,
+    i: M,
     Ee: null,
     ke: null,
     m: r?.lazy ? c : e,
@@ -1343,20 +1344,20 @@ function computed(t, n, r) {
     G: null
   };
   s.h = s;
-  const o = V?.t ? V.u : V;
-  if (V) {
-    const e = V.ke;
+  const o = M?.t ? M.u : M;
+  if (M) {
+    const e = M.ke;
     if (e === null) {
-      V.ke = s;
+      M.ke = s;
     } else {
       s.Ee = e;
-      V.ke = s;
+      M.ke = s;
     }
   }
   if (o) s.o = o.o + 1;
-  if (K && ownerInSnapshotScope(V)) s.pe = true;
+  if (K && ownerInSnapshotScope(M)) s.pe = true;
   if (T) {
-    const e = signal(undefined, { equals: false, pureWrite: true });
+    const e = signal(undefined, { equals: false, ownedWrite: true });
     const t = T.factory(s.I, () => {
       setSignal(e, undefined);
     });
@@ -1378,7 +1379,7 @@ function computed(t, n, r) {
 function signal(e, t, n = null) {
   const r = {
     Te: t?.equals != null ? t.equals : isEqual,
-    ce: !!t?.pureWrite,
+    ce: !!t?.ownedWrite,
     De: !!t?.De,
     xe: t?.unobserved,
     $: e,
@@ -1421,19 +1422,19 @@ function untrack(e, t) {
   }
 }
 function read(e) {
-  if (M) {
+  if (V) {
     const t = getLatestValueComputed(e);
-    const n = M;
-    M = false;
+    const n = V;
+    V = false;
     const r = e.ee !== undefined && e.ee !== S ? e.ee : e.$;
     let i;
     try {
       i = read(t);
     } catch (e) {
-      if (!V && e instanceof NotReadyError) return r;
+      if (!M && e instanceof NotReadyError) return r;
       throw e;
     } finally {
-      M = n;
+      V = n;
     }
     if (t.ye & a) return r;
     if (Q && B && t.Y) {
@@ -1453,7 +1454,7 @@ function read(e) {
       if (e.ee !== S && (t.Ce || !!(t.ye & a))) {
         F = true;
       }
-      let n = V;
+      let n = M;
       if (n?.t) n = n.u;
       if (n && H) link(e, n);
       read(getPendingSignal(e));
@@ -1465,48 +1466,53 @@ function read(e) {
     D = n;
     return e.$;
   }
-  let t = V;
+  let t = M;
   if (t?.t) t = t.u;
-  if (q && e.I) recompute(e);
-  if (e.m & c) {
-    e.m &= ~c;
-    recompute(e, true);
-  }
-  const n = e.L || e;
+  const n = e;
+  if (typeof n.I === "function") {
+    const t = e;
+    if (q && !(t.m & u)) recompute(t);
+    if (t.m & c) {
+      t.m &= ~c;
+      recompute(t, true);
+    } else if (t.m & u) {
+      recompute(t, true);
+    }
+  }
+  const r = e.L || e;
   if (t && H) {
-    if (e.I && e.m & u) recompute(e);
     link(e, t);
-    if (n.I) {
-      const r = e.m & o;
-      if (n.o >= (r ? k.j : P.j)) {
+    if (r.I) {
+      const n = e.m & o;
+      if (r.o >= (n ? k.j : P.j)) {
         markNode(t);
-        markHeap(r ? k : P);
-        updateIfNecessary(n);
+        markHeap(n ? k : P);
+        updateIfNecessary(r);
       }
-      const i = n.o;
+      const i = r.o;
       if (i >= t.o && e.i !== t) {
         t.o = i + 1;
       }
     }
   }
-  if (n.ye & a) {
-    if (t && !(Q && n.G && C !== n.G)) {
+  if (r.ye & a) {
+    if (t && !(Q && r.G && C !== r.G)) {
       if (B) {
-        const r = n.Y;
+        const n = r.Y;
         const i = findLane(B);
-        if (r && findLane(r) === i && !hasActiveOverride(n)) {
+        if (n && findLane(n) === i && !hasActiveOverride(r)) {
           if (!H && e !== t) link(e, t);
-          throw n.ae;
+          throw r.ae;
         }
       } else {
         if (!H && e !== t) link(e, t);
-        throw n.ae;
+        throw r.ae;
       }
-    } else if (t && n !== e && n.ye & h) {
+    } else if (t && r !== e && r.ye & h) {
       if (!H && e !== t) link(e, t);
-      throw n.ae;
-    } else if (!t && n.ye & h) {
-      throw n.ae;
+      throw r.ae;
+    } else if (!t && r.ye & h) {
+      throw r.ae;
     }
   }
   if (e.I && e.ye & d) {
@@ -1528,12 +1534,17 @@ function read(e) {
     if (t && Q && shouldReadStashedOptimisticValue(e)) return e.$;
     return e.ee;
   }
-  return !t ||
-    (B !== null && (e.ee !== undefined || e.Y || (n === e && Q) || !!(n.ye & a))) ||
+  const i =
+    !t ||
+    (B !== null && (e.ee !== undefined || e.Y || (r === e && Q) || !!(r.ye & a))) ||
     e.Z === S ||
     (Q && e.G && C !== e.G)
-    ? e.$
-    : e.Z;
+      ? e.$
+      : e.Z;
+  if (!t && r === e && typeof n.I === "function" && !n.ve && !(r.ye & a) && !n.i && !e.O) {
+    unobserved(e);
+  }
+  return i;
 }
 function setSignal(e, t) {
   if (e.G && C !== e.G) N.initTransition(e.G);
@@ -1574,20 +1585,20 @@ function setSignal(e, t) {
   return t;
 }
 function runWithOwner(e, t) {
-  const n = V;
+  const n = M;
   const r = H;
-  V = e;
+  M = e;
   H = false;
   try {
     return t();
   } finally {
-    V = n;
+    M = n;
     H = r;
   }
 }
 function getPendingSignal(e) {
   if (!e.Fe) {
-    e.Fe = optimisticSignal(false, { pureWrite: true });
+    e.Fe = optimisticSignal(false, { ownedWrite: true });
     if (e.we) {
       e.Fe.we = e;
     }
@@ -1635,17 +1646,17 @@ function updatePendingSignal(e) {
 }
 function getLatestValueComputed(e) {
   if (!e.He) {
-    const t = M;
-    M = false;
+    const t = V;
+    V = false;
     const n = D;
     D = false;
-    const r = V;
-    V = null;
+    const r = M;
+    M = null;
     e.He = optimisticComputed(() => read(e));
     e.He.we = e;
-    V = r;
+    M = r;
     D = n;
-    M = t;
+    V = t;
   }
   return e.He;
 }
@@ -1659,12 +1670,12 @@ function staleValues(e, t = true) {
   }
 }
 function latest(e) {
-  const t = M;
-  M = true;
+  const t = V;
+  V = true;
   try {
     return e();
   } finally {
-    M = t;
+    V = t;
   }
 }
 function isPending(e) {
@@ -1732,13 +1743,13 @@ function effect(e, t, n, r, i) {
     ...i,
     equals: () => {
       o.F = !o.ae;
-      if (s) o.M.enqueue(o.D, runEffect.bind(o));
+      if (s) o.V.enqueue(o.D, runEffect.bind(o));
       return false;
     },
     lazy: true
   });
-  o.Me = r;
-  o.Ve = t;
+  o.Ve = r;
+  o.Me = t;
   o.Be = n;
   o.Ke = undefined;
   o.D = i?.render ? p : y;
@@ -1747,7 +1758,7 @@ function effect(e, t, n, r, i) {
     const r = t !== undefined ? t : o.ae;
     if (n & d) {
       let e = r;
-      o.M.notify(o, a, 0);
+      o.V.notify(o, a, 0);
       if (o.D === y) {
         try {
           return o.Be
@@ -1760,13 +1771,13 @@ function effect(e, t, n, r, i) {
           e = t;
         }
       }
-      if (!o.M.notify(o, d, d)) throw e;
+      if (!o.V.notify(o, d, d)) throw e;
     } else if (o.D === p) {
-      o.M.notify(o, a | d, n, r);
+      o.V.notify(o, a | d, n, r);
     }
   };
   recompute(o, true);
-  !i?.defer && (o.D === y ? o.M.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
+  !i?.defer && (o.D === y ? o.V.enqueue(o.D, runEffect.bind(o)) : runEffect.call(o));
   s = true;
   cleanup(() => o.Ke?.());
 }
@@ -1775,15 +1786,15 @@ function runEffect() {
   this.Ke?.();
   this.Ke = undefined;
   try {
-    const e = this.Ve(this.$, this.Me);
+    const e = this.Me(this.$, this.Ve);
     if (false && e !== undefined && typeof e !== "function");
     this.Ke = e;
   } catch (e) {
     this.ae = new StatusError(this, e);
     this.ye |= d;
-    if (!this.M.notify(this, d, d)) throw e;
+    if (!this.V.notify(this, d, d)) throw e;
   } finally {
-    this.Me = this.$;
+    this.Ve = this.$;
     this.F = false;
   }
 }
@@ -1813,13 +1824,13 @@ function trackedEffect(e, t) {
   n.Qe = (e, t) => {
     const r = e !== undefined ? e : n.ye;
     if (r & d) {
-      n.M.notify(n, a, 0);
+      n.V.notify(n, a, 0);
       const e = t !== undefined ? t : n.ae;
-      if (!n.M.notify(n, d, d)) throw e;
+      if (!n.V.notify(n, d, d)) throw e;
     }
   };
-  n.V = run;
-  n.M.enqueue(y, run);
+  n.M = run;
+  n.V.enqueue(y, run);
   cleanup(() => n.Ke?.());
 }
 function restoreTransition(e, t) {
@@ -1874,23 +1885,24 @@ function accessor(e) {
   t.$r = true;
   return t;
 }
-function createSignal(e, t, n) {
+function createSignal(e, t) {
   if (typeof e === "function") {
-    const r = computed(e, t, n);
-    return [accessor(r), setSignal.bind(null, r)];
+    const n = computed(e, undefined, t);
+    n.ve = true;
+    return [accessor(n), setSignal.bind(null, n)];
   }
-  const r = signal(e, t);
-  return [accessor(r), setSignal.bind(null, r)];
+  const n = signal(e, t);
+  return [accessor(n), setSignal.bind(null, n)];
 }
-function createMemo(e, t, n) {
-  let r = computed(e, t, n);
-  return accessor(r);
+function createMemo(e, t) {
+  let n = computed(e, undefined, t);
+  return accessor(n);
 }
-function createEffect(e, t, n, r) {
-  effect(e, t.effect || t, t.error, n, r);
+function createEffect(e, t, n) {
+  effect(e, t.effect || t, t.error, undefined, n);
 }
-function createRenderEffect(e, t, n, r) {
-  effect(e, t, undefined, n, { render: true, ...r });
+function createRenderEffect(e, t, n) {
+  effect(e, t, undefined, undefined, { render: true, ...n });
 }
 function createTrackedEffect(e, t) {
   trackedEffect(e, t);
@@ -1932,13 +1944,14 @@ function resolve(e) {
     });
   });
 }
-function createOptimistic(e, t, n) {
+function createOptimistic(e, t) {
   if (typeof e === "function") {
-    const r = optimisticComputed(e, t, n);
-    return [accessor(r), setSignal.bind(null, r)];
+    const n = optimisticComputed(e, undefined, t);
+    n.ve = true;
+    return [accessor(n), setSignal.bind(null, n)];
   }
-  const r = optimisticSignal(e, t);
-  return [accessor(r), setSignal.bind(null, r)];
+  const n = optimisticSignal(e, t);
+  return [accessor(n), setSignal.bind(null, n)];
 }
 function onSettled(e) {
   const t = getOwner();
@@ -2083,7 +2096,7 @@ function reconcile(e, t) {
     applyState(e, n, r);
   };
 }
-function createProjectionInternal(e, t = {}, n) {
+function createProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
@@ -2124,7 +2137,7 @@ function createProjectionInternal(e, t = {}, n) {
   r.ve = true;
   return { store: s, node: r };
 }
-function createProjection(e, t = {}, n) {
+function createProjection(e, t, n) {
   return createProjectionInternal(e, t, n).store;
 }
 function createWriteTraps(e) {
@@ -2491,7 +2504,7 @@ function createStore(e, t, n) {
 function createOptimisticStore(e, t, n) {
   GlobalQueue.fe ||= clearOptimisticStore;
   const r = typeof e === "function";
-  const i = (r ? t : e) ?? {};
+  const i = r ? t : e;
   const s = r ? e : undefined;
   const { store: o } = createOptimisticProjectionInternal(s, i, n);
   return [o, e => storeSetter(o, e)];
@@ -2522,7 +2535,7 @@ function clearOptimisticStore(e) {
   }
   delete t[$];
 }
-function createOptimisticProjectionInternal(e, t = {}, n) {
+function createOptimisticProjectionInternal(e, t, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
@@ -2829,7 +2842,7 @@ function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
   const i = t.length > 1;
   const s = t;
-  return createMemo(
+  const o = computed(
     updateKeyedMap.bind({
       ze: createOwner(),
       Ue: 0,
@@ -2844,8 +2857,10 @@ function mapArray(e, t, n) {
       rt: n?.fallback
     })
   );
+  o.ve = true;
+  return accessor(o);
 }
-const pe = { pureWrite: true };
+const pe = { ownedWrite: true };
 function updateKeyedMap() {
   const e = this.Je() || [],
     t = e.length;
@@ -2967,17 +2982,21 @@ function updateKeyedMap() {
 }
 function repeat(e, t, n) {
   const r = t;
-  return updateRepeat.bind({
-    ze: createOwner(),
-    Ue: 0,
-    it: 0,
-    st: e,
-    Ye: r,
-    $e: [],
-    Ze: [],
-    ot: n?.from,
-    rt: n?.fallback
-  });
+  const i = computed(
+    updateRepeat.bind({
+      ze: createOwner(),
+      Ue: 0,
+      it: 0,
+      st: e,
+      Ye: r,
+      $e: [],
+      Ze: [],
+      ot: n?.from,
+      rt: n?.fallback
+    })
+  );
+  i.ve = true;
+  return accessor(i);
 }
 function updateRepeat() {
   const e = this.st();
@@ -3035,7 +3054,7 @@ function boundaryComputed(e, t) {
     const r = e !== undefined ? e : n.ye;
     const i = t !== undefined ? t : n.ae;
     n.ye &= ~n.ut;
-    n.M.notify(n, n.ut, r, i);
+    n.V.notify(n, n.ut, r, i);
   };
   n.ut = t;
   n.ve = true;
@@ -3043,9 +3062,9 @@ function boundaryComputed(e, t) {
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.M;
-  i.addChild((e.M = n));
-  cleanup(() => i.removeChild(e.M));
+  const i = e.V;
+  i.addChild((e.V = n));
+  cleanup(() => i.removeChild(e.V));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
@@ -3075,8 +3094,8 @@ class RevealController {
   wt;
   bt = [];
   ht;
-  ct = signal(false, { pureWrite: true, De: true });
-  dt = signal(false, { pureWrite: true, De: true });
+  ct = signal(false, { ownedWrite: true, De: true });
+  dt = signal(false, { ownedWrite: true, De: true });
   _t = true;
   Ot = false;
   constructor(e, t) {
@@ -3098,7 +3117,7 @@ class RevealController {
     if (this.bt.includes(e)) return;
     this.bt.push(e);
     const t = !!untrack(this.St);
-    setSignal(e.ct, true), setSignal(e.dt, t ? false : !!untrack(this.wt));
+    (setSignal(e.ct, true), setSignal(e.dt, t ? false : !!untrack(this.wt)));
     untrack(() => this.evaluate());
   }
   unregister(e) {
@@ -3139,8 +3158,8 @@ class CollectionQueue extends Queue {
   ft = new Set();
   Pt;
   lt = true;
-  ct = signal(false, { pureWrite: true, De: true });
-  dt = signal(false, { pureWrite: true, De: true });
+  ct = signal(false, { ownedWrite: true, De: true });
+  dt = signal(false, { ownedWrite: true, De: true });
   yt;
   gt = false;
   kt;
@@ -3232,7 +3251,7 @@ function createCollectionBoundary(e, t, n, r) {
   const f = computed(() => {
     if (!read(s.ct)) {
       const e = read(o);
-      if (!untrack(() => read(s.ct))) return (s.gt = true), e;
+      if (!untrack(() => read(s.ct))) return ((s.gt = true), e);
     }
     if (Se && read(s.dt)) return undefined;
     return n(s);