@solidjs/signals 0.11.3 → 0.13.0

package/dist/node.cjs

@@ -32,8 +32,8 @@ const s = 1 << 4;
 const o = 1 << 5;
 const u = 1 << 6;
 const f = 1 << 7;
-const l = 1 << 8;
-const c = 1 << 9;
+const c = 1 << 8;
+const l = 1 << 9;
 const a = 1 << 0;
 const d = 1 << 1;
 const p = 1 << 2;
@@ -107,8 +107,8 @@ function markNode(e, r = n) {
   for (let n = e.O; n !== null; n = n.P) {
     markNode(n.k, t);
   }
-  if (e.A !== null) {
-    for (let n = e.A; n !== null; n = n.C) {
+  if (e.C !== null) {
+    for (let n = e.C; n !== null; n = n.j) {
       for (let e = n.O; e !== null; e = e.P) {
         markNode(e.k, t);
       }
@@ -117,12 +117,12 @@ function markNode(e, r = n) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.j = 0; e.j <= e.S; e.j++) {
-    let n = e.l[e.j];
+  for (e.A = 0; e.A <= e.S; e.A++) {
+    let n = e.l[e.A];
     while (n !== undefined) {
       if (n.m & i) t(n);
       else adjustHeight(n, e);
-      n = e.l[e.j];
+      n = e.l[e.A];
     }
   }
   e.S = 0;
@@ -133,7 +133,7 @@ function adjustHeight(e, t) {
   for (let t = e.W; t; t = t.N) {
     const e = t.L;
     const r = e.I || e;
-    if (r.R && r.o >= n) n = r.o + 1;
+    if (r.H && r.o >= n) n = r.o + 1;
   }
   if (e.o !== n) {
     e.o = n;
@@ -143,33 +143,34 @@ function adjustHeight(e, t) {
   }
 }
 const x = new Set();
-const v = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
-const P = { l: new Array(2e3).fill(undefined), _: false, j: 0, S: 0 };
+const P = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
+const v = { l: new Array(2e3).fill(undefined), _: false, A: 0, S: 0 };
 let k = 0;
-let A = null;
-let C = false;
+let C = null;
 let E = false;
+let j = false;
+function enforceLoadingBoundary(e) {}
 function runLaneEffects(e) {
   for (const t of N) {
-    if (t.H || t.T.size > 0) continue;
-    const n = t.M[e - 1];
+    if (t.R || t.T.size > 0) continue;
+    const n = t.q[e - 1];
     if (n.length) {
-      t.M[e - 1] = [];
+      t.q[e - 1] = [];
       runQueue(n, e);
     }
   }
 }
 function setProjectionWriteActive(e) {
-  E = e;
+  j = e;
 }
 function schedule() {
-  if (C) return;
-  C = true;
-  if (!j.q) queueMicrotask(flush);
+  if (E) return;
+  E = true;
+  if (!A.F && !j) queueMicrotask(flush);
 }
 class Queue {
   i = null;
-  F = [[], []];
+  M = [[], []];
   V = [];
   created = k;
   addChild(e) {
@@ -188,41 +189,41 @@ class Queue {
     return false;
   }
   run(e) {
-    if (this.F[e - 1].length) {
-      const t = this.F[e - 1];
-      this.F[e - 1] = [];
+    if (this.M[e - 1].length) {
+      const t = this.M[e - 1];
+      this.M[e - 1] = [];
       runQueue(t, e);
     }
     for (let t = 0; t < this.V.length; t++) this.V[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
-      if (F) {
-        const n = findLane(F);
-        n.M[e - 1].push(t);
+      if (V) {
+        const n = findLane(V);
+        n.q[e - 1].push(t);
       } else {
-        this.F[e - 1].push(t);
+        this.M[e - 1].push(t);
       }
     }
     schedule();
   }
   stashQueues(e) {
-    e.F[0].push(...this.F[0]);
-    e.F[1].push(...this.F[1]);
-    this.F = [[], []];
+    e.M[0].push(...this.M[0]);
+    e.M[1].push(...this.M[1]);
+    this.M = [[], []];
     for (let t = 0; t < this.V.length; t++) {
       let n = this.V[t];
       let r = e.V[t];
       if (!r) {
-        r = { F: [[], []], V: [] };
+        r = { M: [[], []], V: [] };
         e.V[t] = r;
       }
       n.stashQueues(r);
     }
   }
   restoreQueues(e) {
-    this.F[0].push(...e.F[0]);
-    this.F[1].push(...e.F[1]);
+    this.M[0].push(...e.M[0]);
+    this.M[1].push(...e.M[1]);
     for (let t = 0; t < e.V.length; t++) {
       const n = e.V[t];
       let r = this.V[t];
@@ -231,7 +232,7 @@ class Queue {
   }
 }
 class GlobalQueue extends Queue {
-  q = false;
+  F = false;
   D = [];
   B = [];
   G = new Set();
@@ -239,55 +240,55 @@ class GlobalQueue extends Queue {
   static U;
   static J = null;
   flush() {
-    if (this.q) return;
-    this.q = true;
+    if (this.F) return;
+    this.F = true;
     try {
-      runHeap(v, GlobalQueue.K);
-      if (A) {
-        const e = transitionComplete(A);
+      runHeap(P, GlobalQueue.K);
+      if (C) {
+        const e = transitionComplete(C);
         if (!e) {
-          let e = A;
-          runHeap(P, GlobalQueue.K);
+          let e = C;
+          runHeap(v, GlobalQueue.K);
           this.D = [];
           this.B = [];
           this.G = new Set();
           runLaneEffects(h);
           runLaneEffects(y);
-          this.stashQueues(A.X);
+          this.stashQueues(C.X);
           k++;
-          C = v.S >= v.j;
-          reassignPendingTransition(A.D);
-          A = null;
+          E = P.S >= P.A;
+          reassignPendingTransition(C.D);
+          C = null;
           finalizePureQueue(null, true);
           return;
         }
-        this.D !== A.D && this.D.push(...A.D);
-        this.restoreQueues(A.X);
-        x.delete(A);
-        const t = A;
-        A = null;
+        this.D !== C.D && this.D.push(...C.D);
+        this.restoreQueues(C.X);
+        x.delete(C);
+        const t = C;
+        C = null;
         reassignPendingTransition(this.D);
         finalizePureQueue(t);
       } else {
-        if (x.size) runHeap(P, GlobalQueue.K);
+        if (x.size) runHeap(v, GlobalQueue.K);
         finalizePureQueue();
       }
       k++;
-      C = v.S >= v.j;
+      E = P.S >= P.A;
       runLaneEffects(h);
       this.run(h);
       runLaneEffects(y);
       this.run(y);
     } finally {
-      this.q = false;
+      this.F = false;
     }
   }
   notify(e, t, n, r) {
     if (t & a) {
       if (n & a) {
         const t = r !== undefined ? r : e.Y;
-        if (A && t && !A.Z.includes(t.source)) {
-          A.Z.push(t.source);
+        if (C && t && !C.Z.includes(t.source)) {
+          C.Z.push(t.source);
           schedule();
         }
       }
@@ -297,21 +298,21 @@ class GlobalQueue extends Queue {
   }
   initTransition(e) {
     if (e) e = currentTransition(e);
-    if (e && e === A) return;
-    if (!e && A && A.$ === k) return;
-    if (!A) {
-      A = e ?? {
+    if (e && e === C) return;
+    if (!e && C && C.$ === k) return;
+    if (!C) {
+      C = e ?? {
         $: k,
         D: [],
         Z: [],
         B: [],
         G: new Set(),
         ee: [],
-        X: { F: [[], []], V: [] },
+        X: { M: [[], []], V: [] },
         te: false
       };
     } else if (e) {
-      const t = A;
+      const t = C;
       t.te = e;
       e.ee.push(...t.ee);
       for (const n of N) {
@@ -322,35 +323,35 @@ class GlobalQueue extends Queue {
         e.G.add(n);
       }
       x.delete(t);
-      A = e;
+      C = e;
     }
-    x.add(A);
-    A.$ = k;
+    x.add(C);
+    C.$ = k;
     for (let e = 0; e < this.D.length; e++) {
       const t = this.D[e];
-      t.ne = A;
-      A.D.push(t);
+      t.ne = C;
+      C.D.push(t);
     }
-    this.D = A.D;
+    this.D = C.D;
     for (let e = 0; e < this.B.length; e++) {
       const t = this.B[e];
-      t.ne = A;
-      A.B.push(t);
+      t.ne = C;
+      C.B.push(t);
     }
-    this.B = A.B;
+    this.B = C.B;
     for (const e of N) {
-      if (!e.ne) e.ne = A;
+      if (!e.ne) e.ne = C;
     }
-    for (const e of this.G) A.G.add(e);
-    this.G = A.G;
+    for (const e of this.G) C.G.add(e);
+    this.G = C.G;
   }
 }
 function insertSubs(e, t = false) {
-  const n = e.re || F;
+  const n = e.re || V;
   const r = e.ie !== undefined;
   for (let i = e.O; i !== null; i = i.P) {
     if (r && i.k.se) {
-      i.k.m |= l;
+      i.k.m |= c;
       continue;
     }
     if (t && n) {
@@ -364,66 +365,71 @@ function insertSubs(e, t = false) {
     if (e.oe === g) {
       if (!e.ue) {
         e.ue = true;
-        e.fe.enqueue(y, e.le);
+        e.fe.enqueue(y, e.ce);
       }
       continue;
     }
-    const s = i.k.m & o ? P : v;
-    if (s.j > i.k.o) s.j = i.k.o;
+    const s = i.k.m & o ? v : P;
+    if (s.A > i.k.o) s.A = i.k.o;
     insertIntoHeap(i.k, s);
   }
 }
+function commitPendingNodes() {
+  const e = A.D;
+  for (let t = 0; t < e.length; t++) {
+    const n = e[t];
+    if (n.le !== S) {
+      n.ae = n.le;
+      n.le = S;
+      if (n.oe && n.oe !== g) n.ue = true;
+    }
+    if (!(n.de & a)) n.de &= ~p;
+    if (n.H) GlobalQueue.U(n, false, true);
+  }
+  e.length = 0;
+}
 function finalizePureQueue(e = null, t = false) {
   let n = !t;
-  if (!t) checkBoundaryChildren(j);
-  if (v.S >= v.j) runHeap(v, GlobalQueue.K);
+  if (n) commitPendingNodes();
+  if (!t) checkBoundaryChildren(A);
+  if (P.S >= P.A) runHeap(P, GlobalQueue.K);
   if (n) {
-    const t = j.D;
+    commitPendingNodes();
+    const t = e ? e.B : A.B;
     for (let e = 0; e < t.length; e++) {
       const n = t[e];
-      if (n.ce !== S) {
-        n.ae = n.ce;
-        n.ce = S;
-        if (n.oe && n.oe !== g) n.ue = true;
+      n.re = undefined;
+      if (n.le !== S) {
+        n.ae = n.le;
+        n.le = S;
       }
-      if (!(n.de & a)) n.de &= ~p;
-      if (n.R) GlobalQueue.U(n, false, true);
+      const r = n.pe;
+      n.pe = S;
+      if (r !== S && n.ae !== r) insertSubs(n, true);
+      n.ne = null;
     }
     t.length = 0;
-    const n = e ? e.B : j.B;
-    for (let e = 0; e < n.length; e++) {
-      const t = n[e];
-      const r = t.ce;
-      t.re = undefined;
-      if (r !== S && t.ae !== r) {
-        t.ae = r;
-        insertSubs(t, true);
-      }
-      t.ce = S;
-      t.ne = null;
-    }
-    n.length = 0;
-    const r = e ? e.G : j.G;
-    if (GlobalQueue.J && r.size) {
-      for (const e of r) {
+    const n = e ? e.G : A.G;
+    if (GlobalQueue.J && n.size) {
+      for (const e of n) {
         GlobalQueue.J(e);
       }
-      r.clear();
+      n.clear();
       schedule();
     }
     for (const t of N) {
       const n = e ? t.ne === e : !t.ne;
       if (!n) continue;
-      if (!t.H) {
-        if (t.M[0].length) runQueue(t.M[0], h);
-        if (t.M[1].length) runQueue(t.M[1], y);
+      if (!t.R) {
+        if (t.q[0].length) runQueue(t.q[0], h);
+        if (t.q[1].length) runQueue(t.q[1], y);
       }
-      if (t.pe.re === t) t.pe.re = undefined;
+      if (t.he.re === t) t.he.re = undefined;
       t.T.clear();
-      t.M[0].length = 0;
-      t.M[1].length = 0;
+      t.q[0].length = 0;
+      t.q[1].length = 0;
       N.delete(t);
-      W.delete(t.pe);
+      W.delete(t.he);
     }
   }
 }
@@ -434,18 +440,18 @@ function checkBoundaryChildren(e) {
   }
 }
 function trackOptimisticStore(e) {
-  j.G.add(e);
+  A.G.add(e);
   schedule();
 }
 function reassignPendingTransition(e) {
   for (let t = 0; t < e.length; t++) {
-    e[t].ne = A;
+    e[t].ne = C;
   }
 }
-const j = new GlobalQueue();
+const A = new GlobalQueue();
 function flush() {
-  while (C) {
-    j.flush();
+  while (E) {
+    A.flush();
   }
 }
 function runQueue(e, t) {
@@ -470,15 +476,15 @@ function currentTransition(e) {
   return e;
 }
 function setActiveTransition(e) {
-  A = e;
+  C = e;
 }
 function runInTransition(e, t) {
-  const n = A;
+  const n = C;
   try {
-    A = currentTransition(e);
+    C = currentTransition(e);
     return t();
   } finally {
-    A = n;
+    C = n;
   }
 }
 const W = new WeakMap();
@@ -488,26 +494,26 @@ function getOrCreateLane(e) {
   if (t) {
     return findLane(t);
   }
-  const n = e.he;
+  const n = e.ye;
   const r = n?.re ? findLane(n.re) : null;
-  t = { pe: e, T: new Set(), M: [[], []], H: null, ne: A, ye: r };
+  t = { he: e, T: new Set(), q: [[], []], R: null, ne: C, ge: r };
   W.set(e, t);
   N.add(t);
-  e.ge = e.Se || 0;
+  e.Se = false;
   return t;
 }
 function findLane(e) {
-  while (e.H) e = e.H;
+  while (e.R) e = e.R;
   return e;
 }
 function mergeLanes(e, t) {
   e = findLane(e);
   t = findLane(t);
   if (e === t) return e;
-  t.H = e;
+  t.R = 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]);
+  e.q[0].push(...t.q[0]);
+  e.q[1].push(...t.q[1]);
   return e;
 }
 function resolveLane(e) {
@@ -519,22 +525,22 @@ function resolveLane(e) {
   return undefined;
 }
 function hasActiveOverride(e) {
-  return !!(e.we && e.ce !== S);
+  return !!(e.pe !== undefined && e.pe !== S);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
   const r = e.re;
   if (r) {
-    if (r.H) {
+    if (r.R) {
       e.re = t;
       return;
     }
     const i = findLane(r);
     if (N.has(i)) {
       if (i !== n && !hasActiveOverride(e)) {
-        if (n.ye && findLane(n.ye) === i) {
+        if (n.ge && findLane(n.ge) === i) {
           e.re = t;
-        } else if (i.ye && findLane(i.ye) === n);
+        } else if (i.ge && findLane(i.ge) === n);
         else mergeLanes(n, i);
       }
       return;
@@ -547,41 +553,40 @@ function handleAsync(e, t, r) {
   const s = i && untrack(() => t[Symbol.asyncIterator]);
   const o = !s && i && untrack(() => typeof t.then === "function");
   if (!o && !s) {
-    e.me = null;
+    e.we = null;
     return t;
   }
-  e.me = t;
+  e.we = t;
   let u;
   const handleError = n => {
-    if (e.me !== t) return;
-    j.initTransition(e.ne);
+    if (e.we !== t) return;
+    A.initTransition(e.ne);
     notifyStatus(e, n instanceof NotReadyError ? a : d, n);
     e.$ = k;
   };
   const asyncWrite = (i, s) => {
-    if (e.me !== t) return;
+    if (e.we !== t) return;
     if (e.m & (n | f)) return;
-    j.initTransition(e.ne);
+    A.initTransition(e.ne);
     clearStatus(e);
     const o = resolveLane(e);
     if (o) o.T.delete(e);
     if (r) r(i);
-    else if (e.we) {
-      const t = e.ce !== S;
-      if (e.R) e.ce = i;
-      if (!t) {
+    else if (e.pe !== undefined) {
+      if (e.pe !== undefined && e.pe !== S) e.le = i;
+      else {
         e.ae = i;
         insertSubs(e);
       }
       e.$ = k;
     } else if (o) {
       const t = e.ae;
-      const n = e.be;
+      const n = e.me;
       if (!n || !n(i, t)) {
         e.ae = i;
         e.$ = k;
-        if (e._e) {
-          setSignal(e._e, i);
+        if (e.be) {
+          setSignal(e.be, i);
         }
         insertSubs(e, true);
       }
@@ -608,8 +613,8 @@ function handleAsync(e, t, r) {
     );
     r = false;
     if (!n) {
-      j.initTransition(e.ne);
-      throw new NotReadyError(q);
+      A.initTransition(e.ne);
+      throw new NotReadyError(M);
     }
   }
   if (s) {
@@ -625,6 +630,10 @@ function handleAsync(e, t, r) {
             e = n;
             t = true;
           } else if (!n.done) asyncWrite(n.value, iterate);
+          else {
+            schedule();
+            flush();
+          }
         },
         e => {
           if (!i) handleError(e);
@@ -640,8 +649,8 @@ function handleAsync(e, t, r) {
     };
     const i = iterate();
     if (!r && !i) {
-      j.initTransition(e.ne);
-      throw new NotReadyError(q);
+      A.initTransition(e.ne);
+      throw new NotReadyError(M);
     }
   }
   return u;
@@ -650,13 +659,13 @@ function clearStatus(e) {
   e.de = e.de & p;
   e.Y = null;
   updatePendingSignal(e);
-  e.Oe?.();
+  e._e?.();
 }
 function notifyStatus(e, t, n, r, i) {
   if (t === d && !(n instanceof StatusError) && !(n instanceof NotReadyError))
     n = new StatusError(e, n);
   const s = n instanceof NotReadyError && n.source === e;
-  const o = t === a && e.we && !s;
+  const o = t === a && e.pe !== undefined && !s;
   const u = o && hasActiveOverride(e);
   if (!r) {
     e.de = t | (t !== d ? e.de & p : 0);
@@ -666,35 +675,35 @@ function notifyStatus(e, t, n, r, i) {
   if (i && !r) {
     assignOrMergeLane(e, i);
   }
-  if (u && A && n instanceof NotReadyError) {
+  if (u && C && n instanceof NotReadyError) {
     const e = n.source;
-    if (!A.Z.includes(e)) {
-      A.Z.push(e);
+    if (!C.Z.includes(e)) {
+      C.Z.push(e);
     }
   }
   const f = r || u;
-  const l = r || o ? undefined : i;
-  if (e.Oe) {
+  const c = r || o ? undefined : i;
+  if (e._e) {
     if (f) {
-      e.Oe(t, n);
+      e._e(t, n);
     } else {
-      e.Oe();
+      e._e();
     }
     return;
   }
   for (let r = e.O; r !== null; r = r.P) {
     r.k.$ = k;
     if (r.k.Y !== n) {
-      !r.k.ne && j.D.push(r.k);
-      notifyStatus(r.k, t, n, f, l);
+      !r.k.ne && A.D.push(r.k);
+      notifyStatus(r.k, t, n, f, c);
     }
   }
-  for (let r = e.A; r !== null; r = r.C) {
+  for (let r = e.C; r !== null; r = r.j) {
     for (let e = r.O; e !== null; e = e.P) {
       e.k.$ = k;
       if (e.k.Y !== n) {
-        !e.k.ne && j.D.push(e.k);
-        notifyStatus(e.k, t, n, f, l);
+        !e.k.ne && A.D.push(e.k);
+        notifyStatus(e.k, t, n, f, c);
       }
     }
   }
@@ -703,21 +712,21 @@ function unlinkSubs(e) {
   const t = e.L;
   const n = e.N;
   const r = e.P;
-  const i = e.xe;
-  if (r !== null) r.xe = i;
-  else t.ve = i;
+  const i = e.Oe;
+  if (r !== null) r.Oe = i;
+  else t.xe = i;
   if (i !== null) i.P = r;
   else {
     t.O = r;
     if (r === null) {
       t.Pe?.();
-      t.R && !t.ke && !(t.m & o) && unobserved(t);
+      t.H && !t.ve && !(t.m & o) && unobserved(t);
     }
   }
   return n;
 }
 function unobserved(e) {
-  deleteFromHeap(e, e.m & o ? P : v);
+  deleteFromHeap(e, e.m & o ? v : P);
   let t = e.W;
   while (t !== null) {
     t = unlinkSubs(t);
@@ -726,27 +735,27 @@ function unobserved(e) {
   disposeChildren(e, true);
 }
 function link(e, t) {
-  const n = t.Ae;
+  const n = t.ke;
   if (n !== null && n.L === e) return;
   let i = null;
   const s = t.m & r;
   if (s) {
     i = n !== null ? n.N : t.W;
     if (i !== null && i.L === e) {
-      t.Ae = i;
+      t.ke = i;
       return;
     }
   }
-  const o = e.ve;
+  const o = e.xe;
   if (o !== null && o.k === t && (!s || isValidLink(o, t))) return;
-  const u = (t.Ae = e.ve = { L: e, k: t, N: i, xe: o, P: null });
+  const u = (t.ke = e.xe = { L: e, k: t, N: i, Oe: o, P: null });
   if (n !== null) n.N = u;
   else t.W = u;
   if (o !== null) o.P = u;
   else e.O = u;
 }
 function isValidLink(e, t) {
-  const n = t.Ae;
+  const n = t.ke;
   if (n !== null) {
     let r = t.W;
     do {
@@ -763,8 +772,8 @@ function markDisposal(e) {
   while (t) {
     t.m |= o;
     if (t.m & i) {
-      deleteFromHeap(t, v);
-      insertIntoHeap(t, P);
+      deleteFromHeap(t, P);
+      insertIntoHeap(t, v);
     }
     markDisposal(t);
     t = t.Ee;
@@ -776,7 +785,7 @@ function dispose(e) {
     t = unlinkSubs(t);
   } while (t !== null);
   e.W = null;
-  e.Ae = null;
+  e.ke = null;
   disposeChildren(e, true);
 }
 function disposeChildren(e, t = false, n) {
@@ -787,13 +796,13 @@ function disposeChildren(e, t = false, n) {
     const e = r.Ee;
     if (r.W) {
       const e = r;
-      deleteFromHeap(e, e.m & o ? P : v);
+      deleteFromHeap(e, e.m & o ? v : P);
       let t = e.W;
       do {
         t = unlinkSubs(t);
       } while (t !== null);
       e.W = null;
-      e.Ae = null;
+      e.ke = null;
     }
     disposeChildren(r, true);
     r = e;
@@ -802,13 +811,12 @@ function disposeChildren(e, t = false, n) {
     e.je = null;
   } else {
     e.Ce = null;
-    e.Ee = null;
-    e.We = 0;
+    e.Ae = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ne : e.Le;
+  let n = t ? e.We : e.Ne;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -818,12 +826,12 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? (e.Ne = null) : (e.Le = null);
+  t ? (e.We = null) : (e.Ne = null);
 }
 function childId(e, t) {
   let n = e;
-  while (n.Ie && n.i) n = n.i;
-  if (n.id != null) return formatId(n.id, t ? n.We++ : n.We);
+  while (n.Le && n.i) n = n.i;
+  if (n.id != null) return formatId(n.id, t ? n.Ae++ : n.Ae);
   throw new Error("Cannot get child id from owner without an id");
 }
 function getNextChildId(e) {
@@ -838,37 +846,37 @@ function formatId(e, t) {
   return e + (r ? String.fromCharCode(64 + r) : "") + n;
 }
 function getObserver() {
-  if (Q || M) return L;
-  return I ? q : null;
+  if (T || F) return L;
+  return H ? M : null;
 }
 function getOwner() {
-  return q;
+  return M;
 }
 function onCleanup(e) {
-  if (!q) return e;
-  if (!q.Le) q.Le = e;
-  else if (Array.isArray(q.Le)) q.Le.push(e);
-  else q.Le = [q.Le, 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 = q;
+  const t = M;
   const n = e?.transparent ?? false;
   const r = {
     id: e?.id ?? (n ? t?.id : t?.id != null ? getNextChildId(t) : undefined),
-    Ie: n || undefined,
+    Le: n || undefined,
     t: true,
     u: t?.t ? t.u : t,
     Ce: null,
     Ee: null,
-    Le: null,
-    fe: t?.fe ?? j,
-    Re: t?.Re || _,
-    We: 0,
     Ne: null,
+    fe: t?.fe ?? A,
+    Ie: t?.Ie || _,
+    Ae: 0,
+    We: null,
     je: null,
     i: t,
     dispose(e = true) {
@@ -902,11 +910,11 @@ function effect(e, t, n, r, i) {
     lazy: true
   });
   o.He = r;
-  o.Qe = t;
-  o.Te = n;
-  o.Me = undefined;
+  o.Re = t;
+  o.Qe = n;
+  o.Te = undefined;
   o.oe = i?.render ? h : y;
-  o.Oe = (e, t) => {
+  o._e = (e, t) => {
     const n = e !== undefined ? e : o.de;
     const r = t !== undefined ? t : o.Y;
     if (n & d) {
@@ -914,10 +922,10 @@ function effect(e, t, n, r, i) {
       o.fe.notify(o, a, 0);
       if (o.oe === y) {
         try {
-          return o.Te
-            ? o.Te(e, () => {
-                o.Me?.();
-                o.Me = undefined;
+          return o.Qe
+            ? o.Qe(e, () => {
+                o.Te?.();
+                o.Te = undefined;
               })
             : console.error(e);
         } catch (t) {
@@ -925,19 +933,21 @@ function effect(e, t, n, r, i) {
         }
       }
       if (!o.fe.notify(o, d, d)) throw e;
-    } else if (o.oe === h) o.fe.notify(o, a | d, n, r);
+    } else if (o.oe === h) {
+      o.fe.notify(o, a | d, n, r);
+    }
   };
   recompute(o, true);
   !i?.defer && (o.oe === y ? o.fe.enqueue(o.oe, runEffect.bind(o)) : runEffect.call(o));
   s = true;
-  onCleanup(() => o.Me?.());
+  onCleanup(() => o.Te?.());
 }
 function runEffect() {
   if (!this.ue || this.m & u) return;
-  this.Me?.();
-  this.Me = undefined;
+  this.Te?.();
+  this.Te = undefined;
   try {
-    this.Me = this.Qe(this.ae, this.He);
+    this.Te = this.Re(this.ae, this.He);
   } catch (e) {
     if (!this.fe.notify(this, d, d)) throw e;
   } finally {
@@ -954,34 +964,57 @@ function trackedEffect(e, t) {
   const n = computed(
     () => {
       try {
-        n.Me?.();
-        n.Me = undefined;
-        n.Me = staleValues(e) || undefined;
+        n.Te?.();
+        n.Te = undefined;
+        n.Te = staleValues(e) || undefined;
       } finally {
       }
     },
     undefined,
     { ...t, lazy: true }
   );
-  n.Me = undefined;
+  n.Te = undefined;
   n.ue = true;
   n.oe = g;
-  n.le = run;
+  n.ce = run;
   n.fe.enqueue(y, run);
-  onCleanup(() => n.Me?.());
+  onCleanup(() => n.Te?.());
+}
+let I = null;
+function enableExternalSource(e) {
+  const { factory: t, untrack: n = e => e() } = e;
+  if (I) {
+    const { factory: e, untrack: r } = I;
+    I = {
+      factory: (n, r) => {
+        const i = e(n, r);
+        const s = t(e => i.track(e), r);
+        return {
+          track: e => s.track(e),
+          dispose() {
+            s.dispose();
+            i.dispose();
+          }
+        };
+      },
+      untrack: e => r(() => n(e))
+    };
+  } else {
+    I = { factory: t, untrack: n };
+  }
 }
 GlobalQueue.K = recompute;
 GlobalQueue.U = disposeChildren;
-let I = false;
-let R = false;
 let H = false;
+let R = false;
 let Q = false;
 let T = false;
-let M = false;
-let q = null;
-let F = null;
-let V = false;
-let D = null;
+let q = false;
+let F = false;
+let M = null;
+let V = null;
+let D = false;
+let B = null;
 function ownerInSnapshotScope(e) {
   while (e) {
     if (e.qe) return true;
@@ -990,8 +1023,8 @@ function ownerInSnapshotScope(e) {
   return false;
 }
 function setSnapshotCapture(e) {
-  V = e;
-  if (e && !D) D = new Set();
+  D = e;
+  if (e && !B) B = new Set();
 }
 function markSnapshotScope(e) {
   e.qe = true;
@@ -1008,14 +1041,14 @@ function releaseSubtree(e) {
       t = t.Ee;
       continue;
     }
-    if (t.R) {
+    if (t.H) {
       const e = t;
       e.se = false;
-      if (e.m & l) {
-        e.m &= ~l;
+      if (e.m & c) {
+        e.m &= ~c;
         e.m |= n;
-        if (v.j > e.o) v.j = e.o;
-        insertIntoHeap(e, v);
+        if (P.A > e.o) P.A = e.o;
+        insertIntoHeap(e, P);
       }
     }
     releaseSubtree(t);
@@ -1023,62 +1056,62 @@ function releaseSubtree(e) {
   }
 }
 function clearSnapshots() {
-  if (D) {
-    for (const e of D) {
+  if (B) {
+    for (const e of B) {
       delete e.ie;
       delete e[m];
     }
-    D = null;
+    B = null;
   }
-  V = false;
+  D = false;
 }
 function recompute(t, n = false) {
   const i = t.oe;
   if (!n) {
-    if (t.ne && (!i || A) && A !== t.ne) j.initTransition(t.ne);
-    deleteFromHeap(t, t.m & o ? P : v);
+    if (t.ne && (!i || C) && C !== t.ne) A.initTransition(t.ne);
+    deleteFromHeap(t, t.m & o ? v : P);
     if (t.ne || i === g) disposeChildren(t);
     else {
       markDisposal(t);
-      t.Ne = t.Le;
+      t.We = t.Ne;
       t.je = t.Ce;
-      t.Le = null;
+      t.Ne = null;
       t.Ce = null;
-      t.We = 0;
+      t.Ae = 0;
     }
   }
   const s = !!(t.m & f);
-  const u = hasActiveOverride(t);
-  const c = !!(t.de & a);
-  const p = q;
-  q = t;
-  t.Ae = null;
+  const u = t.pe !== undefined && t.pe !== S;
+  const l = !!(t.de & a);
+  const p = M;
+  M = t;
+  t.ke = null;
   t.m = r;
   t.$ = k;
-  let h = t.ce === S ? t.ae : t.ce;
+  let h = t.le === S ? t.ae : t.le;
   let y = t.o;
-  let w = I;
-  let m = F;
-  I = true;
+  let w = H;
+  let m = V;
+  H = true;
   if (s) {
     const e = resolveLane(t);
-    if (e) F = e;
+    if (e) V = e;
   }
   try {
-    h = handleAsync(t, t.R(h));
+    h = handleAsync(t, t.H(h));
     clearStatus(t);
     const e = resolveLane(t);
     if (e) {
       e.T.delete(t);
-      updatePendingSignal(e.pe);
+      updatePendingSignal(e.he);
     }
   } catch (e) {
-    if (e instanceof NotReadyError && F) {
-      const e = findLane(F);
-      if (e.pe !== t) {
+    if (e instanceof NotReadyError && V) {
+      const e = findLane(V);
+      if (e.he !== t) {
         e.T.add(t);
         t.re = e;
-        updatePendingSignal(e.pe);
+        updatePendingSignal(e.he);
       }
     }
     notifyStatus(
@@ -1089,12 +1122,12 @@ function recompute(t, n = false) {
       e instanceof NotReadyError ? t.re : undefined
     );
   } finally {
-    I = w;
-    t.m = e | (n ? t.m & l : 0);
-    q = p;
+    H = w;
+    t.m = e | (n ? t.m & c : 0);
+    M = p;
   }
   if (!t.Y) {
-    const e = t.Ae;
+    const e = t.ke;
     let r = e !== null ? e.N : t.W;
     if (r !== null) {
       do {
@@ -1103,38 +1136,37 @@ function recompute(t, n = false) {
       if (e !== null) e.N = null;
       else t.W = null;
     }
-    const f = u ? t.ae : t.ce === S ? t.ae : t.ce;
-    const l = !t.be || !t.be(f, h);
-    if (l) {
-      const e = u ? t.ae : undefined;
-      if (n || (i && A !== t.ne) || s) t.ae = h;
-      else t.ce = h;
-      if (u && !s && c) {
-        const e = t.Se || 0;
-        const n = t.ge || 0;
-        if (e <= n) t.ae = h;
-      }
-      if (!u || s || t.ae !== e) {
-        insertSubs(t, s || u);
-      }
+    const f = u ? t.pe : t.le === S ? t.ae : t.le;
+    const c = !t.me || !t.me(f, h);
+    if (c) {
+      const e = u ? t.pe : undefined;
+      if (n || (i && C !== t.ne) || s) {
+        t.ae = h;
+        if (u && s) {
+          t.pe = h;
+          t.le = h;
+        }
+      } else t.le = h;
+      if (u && !s && l && !t.Se) t.pe = h;
+      if (!u || s || t.pe !== e) insertSubs(t, s || u);
     } else if (u) {
-      t.ce = h;
+      t.le = h;
     } else if (t.o != y) {
       for (let e = t.O; e !== null; e = e.P) {
-        insertIntoHeapHeight(e.k, e.k.m & o ? P : v);
+        insertIntoHeapHeight(e.k, e.k.m & o ? v : P);
       }
     }
   }
-  F = m;
-  (!n || t.de & a) && !t.ne && !(A && t.we) && j.D.push(t);
-  t.ne && i && A !== t.ne && runInTransition(t.ne, () => recompute(t));
+  V = m;
+  (!n || t.de & a) && !t.ne && !(C && u) && A.D.push(t);
+  t.ne && i && C !== t.ne && runInTransition(t.ne, () => recompute(t));
 }
 function updateIfNecessary(r) {
   if (r.m & t) {
     for (let e = r.W; e; e = e.N) {
       const t = e.L;
       const i = t.I || t;
-      if (i.R) {
+      if (i.H) {
         updateIfNecessary(i);
       }
       if (r.m & n) {
@@ -1142,166 +1174,174 @@ function updateIfNecessary(r) {
       }
     }
   }
-  if (r.m & (n | f) || (r.Y && r.$ < k)) {
+  if (r.m & (n | f) || (r.Y && r.$ < k && !r.we)) {
     recompute(r);
   }
-  r.m = e | (r.m & l);
+  r.m = e | (r.m & c);
 }
 function computed(t, n, r) {
   const i = r?.transparent ?? false;
   const s = {
-    id: r?.id ?? (i ? q?.id : q?.id != null ? getNextChildId(q) : undefined),
-    Ie: i || undefined,
-    be: r?.equals != null ? r.equals : isEqual,
+    id: r?.id ?? (i ? M?.id : M?.id != null ? getNextChildId(M) : undefined),
+    Le: i || undefined,
+    me: r?.equals != null ? r.equals : isEqual,
     Fe: !!r?.pureWrite,
     Pe: r?.unobserved,
-    Le: null,
-    fe: q?.fe ?? j,
-    Re: q?.Re ?? _,
-    We: 0,
-    R: t,
+    Ne: null,
+    fe: M?.fe ?? A,
+    Ie: M?.Ie ?? _,
+    Ae: 0,
+    H: t,
     ae: n,
     o: 0,
-    A: null,
+    C: null,
     h: undefined,
     p: null,
     W: null,
-    Ae: null,
+    ke: null,
     O: null,
-    ve: null,
-    i: q,
+    xe: null,
+    i: M,
     Ee: null,
     Ce: null,
-    m: r?.lazy ? c : e,
+    m: r?.lazy ? l : e,
     de: p,
     $: k,
-    ce: S,
-    Ne: null,
+    le: S,
+    We: null,
     je: null,
-    me: null,
+    we: null,
     ne: null
   };
   s.p = s;
-  const o = q?.t ? q.u : q;
-  if (q) {
-    const e = q.Ce;
+  const o = M?.t ? M.u : M;
+  if (M) {
+    const e = M.Ce;
     if (e === null) {
-      q.Ce = s;
+      M.Ce = s;
     } else {
       s.Ee = e;
-      q.Ce = s;
+      M.Ce = s;
     }
   }
   if (o) s.o = o.o + 1;
-  if (V && ownerInSnapshotScope(q)) s.se = true;
+  if (D && ownerInSnapshotScope(M)) s.se = true;
+  if (I) {
+    const e = signal(undefined, { equals: false, pureWrite: true });
+    const t = I.factory(s.H, () => {
+      setSignal(e, undefined);
+    });
+    onCleanup(() => t.dispose());
+    s.H = n => {
+      read(e);
+      return t.track(n);
+    };
+  }
   !r?.lazy && recompute(s, true);
-  if (V && !r?.lazy) {
+  if (D && !r?.lazy) {
     if (!(s.de & a)) {
       s.ie = s.ae === undefined ? w : s.ae;
-      D.add(s);
+      B.add(s);
     }
   }
   return s;
 }
 function signal(e, t, n = null) {
   const r = {
-    be: t?.equals != null ? t.equals : isEqual,
+    me: t?.equals != null ? t.equals : isEqual,
     Fe: !!t?.pureWrite,
     Pe: t?.unobserved,
     ae: e,
     O: null,
-    ve: null,
+    xe: null,
     $: k,
     I: n,
-    C: n?.A || null,
-    ce: S
+    j: n?.C || null,
+    le: S
   };
-  n && (n.A = r);
-  if (V && !r.Fe) {
+  n && (n.C = r);
+  if (D && !r.Fe && !((n?.de ?? 0) & a)) {
     r.ie = e === undefined ? w : e;
-    D.add(r);
+    B.add(r);
   }
   return r;
 }
 function optimisticSignal(e, t) {
   const n = signal(e, t);
-  n.we = true;
+  n.pe = S;
   return n;
 }
 function optimisticComputed(e, t, n) {
   const r = computed(e, t, n);
-  r.we = true;
+  r.pe = S;
   return r;
 }
 function isEqual(e, t) {
   return e === t;
 }
-let B = false;
-function setStrictRead(e) {
-  const t = B;
-  B = e;
-  return t;
-}
-function untrack(e) {
-  if (!I && true) return e();
-  I = false;
+function untrack(e, t) {
+  if (!I && !H && true) return e();
+  const n = H;
+  H = false;
   try {
+    if (I) return I.untrack(e);
     return e();
   } finally {
-    I = true;
+    H = n;
   }
 }
 function read(e) {
-  if (M) {
+  if (F) {
     const t = getLatestValueComputed(e);
-    const n = M;
-    M = false;
-    let r;
+    const n = F;
+    F = false;
+    const r = e.pe !== undefined && e.pe !== S ? e.pe : e.ae;
+    let i;
     try {
-      r = read(t);
-    } catch (t) {
-      if (!q && t instanceof NotReadyError) return e.ae;
-      throw t;
+      i = read(t);
+    } catch (e) {
+      if (!M && e instanceof NotReadyError) return r;
+      throw e;
     } finally {
-      M = n;
+      F = n;
     }
-    if (t.de & a) return e.ae;
-    if (R && F && t.re) {
-      const n = findLane(t.re);
-      const r = findLane(F);
-      if (n !== r && n.T.size > 0) {
-        return e.ae;
+    if (t.de & a) return r;
+    if (R && V && t.re) {
+      const e = findLane(t.re);
+      const n = findLane(V);
+      if (e !== n && e.T.size > 0) {
+        return r;
       }
     }
-    return r;
+    return i;
   }
-  if (Q) {
+  if (T) {
     const t = e.I || e;
     const n = getPendingSignal(t);
-    const r = Q;
-    Q = false;
+    const r = T;
+    T = false;
     if (read(n)) {
-      T = true;
+      q = true;
     }
-    Q = r;
+    T = r;
     return e.ae;
   }
-  let t = q;
+  let t = M;
   if (t?.t) t = t.u;
-  if (H && e.R) recompute(e);
-  if (e.m & c) {
-    e.m &= ~c;
+  if (Q && e.H) recompute(e);
+  if (e.m & l) {
+    e.m &= ~l;
     recompute(e, true);
   }
   const n = e.I || e;
-  if (t && I) {
-    if (e.R && e.m & u) recompute(e);
+  if (t && H) {
+    if (e.H && e.m & u) recompute(e);
     link(e, t);
-    if (n.R) {
+    if (n.H) {
       const r = e.m & o;
-      if (n.o >= (r ? P.j : v.j)) {
+      if (n.o >= (r ? v.A : P.A)) {
         markNode(t);
-        markHeap(r ? P : v);
+        markHeap(r ? v : P);
         updateIfNecessary(n);
       }
       const i = n.o;
@@ -1311,74 +1351,77 @@ function read(e) {
     }
   }
   if (n.de & a) {
-    if (t && !(R && n.ne && A !== n.ne)) {
-      if (F) {
+    if (t && !(R && n.ne && C !== n.ne)) {
+      if (V) {
         const r = n.re;
-        const i = findLane(F);
+        const i = findLane(V);
         if (r && findLane(r) === i && !hasActiveOverride(n)) {
-          if (!I) link(e, t);
+          if (!H && e !== t) link(e, t);
           throw n.Y;
         }
       } else {
-        if (!I) link(e, t);
+        if (!H && e !== t) link(e, t);
         throw n.Y;
       }
     } else if (!t && n.de & p) {
       throw n.Y;
     }
   }
-  if (e.R && e.de & d) {
+  if (e.H && e.de & d) {
     if (e.$ < k) {
       recompute(e, true);
       return read(e);
     } else throw e.Y;
   }
-  if (V && t && t.se) {
+  if (D && t && t.se) {
     const n = e.ie;
     if (n !== undefined) {
       const r = n === w ? undefined : n;
-      const i = e.ce !== S ? e.ce : e.ae;
-      if (i !== r) t.m |= l;
+      const i = e.le !== S ? e.le : e.ae;
+      if (i !== r) t.m |= c;
       return r;
     }
   }
-  return !t || F !== null || e.ce === S || (R && e.ne && A !== e.ne) ? e.ae : e.ce;
+  if (e.pe !== undefined && e.pe !== S) return e.pe;
+  return !t ||
+    (V !== null && (e.pe !== undefined || e.re || n === e || !!(n.de & a))) ||
+    e.le === S ||
+    (R && e.ne && C !== e.ne)
+    ? e.ae
+    : e.le;
 }
 function setSignal(e, t) {
-  if (e.ne && A !== e.ne) j.initTransition(e.ne);
-  const n = e.we && !E;
-  const r = n ? e.ae : e.ce === S ? e.ae : e.ce;
-  if (typeof t === "function") t = t(r);
-  const i = !e.be || !e.be(r, t) || !!(e.de & p);
-  if (!i) {
-    if (n && e.ce !== S && e.R) {
+  if (e.ne && C !== e.ne) A.initTransition(e.ne);
+  const n = e.pe !== undefined && !j;
+  const r = e.pe !== undefined && e.pe !== S;
+  const i = n ? (r ? e.pe : e.ae) : e.le === S ? e.ae : e.le;
+  if (typeof t === "function") t = t(i);
+  const s = !e.me || !e.me(i, t) || !!(e.de & p);
+  if (!s) {
+    if (n && r && e.H) {
       insertSubs(e, true);
       schedule();
     }
     return t;
   }
   if (n) {
-    const n = j.B.includes(e);
-    if (e.ne && n) {
-      j.initTransition(e.ne);
-    }
-    if (e.ce === S) {
-      e.ce = e.ae;
+    const n = e.pe === S;
+    if (!n && e.ne) A.initTransition(e.ne);
+    if (n) {
+      e.le = e.ae;
+      A.B.push(e);
     }
-    if (!n) {
-      j.B.push(e);
-    }
-    e.Se = (e.Se || 0) + 1;
+    e.Se = true;
     const r = getOrCreateLane(e);
     e.re = r;
-    e.ae = t;
+    e.pe = t;
   } else {
-    if (e.ce === S) j.D.push(e);
-    e.ce = t;
+    if (e.le === S) A.D.push(e);
+    e.le = t;
   }
   updatePendingSignal(e);
-  if (e._e) {
-    setSignal(e._e, t);
+  if (e.be) {
+    setSignal(e.be, t);
   }
   e.$ = k;
   insertSubs(e, n);
@@ -1386,44 +1429,44 @@ function setSignal(e, t) {
   return t;
 }
 function runWithOwner(e, t) {
-  const n = q;
-  const r = I;
-  q = e;
-  I = false;
+  const n = M;
+  const r = H;
+  M = e;
+  H = false;
   try {
     return t();
   } finally {
-    q = n;
-    I = r;
+    M = n;
+    H = r;
   }
 }
 function getPendingSignal(e) {
-  if (!e.Ve) {
-    e.Ve = optimisticSignal(false, { pureWrite: true });
-    if (e.he) {
-      e.Ve.he = e;
+  if (!e.Me) {
+    e.Me = optimisticSignal(false, { pureWrite: true });
+    if (e.ye) {
+      e.Me.ye = e;
     }
-    if (computePendingState(e)) setSignal(e.Ve, true);
+    if (computePendingState(e)) setSignal(e.Me, true);
   }
-  return e.Ve;
+  return e.Me;
 }
 function computePendingState(e) {
   const t = e;
-  if (e.we && e.ce !== S) {
+  if (e.pe !== undefined && e.pe !== S) {
     if (t.de & a && !(t.de & p)) return true;
-    if (e.he) {
+    if (e.ye) {
       const t = e.re ? findLane(e.re) : null;
       return !!(t && t.T.size > 0);
     }
     return true;
   }
-  if (e.ce !== S && !(t.de & p)) return true;
+  if (e.le !== S && !(t.de & p)) return true;
   return !!(t.de & a && !(t.de & p));
 }
 function updatePendingSignal(e) {
-  if (e.Ve) {
+  if (e.Me) {
     const t = computePendingState(e);
-    const n = e.Ve;
+    const n = e.Me;
     setSignal(n, t);
     if (!t && n.re) {
       const t = resolveLane(e);
@@ -1439,20 +1482,20 @@ function updatePendingSignal(e) {
   }
 }
 function getLatestValueComputed(e) {
-  if (!e._e) {
-    const t = M;
-    M = false;
-    const n = Q;
-    Q = false;
-    const r = q;
-    q = null;
-    e._e = optimisticComputed(() => read(e));
-    e._e.he = e;
-    q = r;
-    Q = n;
-    M = t;
-  }
-  return e._e;
+  if (!e.be) {
+    const t = F;
+    F = false;
+    const n = T;
+    T = false;
+    const r = M;
+    M = null;
+    e.be = optimisticComputed(() => read(e));
+    e.be.ye = e;
+    M = r;
+    T = n;
+    F = t;
+  }
+  return e.be;
 }
 function staleValues(e, t = true) {
   const n = R;
@@ -1464,32 +1507,32 @@ function staleValues(e, t = true) {
   }
 }
 function latest(e) {
-  const t = M;
-  M = true;
+  const t = F;
+  F = true;
   try {
     return e();
   } finally {
-    M = t;
+    F = t;
   }
 }
 function isPending(e) {
-  const t = Q;
-  const n = T;
-  Q = true;
-  T = false;
+  const t = T;
+  const n = q;
+  T = true;
+  q = false;
   try {
     e();
-    return T;
+    return q;
   } catch {
-    return T;
+    return q;
   } finally {
-    Q = t;
-    T = n;
+    T = t;
+    q = n;
   }
 }
 function refresh(e) {
-  let t = H;
-  H = true;
+  let t = Q;
+  Q = true;
   try {
     if (typeof e !== "function") {
       recompute(e[O]);
@@ -1497,14 +1540,14 @@ function refresh(e) {
     }
     return untrack(e);
   } finally {
-    H = t;
+    Q = t;
     if (!t) {
       schedule();
     }
   }
 }
 function isRefreshing() {
-  return H;
+  return Q;
 }
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
@@ -1513,7 +1556,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.Re[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t.Ie[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -1523,16 +1566,16 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.Re = { ...n.Re, [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?.Re[e.id]);
+  return !isUndefined(t?.Ie[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
 }
 function restoreTransition(e, t) {
-  j.initTransition(e);
+  A.initTransition(e);
   const n = t();
   flush();
   return n;
@@ -1541,8 +1584,8 @@ function action(e) {
   return (...t) =>
     new Promise((n, r) => {
       const i = e(...t);
-      j.initTransition();
-      let s = A;
+      A.initTransition();
+      let s = C;
       s.ee.push(i);
       const done = (e, t) => {
         s = currentTransition(s);
@@ -1575,17 +1618,22 @@ function action(e) {
       step();
     });
 }
+function accessor(e) {
+  const t = read.bind(null, e);
+  t.$r = true;
+  return t;
+}
 function createSignal(e, t, n) {
   if (typeof e === "function") {
     const r = computed(e, t, n);
-    return [read.bind(null, r), setSignal.bind(null, r)];
+    return [accessor(r), setSignal.bind(null, r)];
   }
   const r = signal(e, t);
-  return [read.bind(null, r), setSignal.bind(null, r)];
+  return [accessor(r), setSignal.bind(null, r)];
 }
 function createMemo(e, t, n) {
   let r = computed(e, t, n);
-  return read.bind(null, r);
+  return accessor(r);
 }
 function createEffect(e, t, n, r) {
   effect(e, t.effect || t, t.error, n, r);
@@ -1633,18 +1681,18 @@ function resolve(e) {
 }
 function createOptimistic(e, t, n) {
   const r = typeof e === "function" ? optimisticComputed(e, t, n) : optimisticSignal(e, t);
-  return [read.bind(null, r), setSignal.bind(null, r)];
+  return [accessor(r), setSignal.bind(null, r)];
 }
 function onSettled(e) {
   getOwner()
     ? createTrackedEffect(() => untrack(e))
-    : j.enqueue(y, () => {
+    : A.enqueue(y, () => {
         const t = e();
         t?.();
       });
 }
 function unwrap(e) {
-  return e?.[U]?.[te] ?? e;
+  return e?.[z]?.[$] ?? e;
 }
 function getOverrideValue(e, t, n, r, i) {
   if (i && r in i) return i[r];
@@ -1655,135 +1703,135 @@ function getAllKeys(e, t, n) {
   const i = Object.keys(n);
   return Array.from(new Set([...r, ...i]));
 }
-function applyState(e, t, n, r) {
-  const i = t?.[U];
-  if (!i) return;
-  const s = i[Z];
-  const o = i[$];
-  const u = i[ee];
-  let f = i[te];
-  if (e === s && !o && !u) return;
-  (i[ie] || ue).set(e, i[J]);
-  i[Z] = e;
-  i[$] = undefined;
-  if (Array.isArray(s)) {
+function applyState(e, t, n) {
+  const r = t?.[z];
+  if (!r) return;
+  const i = r[X];
+  const s = r[Y];
+  const o = r[Z];
+  let u = r[$];
+  if (e === i && !s && !o) return;
+  (r[ne] || se).set(e, r[U]);
+  r[X] = e;
+  r[Y] = undefined;
+  if (Array.isArray(i)) {
     let t = false;
-    const l = getOverrideValue(s, o, f, "length", u);
-    if (e.length && l && e[0] && n(e[0]) != null) {
-      let c, a, d, p, h, y, g, S;
+    const f = getOverrideValue(i, s, u, "length", o);
+    if (e.length && f && e[0] && n(e[0]) != null) {
+      let c, l, a, d, p, h, y, g;
       for (
-        d = 0, p = Math.min(l, e.length);
-        d < p &&
-        ((y = getOverrideValue(s, o, f, d, u)) === e[d] || (y && e[d] && n(y) === n(e[d])));
-        d++
+        a = 0, d = Math.min(f, e.length);
+        a < d &&
+        ((h = getOverrideValue(i, s, u, a, o)) === e[a] || (h && e[a] && n(h) === n(e[a])));
+        a++
       ) {
-        applyState(e[d], wrap(y, i), n, r);
+        applyState(e[a], wrap(h, r), n);
       }
-      const w = new Array(e.length),
-        m = new Map();
+      const S = new Array(e.length),
+        w = new Map();
       for (
-        p = l - 1, h = e.length - 1;
-        p >= d &&
-        h >= d &&
-        ((y = getOverrideValue(s, o, f, p, u)) === e[h] || (y && e[h] && n(y) === n(e[h])));
-        p--, h--
+        d = f - 1, p = e.length - 1;
+        d >= a &&
+        p >= a &&
+        ((h = getOverrideValue(i, s, u, d, o)) === e[p] || (h && e[p] && n(h) === n(e[p])));
+        d--, p--
       ) {
-        w[h] = y;
+        S[p] = h;
       }
-      if (d > h || d > p) {
-        for (a = d; a <= h; a++) {
+      if (a > p || a > d) {
+        for (l = a; l <= p; l++) {
           t = true;
-          i[te][a] && setSignal(i[te][a], wrap(e[a], i));
+          r[$][l] && setSignal(r[$][l], wrap(e[l], r));
         }
-        for (; a < e.length; a++) {
+        for (; l < e.length; l++) {
           t = true;
-          const s = wrap(w[a], i);
-          i[te][a] && setSignal(i[te][a], s);
-          applyState(e[a], s, n, r);
+          const i = wrap(S[l], r);
+          r[$][l] && setSignal(r[$][l], i);
+          applyState(e[l], i, n);
         }
-        t && i[te][K] && setSignal(i[te][K], void 0);
-        l !== e.length && i[te].length && setSignal(i[te].length, e.length);
+        t && r[$][K] && setSignal(r[$][K], void 0);
+        f !== e.length && r[$].length && setSignal(r[$].length, e.length);
         return;
       }
-      g = new Array(h + 1);
-      for (a = h; a >= d; a--) {
-        y = e[a];
-        S = y ? n(y) : y;
-        c = m.get(S);
-        g[a] = c === undefined ? -1 : c;
-        m.set(S, a);
-      }
-      for (c = d; c <= p; c++) {
-        y = getOverrideValue(s, o, f, c, u);
-        S = y ? n(y) : y;
-        a = m.get(S);
-        if (a !== undefined && a !== -1) {
-          w[a] = y;
-          a = g[a];
-          m.set(S, a);
+      y = new Array(p + 1);
+      for (l = p; l >= a; l--) {
+        h = e[l];
+        g = h ? n(h) : h;
+        c = w.get(g);
+        y[l] = c === undefined ? -1 : c;
+        w.set(g, l);
+      }
+      for (c = a; c <= d; c++) {
+        h = getOverrideValue(i, s, u, c, o);
+        g = h ? n(h) : h;
+        l = w.get(g);
+        if (l !== undefined && l !== -1) {
+          S[l] = h;
+          l = y[l];
+          w.set(g, l);
         }
       }
-      for (a = d; a < e.length; a++) {
-        if (a in w) {
-          const t = wrap(w[a], i);
-          i[te][a] && setSignal(i[te][a], t);
-          applyState(e[a], t, n, r);
-        } else i[te][a] && setSignal(i[te][a], wrap(e[a], i));
+      for (l = a; l < e.length; l++) {
+        if (l in S) {
+          const t = wrap(S[l], r);
+          r[$][l] && setSignal(r[$][l], t);
+          applyState(e[l], t, n);
+        } else r[$][l] && setSignal(r[$][l], wrap(e[l], r));
       }
-      if (d < e.length) t = true;
+      if (a < 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[te][t] && setSignal(i[te][t], e[t]);
+      for (let t = 0, f = e.length; t < f; t++) {
+        const f = getOverrideValue(i, s, u, t, o);
+        isWrappable(f) ? applyState(e[t], wrap(f, r), n) : r[$][t] && setSignal(r[$][t], e[t]);
       }
     }
-    if (l !== e.length) {
+    if (f !== e.length) {
       t = true;
-      i[te].length && setSignal(i[te].length, e.length);
+      r[$].length && setSignal(r[$].length, e.length);
     }
-    t && i[te][K] && setSignal(i[te][K], void 0);
+    t && r[$][K] && setSignal(r[$][K], void 0);
     return;
   }
-  if (f) {
-    const t = f[K];
-    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];
-      const d = f[a];
-      const p = unwrap(getOverrideValue(s, o, f, a, u));
-      let h = unwrap(e[a]);
-      if (p === h) continue;
-      if (!p || !isWrappable(p) || !isWrappable(h) || (n(p) != null && n(p) !== n(h))) {
+  if (u) {
+    const t = u[K];
+    const f = t ? getAllKeys(i, s, e) : Object.keys(u);
+    for (let c = 0, l = f.length; c < l; c++) {
+      const l = f[c];
+      const a = u[l];
+      const d = unwrap(getOverrideValue(i, s, u, l, o));
+      let p = unwrap(e[l]);
+      if (d === p) continue;
+      if (!d || !isWrappable(d) || !isWrappable(p) || (n(d) != null && n(d) !== n(p))) {
         t && setSignal(t, void 0);
-        d && setSignal(d, isWrappable(h) ? wrap(h, i) : h);
-      } else applyState(h, wrap(p, i), n, r);
+        a && setSignal(a, isWrappable(p) ? wrap(p, r) : p);
+      } else applyState(p, wrap(d, r), n);
     }
   }
-  if ((f = i[ne])) {
-    const t = Object.keys(f);
+  if ((u = r[ee])) {
+    const t = Object.keys(u);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
-      setSignal(f[r], r in e);
+      setSignal(u[r], r in e);
     }
   }
 }
-function reconcile(e, t, n = false) {
-  return r => {
-    if (r == null) throw new Error("Cannot reconcile null or undefined state");
-    const i = typeof t === "string" ? e => e[t] : t;
-    const s = i(r);
-    if (s !== undefined && i(e) !== i(r))
+function reconcile(e, t) {
+  return n => {
+    if (n == null) throw new Error("Cannot reconcile null or undefined state");
+    const r = typeof t === "string" ? e => e[t] : t;
+    const i = r(n);
+    if (i !== undefined && r(e) !== r(n))
       throw new Error("Cannot reconcile states with different identity");
-    applyState(e, r, i, n);
+    applyState(e, n, r);
   };
 }
 function createProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[re] = wrapProjection;
-    e[ie] = i;
-    Object.defineProperty(e, se, {
+    e[te] = wrapProjection;
+    e[ne] = i;
+    Object.defineProperty(e, re, {
       get() {
         return r;
       },
@@ -1792,8 +1840,8 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[U]?.[re] === wrapProjection) return e;
-    const t = createStoreProxy(e, ce, wrapper);
+    if (e[z]?.[te] === wrapProjection) return e;
+    const t = createStoreProxy(e, fe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -1802,13 +1850,12 @@ function createProjectionInternal(e, t = {}, n) {
     const t = getOwner();
     storeSetter(new Proxy(s, G), r => {
       const i = handleAsync(t, e(r), e => {
-        e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
-        setSignal(t, undefined);
+        e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
       });
-      i !== r && i !== undefined && reconcile(i, n?.key || "id", n?.all)(s);
+      i !== r && i !== undefined && reconcile(i, n?.key || "id")(s);
     });
   });
-  r.ke = true;
+  r.ve = true;
   return { store: s, node: r };
 }
 function createProjection(e, t = {}, n) {
@@ -1853,43 +1900,41 @@ const G = {
 const K = Symbol(0),
   z = Symbol(0),
   U = Symbol(0),
-  J = Symbol(0),
-  X = Symbol(0);
-const Y = new WeakMap();
-const Z = "v",
-  $ = "o",
-  ee = "x",
-  te = "n",
-  ne = "h",
-  re = "w",
-  ie = "l",
-  se = "f",
-  oe = "p";
-function createStoreProxy(e, t = ce, n) {
+  J = Symbol(0);
+const X = "v",
+  Y = "o",
+  Z = "x",
+  $ = "n",
+  ee = "h",
+  te = "w",
+  ne = "l",
+  re = "f",
+  ie = "p";
+function createStoreProxy(e, t = fe, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else r = { v: e };
   n && n(r);
-  return (r[J] = new Proxy(r, t));
+  return (r[U] = new Proxy(r, t));
 }
-const ue = new WeakMap();
+const se = new WeakMap();
 function wrap(e, t) {
-  if (t?.[re]) return t[re](e, t);
-  let n = e[J] || ue.get(e);
-  if (!n) ue.set(e, (n = createStoreProxy(e)));
+  if (t?.[te]) return t[te](e, t);
+  let n = e[U] || se.get(e);
+  if (!n) se.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
   return e != null && typeof e === "object" && !Object.isFrozen(e);
 }
-let fe = false;
+let oe = false;
 function setWriteOverride(e) {
-  fe = e;
+  oe = e;
 }
 function writeOnly(e) {
-  return fe || !!le?.has(e);
+  return oe || !!ue?.has(e);
 }
 function getNodes(e, t) {
   let n = e[t];
@@ -1908,16 +1953,18 @@ function getNode(e, t, n, r, i = isEqual, s, o) {
     },
     r
   );
-  if (s) u.we = true;
+  if (s) {
+    u.pe = S;
+  }
   if (o && t in o) {
     const e = o[t];
     u.ie = e === undefined ? w : e;
-    D?.add(u);
+    B?.add(u);
   }
   return (e[t] = u);
 }
 function trackSelf(e, t = K) {
-  getObserver() && read(getNode(getNodes(e, te), t, undefined, e[se], false, e[oe]));
+  getObserver() && read(getNode(getNodes(e, $), t, undefined, e[re], false, e[ie]));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -1925,7 +1972,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] !== X) i.add(e);
+    if (t[e] !== J) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
@@ -1933,131 +1980,129 @@ function getKeys(e, t, n = true) {
 function getPropertyDescriptor(e, t, n) {
   let r = e;
   if (t && n in t) {
-    if (r[n] === X) return void 0;
+    if (r[n] === J) return void 0;
     if (!(n in r)) r = t;
   }
   return Reflect.getOwnPropertyDescriptor(r, n);
 }
-let le = null;
-const ce = {
+let ue = null;
+const fe = {
   get(e, t, n) {
-    if (t === U) return e;
-    if (t === J) return n;
-    if (t === O) return e[se];
-    if (t === K || t === z) {
-      trackSelf(e, t);
+    if (t === z) return e;
+    if (t === U) return n;
+    if (t === O) return e[re];
+    if (t === K) {
+      trackSelf(e);
       return n;
     }
-    const r = getNodes(e, te);
+    const r = getNodes(e, $);
     const i = r[t];
-    const s = e[ee] && t in e[ee];
-    const o = s || (e[$] && t in e[$]);
-    const u = !!e[Z][U];
-    const f = s ? e[ee] : e[$] && t in e[$] ? e[$] : e[Z];
+    const s = e[Z] && t in e[Z];
+    const o = s || (e[Y] && t in e[Y]);
+    const u = !!e[X][z];
+    const f = s ? e[Z] : e[Y] && t in e[Y] ? e[Y] : e[X];
     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 !== S ? (i.we ? i.ae : i.ce) : i.ae) : f[t];
-      n === X && (n = undefined);
+      let n =
+        i && (o || !u)
+          ? i.pe !== undefined && i.pe !== S
+            ? i.pe
+            : i.le !== S
+              ? i.le
+              : i.ae
+          : f[t];
+      n === J && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      le?.add(r);
+      ue?.add(r);
       return r;
     }
-    let l = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
-    l === X && (l = undefined);
+    let c = i ? (o || !u ? read(r[t]) : (read(r[t]), f[t])) : f[t];
+    c === J && (c = undefined);
     if (!i) {
-      if (!o && typeof l === "function" && !f.hasOwnProperty(t)) {
+      if (!o && typeof c === "function" && !f.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[Z]) && (t = Object.getPrototypeOf(e[Z])) && t !== Object.prototype
-          ? l.bind(f)
-          : l;
+        return !Array.isArray(e[X]) && (t = Object.getPrototypeOf(e[X])) && t !== Object.prototype
+          ? c.bind(f)
+          : c;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[se], isEqual, e[oe], e[m]));
+        return read(getNode(r, t, isWrappable(c) ? wrap(c, e) : c, e[re], isEqual, e[ie], e[m]));
       }
     }
-    return isWrappable(l) ? wrap(l, e) : l;
+    return isWrappable(c) ? wrap(c, e) : c;
   },
   has(e, t) {
-    if (t === J || t === K || t === "__proto__") return true;
-    const n = e[ee] && t in e[ee] ? e[ee][t] !== X : e[$] && t in e[$] ? e[$][t] !== X : t in e[Z];
-    getObserver() && read(getNode(getNodes(e, ne), t, n, e[se], isEqual, e[oe]));
+    if (t === U || t === K || t === "__proto__") return true;
+    const n = e[Z] && t in e[Z] ? e[Z][t] !== J : e[Y] && t in e[Y] ? e[Y][t] !== J : t in e[X];
+    getObserver() && read(getNode(getNodes(e, ee), t, n, e[re], isEqual, e[ie]));
     return n;
   },
   set(e, t, n) {
-    const r = e[J];
+    const r = e[U];
     if (writeOnly(r)) {
-      if (e[oe]) {
-        const t = e[se];
+      if (e[ie]) {
+        const t = e[re];
         if (t?.ne) {
-          j.initTransition(t.ne);
+          A.initTransition(t.ne);
         }
       }
       untrack(() => {
-        const i = e[Z];
+        const i = e[X];
         const s = i[t];
-        if (V && typeof t !== "symbol") {
+        if (D && typeof t !== "symbol" && !((e[re]?.de ?? 0) & a)) {
           if (!e[m]) {
             e[m] = Object.create(null);
-            D?.add(e);
+            B?.add(e);
           }
           if (!(t in e[m])) {
             e[m][t] = s;
           }
         }
-        const o = e[oe] && !E;
-        const u = o ? ee : $;
+        const o = e[ie] && !j;
+        const u = o ? Z : Y;
         if (o) trackOptimisticStore(r);
-        const f = e[ee] && t in e[ee] ? e[ee][t] : e[$] && t in e[$] ? e[$][t] : s;
-        const l = n?.[U]?.[Z] ?? n;
-        if (f === l) return true;
-        const c = e[ee]?.length || e[$]?.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 = Y.get(f);
-          e && (e instanceof Set ? e.delete(r) : Y.delete(f));
-        }
-        if (recursivelyNotify(r, ue) && a) recursivelyAddParent(l, r);
-        e[ne]?.[t] && setSignal(e[ne][t], true);
-        const d = getNodes(e, te);
-        d[t] && setSignal(d[t], () => (a ? wrap(l, e) : l));
+        const f = e[Z] && t in e[Z] ? e[Z][t] : e[Y] && t in e[Y] ? e[Y][t] : s;
+        const c = n?.[z]?.[X] ?? n;
+        if (f === c) return true;
+        const l = e[Z]?.length || e[Y]?.length || i.length;
+        if (c !== undefined && c === s) delete e[u][t];
+        else (e[u] || (e[u] = Object.create(null)))[t] = c;
+        const d = isWrappable(c);
+        e[ee]?.[t] && setSignal(e[ee][t], true);
+        const p = getNodes(e, $);
+        p[t] && setSignal(p[t], () => (d ? wrap(c, e) : c));
         if (Array.isArray(i)) {
           if (t === "length") {
-            d.length && setSignal(d.length, l);
+            p.length && setSignal(p.length, c);
           } else {
             const e = parseInt(t) + 1;
-            if (e > c) d.length && setSignal(d.length, e);
+            if (e > l) p.length && setSignal(p.length, e);
           }
         }
-        d[K] && setSignal(d[K], undefined);
+        p[K] && setSignal(p[K], undefined);
       });
     }
     return true;
   },
   deleteProperty(e, t) {
-    const n = e[ee]?.[t] === X;
-    const r = e[$]?.[t] === X;
-    if (writeOnly(e[J]) && !n && !r) {
+    const n = e[Z]?.[t] === J;
+    const r = e[Y]?.[t] === J;
+    if (writeOnly(e[U]) && !n && !r) {
       untrack(() => {
-        const n = e[oe] && !E;
-        const r = n ? ee : $;
-        if (n) trackOptimisticStore(e[J]);
-        const i = e[ee] && t in e[ee] ? e[ee][t] : e[$] && t in e[$] ? e[$][t] : e[Z][t];
-        if (t in e[Z] || (e[$] && t in e[$])) {
-          (e[r] || (e[r] = Object.create(null)))[t] = X;
+        const n = e[ie] && !j;
+        const r = n ? Z : Y;
+        if (n) trackOptimisticStore(e[U]);
+        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] = J;
         } else if (e[r] && t in e[r]) {
           delete e[r][t];
         } else return true;
-        if (isWrappable(i)) {
-          const t = Y.get(i);
-          t && (t instanceof Set ? t.delete(e) : Y.delete(i));
-        }
-        if (e[ne]?.[t]) setSignal(e[ne][t], false);
-        const s = getNodes(e, te);
+        if (e[ee]?.[t]) setSignal(e[ee][t], false);
+        const s = getNodes(e, $);
         s[t] && setSignal(s[t], undefined);
         s[K] && setSignal(s[K], undefined);
       });
@@ -2066,11 +2111,11 @@ const ce = {
   },
   ownKeys(e) {
     trackSelf(e);
-    let t = getKeys(e[Z], e[$], false);
-    if (e[ee]) {
+    let t = getKeys(e[X], e[Y], false);
+    if (e[Z]) {
       const n = new Set(t);
-      for (const t of Reflect.ownKeys(e[ee])) {
-        if (e[ee][t] !== X) n.add(t);
+      for (const t of Reflect.ownKeys(e[Z])) {
+        if (e[Z][t] !== J) n.add(t);
         else n.delete(t);
       }
       t = Array.from(n);
@@ -2078,25 +2123,25 @@ const ce = {
     return t;
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === J) return { value: e[J], writable: true, configurable: true };
-    if (e[ee] && t in e[ee]) {
-      if (e[ee][t] === X) return undefined;
-      const n = getPropertyDescriptor(e[Z], e[$], t);
+    if (t === U) return { value: e[U], writable: true, configurable: true };
+    if (e[Z] && t in e[Z]) {
+      if (e[Z][t] === J) return undefined;
+      const n = getPropertyDescriptor(e[X], e[Y], t);
       if (n) {
-        return { ...n, value: e[ee][t] };
+        return { ...n, value: e[Z][t] };
       }
-      return { value: e[ee][t], writable: true, enumerable: true, configurable: true };
+      return { value: e[Z][t], writable: true, enumerable: true, configurable: true };
     }
-    return getPropertyDescriptor(e[Z], e[$], t);
+    return getPropertyDescriptor(e[X], e[Y], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[Z]);
+    return Object.getPrototypeOf(e[X]);
   }
 };
 function storeSetter(e, t) {
-  const n = le;
-  le = new Set();
-  le.add(e);
+  const n = ue;
+  ue = new Set();
+  ue.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -2112,8 +2157,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    le.clear();
-    le = n;
+    ue.clear();
+    ue = n;
   }
 }
 function createStore(e, t, n) {
@@ -2121,59 +2166,6 @@ function createStore(e, t, n) {
     i = r ? createProjectionInternal(e, t, n).store : wrap(e);
   return [i, e => storeSetter(i, e)];
 }
-function recursivelyNotify(e, t) {
-  let n = e[U] || t?.get(e)?.[U];
-  let r = false;
-  if (n) {
-    const e = getNodes(n, te)[z];
-    if (e) {
-      setSignal(e, undefined);
-      r = true;
-    }
-    t = n[ie] || t;
-  }
-  const i = Y.get(n?.[Z] || e);
-  if (!i) return r;
-  if (i instanceof Set) {
-    for (let e of i) r = recursivelyNotify(e, t) || r;
-  } else r = recursivelyNotify(i, t) || r;
-  return r;
-}
-function recursivelyAddParent(e, t) {
-  let n;
-  const r = e[U];
-  if (r) {
-    n = r[$];
-    e = r[Z];
-  }
-  if (t) {
-    let n = Y.get(e);
-    if (!n) Y.set(e, t);
-    else if (n !== t) {
-      if (!(n instanceof Set)) Y.set(e, (n = new Set([n])));
-      else if (n.has(t)) return;
-      n.add(t);
-    } else return;
-  }
-  if (Array.isArray(e)) {
-    const t = n?.length || e.length;
-    for (let r = 0; r < t; r++) {
-      const t = n && r in n ? n[r] : e[r];
-      isWrappable(t) && recursivelyAddParent(t, e);
-    }
-  } else {
-    const t = getKeys(e, n);
-    for (let r = 0; r < t.length; r++) {
-      const i = t[r];
-      const s = n && i in n ? n[i] : e[i];
-      isWrappable(s) && recursivelyAddParent(s, e);
-    }
-  }
-}
-function deep(e) {
-  recursivelyAddParent(e);
-  return e[z];
-}
 function createOptimisticStore(e, t, n) {
   GlobalQueue.J ||= clearOptimisticStore;
   const r = typeof e === "function";
@@ -2183,18 +2175,18 @@ function createOptimisticStore(e, t, n) {
   return [o, e => storeSetter(o, e)];
 }
 function clearOptimisticStore(e) {
-  const t = e[U];
-  if (!t || !t[ee]) return;
-  const n = t[ee];
-  const r = t[te];
+  const t = e[z];
+  if (!t || !t[Z]) return;
+  const n = t[Z];
+  const r = t[$];
   setProjectionWriteActive(true);
   try {
     if (r) {
       for (const e of Reflect.ownKeys(n)) {
         if (r[e]) {
           r[e].re = undefined;
-          const n = t[$] && e in t[$] ? t[$][e] : t[Z][e];
-          const i = n === X ? undefined : n;
+          const n = t[Y] && e in t[Y] ? t[Y][e] : t[X][e];
+          const i = n === J ? undefined : n;
           setSignal(r[e], isWrappable(i) ? wrap(i, t) : i);
         }
       }
@@ -2206,16 +2198,16 @@ function clearOptimisticStore(e) {
   } finally {
     setProjectionWriteActive(false);
   }
-  delete t[ee];
+  delete t[Z];
 }
 function createOptimisticProjectionInternal(e, t = {}, n) {
   let r;
   const i = new WeakMap();
   const wrapper = e => {
-    e[re] = wrapProjection;
-    e[ie] = i;
-    e[oe] = true;
-    Object.defineProperty(e, se, {
+    e[te] = wrapProjection;
+    e[ne] = i;
+    e[ie] = true;
+    Object.defineProperty(e, re, {
       get() {
         return r;
       },
@@ -2224,8 +2216,8 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
   };
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[U]?.[re] === wrapProjection) return e;
-    const t = createStoreProxy(e, ce, wrapper);
+    if (e[z]?.[te] === wrapProjection) return e;
+    const t = createStoreProxy(e, fe, wrapper);
     i.set(e, t);
     return t;
   };
@@ -2239,22 +2231,22 @@ function createOptimisticProjectionInternal(e, t = {}, n) {
           const i = handleAsync(t, e(r), e => {
             setProjectionWriteActive(true);
             try {
-              e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
+              e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id"));
             } finally {
               setProjectionWriteActive(false);
             }
           });
-          i !== r && i !== undefined && reconcile(i, n?.key || "id", n?.all)(s);
+          i !== r && i !== undefined && reconcile(i, n?.key || "id")(s);
         });
       } finally {
         setProjectionWriteActive(false);
       }
     });
-    r.ke = true;
+    r.ve = true;
   }
   return { store: s, node: r };
 }
-const ae = Symbol(0);
+const ce = Symbol(0);
 function updatePath(e, t, n = 0) {
   let r,
     i = e;
@@ -2298,7 +2290,7 @@ function updatePath(e, t, n = 0) {
     if (s === i) return;
   }
   if (r === undefined && s == undefined) return;
-  if (s === ae) {
+  if (s === ce) {
     delete e[r];
   } else if (r === undefined || (isWrappable(i) && isWrappable(s) && !Array.isArray(s))) {
     const t = r !== undefined ? e[r] : e;
@@ -2308,67 +2300,76 @@ function updatePath(e, t, n = 0) {
     e[r] = s;
   }
 }
-const de = Object.assign(
+const le = Object.assign(
   function storePath(...e) {
     return t => {
       updatePath(t, e);
     };
   },
-  { DELETE: ae }
+  { DELETE: ce }
 );
-function snapshot(e, t, n) {
-  let r, i, s, o, u, f;
+function snapshotImpl(e, t, n, r) {
+  let i, s, o, u, f, c;
   if (!isWrappable(e)) return e;
-  if (t && t.has(e)) return t.get(e);
-  if (!t) t = new Map();
-  if ((r = e[U] || n?.get(e)?.[U])) {
-    s = r[$];
-    i = Array.isArray(r[Z]);
-    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[Z]))) : r[Z]);
-    e = r[Z];
-    n = ue;
+  if (n && n.has(e)) return n.get(e);
+  if (!n) n = new Map();
+  if ((i = e[z] || r?.get(e)?.[z])) {
+    if (t) trackSelf(i, K);
+    o = i[Y];
+    s = Array.isArray(i[X]);
+    n.set(e, o ? (u = s ? [] : Object.create(Object.getPrototypeOf(i[X]))) : i[X]);
+    e = i[X];
+    r = se;
   } else {
-    i = Array.isArray(e);
-    t.set(e, e);
+    s = Array.isArray(e);
+    n.set(e, e);
   }
-  if (i) {
-    const r = s?.length || e.length;
-    for (let i = 0; i < r; i++) {
-      f = s && i in s ? s[i] : e[i];
-      if (f === X) continue;
-      if ((u = snapshot(f, t, n)) !== f || o) {
-        if (!o) t.set(e, (o = [...e]));
-        o[i] = u;
+  if (s) {
+    const s = o?.length || e.length;
+    for (let l = 0; l < s; l++) {
+      c = o && l in o ? o[l] : e[l];
+      if (c === J) continue;
+      if (t && isWrappable(c)) wrap(c, i);
+      if ((f = snapshotImpl(c, t, n, r)) !== c || u) {
+        if (!u) n.set(e, (u = [...e]));
+        u[l] = f;
       }
     }
   } else {
-    const r = getKeys(e, s);
-    for (let i = 0, l = r.length; i < l; i++) {
-      let l = r[i];
-      const c = getPropertyDescriptor(e, s, l);
-      if (c.get) continue;
-      f = s && l in s ? s[l] : e[l];
-      if ((u = snapshot(f, t, n)) !== e[l] || o) {
-        if (!o) {
-          o = Object.create(Object.getPrototypeOf(e));
-          Object.assign(o, e);
+    const s = getKeys(e, o);
+    for (let l = 0, a = s.length; l < a; l++) {
+      let a = s[l];
+      const d = getPropertyDescriptor(e, o, a);
+      if (d.get) continue;
+      c = o && a in o ? o[a] : e[a];
+      if (t && isWrappable(c)) wrap(c, i);
+      if ((f = snapshotImpl(c, t, n, r)) !== e[a] || u) {
+        if (!u) {
+          u = Object.create(Object.getPrototypeOf(e));
+          Object.assign(u, e);
         }
-        o[l] = u;
+        u[a] = f;
       }
     }
   }
-  return o || e;
+  return u || e;
+}
+function snapshot(e, t, n) {
+  return snapshotImpl(e, false, t, n);
+}
+function deep(e) {
+  return snapshotImpl(e, true);
 }
 function trueFn() {
   return true;
 }
-const pe = {
+const ae = {
   get(e, t, n) {
-    if (t === J) return n;
+    if (t === U) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === J) return true;
+    if (t === U) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -2391,15 +2392,15 @@ const pe = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const he = Symbol(0);
+const de = 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 && J in i);
-    const s = !!i && i[he];
+    t = t || (!!i && U in i);
+    const s = !!i && i[de];
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
@@ -2407,7 +2408,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === he) return n;
+          if (e === de) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -2425,7 +2426,7 @@ function merge(...e) {
           return [...new Set(e)];
         }
       },
-      pe
+      ae
     );
   }
   const r = Object.create(null);
@@ -2457,12 +2458,12 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[he] = n;
+  o[de] = n;
   return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (b && J in e) {
+  if (b && U in e) {
     return new Proxy(
       {
         get(t) {
@@ -2475,7 +2476,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !n.has(e));
         }
       },
-      pe
+      ae
     );
   }
   const r = {};
@@ -2495,217 +2496,214 @@ function mapArray(e, t, n) {
   const s = t;
   return createMemo(
     updateKeyedMap.bind({
-      De: createOwner(),
-      Be: 0,
-      Ge: e,
-      Ke: [],
-      ze: s,
+      Ve: createOwner(),
+      De: 0,
+      Be: e,
+      Ge: [],
+      Ke: s,
+      ze: [],
       Ue: [],
-      Je: [],
-      Xe: r,
-      Ye: r || n?.keyed === false ? [] : undefined,
-      Ze: i ? [] : undefined,
-      $e: n?.fallback
+      Je: r,
+      Xe: r || n?.keyed === false ? [] : undefined,
+      Ye: i ? [] : undefined,
+      Ze: n?.fallback
     })
   );
 }
-const ye = { pureWrite: true };
+const pe = { pureWrite: true };
 function updateKeyedMap() {
-  const e = this.Ge() || [],
+  const e = this.Be() || [],
     t = e.length;
   e[K];
-  runWithOwner(this.De, () => {
+  runWithOwner(this.Ve, () => {
     let n,
       r,
-      i = this.Ye
+      i = this.Xe
         ? () => {
-            this.Ye[r] = signal(e[r], ye);
-            this.Ze && (this.Ze[r] = signal(r, ye));
-            return this.ze(
-              read.bind(null, this.Ye[r]),
-              this.Ze ? read.bind(null, this.Ze[r]) : undefined
-            );
+            this.Xe[r] = signal(e[r], pe);
+            this.Ye && (this.Ye[r] = signal(r, pe));
+            return this.Ke(accessor(this.Xe[r]), this.Ye ? accessor(this.Ye[r]) : undefined);
           }
-        : this.Ze
+        : this.Ye
           ? () => {
               const t = e[r];
-              this.Ze[r] = signal(r, ye);
-              return this.ze(() => t, read.bind(null, this.Ze[r]));
+              this.Ye[r] = signal(r, pe);
+              return this.Ke(() => t, accessor(this.Ye[r]));
             }
           : () => {
               const t = e[r];
-              return this.ze(() => t);
+              return this.Ke(() => t);
             };
     if (t === 0) {
-      if (this.Be !== 0) {
-        this.De.dispose(false);
-        this.Je = [];
-        this.Ke = [];
+      if (this.De !== 0) {
+        this.Ve.dispose(false);
         this.Ue = [];
-        this.Be = 0;
+        this.Ge = [];
+        this.ze = [];
+        this.De = 0;
+        this.Xe && (this.Xe = []);
         this.Ye && (this.Ye = []);
-        this.Ze && (this.Ze = []);
       }
-      if (this.$e && !this.Ue[0]) {
-        this.Ue[0] = runWithOwner((this.Je[0] = createOwner()), this.$e);
+      if (this.Ze && !this.ze[0]) {
+        this.ze[0] = runWithOwner((this.Ue[0] = createOwner()), this.Ze);
       }
-    } else if (this.Be === 0) {
-      if (this.Je[0]) this.Je[0].dispose();
-      this.Ue = new Array(t);
+    } else if (this.De === 0) {
+      if (this.Ue[0]) this.Ue[0].dispose();
+      this.ze = new Array(t);
       for (r = 0; r < t; r++) {
-        this.Ke[r] = e[r];
-        this.Ue[r] = runWithOwner((this.Je[r] = createOwner()), i);
+        this.Ge[r] = e[r];
+        this.ze[r] = runWithOwner((this.Ue[r] = createOwner()), i);
       }
-      this.Be = t;
+      this.De = t;
     } else {
       let s,
         o,
         u,
         f,
-        l,
         c,
+        l,
         a,
         d = new Array(t),
         p = new Array(t),
-        h = this.Ye ? new Array(t) : undefined,
-        y = this.Ze ? new Array(t) : undefined;
+        h = this.Xe ? new Array(t) : undefined,
+        y = this.Ye ? new Array(t) : undefined;
       for (
-        s = 0, o = Math.min(this.Be, t);
-        s < o && (this.Ke[s] === e[s] || (this.Ye && compare(this.Xe, this.Ke[s], e[s])));
+        s = 0, o = Math.min(this.De, t);
+        s < o && (this.Ge[s] === e[s] || (this.Xe && compare(this.Je, this.Ge[s], e[s])));
         s++
       ) {
-        if (this.Ye) setSignal(this.Ye[s], e[s]);
+        if (this.Xe) setSignal(this.Xe[s], e[s]);
       }
       for (
-        o = this.Be - 1, u = t - 1;
+        o = this.De - 1, u = t - 1;
         o >= s &&
         u >= s &&
-        (this.Ke[o] === e[u] || (this.Ye && compare(this.Xe, this.Ke[o], e[u])));
+        (this.Ge[o] === e[u] || (this.Xe && compare(this.Je, this.Ge[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.Ue[o];
-        p[u] = this.Je[o];
-        h && (h[u] = this.Ye[o]);
-        y && (y[u] = this.Ze[o]);
+        d[u] = this.ze[o];
+        p[u] = this.Ue[o];
+        h && (h[u] = this.Xe[o]);
+        y && (y[u] = this.Ye[o]);
       }
-      c = new Map();
+      l = new Map();
       a = new Array(u + 1);
       for (r = u; r >= s; r--) {
         f = e[r];
-        l = this.Xe ? this.Xe(f) : f;
-        n = c.get(l);
+        c = this.Je ? this.Je(f) : f;
+        n = l.get(c);
         a[r] = n === undefined ? -1 : n;
-        c.set(l, r);
+        l.set(c, r);
       }
       for (n = s; n <= o; n++) {
-        f = this.Ke[n];
-        l = this.Xe ? this.Xe(f) : f;
-        r = c.get(l);
+        f = this.Ge[n];
+        c = this.Je ? this.Je(f) : f;
+        r = l.get(c);
         if (r !== undefined && r !== -1) {
-          d[r] = this.Ue[n];
-          p[r] = this.Je[n];
-          h && (h[r] = this.Ye[n]);
-          y && (y[r] = this.Ze[n]);
+          d[r] = this.ze[n];
+          p[r] = this.Ue[n];
+          h && (h[r] = this.Xe[n]);
+          y && (y[r] = this.Ye[n]);
           r = a[r];
-          c.set(l, r);
-        } else this.Je[n].dispose();
+          l.set(c, r);
+        } else this.Ue[n].dispose();
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.Ue[r] = d[r];
-          this.Je[r] = p[r];
+          this.ze[r] = d[r];
+          this.Ue[r] = p[r];
           if (h) {
-            this.Ye[r] = h[r];
-            setSignal(this.Ye[r], e[r]);
+            this.Xe[r] = h[r];
+            setSignal(this.Xe[r], e[r]);
           }
           if (y) {
-            this.Ze[r] = y[r];
-            setSignal(this.Ze[r], r);
+            this.Ye[r] = y[r];
+            setSignal(this.Ye[r], r);
           }
         } else {
-          this.Ue[r] = runWithOwner((this.Je[r] = createOwner()), i);
+          this.ze[r] = runWithOwner((this.Ue[r] = createOwner()), i);
         }
       }
-      this.Ue = this.Ue.slice(0, (this.Be = t));
-      this.Ke = e.slice(0);
+      this.ze = this.ze.slice(0, (this.De = t));
+      this.Ge = e.slice(0);
     }
   });
-  return this.Ue;
+  return this.ze;
 }
 function repeat(e, t, n) {
   const r = t;
   return updateRepeat.bind({
-    De: createOwner(),
-    Be: 0,
-    et: 0,
-    tt: e,
-    ze: r,
-    Je: [],
+    Ve: createOwner(),
+    De: 0,
+    $e: 0,
+    et: e,
+    Ke: r,
     Ue: [],
-    nt: n?.from,
-    $e: n?.fallback
+    ze: [],
+    tt: n?.from,
+    Ze: n?.fallback
   });
 }
 function updateRepeat() {
-  const e = this.tt();
-  const t = this.nt?.() || 0;
-  runWithOwner(this.De, () => {
+  const e = this.et();
+  const t = this.tt?.() || 0;
+  runWithOwner(this.Ve, () => {
     if (e === 0) {
-      if (this.Be !== 0) {
-        this.De.dispose(false);
-        this.Je = [];
+      if (this.De !== 0) {
+        this.Ve.dispose(false);
         this.Ue = [];
-        this.Be = 0;
+        this.ze = [];
+        this.De = 0;
       }
-      if (this.$e && !this.Ue[0]) {
-        this.Ue[0] = runWithOwner((this.Je[0] = createOwner()), this.$e);
+      if (this.Ze && !this.ze[0]) {
+        this.ze[0] = runWithOwner((this.Ue[0] = createOwner()), this.Ze);
       }
       return;
     }
     const n = t + e;
-    const r = this.et + this.Be;
-    if (this.Be === 0 && this.Je[0]) this.Je[0].dispose();
-    for (let e = n; e < r; e++) this.Je[e - this.et].dispose();
-    if (this.et < t) {
-      let e = this.et;
-      while (e < t && e < this.Be) this.Je[e++].dispose();
-      this.Je.splice(0, t - this.et);
-      this.Ue.splice(0, t - this.et);
-    } else if (this.et > t) {
-      let n = r - this.et - 1;
-      let i = this.et - t;
-      this.Je.length = this.Ue.length = e;
+    const r = this.$e + this.De;
+    if (this.De === 0 && this.Ue[0]) this.Ue[0].dispose();
+    for (let e = n; e < r; e++) this.Ue[e - this.$e].dispose();
+    if (this.$e < t) {
+      let e = this.$e;
+      while (e < t && e < this.De) this.Ue[e++].dispose();
+      this.Ue.splice(0, t - this.$e);
+      this.ze.splice(0, t - this.$e);
+    } else if (this.$e > t) {
+      let n = r - this.$e - 1;
+      let i = this.$e - t;
+      this.Ue.length = this.ze.length = e;
       while (n >= i) {
-        this.Je[n] = this.Je[n - i];
         this.Ue[n] = this.Ue[n - i];
+        this.ze[n] = this.ze[n - i];
         n--;
       }
       for (let e = 0; e < i; e++) {
-        this.Ue[e] = runWithOwner((this.Je[e] = createOwner()), () => this.ze(e + t));
+        this.ze[e] = runWithOwner((this.Ue[e] = createOwner()), () => this.Ke(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.Ue[e - t] = runWithOwner((this.Je[e - t] = createOwner()), () => this.ze(e));
+      this.ze[e - t] = runWithOwner((this.Ue[e - t] = createOwner()), () => this.Ke(e));
     }
-    this.Ue = this.Ue.slice(0, e);
-    this.et = t;
-    this.Be = e;
+    this.ze = this.ze.slice(0, e);
+    this.$e = t;
+    this.De = e;
   });
-  return this.Ue;
+  return this.ze;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, { lazy: true });
-  n.Oe = (e, t) => {
+  n._e = (e, t) => {
     const r = e !== undefined ? e : n.de;
     const i = t !== undefined ? t : n.Y;
-    n.de &= ~n.rt;
-    n.fe.notify(n, n.rt, r, i);
+    n.de &= ~n.nt;
+    n.fe.notify(n, n.nt, r, i);
   };
-  n.rt = t;
-  n.ke = true;
+  n.nt = t;
+  n.ve = true;
   recompute(n, true);
   return n;
 }
@@ -2718,64 +2716,90 @@ function createBoundChildren(e, t, n, r) {
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
   });
 }
+const he = Symbol();
 class CollectionQueue extends Queue {
-  it;
-  st = new Set();
-  ot = signal(false, { pureWrite: true });
-  ut = false;
+  rt;
+  it = new Set();
+  st = signal(false, { pureWrite: true });
+  ot = false;
+  ut;
+  ft = he;
   constructor(e) {
     super();
-    this.it = e;
+    this.rt = e;
   }
   run(e) {
-    if (!e || read(this.ot)) return;
+    if (!e || read(this.st)) return;
     return super.run(e);
   }
   notify(e, t, n, r) {
-    if (!(t & this.it) || (this.it & a && this.ut)) return super.notify(e, t, n, r);
-    if (n & this.it) {
+    if (!(t & this.rt)) return super.notify(e, t, n, r);
+    if (this.ot && this.ut) {
+      const e = untrack(() => {
+        try {
+          return this.ut();
+        } catch {
+          return he;
+        }
+      });
+      if (e !== this.ft) {
+        this.ft = e;
+        this.ot = false;
+        this.it.clear();
+      }
+    }
+    if (this.rt & a && this.ot) return super.notify(e, t, n, r);
+    if (n & this.rt) {
       const t = r?.source || e.Y?.source;
       if (t) {
-        const e = this.st.size === 0;
-        this.st.add(t);
-        if (e) setSignal(this.ot, true);
+        const e = this.it.size === 0;
+        this.it.add(t);
+        if (e) setSignal(this.st, true);
       }
     }
-    t &= ~this.it;
+    t &= ~this.rt;
     return t ? super.notify(e, t, n, r) : true;
   }
   checkSources() {
-    for (const e of this.st) {
-      if (!(e.de & this.it)) this.st.delete(e);
+    for (const e of this.it) {
+      if (!(e.de & this.rt)) this.it.delete(e);
+    }
+    if (!this.it.size) {
+      setSignal(this.st, false);
+      if (this.ut) {
+        try {
+          this.ft = untrack(() => this.ut());
+        } catch {}
+      }
     }
-    if (!this.st.size) setSignal(this.ot, false);
   }
 }
-function createCollectionBoundary(e, t, n) {
-  const r = createOwner();
-  const i = new CollectionQueue(e);
-  const s = createBoundChildren(r, t, i, e);
-  const o = computed(() => {
-    if (!read(i.ot)) {
-      const e = read(s);
-      if (!untrack(() => read(i.ot))) {
-        i.ut = true;
+function createCollectionBoundary(e, t, n, r) {
+  const i = createOwner();
+  const s = new CollectionQueue(e);
+  if (r) s.ut = r;
+  const o = createBoundChildren(i, t, s, e);
+  const u = computed(() => {
+    if (!read(s.st)) {
+      const e = read(o);
+      if (!untrack(() => read(s.st))) {
+        s.ot = true;
         return e;
       }
     }
-    return n(i);
+    return n(s);
   });
-  return read.bind(null, o);
+  return accessor(u);
 }
-function createLoadBoundary(e, t) {
-  return createCollectionBoundary(a, e, () => t());
+function createLoadingBoundary(e, t, n) {
+  return createCollectionBoundary(a, e, () => t(), n?.on);
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(d, e, e => {
-    let n = e.st.values().next().value;
+    let n = e.it.values().next().value;
     const r = n.Y?.cause ?? n.Y;
     return t(r, () => {
-      for (const t of e.st) recompute(t);
+      for (const t of e.it) recompute(t);
       schedule();
     });
   });
@@ -2829,8 +2853,9 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-exports.$PROXY = J;
-exports.$TARGET = U;
+exports.$PROXY = U;
+exports.$REFRESH = O;
+exports.$TARGET = z;
 exports.$TRACK = K;
 exports.ContextNotFoundError = ContextNotFoundError;
 exports.NoOwnerError = NoOwnerError;
@@ -2841,7 +2866,7 @@ exports.clearSnapshots = clearSnapshots;
 exports.createContext = createContext;
 exports.createEffect = createEffect;
 exports.createErrorBoundary = createErrorBoundary;
-exports.createLoadBoundary = createLoadBoundary;
+exports.createLoadingBoundary = createLoadingBoundary;
 exports.createMemo = createMemo;
 exports.createOptimistic = createOptimistic;
 exports.createOptimisticStore = createOptimisticStore;
@@ -2854,6 +2879,8 @@ exports.createSignal = createSignal;
 exports.createStore = createStore;
 exports.createTrackedEffect = createTrackedEffect;
 exports.deep = deep;
+exports.enableExternalSource = enableExternalSource;
+exports.enforceLoadingBoundary = enforceLoadingBoundary;
 exports.flatten = flatten;
 exports.flush = flush;
 exports.getContext = getContext;
@@ -2881,7 +2908,6 @@ exports.resolve = resolve;
 exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
 exports.setSnapshotCapture = setSnapshotCapture;
-exports.setStrictRead = setStrictRead;
 exports.snapshot = snapshot;
-exports.storePath = de;
+exports.storePath = le;
 exports.untrack = untrack;