@solidjs/signals 0.10.7 → 0.10.8

package/dist/node.cjs

@@ -132,7 +132,7 @@ function adjustHeight(e, t) {
   for (let t = e.j; t; t = t.N) {
     const e = t.L;
     const r = e.I || e;
-    if (r.H && r.o >= n) n = r.o + 1;
+    if (r.R && r.o >= n) n = r.o + 1;
   }
   if (e.o !== n) {
     e.o = n;
@@ -150,7 +150,7 @@ let C = false;
 let A = false;
 function runLaneEffects(e) {
   for (const t of j) {
-    if (t.R || t.T.size > 0) continue;
+    if (t.H || t.T.size > 0) continue;
     const n = t.M[e - 1];
     if (n.length) {
       t.M[e - 1] = [];
@@ -386,7 +386,7 @@ function finalizePureQueue(e = null, t = false) {
         if (n.oe && n.oe !== y) n.ue = true;
       }
       n.de &= ~d;
-      if (n.H) GlobalQueue.U(n, false, true);
+      if (n.R) GlobalQueue.U(n, false, true);
     }
     t.length = 0;
     const n = e ? e.B : W.B;
@@ -413,7 +413,7 @@ function finalizePureQueue(e = null, t = false) {
     for (const t of j) {
       const n = e ? t.ne === e : !t.ne;
       if (!n) continue;
-      if (!t.R) {
+      if (!t.H) {
         if (t.M[0].length) runQueue(t.M[0], p);
         if (t.M[1].length) runQueue(t.M[1], h);
       }
@@ -489,21 +489,21 @@ function getOrCreateLane(e) {
   }
   const n = e.he;
   const r = n?.re ? findLane(n.re) : null;
-  t = { pe: e, T: new Set(), M: [[], []], R: null, ne: k, ye: r };
+  t = { pe: e, T: new Set(), M: [[], []], H: null, ne: k, ye: r };
   E.set(e, t);
   j.add(t);
   e.ge = e.Se || 0;
   return t;
 }
 function findLane(e) {
-  while (e.R) e = e.R;
+  while (e.H) e = e.H;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.R = e;
+  t.H = e;
   for (const n of t.T) e.T.add(n);
   e.M[0].push(...t.M[0]);
   e.M[1].push(...t.M[1]);
@@ -524,7 +524,7 @@ function assignOrMergeLane(e, t) {
   const n = findLane(t);
   const r = e.re;
   if (r) {
-    if (r.R) {
+    if (r.H) {
       e.re = t;
       return;
     }
@@ -567,7 +567,7 @@ function handleAsync(e, t, r) {
     if (r) r(i);
     else if (e.we) {
       const t = e.ce !== g;
-      if (e.H) e.ce = i;
+      if (e.R) e.ce = i;
       if (!t) {
         e.ae = i;
         insertSubs(e);
@@ -710,7 +710,7 @@ function unlinkSubs(e) {
     t.O = r;
     if (r === null) {
       t.Pe?.();
-      t.H && !t.ke && !(t.m & o) && unobserved(t);
+      t.R && !t.ke && !(t.m & o) && unobserved(t);
     }
   }
   return n;
@@ -837,7 +837,7 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (R || T) return N;
+  if (H || T) return N;
   return L ? M : null;
 }
 function getOwner() {
@@ -865,7 +865,7 @@ function createOwner(e) {
     We: null,
     Le: null,
     fe: t?.fe ?? W,
-    He: t?.He || b,
+    Re: t?.Re || b,
     je: 0,
     Ne: null,
     Ee: null,
@@ -900,7 +900,7 @@ function effect(e, t, n, r, i) {
     },
     lazy: true
   });
-  o.Re = r;
+  o.He = r;
   o.Qe = t;
   o.Te = n;
   o.Me = undefined;
@@ -936,11 +936,11 @@ function runEffect() {
   this.Me?.();
   this.Me = undefined;
   try {
-    this.Me = this.Qe(this.ae, this.Re);
+    this.Me = this.Qe(this.ae, this.He);
   } catch (e) {
     if (!this.fe.notify(this, a, a)) throw e;
   } finally {
-    this.Re = this.ae;
+    this.He = this.ae;
     this.ue = false;
   }
 }
@@ -973,8 +973,8 @@ GlobalQueue.K = recompute;
 GlobalQueue.U = disposeChildren;
 let L = false;
 let I = false;
-let H = false;
 let R = false;
+let H = false;
 let Q = false;
 let T = false;
 let M = null;
@@ -1007,7 +1007,7 @@ function releaseSubtree(e) {
       t = t.We;
       continue;
     }
-    if (t.H) {
+    if (t.R) {
       const e = t;
       e.se = false;
       if (e.m & l) {
@@ -1064,7 +1064,7 @@ function recompute(t, n = false) {
     if (e) q = e;
   }
   try {
-    h = handleAsync(t, t.H(h));
+    h = handleAsync(t, t.R(h));
     clearStatus(t);
     const e = resolveLane(t);
     if (e) {
@@ -1133,7 +1133,7 @@ function updateIfNecessary(r) {
     for (let e = r.j; e; e = e.N) {
       const t = e.L;
       const i = t.I || t;
-      if (i.H) {
+      if (i.R) {
         updateIfNecessary(i);
       }
       if (r.m & n) {
@@ -1156,9 +1156,9 @@ function computed(t, n, r) {
     Pe: r?.unobserved,
     Le: null,
     fe: M?.fe ?? W,
-    He: M?.He ?? b,
+    Re: M?.Re ?? b,
     je: 0,
-    H: t,
+    R: t,
     ae: n,
     o: 0,
     C: null,
@@ -1235,8 +1235,14 @@ function optimisticComputed(e, t, n) {
 function isEqual(e, t) {
   return e === t;
 }
+let D = false;
+function setStrictRead(e) {
+  const t = D;
+  D = e;
+  return t;
+}
 function untrack(e) {
-  if (!L) return e();
+  if (!L && true) return e();
   L = false;
   try {
     return e();
@@ -1268,25 +1274,25 @@ function read(e) {
     }
     return r;
   }
-  if (R) {
+  if (H) {
     const t = e.I || e;
     const n = getPendingSignal(t);
-    const r = R;
-    R = false;
+    const r = H;
+    H = false;
     if (read(n)) {
       Q = true;
     }
-    R = r;
+    H = r;
     return e.ae;
   }
   let t = M;
   if (t?.t) t = t.u;
-  if (H && e.H) recompute(e);
+  if (R && e.R) recompute(e);
   if (t && L) {
-    if (e.H && e.m & u) recompute(e);
+    if (e.R && e.m & u) recompute(e);
     link(e, t);
     const n = e.I || e;
-    if (n.H) {
+    if (n.R) {
       const r = e.m & o;
       if (n.o >= (r ? v.W : x.W)) {
         markNode(t);
@@ -1317,7 +1323,7 @@ function read(e) {
       throw n.Y;
     }
   }
-  if (e.H && e.de & a) {
+  if (e.R && e.de & a) {
     if (e.$ < P) {
       recompute(e, true);
       return read(e);
@@ -1341,7 +1347,7 @@ function setSignal(e, t) {
   if (typeof t === "function") t = t(r);
   const i = !e.be || !e.be(r, t);
   if (!i) {
-    if (n && e.ce !== g && e.H) {
+    if (n && e.ce !== g && e.R) {
       insertSubs(e, true);
       schedule();
     }
@@ -1432,14 +1438,14 @@ function getPendingValueComputed(e) {
   if (!e._e) {
     const t = T;
     T = false;
-    const n = R;
-    R = false;
+    const n = H;
+    H = false;
     const r = M;
     M = null;
     e._e = optimisticComputed(() => read(e));
     e._e.he = e;
     M = r;
-    R = n;
+    H = n;
     T = t;
   }
   return e._e;
@@ -1463,9 +1469,9 @@ function pending(e) {
   }
 }
 function isPending(e) {
-  const t = R;
+  const t = H;
   const n = Q;
-  R = true;
+  H = true;
   Q = false;
   try {
     e();
@@ -1473,13 +1479,13 @@ function isPending(e) {
   } catch {
     return Q;
   } finally {
-    R = t;
+    H = t;
     Q = n;
   }
 }
 function refresh(e) {
-  let t = H;
-  H = true;
+  let t = R;
+  R = true;
   try {
     if (typeof e !== "function") {
       recompute(e[_]);
@@ -1487,14 +1493,14 @@ function refresh(e) {
     }
     return untrack(e);
   } finally {
-    H = t;
+    R = t;
     if (!t) {
       schedule();
     }
   }
 }
 function isRefreshing() {
-  return H;
+  return R;
 }
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
@@ -1503,7 +1509,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.He[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Re[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1513,10 +1519,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.He = { ...n.He, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n.Re = { ...n.Re, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.He[e.id]);
+  return !isUndefined(t?.Re[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -1634,7 +1640,7 @@ function onSettled(e) {
       });
 }
 function unwrap(e) {
-  return e?.[K]?.[$] ?? e;
+  return e?.[z]?.[ee] ?? e;
 }
 function getOverrideValue(e, t, n, r, i) {
   if (i && r in i) return i[r];
@@ -1646,16 +1652,16 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n, r) {
-  const i = t?.[K];
+  const i = t?.[z];
   if (!i) return;
-  const s = i[X];
-  const o = i[Y];
-  const u = i[Z];
-  let f = i[$];
+  const s = i[Y];
+  const o = i[Z];
+  const u = i[$];
+  let f = i[ee];
   if (e === s && !o && !u) return;
-  (i[ne] || se).set(e, i[z]);
-  i[X] = e;
-  i[Y] = undefined;
+  (i[re] || oe).set(e, i[U]);
+  i[Y] = e;
+  i[Z] = undefined;
   if (Array.isArray(s)) {
     let t = false;
     const l = getOverrideValue(s, o, f, "length", u);
@@ -1683,16 +1689,16 @@ function applyState(e, t, n, r) {
       if (d > h || d > p) {
         for (a = d; a <= h; a++) {
           t = true;
-          i[$][a] && setSignal(i[$][a], wrap(e[a], i));
+          i[ee][a] && setSignal(i[ee][a], wrap(e[a], i));
         }
         for (; a < e.length; a++) {
           t = true;
           const s = wrap(w[a], i);
-          i[$][a] && setSignal(i[$][a], s);
+          i[ee][a] && setSignal(i[ee][a], s);
           applyState(e[a], s, n, r);
         }
-        t && i[$][B] && setSignal(i[$][B], void 0);
-        l !== e.length && i[$].length && setSignal(i[$].length, e.length);
+        t && i[ee][G] && setSignal(i[ee][G], void 0);
+        l !== e.length && i[ee].length && setSignal(i[ee].length, e.length);
         return;
       }
       g = new Array(h + 1);
@@ -1716,26 +1722,26 @@ function applyState(e, t, n, r) {
       for (a = d; a < e.length; a++) {
         if (a in w) {
           const t = wrap(w[a], i);
-          i[$][a] && setSignal(i[$][a], t);
+          i[ee][a] && setSignal(i[ee][a], t);
           applyState(e[a], t, n, r);
-        } else i[$][a] && setSignal(i[$][a], wrap(e[a], i));
+        } else i[ee][a] && setSignal(i[ee][a], wrap(e[a], i));
       }
       if (d < e.length) t = true;
     } else if (e.length) {
       for (let t = 0, l = e.length; t < l; t++) {
         const l = getOverrideValue(s, o, f, t, u);
-        isWrappable(l) ? applyState(e[t], wrap(l, i), n, r) : i[$][t] && setSignal(i[$][t], e[t]);
+        isWrappable(l) ? applyState(e[t], wrap(l, i), n, r) : i[ee][t] && setSignal(i[ee][t], e[t]);
       }
     }
     if (l !== e.length) {
       t = true;
-      i[$].length && setSignal(i[$].length, e.length);
+      i[ee].length && setSignal(i[ee].length, e.length);
     }
-    t && i[$][B] && setSignal(i[$][B], void 0);
+    t && i[ee][G] && setSignal(i[ee][G], void 0);
     return;
   }
   if (f) {
-    const t = f[B];
+    const t = f[G];
     const l = t || r ? getAllKeys(s, o, e) : Object.keys(f);
     for (let c = 0, a = l.length; c < a; c++) {
       const a = l[c];
@@ -1749,7 +1755,7 @@ function applyState(e, t, n, r) {
       } else applyState(h, wrap(p, i), n, r);
     }
   }
-  if ((f = i[ee])) {
+  if ((f = i[te])) {
     const t = Object.keys(f);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -1771,9 +1777,9 @@ function createProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[te] = wrapProjection;
-    e[ne] = i;
-    Object.defineProperty(e, re, {
+    e[ne] = wrapProjection;
+    e[re] = i;
+    Object.defineProperty(e, ie, {
       get() {
         return r;
       },
@@ -1782,15 +1788,15 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[K]?.[te] === wrapProjection) return e;
-    const t = createStoreProxy(e, fe, wrapper);
+    if (e[z]?.[ne] === wrapProjection) return e;
+    const t = createStoreProxy(e, le, wrapper);
     i.set(e, t);
     return t;
   };
   const s = wrapProjection(t);
   r = computed(() => {
     const t = getOwner();
-    storeSetter(new Proxy(s, D), r => {
+    storeSetter(new Proxy(s, B), r => {
       const i = handleAsync(t, e(r), e => {
         e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
         setSignal(t, undefined);
@@ -1804,7 +1810,7 @@ function createProjectionInternal(e, t = {}, n) {
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
 }
-const D = {
+const B = {
   get(e, t) {
     let n;
     setWriteOverride(true);
@@ -1815,7 +1821,7 @@ const D = {
       setWriteOverride(false);
       setProjectionWriteActive(false);
     }
-    return typeof n === "object" && n !== null ? new Proxy(n, D) : n;
+    return typeof n === "object" && n !== null ? new Proxy(n, B) : n;
   },
   set(e, t, n) {
     setWriteOverride(true);
@@ -1840,46 +1846,46 @@ const D = {
     return true;
   }
 };
-const B = Symbol(0),
-  G = Symbol(0),
+const G = Symbol(0),
   K = Symbol(0),
   z = Symbol(0),
-  U = Symbol(0);
-const J = new WeakMap();
-const X = "v",
-  Y = "o",
-  Z = "x",
-  $ = "n",
-  ee = "h",
-  te = "w",
-  ne = "l",
-  re = "f",
-  ie = "p";
-function createStoreProxy(e, t = fe, n) {
+  U = Symbol(0),
+  J = Symbol(0);
+const X = new WeakMap();
+const Y = "v",
+  Z = "o",
+  $ = "x",
+  ee = "n",
+  te = "h",
+  ne = "w",
+  re = "l",
+  ie = "f",
+  se = "p";
+function createStoreProxy(e, t = le, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else r = { v: e };
   n && n(r);
-  return (r[z] = new Proxy(r, t));
+  return (r[U] = new Proxy(r, t));
 }
-const se = new WeakMap();
+const oe = new WeakMap();
 function wrap(e, t) {
-  if (t?.[te]) return t[te](e, t);
-  let n = e[z] || se.get(e);
-  if (!n) se.set(e, (n = createStoreProxy(e)));
+  if (t?.[ne]) return t[ne](e, t);
+  let n = e[U] || oe.get(e);
+  if (!n) oe.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
   return e != null && typeof e === "object" && !Object.isFrozen(e);
 }
-let oe = false;
+let ue = false;
 function setWriteOverride(e) {
-  oe = e;
+  ue = e;
 }
 function writeOnly(e) {
-  return oe || !!ue?.has(e);
+  return ue || !!fe?.has(e);
 }
 function getNodes(e, t) {
   let n = e[t];
@@ -1906,8 +1912,8 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
   }
   return (e[t] = u);
 }
-function trackSelf(e, t = B) {
-  getObserver() && read(getNode(getNodes(e, $), t, undefined, e[re], false, e[ie]));
+function trackSelf(e, t = G) {
+  getObserver() && read(getNode(getNodes(e, ee), t, undefined, e[ie], false, e[se]));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -1915,7 +1921,7 @@ function getKeys(e, t, n = true) {
   const i = new Set(r);
   const s = Reflect.ownKeys(t);
   for (const e of s) {
-    if (t[e] !== U) i.add(e);
+    if (t[e] !== J) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
@@ -1923,70 +1929,70 @@ function getKeys(e, t, n = true) {
 function getPropertyDescriptor(e, t, n) {
   let r = e;
   if (t && n in t) {
-    if (r[n] === U) return void 0;
+    if (r[n] === J) return void 0;
     if (!(n in r)) r = t;
   }
   return Reflect.getOwnPropertyDescriptor(r, n);
 }
-let ue = null;
-const fe = {
+let fe = null;
+const le = {
   get(e, t, n) {
-    if (t === K) return e;
-    if (t === z) return n;
-    if (t === _) return e[re];
-    if (t === B || t === G) {
+    if (t === z) return e;
+    if (t === U) return n;
+    if (t === _) return e[ie];
+    if (t === G || t === K) {
       trackSelf(e, t);
       return n;
     }
-    const r = getNodes(e, $);
+    const r = getNodes(e, ee);
     const i = r[t];
-    const s = e[Z] && t in e[Z];
-    const o = s || (e[Y] && t in e[Y]);
-    const u = !!e[X][K];
-    const f = s ? e[Z] : e[Y] && t in e[Y] ? e[Y] : e[X];
+    const s = e[$] && t in e[$];
+    const o = s || (e[Z] && t in e[Z]);
+    const u = !!e[Y][z];
+    const f = s ? e[$] : e[Z] && t in e[Z] ? e[Z] : e[Y];
     if (!i) {
       const e = Object.getOwnPropertyDescriptor(f, t);
       if (e && e.get) return e.get.call(n);
     }
     if (writeOnly(n)) {
       let n = i && (o || !u) ? (i.ce !== g ? (i.we ? i.ae : i.ce) : i.ae) : f[t];
-      n === U && (n = undefined);
+      n === J && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      ue?.add(r);
+      fe?.add(r);
       return r;
     }
     let l = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    l === U && (l = undefined);
+    l === J && (l = undefined);
     if (!i) {
       if (!o && typeof l === "function" && !f.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[X]) && (t = Object.getPrototypeOf(e[X])) && t !== Object.prototype
+        return !Array.isArray(e[Y]) && (t = Object.getPrototypeOf(e[Y])) && t !== Object.prototype
           ? l.bind(f)
           : l;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[re], isEqual, e[ie], e[w]));
+        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[ie], isEqual, e[se], e[w]));
       }
     }
     return isWrappable(l) ? wrap(l, e) : l;
   },
   has(e, t) {
-    if (t === z || t === B || t === "__proto__") return true;
-    const n = e[Z] && t in e[Z] ? e[Z][t] !== U : e[Y] && t in e[Y] ? e[Y][t] !== U : t in e[X];
-    getObserver() && read(getNode(getNodes(e, ee), t, n, e[re], isEqual, e[ie]));
+    if (t === U || t === G || t === "__proto__") return true;
+    const n = e[$] && t in e[$] ? e[$][t] !== J : e[Z] && t in e[Z] ? e[Z][t] !== J : t in e[Y];
+    getObserver() && read(getNode(getNodes(e, te), t, n, e[ie], isEqual, e[se]));
     return n;
   },
   set(e, t, n) {
-    const r = e[z];
+    const r = e[U];
     if (writeOnly(r)) {
-      if (e[ie]) {
-        const t = e[re];
+      if (e[se]) {
+        const t = e[ie];
         if (t?.ne) {
           W.initTransition(t.ne);
         }
       }
       untrack(() => {
-        const i = e[X];
+        const i = e[Y];
         const s = i[t];
         if (F && typeof t !== "symbol") {
           if (!e[w]) {
@@ -1997,23 +2003,23 @@ const fe = {
             e[w][t] = s;
           }
         }
-        const o = e[ie] && !A;
-        const u = o ? Z : Y;
+        const o = e[se] && !A;
+        const u = o ? $ : Z;
         if (o) trackOptimisticStore(r);
-        const f = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : s;
-        const l = n?.[K]?.[X] ?? n;
+        const f = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : s;
+        const l = n?.[z]?.[Y] ?? n;
         if (f === l) return true;
-        const c = e[Z]?.length || e[Y]?.length || i.length;
+        const c = e[$]?.length || e[Z]?.length || i.length;
         if (l !== undefined && l === s) delete e[u][t];
         else (e[u] || (e[u] = Object.create(null)))[t] = l;
         const a = isWrappable(l);
         if (isWrappable(f)) {
-          const e = J.get(f);
-          e && (e instanceof Set ? e.delete(r) : J.delete(f));
+          const e = X.get(f);
+          e && (e instanceof Set ? e.delete(r) : X.delete(f));
         }
-        if (recursivelyNotify(r, se) && a) recursivelyAddParent(l, r);
-        e[ee]?.[t] && setSignal(e[ee][t], true);
-        const d = getNodes(e, $);
+        if (recursivelyNotify(r, oe) && a) recursivelyAddParent(l, r);
+        e[te]?.[t] && setSignal(e[te][t], true);
+        const d = getNodes(e, ee);
         d[t] && setSignal(d[t], () => (a ? wrap(l, e) : l));
         if (Array.isArray(i)) {
           if (t === "length") {
@@ -2023,44 +2029,44 @@ const fe = {
             if (e > c) d.length && setSignal(d.length, e);
           }
         }
-        d[B] && setSignal(d[B], undefined);
+        d[G] && setSignal(d[G], undefined);
       });
     }
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[Z]?.[t] === U;
-    const r = e[Y]?.[t] === U;
-    if (writeOnly(e[z]) && !n && !r) {
+    const n = e[$]?.[t] === J;
+    const r = e[Z]?.[t] === J;
+    if (writeOnly(e[U]) && !n && !r) {
       untrack(() => {
-        const n = e[ie] && !A;
-        const r = n ? Z : Y;
-        if (n) trackOptimisticStore(e[z]);
-        const i = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : e[X][t];
-        if (t in e[X] || (e[Y] && t in e[Y])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = U;
+        const n = e[se] && !A;
+        const r = n ? $ : Z;
+        if (n) trackOptimisticStore(e[U]);
+        const i = e[$] && t in e[$] ? e[$][t] : e[Z] && t in e[Z] ? e[Z][t] : e[Y][t];
+        if (t in e[Y] || (e[Z] && t in e[Z])) {
+          (e[r] || (e[r] = Object.create(null)))[t] = J;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
         if (isWrappable(i)) {
-          const t = J.get(i);
-          t && (t instanceof Set ? t.delete(e) : J.delete(i));
+          const t = X.get(i);
+          t && (t instanceof Set ? t.delete(e) : X.delete(i));
         }
-        if (e[ee]?.[t]) setSignal(e[ee][t], false);
-        const s = getNodes(e, $);
+        if (e[te]?.[t]) setSignal(e[te][t], false);
+        const s = getNodes(e, ee);
         s[t] && setSignal(s[t], undefined);
-        s[B] && setSignal(s[B], undefined);
+        s[G] && setSignal(s[G], undefined);
       });
     }
     return true;
   },
   ownKeys(e) {
     trackSelf(e);
-    let t = getKeys(e[X], e[Y], false);
-    if (e[Z]) {
+    let t = getKeys(e[Y], e[Z], false);
+    if (e[$]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[Z])) {
-        if (e[Z][t] !== U) n.add(t);
+      for (const t of Reflect.ownKeys(e[$])) {
+        if (e[$][t] !== J) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2068,25 +2074,25 @@ const fe = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === z) return { value: e[z], writable: true, configurable: true };
-    if (e[Z] && t in e[Z]) {
-      if (e[Z][t] === U) return undefined;
-      const n = getPropertyDescriptor(e[X], e[Y], t);
+    if (t === U) return { value: e[U], writable: true, configurable: true };
+    if (e[$] && t in e[$]) {
+      if (e[$][t] === J) return undefined;
+      const n = getPropertyDescriptor(e[Y], e[Z], t);
       if (n) {
-        return { ...n, value: e[Z][t] };
+        return { ...n, value: e[$][t] };
       }
-      return { value: e[Z][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[$][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[X], e[Y], t);
+    return getPropertyDescriptor(e[Y], e[Z], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[X]);
+    return Object.getPrototypeOf(e[Y]);
   }
 };
 function storeSetter(e, t) {
-  const n = ue;
-  ue = new Set();
-  ue.add(e);
+  const n = fe;
+  fe = new Set();
+  fe.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2102,8 +2108,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    ue.clear();
-    ue = n;
+    fe.clear();
+    fe = n;
   }
 }
 function createStore(e, t, n) {
@@ -2112,17 +2118,17 @@ function createStore(e, t, n) {
   return [i, e => storeSetter(i, e)];
 }
 function recursivelyNotify(e, t) {
-  let n = e[K] || t?.get(e)?.[K];
+  let n = e[z] || t?.get(e)?.[z];
   let r = false;
   if (n) {
-    const e = getNodes(n, $)[G];
+    const e = getNodes(n, ee)[K];
     if (e) {
       setSignal(e, undefined);
       r = true;
     }
-    t = n[ne] || t;
+    t = n[re] || t;
   }
-  const i = J.get(n?.[X] || e);
+  const i = X.get(n?.[Y] || e);
   if (!i) return r;
   if (i instanceof Set) {
     for (let e of i) r = recursivelyNotify(e, t) || r;
@@ -2131,16 +2137,16 @@ function recursivelyNotify(e, t) {
 }
 function recursivelyAddParent(e, t) {
   let n;
-  const r = e[K];
+  const r = e[z];
   if (r) {
-    n = r[Y];
-    e = r[X];
+    n = r[Z];
+    e = r[Y];
   }
   if (t) {
-    let n = J.get(e);
-    if (!n) J.set(e, t);
+    let n = X.get(e);
+    if (!n) X.set(e, t);
     else if (n !== t) {
-      if (!(n instanceof Set)) J.set(e, (n = new Set([n])));
+      if (!(n instanceof Set)) X.set(e, (n = new Set([n])));
       else if (n.has(t)) return;
       n.add(t);
     } else return;
@@ -2162,7 +2168,7 @@ function recursivelyAddParent(e, t) {
 }
 function deep(e) {
   recursivelyAddParent(e);
-  return e[G];
+  return e[K];
 }
 function createOptimisticStore(e, t, n) {
   GlobalQueue.J ||= clearOptimisticStore;
@@ -2173,39 +2179,39 @@ function createOptimisticStore(e, t, n) {
   return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
-  const t = e[K];
-  if (!t || !t[Z]) return;
-  const n = t[Z];
-  const r = t[$];
+  const t = e[z];
+  if (!t || !t[$]) return;
+  const n = t[$];
+  const r = t[ee];
   setProjectionWriteActive(true);
   try {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
           r[e].re = undefined;
-          const n = t[Y] && e in t[Y] ? t[Y][e] : t[X][e];
-          const i = n === U ? undefined : n;
+          const n = t[Z] && e in t[Z] ? t[Z][e] : t[Y][e];
+          const i = n === J ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
-      if (r[B]) {
-        r[B].re = undefined;
-        setSignal(r[B], undefined);
+      if (r[G]) {
+        r[G].re = undefined;
+        setSignal(r[G], undefined);
       }
     }
   } finally {
     setProjectionWriteActive(false);
   }
-  delete t[Z];
+  delete t[$];
 }
 function createOptimisticProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[te] = wrapProjection;
-    e[ne] = i;
-    e[ie] = true;
-    Object.defineProperty(e, re, {
+    e[ne] = wrapProjection;
+    e[re] = i;
+    e[se] = true;
+    Object.defineProperty(e, ie, {
       get() {
         return r;
       },
@@ -2214,8 +2220,8 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[K]?.[te] === wrapProjection) return e;
-    const t = createStoreProxy(e, fe, wrapper);
+    if (e[z]?.[ne] === wrapProjection) return e;
+    const t = createStoreProxy(e, le, wrapper);
     i.set(e, t);
     return t;
   };
@@ -2225,7 +2231,7 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
       const t = getOwner();
       setProjectionWriteActive(true);
       try {
-        storeSetter(new Proxy(s, D), r => {
+        storeSetter(new Proxy(s, B), r => {
           const i = handleAsync(t, e(r), e => {
             setProjectionWriteActive(true);
             try {
@@ -2249,12 +2255,12 @@ function snapshot(e, t, n) {
   if (!isWrappable(e)) return e;
   if (t && t.has(e)) return t.get(e);
   if (!t) t = new Map();
-  if ((r = e[K] || n?.get(e)?.[K])) {
-    s = r[Y];
-    i = Array.isArray(r[X]);
-    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[X]))) : r[X]);
-    e = r[X];
-    n = se;
+  if ((r = e[z] || n?.get(e)?.[z])) {
+    s = r[Z];
+    i = Array.isArray(r[Y]);
+    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[Y]))) : r[Y]);
+    e = r[Y];
+    n = oe;
   } else {
     i = Array.isArray(e);
     t.set(e, e);
@@ -2263,7 +2269,7 @@ function snapshot(e, t, n) {
     const r = s?.length || e.length;
     for (let i = 0; i < r; i++) {
       f = s && i in s ? s[i] : e[i];
-      if (f === U) continue;
+      if (f === J) continue;
       if ((u = snapshot(f, t, n)) !== f || o) {
         if (!o) t.set(e, (o = [...e]));
         o[i] = u;
@@ -2290,13 +2296,13 @@ function snapshot(e, t, n) {
 function trueFn() {
   return true;
 }
-const le = {
+const ce = {
   get(e, t, n) {
-    if (t === z) return n;
+    if (t === U) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === z) return true;
+    if (t === U) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -2319,15 +2325,15 @@ const le = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const ce = Symbol(0);
+const ae = Symbol(0);
 function merge(...e) {
   if (e.length === 1 && typeof e[0] !== "function") return e[0];
   let t = false;
   const n = [];
   for (let r = 0; r < e.length; r++) {
     const i = e[r];
-    t = t || (!!i && z in i);
-    const s = !!i && i[ce];
+    t = t || (!!i && U in i);
+    const s = !!i && i[ae];
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
@@ -2335,7 +2341,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === ce) return n;
+          if (e === ae) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -2353,7 +2359,7 @@ function merge(...e) {
           return [...new Set(e)];
         }
       },
-      le
+      ce
     );
   }
   const r = Object.create(null);
@@ -2385,12 +2391,12 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[ce] = n;
+  o[ae] = n;
   return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (m && z in e) {
+  if (m && U in e) {
     return new Proxy(
       {
         get(t) {
@@ -2403,7 +2409,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !n.has(e));
         }
       },
-      le
+      ce
     );
   }
   const r = {};
@@ -2419,34 +2425,36 @@ function omit(e, ...t) {
 }
 function mapArray(e, t, n) {
   const r = typeof n?.keyed === "function" ? n.keyed : undefined;
+  const i = t.length > 1;
+  const s = t;
   return createMemo(
     updateKeyedMap.bind({
       De: createOwner(),
       Be: 0,
       Ge: e,
       Ke: [],
-      ze: t,
+      ze: s,
       Ue: [],
       Je: [],
       Xe: r,
       Ye: r || n?.keyed === false ? [] : undefined,
-      Ze: t.length > 1 ? [] : undefined,
+      Ze: i ? [] : undefined,
       $e: n?.fallback
     })
   );
 }
-const ae = { pureWrite: true };
+const de = { pureWrite: true };
 function updateKeyedMap() {
   const e = this.Ge() || [],
     t = e.length;
-  e[B];
+  e[G];
   runWithOwner(this.De, () => {
     let n,
       r,
       i = this.Ye
         ? () => {
-            this.Ye[r] = signal(e[r], ae);
-            this.Ze && (this.Ze[r] = signal(r, ae));
+            this.Ye[r] = signal(e[r], de);
+            this.Ze && (this.Ze[r] = signal(r, de));
             return this.ze(
               read.bind(null, this.Ye[r]),
               this.Ze ? read.bind(null, this.Ze[r]) : undefined
@@ -2455,7 +2463,7 @@ function updateKeyedMap() {
         : this.Ze
           ? () => {
               const t = e[r];
-              this.Ze[r] = signal(r, ae);
+              this.Ze[r] = signal(r, de);
               return this.ze(() => t, read.bind(null, this.Ze[r]));
             }
           : () => {
@@ -2559,12 +2567,13 @@ function updateKeyedMap() {
   return this.Ue;
 }
 function repeat(e, t, n) {
+  const r = t;
   return updateRepeat.bind({
     De: createOwner(),
     Be: 0,
     et: 0,
     tt: e,
-    ze: t,
+    ze: r,
     Je: [],
     Ue: [],
     nt: n?.from,
@@ -2754,9 +2763,9 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-exports.$PROXY = z;
-exports.$TARGET = K;
-exports.$TRACK = B;
+exports.$PROXY = U;
+exports.$TARGET = z;
+exports.$TRACK = G;
 exports.ContextNotFoundError = ContextNotFoundError;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
@@ -2806,5 +2815,6 @@ exports.resolve = resolve;
 exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
+exports.setStrictRead = setStrictRead;
 exports.snapshot = snapshot;
 exports.untrack = untrack;