@solidjs/signals 0.10.7 → 0.10.8

package/dist/prod.js

@@ -81,10 +81,10 @@ function deleteFromHeap(e, t) {
   else {
     const n = e.S;
     const r = t.l[i];
-    const o = n ?? r;
+    const s = n ?? r;
     if (e === r) t.l[i] = n;
     else e.T.S = n;
-    o.T = e.T;
+    s.T = e.T;
   }
   e.T = e;
   e.S = undefined;
@@ -347,7 +347,7 @@ function insertSubs(e, t = false) {
   const n = e.ie || currentOptimisticLane;
   const i = e.re !== undefined;
   for (let r = e.I; r !== null; r = r.p) {
-    if (i && r.h.oe) {
+    if (i && r.h.se) {
       r.h.O |= REACTIVE_SNAPSHOT_STALE;
       continue;
     }
@@ -359,16 +359,16 @@ function insertSubs(e, t = false) {
       r.h.ie = undefined;
     }
     const e = r.h;
-    if (e.se === EFFECT_TRACKED) {
+    if (e.oe === EFFECT_TRACKED) {
       if (!e.ue) {
         e.ue = true;
         e.ce.enqueue(EFFECT_USER, e.le);
       }
       continue;
     }
-    const o = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (o.N > r.h.o) o.N = r.h.o;
-    insertIntoHeap(r.h, o);
+    const s = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (s.N > r.h.o) s.N = r.h.o;
+    insertIntoHeap(r.h, s);
   }
 }
 function finalizePureQueue(e = null, t = false) {
@@ -382,7 +382,7 @@ function finalizePureQueue(e = null, t = false) {
       if (n.ae !== NOT_PENDING) {
         n.fe = n.ae;
         n.ae = NOT_PENDING;
-        if (n.se && n.se !== EFFECT_TRACKED) n.ue = true;
+        if (n.oe && n.oe !== EFFECT_TRACKED) n.ue = true;
       }
       n.Ee &= ~STATUS_UNINITIALIZED;
       if (n.L) GlobalQueue.Y(n, false, true);
@@ -543,13 +543,13 @@ function assignOrMergeLane(e, t) {
 function handleAsync(e, t, n) {
   const i = typeof t === "object" && t !== null;
   const r = i && untrack(() => t[Symbol.asyncIterator]);
-  const o = !r && i && untrack(() => typeof t.then === "function");
-  if (!o && !r) {
+  const s = !r && i && untrack(() => typeof t.then === "function");
+  if (!s && !r) {
     e.Ie = null;
     return t;
   }
   e.Ie = t;
-  let s;
+  let o;
   const handleError = n => {
     if (e.Ie !== t) return;
     globalQueue.initTransition(e.ne);
@@ -561,8 +561,8 @@ function handleAsync(e, t, n) {
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(e.ne);
     clearStatus(e);
-    const o = resolveLane(e);
-    if (o) o.U.delete(e);
+    const s = resolveLane(e);
+    if (s) s.U.delete(e);
     if (n) n(i);
     else if (e._e) {
       const t = e.ae !== NOT_PENDING;
@@ -572,7 +572,7 @@ function handleAsync(e, t, n) {
         insertSubs(e);
       }
       e.J = clock;
-    } else if (o) {
+    } else if (s) {
       const t = e.fe;
       const n = e.pe;
       if (!n || !n(i, t)) {
@@ -590,13 +590,13 @@ function handleAsync(e, t, n) {
     flush();
     r?.();
   };
-  if (o) {
+  if (s) {
     let n = false,
       i = true;
     t.then(
       e => {
         if (i) {
-          s = e;
+          o = e;
           n = true;
         } else asyncWrite(e);
       },
@@ -630,7 +630,7 @@ function handleAsync(e, t, n) {
       );
       r = false;
       if (t && !e.done) {
-        s = e.value;
+        o = e.value;
         i = true;
         return iterate();
       }
@@ -642,7 +642,7 @@ function handleAsync(e, t, n) {
       throw new NotReadyError(context);
     }
   }
-  return s;
+  return o;
 }
 function clearStatus(e) {
   e.Ee = e.Ee & STATUS_UNINITIALIZED;
@@ -653,9 +653,9 @@ function clearStatus(e) {
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
-  const o = n instanceof NotReadyError && n.source === e;
-  const s = t === STATUS_PENDING && e._e && !o;
-  const u = s && hasActiveOverride(e);
+  const s = n instanceof NotReadyError && n.source === e;
+  const o = t === STATUS_PENDING && e._e && !s;
+  const u = o && hasActiveOverride(e);
   if (!i) {
     e.Ee = t | (t !== STATUS_ERROR ? e.Ee & STATUS_UNINITIALIZED : 0);
     e.q = n;
@@ -671,7 +671,7 @@ function notifyStatus(e, t, n, i, r) {
     }
   }
   const c = i || u;
-  const l = i || s ? undefined : r;
+  const l = i || o ? undefined : r;
   if (e.Ae) {
     if (c) {
       e.Ae(t, n);
@@ -735,13 +735,13 @@ function link(e, t) {
       return;
     }
   }
-  const o = e.Pe;
-  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
-  const s = (t.ye = e.Pe = { V: e, h: t, D: i, ge: o, p: null });
-  if (n !== null) n.D = s;
-  else t.C = s;
-  if (o !== null) o.p = s;
-  else e.I = s;
+  const s = e.Pe;
+  if (s !== null && s.h === t && (!r || isValidLink(s, t))) return;
+  const o = (t.ye = e.Pe = { V: e, h: t, D: i, ge: s, p: null });
+  if (n !== null) n.D = o;
+  else t.C = o;
+  if (s !== null) s.p = o;
+  else e.I = o;
 }
 function isValidLink(e, t) {
   const n = t.ye;
@@ -889,46 +889,46 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(n.dispose));
 }
 function effect(e, t, n, i, r) {
-  let o = false;
-  const s = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
+  let s = false;
+  const o = computed(r?.render ? t => staleValues(() => e(t)) : e, i, {
     ...r,
     equals: () => {
-      s.ue = !s.q;
-      if (o) s.ce.enqueue(s.se, runEffect.bind(s));
+      o.ue = !o.q;
+      if (s) o.ce.enqueue(o.oe, runEffect.bind(o));
       return false;
     },
     lazy: true
   });
-  s.Ue = i;
-  s.We = t;
-  s.He = n;
-  s.xe = undefined;
-  s.se = r?.render ? EFFECT_RENDER : EFFECT_USER;
-  s.Ae = (e, t) => {
-    const n = e !== undefined ? e : s.Ee;
-    const i = t !== undefined ? t : s.q;
+  o.Ue = i;
+  o.We = t;
+  o.He = n;
+  o.xe = undefined;
+  o.oe = r?.render ? EFFECT_RENDER : EFFECT_USER;
+  o.Ae = (e, t) => {
+    const n = e !== undefined ? e : o.Ee;
+    const i = t !== undefined ? t : o.q;
     if (n & STATUS_ERROR) {
       let e = i;
-      s.ce.notify(s, STATUS_PENDING, 0);
-      if (s.se === EFFECT_USER) {
+      o.ce.notify(o, STATUS_PENDING, 0);
+      if (o.oe === EFFECT_USER) {
         try {
-          return s.He
-            ? s.He(e, () => {
-                s.xe?.();
-                s.xe = undefined;
+          return o.He
+            ? o.He(e, () => {
+                o.xe?.();
+                o.xe = undefined;
               })
             : console.error(e);
         } catch (t) {
           e = t;
         }
       }
-      if (!s.ce.notify(s, STATUS_ERROR, STATUS_ERROR)) throw e;
-    } else if (s.se === EFFECT_RENDER) s.ce.notify(s, STATUS_PENDING | STATUS_ERROR, n, i);
+      if (!o.ce.notify(o, STATUS_ERROR, STATUS_ERROR)) throw e;
+    } else if (o.oe === EFFECT_RENDER) o.ce.notify(o, STATUS_PENDING | STATUS_ERROR, n, i);
   };
-  recompute(s, true);
-  !r?.defer && (s.se === EFFECT_USER ? s.ce.enqueue(s.se, runEffect.bind(s)) : runEffect.call(s));
-  o = true;
-  onCleanup(() => s.xe?.());
+  recompute(o, true);
+  !r?.defer && (o.oe === EFFECT_USER ? o.ce.enqueue(o.oe, runEffect.bind(o)) : runEffect.call(o));
+  s = true;
+  onCleanup(() => o.xe?.());
 }
 function runEffect() {
   if (!this.ue || this.O & REACTIVE_DISPOSED) return;
@@ -963,7 +963,7 @@ function trackedEffect(e, t) {
   );
   n.xe = undefined;
   n.ue = true;
-  n.se = EFFECT_TRACKED;
+  n.oe = EFFECT_TRACKED;
   n.le = run;
   n.ce.enqueue(EFFECT_USER, run);
   onCleanup(() => n.xe?.());
@@ -1008,7 +1008,7 @@ function releaseSubtree(e) {
     }
     if (t.L) {
       const e = t;
-      e.oe = false;
+      e.se = false;
       if (e.O & REACTIVE_SNAPSHOT_STALE) {
         e.O &= ~REACTIVE_SNAPSHOT_STALE;
         e.O |= REACTIVE_DIRTY;
@@ -1031,7 +1031,7 @@ function clearSnapshots() {
   snapshotCaptureActive = false;
 }
 function recompute(e, t = false) {
-  const n = e.se;
+  const n = e.oe;
   if (!t) {
     if (e.ne && (!n || activeTransition) && activeTransition !== e.ne)
       globalQueue.initTransition(e.ne);
@@ -1048,8 +1048,8 @@ function recompute(e, t = false) {
   }
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
   const r = hasActiveOverride(e);
-  const o = !!(e.Ee & STATUS_PENDING);
-  const s = context;
+  const s = !!(e.Ee & STATUS_PENDING);
+  const o = context;
   context = e;
   e.ye = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
@@ -1090,30 +1090,30 @@ function recompute(e, t = false) {
   } finally {
     tracking = l;
     e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
-    context = s;
+    context = o;
   }
   if (!e.q) {
-    const s = e.ye;
-    let l = s !== null ? s.D : e.C;
+    const o = e.ye;
+    let l = o !== null ? o.D : e.C;
     if (l !== null) {
       do {
         l = unlinkSubs(l);
       } while (l !== null);
-      if (s !== null) s.D = null;
+      if (o !== null) o.D = null;
       else e.C = null;
     }
     const a = r ? e.fe : e.ae === NOT_PENDING ? e.fe : e.ae;
     const f = !e.pe || !e.pe(a, u);
     if (f) {
-      const s = r ? e.fe : undefined;
+      const o = r ? e.fe : undefined;
       if (t || (n && activeTransition !== e.ne) || i) e.fe = u;
       else e.ae = u;
-      if (r && !i && o) {
+      if (r && !i && s) {
         const t = e.Oe || 0;
         const n = e.Re || 0;
         if (t <= n) e.fe = u;
       }
-      if (!r || i || e.fe !== s) {
+      if (!r || i || e.fe !== o) {
         insertSubs(e, i || r);
       }
     } else if (r) {
@@ -1181,7 +1181,7 @@ function computed(e, t, n) {
     ne: null
   };
   r.T = r;
-  const o = context?.t ? context.u : context;
+  const s = context?.t ? context.u : context;
   if (context) {
     const e = context.De;
     if (e === null) {
@@ -1191,8 +1191,8 @@ function computed(e, t, n) {
       context.De = r;
     }
   }
-  if (o) r.o = o.o + 1;
-  if (snapshotCaptureActive && ownerInSnapshotScope(context)) r.oe = true;
+  if (s) r.o = s.o + 1;
+  if (snapshotCaptureActive && ownerInSnapshotScope(context)) r.se = true;
   !n?.lazy && recompute(r, true);
   if (snapshotCaptureActive && !n?.lazy) {
     if (!(r.Ee & STATUS_PENDING)) {
@@ -1235,8 +1235,14 @@ function optimisticComputed(e, t, n) {
 function isEqual(e, t) {
   return e === t;
 }
+let strictRead = false;
+function setStrictRead(e) {
+  const t = strictRead;
+  strictRead = e;
+  return t;
+}
 function untrack(e) {
-  if (!tracking) return e();
+  if (!tracking && true) return e();
   tracking = false;
   try {
     return e();
@@ -1323,7 +1329,7 @@ function read(e) {
       return read(e);
     } else throw e.q;
   }
-  if (snapshotCaptureActive && t && t.oe) {
+  if (snapshotCaptureActive && t && t.se) {
     const n = e.re;
     if (n !== undefined) {
       const i = n === NO_SNAPSHOT ? undefined : n;
@@ -1537,13 +1543,13 @@ function action(e) {
     new Promise((n, i) => {
       const r = e(...t);
       globalQueue.initTransition();
-      let o = activeTransition;
-      o.ee.push(r);
+      let s = activeTransition;
+      s.ee.push(r);
       const done = (e, t) => {
-        o = currentTransition(o);
-        const s = o.ee.indexOf(r);
-        if (s >= 0) o.ee.splice(s, 1);
-        setActiveTransition(o);
+        s = currentTransition(s);
+        const o = s.ee.indexOf(r);
+        if (o >= 0) s.ee.splice(o, 1);
+        setActiveTransition(s);
         schedule();
         t ? i(t) : n(e);
       };
@@ -1555,17 +1561,17 @@ function action(e) {
           return done(undefined, e);
         }
         if (n instanceof Promise)
-          return void n.then(run, e => restoreTransition(o, () => step(e, true)));
+          return void n.then(run, e => restoreTransition(s, () => step(e, true)));
         run(n);
       };
       const run = e => {
         if (e.done) return done(e.value);
         if (e.value instanceof Promise)
           return void e.value.then(
-            e => restoreTransition(o, () => step(e)),
-            e => restoreTransition(o, () => step(e, true))
+            e => restoreTransition(s, () => step(e)),
+            e => restoreTransition(s, () => step(e, true))
           );
-        restoreTransition(o, () => step(e.value));
+        restoreTransition(s, () => step(e.value));
       };
       step();
     });
@@ -1653,23 +1659,23 @@ function getAllKeys(e, t, n) {
 function applyState(e, t, n, i) {
   const r = t?.[$TARGET];
   if (!r) return;
-  const o = r[STORE_VALUE];
-  const s = r[STORE_OVERRIDE];
+  const s = r[STORE_VALUE];
+  const o = r[STORE_OVERRIDE];
   const u = r[STORE_OPTIMISTIC_OVERRIDE];
   let c = r[STORE_NODE];
-  if (e === o && !s && !u) return;
+  if (e === s && !o && !u) return;
   (r[STORE_LOOKUP] || storeLookup).set(e, r[$PROXY]);
   r[STORE_VALUE] = e;
   r[STORE_OVERRIDE] = undefined;
-  if (Array.isArray(o)) {
+  if (Array.isArray(s)) {
     let t = false;
-    const l = getOverrideValue(o, s, c, "length", u);
+    const l = getOverrideValue(s, o, c, "length", u);
     if (e.length && l && e[0] && n(e[0]) != null) {
       let a, f, E, T, d, S, R, O;
       for (
         E = 0, T = Math.min(l, e.length);
         E < T &&
-        ((S = getOverrideValue(o, s, c, E, u)) === e[E] || (S && e[E] && n(S) === n(e[E])));
+        ((S = getOverrideValue(s, o, c, E, u)) === e[E] || (S && e[E] && n(S) === n(e[E])));
         E++
       ) {
         applyState(e[E], wrap(S, r), n, i);
@@ -1680,7 +1686,7 @@ function applyState(e, t, n, i) {
         T = l - 1, d = e.length - 1;
         T >= E &&
         d >= E &&
-        ((S = getOverrideValue(o, s, c, T, u)) === e[d] || (S && e[d] && n(S) === n(e[d])));
+        ((S = getOverrideValue(s, o, c, T, u)) === e[d] || (S && e[d] && n(S) === n(e[d])));
         T--, d--
       ) {
         _[d] = S;
@@ -1692,9 +1698,9 @@ function applyState(e, t, n, i) {
         }
         for (; f < e.length; f++) {
           t = true;
-          const o = wrap(_[f], r);
-          r[STORE_NODE][f] && setSignal(r[STORE_NODE][f], o);
-          applyState(e[f], o, n, i);
+          const s = wrap(_[f], r);
+          r[STORE_NODE][f] && setSignal(r[STORE_NODE][f], s);
+          applyState(e[f], s, n, i);
         }
         t && r[STORE_NODE][$TRACK] && setSignal(r[STORE_NODE][$TRACK], void 0);
         l !== e.length && r[STORE_NODE].length && setSignal(r[STORE_NODE].length, e.length);
@@ -1709,7 +1715,7 @@ function applyState(e, t, n, i) {
         I.set(O, f);
       }
       for (a = E; a <= T; a++) {
-        S = getOverrideValue(o, s, c, a, u);
+        S = getOverrideValue(s, o, c, a, u);
         O = S ? n(S) : S;
         f = I.get(O);
         if (f !== undefined && f !== -1) {
@@ -1728,7 +1734,7 @@ function applyState(e, t, n, i) {
       if (E < e.length) t = true;
     } else if (e.length) {
       for (let t = 0, l = e.length; t < l; t++) {
-        const l = getOverrideValue(o, s, c, t, u);
+        const l = getOverrideValue(s, o, c, t, u);
         isWrappable(l)
           ? applyState(e[t], wrap(l, r), n, i)
           : r[STORE_NODE][t] && setSignal(r[STORE_NODE][t], e[t]);
@@ -1743,11 +1749,11 @@ function applyState(e, t, n, i) {
   }
   if (c) {
     const t = c[$TRACK];
-    const l = t || i ? getAllKeys(o, s, e) : Object.keys(c);
+    const l = t || i ? getAllKeys(s, o, e) : Object.keys(c);
     for (let a = 0, f = l.length; a < f; a++) {
       const f = l[a];
       const E = c[f];
-      const T = unwrap(getOverrideValue(o, s, c, f, u));
+      const T = unwrap(getOverrideValue(s, o, c, f, u));
       let d = unwrap(e[f]);
       if (T === d) continue;
       if (!T || !isWrappable(T) || !isWrappable(d) || (n(T) != null && n(T) !== n(d))) {
@@ -1768,8 +1774,8 @@ function reconcile(e, t, n = false) {
   return i => {
     if (i == null) throw new Error("Cannot reconcile null or undefined state");
     const r = typeof t === "string" ? e => e[t] : t;
-    const o = r(i);
-    if (o !== undefined && r(e) !== r(i))
+    const s = r(i);
+    if (s !== undefined && r(e) !== r(i))
       throw new Error("Cannot reconcile states with different identity");
     applyState(e, i, r, n);
   };
@@ -1794,19 +1800,19 @@ function createProjectionInternal(e, t = {}, n) {
     r.set(e, t);
     return t;
   };
-  const o = wrapProjection(t);
+  const s = wrapProjection(t);
   i = computed(() => {
     const t = getOwner();
-    storeSetter(new Proxy(o, writeTraps), i => {
+    storeSetter(new Proxy(s, writeTraps), i => {
       const r = handleAsync(t, e(i), e => {
-        e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id", n?.all));
+        e !== i && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
         setSignal(t, undefined);
       });
-      r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(o);
+      r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(s);
     });
   });
   i.Ce = true;
-  return { store: o, node: i };
+  return { store: s, node: i };
 }
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
@@ -1893,7 +1899,7 @@ function getNodes(e, t) {
   if (!n) e[t] = n = Object.create(null);
   return n;
 }
-function getNode(e, t, n, i, r = isEqual, o, s) {
+function getNode(e, t, n, i, r = isEqual, s, o) {
   if (e[t]) return e[t];
   const u = signal(
     n,
@@ -1905,9 +1911,9 @@ function getNode(e, t, n, i, r = isEqual, o, s) {
     },
     i
   );
-  if (o) u._e = true;
-  if (s && t in s) {
-    const e = s[t];
+  if (s) u._e = true;
+  if (o && t in o) {
+    const e = o[t];
     u.re = e === undefined ? NO_SNAPSHOT : e;
     snapshotSources?.add(u);
   }
@@ -1923,8 +1929,8 @@ function getKeys(e, t, n = true) {
   const i = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
   if (!t) return i;
   const r = new Set(i);
-  const o = Reflect.ownKeys(t);
-  for (const e of o) {
+  const s = Reflect.ownKeys(t);
+  for (const e of s) {
     if (t[e] !== $DELETED) r.add(e);
     else r.delete(e);
   }
@@ -1950,10 +1956,10 @@ const storeTraps = {
     }
     const i = getNodes(e, STORE_NODE);
     const r = i[t];
-    const o = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
-    const s = o || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
+    const s = e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE];
+    const o = s || (e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]);
     const u = !!e[STORE_VALUE][$TARGET];
-    const c = o
+    const c = s
       ? e[STORE_OPTIMISTIC_OVERRIDE]
       : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
         ? e[STORE_OVERRIDE]
@@ -1963,17 +1969,17 @@ const storeTraps = {
       if (e && e.get) return e.get.call(n);
     }
     if (writeOnly(n)) {
-      let n = r && (s || !u) ? (r.ae !== NOT_PENDING ? (r._e ? r.fe : r.ae) : r.fe) : c[t];
+      let n = r && (o || !u) ? (r.ae !== NOT_PENDING ? (r._e ? r.fe : r.ae) : r.fe) : c[t];
       n === $DELETED && (n = undefined);
       if (!isWrappable(n)) return n;
       const i = wrap(n, e);
       Writing?.add(i);
       return i;
     }
-    let l = r ? (s || !u ? read(i[t]) : (read(i[t]), c[t])) : c[t];
+    let l = r ? (o || !u ? read(i[t]) : (read(i[t]), c[t])) : c[t];
     l === $DELETED && (l = undefined);
     if (!r) {
-      if (!s && typeof l === "function" && !c.hasOwnProperty(t)) {
+      if (!o && typeof l === "function" && !c.hasOwnProperty(t)) {
         let t;
         return !Array.isArray(e[STORE_VALUE]) &&
           (t = Object.getPrototypeOf(e[STORE_VALUE])) &&
@@ -2019,29 +2025,29 @@ const storeTraps = {
       }
       untrack(() => {
         const r = e[STORE_VALUE];
-        const o = r[t];
+        const s = r[t];
         if (snapshotCaptureActive && typeof t !== "symbol") {
           if (!e[STORE_SNAPSHOT_PROPS]) {
             e[STORE_SNAPSHOT_PROPS] = Object.create(null);
             snapshotSources?.add(e);
           }
           if (!(t in e[STORE_SNAPSHOT_PROPS])) {
-            e[STORE_SNAPSHOT_PROPS][t] = o;
+            e[STORE_SNAPSHOT_PROPS][t] = s;
           }
         }
-        const s = e[STORE_OPTIMISTIC] && !projectionWriteActive;
-        const u = s ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
-        if (s) trackOptimisticStore(i);
+        const o = e[STORE_OPTIMISTIC] && !projectionWriteActive;
+        const u = o ? STORE_OPTIMISTIC_OVERRIDE : STORE_OVERRIDE;
+        if (o) trackOptimisticStore(i);
         const c =
           e[STORE_OPTIMISTIC_OVERRIDE] && t in e[STORE_OPTIMISTIC_OVERRIDE]
             ? e[STORE_OPTIMISTIC_OVERRIDE][t]
             : e[STORE_OVERRIDE] && t in e[STORE_OVERRIDE]
               ? e[STORE_OVERRIDE][t]
-              : o;
+              : s;
         const l = n?.[$TARGET]?.[STORE_VALUE] ?? n;
         if (c === l) return true;
         const a = e[STORE_OPTIMISTIC_OVERRIDE]?.length || e[STORE_OVERRIDE]?.length || r.length;
-        if (l !== undefined && l === o) delete e[u][t];
+        if (l !== undefined && l === s) delete e[u][t];
         else (e[u] || (e[u] = Object.create(null)))[t] = l;
         const f = isWrappable(l);
         if (isWrappable(c)) {
@@ -2089,9 +2095,9 @@ const storeTraps = {
           t && (t instanceof Set ? t.delete(e) : PARENTS.delete(r));
         }
         if (e[STORE_HAS]?.[t]) setSignal(e[STORE_HAS][t], false);
-        const o = getNodes(e, STORE_NODE);
-        o[t] && setSignal(o[t], undefined);
-        o[$TRACK] && setSignal(o[$TRACK], undefined);
+        const s = getNodes(e, STORE_NODE);
+        s[t] && setSignal(s[t], undefined);
+        s[$TRACK] && setSignal(s[$TRACK], undefined);
       });
     }
     return true;
@@ -2202,8 +2208,8 @@ function recursivelyAddParent(e, t) {
     const t = getKeys(e, n);
     for (let i = 0; i < t.length; i++) {
       const r = t[i];
-      const o = n && r in n ? n[r] : e[r];
-      isWrappable(o) && recursivelyAddParent(o, e);
+      const s = n && r in n ? n[r] : e[r];
+      isWrappable(s) && recursivelyAddParent(s, e);
     }
   }
 }
@@ -2215,9 +2221,9 @@ function createOptimisticStore(e, t, n) {
   GlobalQueue.B ||= clearOptimisticStore;
   const i = typeof e === "function";
   const r = (i ? t : e) ?? {};
-  const o = i ? e : undefined;
-  const { store: s } = createOptimisticProjectionInternal(o, r, n);
-  return [s, e => storeSetter(s, e)];
+  const s = i ? e : undefined;
+  const { store: o } = createOptimisticProjectionInternal(s, r, n);
+  return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
   const t = e[$TARGET];
@@ -2267,22 +2273,22 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
     r.set(e, t);
     return t;
   };
-  const o = wrapProjection(t);
+  const s = wrapProjection(t);
   if (e) {
     i = computed(() => {
       const t = getOwner();
       setProjectionWriteActive(true);
       try {
-        storeSetter(new Proxy(o, writeTraps), i => {
+        storeSetter(new Proxy(s, writeTraps), i => {
           const r = handleAsync(t, e(i), e => {
             setProjectionWriteActive(true);
             try {
-              e !== i && e !== undefined && storeSetter(o, reconcile(e, n?.key || "id", n?.all));
+              e !== i && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
             } finally {
               setProjectionWriteActive(false);
             }
           });
-          r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(o);
+          r !== i && r !== undefined && reconcile(r, n?.key || "id", n?.all)(s);
         });
       } finally {
         setProjectionWriteActive(false);
@@ -2290,19 +2296,19 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
     });
     i.Ce = true;
   }
-  return { store: o, node: i };
+  return { store: s, node: i };
 }
 function snapshot(e, t, n) {
-  let i, r, o, s, u, c;
+  let i, r, s, o, u, c;
   if (!isWrappable(e)) return e;
   if (t && t.has(e)) return t.get(e);
   if (!t) t = new Map();
   if ((i = e[$TARGET] || n?.get(e)?.[$TARGET])) {
-    o = i[STORE_OVERRIDE];
+    s = i[STORE_OVERRIDE];
     r = Array.isArray(i[STORE_VALUE]);
     t.set(
       e,
-      o ? (s = r ? [] : Object.create(Object.getPrototypeOf(i[STORE_VALUE]))) : i[STORE_VALUE]
+      s ? (o = r ? [] : Object.create(Object.getPrototypeOf(i[STORE_VALUE]))) : i[STORE_VALUE]
     );
     e = i[STORE_VALUE];
     n = storeLookup;
@@ -2311,32 +2317,32 @@ function snapshot(e, t, n) {
     t.set(e, e);
   }
   if (r) {
-    const i = o?.length || e.length;
+    const i = s?.length || e.length;
     for (let r = 0; r < i; r++) {
-      c = o && r in o ? o[r] : e[r];
+      c = s && r in s ? s[r] : e[r];
       if (c === $DELETED) continue;
-      if ((u = snapshot(c, t, n)) !== c || s) {
-        if (!s) t.set(e, (s = [...e]));
-        s[r] = u;
+      if ((u = snapshot(c, t, n)) !== c || o) {
+        if (!o) t.set(e, (o = [...e]));
+        o[r] = u;
       }
     }
   } else {
-    const i = getKeys(e, o);
+    const i = getKeys(e, s);
     for (let r = 0, l = i.length; r < l; r++) {
       let l = i[r];
-      const a = getPropertyDescriptor(e, o, l);
+      const a = getPropertyDescriptor(e, s, l);
       if (a.get) continue;
-      c = o && l in o ? o[l] : e[l];
-      if ((u = snapshot(c, t, n)) !== e[l] || s) {
-        if (!s) {
-          s = Object.create(Object.getPrototypeOf(e));
-          Object.assign(s, e);
+      c = s && l in s ? s[l] : e[l];
+      if ((u = snapshot(c, t, n)) !== e[l] || o) {
+        if (!o) {
+          o = Object.create(Object.getPrototypeOf(e));
+          Object.assign(o, e);
         }
-        s[l] = u;
+        o[l] = u;
       }
     }
   }
-  return s || e;
+  return o || e;
 }
 function trueFn() {
   return true;
@@ -2378,8 +2384,8 @@ function merge(...e) {
   for (let i = 0; i < e.length; i++) {
     const r = e[i];
     t = t || (!!r && $PROXY in r);
-    const o = !!r && r[$SOURCES];
-    if (o) n.push(...o);
+    const s = !!r && r[$SOURCES];
+    if (s) n.push(...s);
     else n.push(typeof r === "function" ? ((t = true), createMemo(r)) : r);
   }
   if (SUPPORTS_PROXY && t) {
@@ -2409,35 +2415,35 @@ function merge(...e) {
   }
   const i = Object.create(null);
   let r = false;
-  let o = n.length - 1;
-  for (let e = o; e >= 0; e--) {
+  let s = n.length - 1;
+  for (let e = s; e >= 0; e--) {
     const t = n[e];
     if (!t) {
-      e === o && o--;
+      e === s && s--;
       continue;
     }
-    const s = Object.getOwnPropertyNames(t);
-    for (let n = s.length - 1; n >= 0; n--) {
-      const u = s[n];
+    const o = Object.getOwnPropertyNames(t);
+    for (let n = o.length - 1; n >= 0; n--) {
+      const u = o[n];
       if (u === "__proto__" || u === "constructor") continue;
       if (!i[u]) {
-        r = r || e !== o;
+        r = r || e !== s;
         const n = Object.getOwnPropertyDescriptor(t, u);
         i[u] = n.get ? { enumerable: true, configurable: true, get: n.get.bind(t) } : n;
       }
     }
   }
-  if (!r) return n[o];
-  const s = {};
+  if (!r) return n[s];
+  const o = {};
   const u = Object.keys(i);
   for (let e = u.length - 1; e >= 0; e--) {
     const t = u[e],
       n = i[t];
-    if (n.get) Object.defineProperty(s, t, n);
-    else s[t] = n.value;
+    if (n.get) Object.defineProperty(o, t, n);
+    else o[t] = n.value;
   }
-  s[$SOURCES] = n;
-  return s;
+  o[$SOURCES] = n;
+  return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
@@ -2470,18 +2476,20 @@ function omit(e, ...t) {
 }
 function mapArray(e, t, n) {
   const i = typeof n?.keyed === "function" ? n.keyed : undefined;
+  const r = t.length > 1;
+  const s = t;
   return createMemo(
     updateKeyedMap.bind({
       Fe: createOwner(),
       $e: 0,
       je: e,
       Ke: [],
-      Ye: t,
+      Ye: s,
       Be: [],
       Xe: [],
       qe: i,
       ze: i || n?.keyed === false ? [] : undefined,
-      Ze: t.length > 1 ? [] : undefined,
+      Ze: r ? [] : undefined,
       Je: n?.fallback
     })
   );
@@ -2535,8 +2543,8 @@ function updateKeyedMap() {
       }
       this.$e = t;
     } else {
-      let o,
-        s,
+      let s,
+        o,
         u,
         c,
         l,
@@ -2547,34 +2555,34 @@ function updateKeyedMap() {
         d = this.ze ? new Array(t) : undefined,
         S = this.Ze ? new Array(t) : undefined;
       for (
-        o = 0, s = Math.min(this.$e, t);
-        o < s && (this.Ke[o] === e[o] || (this.ze && compare(this.qe, this.Ke[o], e[o])));
-        o++
+        s = 0, o = Math.min(this.$e, t);
+        s < o && (this.Ke[s] === e[s] || (this.ze && compare(this.qe, this.Ke[s], e[s])));
+        s++
       ) {
-        if (this.ze) setSignal(this.ze[o], e[o]);
+        if (this.ze) setSignal(this.ze[s], e[s]);
       }
       for (
-        s = this.$e - 1, u = t - 1;
-        s >= o &&
-        u >= o &&
-        (this.Ke[s] === e[u] || (this.ze && compare(this.qe, this.Ke[s], e[u])));
-        s--, u--
+        o = this.$e - 1, u = t - 1;
+        o >= s &&
+        u >= s &&
+        (this.Ke[o] === e[u] || (this.ze && compare(this.qe, this.Ke[o], e[u])));
+        o--, u--
       ) {
-        E[u] = this.Be[s];
-        T[u] = this.Xe[s];
-        d && (d[u] = this.ze[s]);
-        S && (S[u] = this.Ze[s]);
+        E[u] = this.Be[o];
+        T[u] = this.Xe[o];
+        d && (d[u] = this.ze[o]);
+        S && (S[u] = this.Ze[o]);
       }
       a = new Map();
       f = new Array(u + 1);
-      for (i = u; i >= o; i--) {
+      for (i = u; i >= s; i--) {
         c = e[i];
         l = this.qe ? this.qe(c) : c;
         n = a.get(l);
         f[i] = n === undefined ? -1 : n;
         a.set(l, i);
       }
-      for (n = o; n <= s; n++) {
+      for (n = s; n <= o; n++) {
         c = this.Ke[n];
         l = this.qe ? this.qe(c) : c;
         i = a.get(l);
@@ -2587,7 +2595,7 @@ function updateKeyedMap() {
           a.set(l, i);
         } else this.Xe[n].dispose();
       }
-      for (i = o; i < t; i++) {
+      for (i = s; i < t; i++) {
         if (i in E) {
           this.Be[i] = E[i];
           this.Xe[i] = T[i];
@@ -2610,12 +2618,13 @@ function updateKeyedMap() {
   return this.Be;
 }
 function repeat(e, t, n) {
+  const i = t;
   return updateRepeat.bind({
     Fe: createOwner(),
     $e: 0,
     et: 0,
     tt: e,
-    Ye: t,
+    Ye: i,
     Xe: [],
     Be: [],
     nt: n?.from,
@@ -2696,15 +2705,15 @@ function createBoundChildren(e, t, n, i) {
 }
 class CollectionQueue extends Queue {
   rt;
-  ot = new Set();
-  st = signal(false, { pureWrite: true });
+  st = new Set();
+  ot = signal(false, { pureWrite: true });
   ut = false;
   constructor(e) {
     super();
     this.rt = e;
   }
   run(e) {
-    if (!e || read(this.st)) return;
+    if (!e || read(this.ot)) return;
     return super.run(e);
   }
   notify(e, t, n, i) {
@@ -2712,46 +2721,46 @@ class CollectionQueue extends Queue {
     if (n & this.rt) {
       const t = i?.source || e.q?.source;
       if (t) {
-        const e = this.ot.size === 0;
-        this.ot.add(t);
-        if (e) setSignal(this.st, true);
+        const e = this.st.size === 0;
+        this.st.add(t);
+        if (e) setSignal(this.ot, true);
       }
     }
     t &= ~this.rt;
     return t ? super.notify(e, t, n, i) : true;
   }
   checkSources() {
-    for (const e of this.ot) {
-      if (!(e.Ee & this.rt)) this.ot.delete(e);
+    for (const e of this.st) {
+      if (!(e.Ee & this.rt)) this.st.delete(e);
     }
-    if (!this.ot.size) setSignal(this.st, false);
+    if (!this.st.size) setSignal(this.ot, false);
   }
 }
 function createCollectionBoundary(e, t, n) {
   const i = createOwner();
   const r = new CollectionQueue(e);
-  const o = createBoundChildren(i, t, r, e);
-  const s = computed(() => {
-    if (!read(r.st)) {
-      const e = read(o);
-      if (!untrack(() => read(r.st))) {
+  const s = createBoundChildren(i, t, r, e);
+  const o = computed(() => {
+    if (!read(r.ot)) {
+      const e = read(s);
+      if (!untrack(() => read(r.ot))) {
         r.ut = true;
         return e;
       }
     }
     return n(r);
   });
-  return read.bind(null, s);
+  return read.bind(null, o);
 }
 function createLoadBoundary(e, t) {
   return createCollectionBoundary(STATUS_PENDING, e, () => t());
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(STATUS_ERROR, e, e => {
-    let n = e.ot.values().next().value;
+    let n = e.st.values().next().value;
     const i = n.q?.cause ?? n.q;
     return t(i, () => {
-      for (const t of e.ot) recompute(t);
+      for (const t of e.st) recompute(t);
       schedule();
     });
   });
@@ -2780,9 +2789,9 @@ function flatten(e, t) {
 function flattenArray(e, t = [], n) {
   let i = null;
   let r = false;
-  for (let o = 0; o < e.length; o++) {
+  for (let s = 0; s < e.length; s++) {
     try {
-      let i = e[o];
+      let i = e[s];
       if (typeof i === "function" && !i.length) {
         if (n?.doNotUnwrap) {
           t.push(i);
@@ -2858,6 +2867,7 @@ export {
   runWithOwner,
   setContext,
   setSnapshotCapture,
+  setStrictRead,
   snapshot,
   untrack
 };