@solidjs/universal 2.0.0-beta.2 → 2.0.0-beta.3

package/dist/universal.cjs

@@ -72,9 +72,9 @@ function deleteFromHeap(e, t) {
   if (e.T === e) t.l[i] = undefined;else {
     const n = e.S;
     const r = t.l[i];
-    const s = n ?? r;
+    const o = n ?? r;
     if (e === r) t.l[i] = n;else e.T.S = n;
-    s.T = e.T;
+    o.T = e.T;
   }
   e.T = e;
   e.S = undefined;
@@ -96,7 +96,7 @@ function markNode(e, t = REACTIVE_DIRTY) {
     markNode(t.h, REACTIVE_CHECK);
   }
   if (e.A !== null) {
-    for (let t = e.A; t !== null; t = t.P) {
+    for (let t = e.A; t !== null; t = t.N) {
       for (let e = t.I; e !== null; e = e.p) {
         markNode(e.h, REACTIVE_CHECK);
       }
@@ -105,11 +105,11 @@ function markNode(e, t = REACTIVE_DIRTY) {
 }
 function runHeap(e, t) {
   e._ = false;
-  for (e.N = 0; e.N <= e.R; e.N++) {
-    let n = e.l[e.N];
+  for (e.P = 0; e.P <= e.R; e.P++) {
+    let n = e.l[e.P];
     while (n !== undefined) {
       if (n.O & REACTIVE_IN_HEAP) t(n);else adjustHeight(n, e);
-      n = e.l[e.N];
+      n = e.l[e.P];
     }
   }
   e.R = 0;
@@ -118,8 +118,8 @@ function adjustHeight(e, t) {
   deleteFromHeap(e, t);
   let n = e.o;
   for (let t = e.C; t; t = t.D) {
-    const e = t.V;
-    const i = e.m || e;
+    const e = t.m;
+    const i = e.V || e;
     if (i.L && i.o >= n) n = i.o + 1;
   }
   if (e.o !== n) {
@@ -133,13 +133,13 @@ const transitions = new Set();
 const dirtyQueue = {
   l: new Array(2e3).fill(undefined),
   _: false,
-  N: 0,
+  P: 0,
   R: 0
 };
 const zombieQueue = {
   l: new Array(2e3).fill(undefined),
   _: false,
-  N: 0,
+  P: 0,
   R: 0
 };
 let clock = 0;
@@ -163,16 +163,16 @@ function schedule() {
 class Queue {
   i = null;
   G = [[], []];
-  M = [];
+  F = [];
   created = clock;
   addChild(e) {
-    this.M.push(e);
+    this.F.push(e);
     e.i = this;
   }
   removeChild(e) {
-    const t = this.M.indexOf(e);
+    const t = this.F.indexOf(e);
     if (t >= 0) {
-      this.M.splice(t, 1);
+      this.F.splice(t, 1);
       e.i = null;
     }
   }
@@ -186,7 +186,7 @@ class Queue {
       this.G[e - 1] = [];
       runQueue(t, e);
     }
-    for (let t = 0; t < this.M.length; t++) this.M[t].run?.(e);
+    for (let t = 0; t < this.F.length; t++) this.F[t].run?.(e);
   }
   enqueue(e, t) {
     if (e) {
@@ -203,15 +203,15 @@ class Queue {
     e.G[0].push(...this.G[0]);
     e.G[1].push(...this.G[1]);
     this.G = [[], []];
-    for (let t = 0; t < this.M.length; t++) {
-      let n = this.M[t];
-      let i = e.M[t];
+    for (let t = 0; t < this.F.length; t++) {
+      let n = this.F[t];
+      let i = e.F[t];
       if (!i) {
         i = {
           G: [[], []],
-          M: []
+          F: []
         };
-        e.M[t] = i;
+        e.F[t] = i;
       }
       n.stashQueues(i);
     }
@@ -219,21 +219,21 @@ class Queue {
   restoreQueues(e) {
     this.G[0].push(...e.G[0]);
     this.G[1].push(...e.G[1]);
-    for (let t = 0; t < e.M.length; t++) {
-      const n = e.M[t];
-      let i = this.M[t];
+    for (let t = 0; t < e.F.length; t++) {
+      const n = e.F[t];
+      let i = this.F[t];
       if (i) i.restoreQueues(n);
     }
   }
 }
 class GlobalQueue extends Queue {
   H = false;
-  F = [];
+  M = [];
   $ = [];
   j = new Set();
   static K;
   static Y;
-  static Z = null;
+  static B = null;
   flush() {
     if (this.H) return;
     this.H = true;
@@ -244,32 +244,32 @@ class GlobalQueue extends Queue {
         if (!e) {
           let e = activeTransition;
           runHeap(zombieQueue, GlobalQueue.K);
-          this.F = [];
+          this.M = [];
           this.$ = [];
           this.j = new Set();
           runLaneEffects(EFFECT_RENDER);
           runLaneEffects(EFFECT_USER);
-          this.stashQueues(activeTransition.B);
+          this.stashQueues(activeTransition.Z);
           clock++;
-          scheduled = dirtyQueue.R >= dirtyQueue.N;
-          reassignPendingTransition(activeTransition.F);
+          scheduled = dirtyQueue.R >= dirtyQueue.P;
+          reassignPendingTransition(activeTransition.M);
           activeTransition = null;
           finalizePureQueue(null, true);
           return;
         }
-        this.F !== activeTransition.F && this.F.push(...activeTransition.F);
-        this.restoreQueues(activeTransition.B);
+        this.M !== activeTransition.M && this.M.push(...activeTransition.M);
+        this.restoreQueues(activeTransition.Z);
         transitions.delete(activeTransition);
         const t = activeTransition;
         activeTransition = null;
-        reassignPendingTransition(this.F);
+        reassignPendingTransition(this.M);
         finalizePureQueue(t);
       } else {
         if (transitions.size) runHeap(zombieQueue, GlobalQueue.K);
         finalizePureQueue();
       }
       clock++;
-      scheduled = dirtyQueue.R >= dirtyQueue.N;
+      scheduled = dirtyQueue.R >= dirtyQueue.P;
       runLaneEffects(EFFECT_RENDER);
       this.run(EFFECT_RENDER);
       runLaneEffects(EFFECT_USER);
@@ -281,9 +281,9 @@ class GlobalQueue extends Queue {
   notify(e, t, n, i) {
     if (t & STATUS_PENDING) {
       if (n & STATUS_PENDING) {
-        const t = i !== undefined ? i : e.X;
-        if (activeTransition && t && !activeTransition.q.includes(t.source)) {
-          activeTransition.q.push(t.source);
+        const t = i !== undefined ? i : e.q;
+        if (activeTransition && t && !activeTransition.X.includes(t.source)) {
+          activeTransition.X.push(t.source);
           schedule();
         }
       }
@@ -298,14 +298,14 @@ class GlobalQueue extends Queue {
     if (!activeTransition) {
       activeTransition = e ?? {
         J: clock,
-        F: [],
-        q: [],
+        M: [],
+        X: [],
         $: [],
         j: new Set(),
         ee: [],
-        B: {
+        Z: {
           G: [[], []],
-          M: []
+          F: []
         },
         te: false
       };
@@ -325,12 +325,12 @@ class GlobalQueue extends Queue {
     }
     transitions.add(activeTransition);
     activeTransition.J = clock;
-    for (let e = 0; e < this.F.length; e++) {
-      const t = this.F[e];
+    for (let e = 0; e < this.M.length; e++) {
+      const t = this.M[e];
       t.ne = activeTransition;
-      activeTransition.F.push(t);
+      activeTransition.M.push(t);
     }
-    this.F = activeTransition.F;
+    this.M = activeTransition.M;
     for (let e = 0; e < this.$.length; e++) {
       const t = this.$[e];
       t.ne = activeTransition;
@@ -348,7 +348,7 @@ function insertSubs(e, t = false) {
   const n = e.ie || currentOptimisticLane;
   const i = e.re !== undefined;
   for (let r = e.I; r !== null; r = r.p) {
-    if (i && r.h.se) {
+    if (i && r.h.oe) {
       r.h.O |= REACTIVE_SNAPSHOT_STALE;
       continue;
     }
@@ -360,48 +360,59 @@ function insertSubs(e, t = false) {
       r.h.ie = undefined;
     }
     const e = r.h;
-    if (e.oe === EFFECT_TRACKED) {
+    if (e.se === EFFECT_TRACKED) {
       if (!e.ue) {
         e.ue = true;
-        e.ce.enqueue(EFFECT_USER, e.le);
+        e.ce.enqueue(EFFECT_USER, e.ae);
       }
       continue;
     }
-    const s = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
-    if (s.N > r.h.o) s.N = r.h.o;
-    insertIntoHeap(r.h, s);
+    const o = r.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue;
+    if (o.P > r.h.o) o.P = r.h.o;
+    insertIntoHeap(r.h, o);
+  }
+}
+function commitPendingNodes() {
+  const e = globalQueue.M;
+  for (let t = 0; t < e.length; t++) {
+    const n = e[t];
+    if (n.le !== NOT_PENDING) {
+      n.fe = n.le;
+      n.le = NOT_PENDING;
+      if (n.se && n.se !== EFFECT_TRACKED) n.ue = true;
+    }
+    if (n.Ee & STATUS_PENDING) {
+      const e = n.q?.source;
+      if (e && !(e.Ee & STATUS_PENDING)) {
+        n.Ee &= -6;
+        n.q = null;
+      }
+    } else n.Ee &= ~STATUS_UNINITIALIZED;
+    if (n.L) GlobalQueue.Y(n, false, true);
   }
+  e.length = 0;
 }
 function finalizePureQueue(e = null, t = false) {
   let n = !t;
+  if (n) commitPendingNodes();
   if (!t) checkBoundaryChildren(globalQueue);
-  if (dirtyQueue.R >= dirtyQueue.N) runHeap(dirtyQueue, GlobalQueue.K);
+  if (dirtyQueue.R >= dirtyQueue.P) runHeap(dirtyQueue, GlobalQueue.K);
   if (n) {
-    const t = globalQueue.F;
+    commitPendingNodes();
+    const t = e ? e.$ : globalQueue.$;
     for (let e = 0; e < t.length; e++) {
       const n = t[e];
-      if (n.ae !== NOT_PENDING) {
-        n.fe = n.ae;
-        n.ae = NOT_PENDING;
-        if (n.oe && n.oe !== EFFECT_TRACKED) n.ue = true;
+      n.ie = undefined;
+      if (n.le !== NOT_PENDING) {
+        n.fe = n.le;
+        n.le = NOT_PENDING;
       }
-      if (!(n.Ee & STATUS_PENDING)) n.Ee &= ~STATUS_UNINITIALIZED;
-      if (n.L) GlobalQueue.Y(n, false, true);
+      const i = n.Te;
+      n.Te = NOT_PENDING;
+      if (i !== NOT_PENDING && n.fe !== i) insertSubs(n, true);
+      n.ne = null;
     }
     t.length = 0;
-    const n = e ? e.$ : globalQueue.$;
-    for (let e = 0; e < n.length; e++) {
-      const t = n[e];
-      const i = t.ae;
-      t.ie = undefined;
-      if (i !== NOT_PENDING && t.fe !== i) {
-        t.fe = i;
-        insertSubs(t, true);
-      }
-      t.ae = NOT_PENDING;
-      t.ne = null;
-    }
-    n.length = 0;
     e ? e.j : globalQueue.j;
     for (const t of activeLanes) {
       const n = e ? t.ne === e : !t.ne;
@@ -410,17 +421,17 @@ function finalizePureQueue(e = null, t = false) {
         if (t.W[0].length) runQueue(t.W[0], EFFECT_RENDER);
         if (t.W[1].length) runQueue(t.W[1], EFFECT_USER);
       }
-      if (t.Te.ie === t) t.Te.ie = undefined;
+      if (t.de.ie === t) t.de.ie = undefined;
       t.U.clear();
       t.W[0].length = 0;
       t.W[1].length = 0;
       activeLanes.delete(t);
-      signalLanes.delete(t.Te);
+      signalLanes.delete(t.de);
     }
   }
 }
 function checkBoundaryChildren(e) {
-  for (const t of e.M) {
+  for (const t of e.F) {
     t.checkSources?.();
     checkBoundaryChildren(t);
   }
@@ -443,9 +454,9 @@ function transitionComplete(e) {
   if (e.te) return true;
   if (e.ee.length) return false;
   let t = true;
-  for (let n = 0; n < e.q.length; n++) {
-    const i = e.q[n];
-    if (i.Ee & STATUS_PENDING && i.X?.source === i) {
+  for (let n = 0; n < e.X.length; n++) {
+    const i = e.X[n];
+    if (i.Ee & STATUS_PENDING && i.q?.source === i) {
       t = false;
       break;
     }
@@ -473,19 +484,19 @@ function getOrCreateLane(e) {
   if (t) {
     return findLane(t);
   }
-  const n = e.de;
+  const n = e.Se;
   const i = n?.ie ? findLane(n.ie) : null;
   t = {
-    Te: e,
+    de: e,
     U: new Set(),
     W: [[], []],
     k: null,
     ne: activeTransition,
-    Se: i
+    Re: i
   };
   signalLanes.set(e, t);
   activeLanes.add(t);
-  e.Re = e.Oe || 0;
+  e.Oe = false;
   return t;
 }
 function findLane(e) {
@@ -511,7 +522,7 @@ function resolveLane(e) {
   return undefined;
 }
 function hasActiveOverride(e) {
-  return !!(e._e && e.ae !== NOT_PENDING);
+  return !!(e.Te !== undefined && e.Te !== NOT_PENDING);
 }
 function assignOrMergeLane(e, t) {
   const n = findLane(t);
@@ -524,9 +535,9 @@ function assignOrMergeLane(e, t) {
     const r = findLane(i);
     if (activeLanes.has(r)) {
       if (r !== n && !hasActiveOverride(e)) {
-        if (n.Se && findLane(n.Se) === r) {
+        if (n.Re && findLane(n.Re) === r) {
           e.ie = t;
-        } else if (r.Se && findLane(r.Se) === n) ;else mergeLanes(n, r);
+        } else if (r.Re && findLane(r.Re) === n) ;else mergeLanes(n, r);
       }
       return;
     }
@@ -536,42 +547,40 @@ function assignOrMergeLane(e, t) {
 function handleAsync(e, t, n) {
   const i = typeof t === "object" && t !== null;
   const r = i && untrack(() => t[Symbol.asyncIterator]);
-  const s = !r && i && untrack(() => typeof t.then === "function");
-  if (!s && !r) {
-    e.Ie = null;
+  const o = !r && i && untrack(() => typeof t.then === "function");
+  if (!o && !r) {
+    e._e = null;
     return t;
   }
-  e.Ie = t;
-  let o;
+  e._e = t;
+  let s;
   const handleError = n => {
-    if (e.Ie !== t) return;
+    if (e._e !== t) return;
     globalQueue.initTransition(e.ne);
     notifyStatus(e, n instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, n);
     e.J = clock;
   };
   const asyncWrite = (i, r) => {
-    if (e.Ie !== t) return;
+    if (e._e !== t) return;
     if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY)) return;
     globalQueue.initTransition(e.ne);
     clearStatus(e);
-    const s = resolveLane(e);
-    if (s) s.U.delete(e);
-    if (e._e) {
-      const t = e.ae !== NOT_PENDING;
-      if (e.L) e.ae = i;
-      if (!t) {
+    const o = resolveLane(e);
+    if (o) o.U.delete(e);
+    if (e.Te !== undefined) {
+      if (e.Te !== undefined && e.Te !== NOT_PENDING) e.le = i;else {
         e.fe = i;
         insertSubs(e);
       }
       e.J = clock;
-    } else if (s) {
+    } else if (o) {
       const t = e.fe;
-      const n = e.pe;
+      const n = e.Ie;
       if (!n || !n(i, t)) {
         e.fe = i;
         e.J = clock;
-        if (e.he) {
-          setSignal(e.he, i);
+        if (e.pe) {
+          setSignal(e.pe, i);
         }
         insertSubs(e, true);
       }
@@ -582,12 +591,12 @@ function handleAsync(e, t, n) {
     flush();
     r?.();
   };
-  if (s) {
+  if (o) {
     let n = false,
       i = true;
     t.then(e => {
       if (i) {
-        o = e;
+        s = e;
         n = true;
       } else asyncWrite(e);
     }, e => {
@@ -619,7 +628,7 @@ function handleAsync(e, t, n) {
       });
       r = false;
       if (t && !e.done) {
-        o = e.value;
+        s = e.value;
         i = true;
         return iterate();
       }
@@ -631,22 +640,22 @@ function handleAsync(e, t, n) {
       throw new NotReadyError(context);
     }
   }
-  return o;
+  return s;
 }
 function clearStatus(e) {
   e.Ee = e.Ee & STATUS_UNINITIALIZED;
-  e.X = null;
+  e.q = null;
   updatePendingSignal(e);
-  e.Ae?.();
+  e.he?.();
 }
 function notifyStatus(e, t, n, i, r) {
   if (t === STATUS_ERROR && !(n instanceof StatusError) && !(n instanceof NotReadyError)) n = new StatusError(e, n);
-  const s = n instanceof NotReadyError && n.source === e;
-  const o = t === STATUS_PENDING && e._e && !s;
-  const u = o && hasActiveOverride(e);
+  const o = n instanceof NotReadyError && n.source === e;
+  const s = t === STATUS_PENDING && e.Te !== undefined && !o;
+  const u = s && hasActiveOverride(e);
   if (!i) {
     e.Ee = t | (t !== STATUS_ERROR ? e.Ee & STATUS_UNINITIALIZED : 0);
-    e.X = n;
+    e.q = n;
     updatePendingSignal(e);
   }
   if (r && !i) {
@@ -654,48 +663,48 @@ function notifyStatus(e, t, n, i, r) {
   }
   if (u && activeTransition && n instanceof NotReadyError) {
     const e = n.source;
-    if (!activeTransition.q.includes(e)) {
-      activeTransition.q.push(e);
+    if (!activeTransition.X.includes(e)) {
+      activeTransition.X.push(e);
     }
   }
   const c = i || u;
-  const l = i || o ? undefined : r;
-  if (e.Ae) {
+  const a = i || s ? undefined : r;
+  if (e.he) {
     if (c) {
-      e.Ae(t, n);
+      e.he(t, n);
     } else {
-      e.Ae();
+      e.he();
     }
     return;
   }
   for (let i = e.I; i !== null; i = i.p) {
     i.h.J = clock;
-    if (i.h.X !== n) {
-      !i.h.ne && globalQueue.F.push(i.h);
-      notifyStatus(i.h, t, n, c, l);
+    if (i.h.q !== n) {
+      !i.h.ne && globalQueue.M.push(i.h);
+      notifyStatus(i.h, t, n, c, a);
     }
   }
-  for (let i = e.A; i !== null; i = i.P) {
+  for (let i = e.A; i !== null; i = i.N) {
     for (let e = i.I; e !== null; e = e.p) {
       e.h.J = clock;
-      if (e.h.X !== n) {
-        !e.h.ne && globalQueue.F.push(e.h);
-        notifyStatus(e.h, t, n, c, l);
+      if (e.h.q !== n) {
+        !e.h.ne && globalQueue.M.push(e.h);
+        notifyStatus(e.h, t, n, c, a);
       }
     }
   }
 }
 function unlinkSubs(e) {
-  const t = e.V;
+  const t = e.m;
   const n = e.D;
   const i = e.p;
-  const r = e.Pe;
-  if (i !== null) i.Pe = r;else t.Ne = r;
+  const r = e.Ae;
+  if (i !== null) i.Ae = r;else t.Ne = r;
   if (r !== null) r.p = i;else {
     t.I = i;
     if (i === null) {
       t.ge?.();
-      t.L && !t.Ce && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
+      t.L && !t.Pe && !(t.O & REACTIVE_ZOMBIE) && unobserved(t);
     }
   }
   return n;
@@ -710,31 +719,31 @@ function unobserved(e) {
   disposeChildren(e, true);
 }
 function link(e, t) {
-  const n = t.ye;
-  if (n !== null && n.V === e) return;
+  const n = t.Ce;
+  if (n !== null && n.m === e) return;
   let i = null;
   const r = t.O & REACTIVE_RECOMPUTING_DEPS;
   if (r) {
     i = n !== null ? n.D : t.C;
-    if (i !== null && i.V === e) {
-      t.ye = i;
+    if (i !== null && i.m === e) {
+      t.Ce = i;
       return;
     }
   }
-  const s = e.Ne;
-  if (s !== null && s.h === t && (!r || isValidLink(s, t))) return;
-  const o = t.ye = e.Ne = {
-    V: e,
+  const o = e.Ne;
+  if (o !== null && o.h === t && (!r || isValidLink(o, t))) return;
+  const s = t.Ce = e.Ne = {
+    m: e,
     h: t,
     D: i,
-    Pe: s,
+    Ae: o,
     p: null
   };
-  if (n !== null) n.D = o;else t.C = o;
-  if (s !== null) s.p = o;else e.I = o;
+  if (n !== null) n.D = s;else t.C = s;
+  if (o !== null) o.p = s;else e.I = s;
 }
 function isValidLink(e, t) {
-  const n = t.ye;
+  const n = t.Ce;
   if (n !== null) {
     let i = t.C;
     do {
@@ -754,15 +763,15 @@ function markDisposal(e) {
       insertIntoHeap(t, zombieQueue);
     }
     markDisposal(t);
-    t = t.ve;
+    t = t.ye;
   }
 }
 function disposeChildren(e, t = false, n) {
   if (e.O & REACTIVE_DISPOSED) return;
   if (t) e.O = REACTIVE_DISPOSED;
-  let i = n ? e.be : e.De;
+  let i = n ? e.ve : e.De;
   while (i) {
-    const e = i.ve;
+    const e = i.ye;
     if (i.C) {
       const e = i;
       deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
@@ -771,22 +780,21 @@ function disposeChildren(e, t = false, n) {
         t = unlinkSubs(t);
       } while (t !== null);
       e.C = null;
-      e.ye = null;
+      e.Ce = null;
     }
     disposeChildren(i, true);
     i = e;
   }
   if (n) {
-    e.be = null;
+    e.ve = null;
   } else {
     e.De = null;
-    e.ve = null;
     e.we = 0;
   }
   runDisposal(e, n);
 }
 function runDisposal(e, t) {
-  let n = t ? e.Ve : e.me;
+  let n = t ? e.be : e.me;
   if (!n) return;
   if (Array.isArray(n)) {
     for (let e = 0; e < n.length; e++) {
@@ -796,8 +804,9 @@ function runDisposal(e, t) {
   } else {
     n.call(n);
   }
-  t ? e.Ve = null : e.me = null;
+  t ? e.be = null : e.me = null;
 }
+let externalSourceConfig = null;
 GlobalQueue.K = recompute;
 GlobalQueue.Y = disposeChildren;
 let tracking = false;
@@ -805,31 +814,31 @@ let stale = false;
 let context = null;
 let currentOptimisticLane = null;
 function recompute(e, t = false) {
-  const n = e.oe;
+  const n = e.se;
   if (!t) {
     if (e.ne && (!n || activeTransition) && activeTransition !== e.ne) globalQueue.initTransition(e.ne);
     deleteFromHeap(e, e.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
     if (e.ne || n === EFFECT_TRACKED) disposeChildren(e);else {
       markDisposal(e);
-      e.Ve = e.me;
-      e.be = e.De;
+      e.be = e.me;
+      e.ve = e.De;
       e.me = null;
       e.De = null;
       e.we = 0;
     }
   }
   const i = !!(e.O & REACTIVE_OPTIMISTIC_DIRTY);
-  const r = hasActiveOverride(e);
-  const s = !!(e.Ee & STATUS_PENDING);
-  const o = context;
+  const r = e.Te !== undefined && e.Te !== NOT_PENDING;
+  const o = !!(e.Ee & STATUS_PENDING);
+  const s = context;
   context = e;
-  e.ye = null;
+  e.Ce = null;
   e.O = REACTIVE_RECOMPUTING_DEPS;
   e.J = clock;
-  let u = e.ae === NOT_PENDING ? e.fe : e.ae;
+  let u = e.le === NOT_PENDING ? e.fe : e.le;
   let c = e.o;
-  let l = tracking;
-  let a = currentOptimisticLane;
+  let a = tracking;
+  let l = currentOptimisticLane;
   tracking = true;
   if (i) {
     const t = resolveLane(e);
@@ -841,62 +850,62 @@ function recompute(e, t = false) {
     const t = resolveLane(e);
     if (t) {
       t.U.delete(e);
-      updatePendingSignal(t.Te);
+      updatePendingSignal(t.de);
     }
   } catch (t) {
     if (t instanceof NotReadyError && currentOptimisticLane) {
       const t = findLane(currentOptimisticLane);
-      if (t.Te !== e) {
+      if (t.de !== e) {
         t.U.add(e);
         e.ie = t;
-        updatePendingSignal(t.Te);
+        updatePendingSignal(t.de);
       }
     }
     notifyStatus(e, t instanceof NotReadyError ? STATUS_PENDING : STATUS_ERROR, t, undefined, t instanceof NotReadyError ? e.ie : undefined);
   } finally {
-    tracking = l;
+    tracking = a;
     e.O = REACTIVE_NONE | (t ? e.O & REACTIVE_SNAPSHOT_STALE : 0);
-    context = o;
+    context = s;
   }
-  if (!e.X) {
-    const o = e.ye;
-    let l = o !== null ? o.D : e.C;
-    if (l !== null) {
+  if (!e.q) {
+    const s = e.Ce;
+    let a = s !== null ? s.D : e.C;
+    if (a !== null) {
       do {
-        l = unlinkSubs(l);
-      } while (l !== null);
-      if (o !== null) o.D = null;else e.C = null;
+        a = unlinkSubs(a);
+      } while (a !== null);
+      if (s !== null) s.D = null;else e.C = null;
     }
-    const a = r ? e.fe : e.ae === NOT_PENDING ? e.fe : e.ae;
-    const f = !e.pe || !e.pe(a, u);
+    const l = r ? e.Te : e.le === NOT_PENDING ? e.fe : e.le;
+    const f = !e.Ie || !e.Ie(l, u);
     if (f) {
-      const o = r ? e.fe : undefined;
-      if (t || n && activeTransition !== e.ne || i) e.fe = u;else e.ae = u;
-      if (r && !i && s) {
-        const t = e.Oe || 0;
-        const n = e.Re || 0;
-        if (t <= n) e.fe = u;
-      }
-      if (!r || i || e.fe !== o) {
-        insertSubs(e, i || r);
-      }
+      const s = r ? e.Te : undefined;
+      if (t || n && activeTransition !== e.ne || i) {
+        e.fe = u;
+        if (r && i) {
+          e.Te = u;
+          e.le = u;
+        }
+      } else e.le = u;
+      if (r && !i && o && !e.Oe) e.Te = u;
+      if (!r || i || e.Te !== s) insertSubs(e, i || r);
     } else if (r) {
-      e.ae = u;
+      e.le = u;
     } else if (e.o != c) {
       for (let t = e.I; t !== null; t = t.p) {
         insertIntoHeapHeight(t.h, t.h.O & REACTIVE_ZOMBIE ? zombieQueue : dirtyQueue);
       }
     }
   }
-  currentOptimisticLane = a;
-  (!t || e.Ee & STATUS_PENDING) && !e.ne && !(activeTransition && e._e) && globalQueue.F.push(e);
+  currentOptimisticLane = l;
+  (!t || e.Ee & STATUS_PENDING) && !e.ne && !(activeTransition && r) && globalQueue.M.push(e);
   e.ne && n && activeTransition !== e.ne && runInTransition(e.ne, () => recompute(e));
 }
 function updateIfNecessary(e) {
   if (e.O & REACTIVE_CHECK) {
     for (let t = e.C; t; t = t.D) {
-      const n = t.V;
-      const i = n.m || n;
+      const n = t.m;
+      const i = n.V || n;
       if (i.L) {
         updateIfNecessary(i);
       }
@@ -905,7 +914,7 @@ function updateIfNecessary(e) {
       }
     }
   }
-  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || e.X && e.J < clock && !e.Ie) {
+  if (e.O & (REACTIVE_DIRTY | REACTIVE_OPTIMISTIC_DIRTY) || e.q && e.J < clock && !e._e) {
     recompute(e);
   }
   e.O = REACTIVE_NONE | e.O & REACTIVE_SNAPSHOT_STALE;
@@ -914,13 +923,13 @@ function computed(e, t, n) {
   const i = n?.transparent;
   const r = {
     id: n?.id ?? (context?.id ),
-    Le: i,
-    pe: n?.equals != null ? n.equals : isEqual,
+    Ve: i,
+    Ie: n?.equals != null ? n.equals : isEqual,
     Ge: !!n?.pureWrite,
     ge: n?.unobserved,
     me: null,
     ce: context?.ce ?? globalQueue,
-    ke: context?.ke ?? defaultContext,
+    Le: context?.Le ?? defaultContext,
     we: 0,
     L: e,
     fe: t,
@@ -929,33 +938,33 @@ function computed(e, t, n) {
     S: undefined,
     T: null,
     C: null,
-    ye: null,
+    Ce: null,
     I: null,
     Ne: null,
     i: context,
-    ve: null,
+    ye: null,
     De: null,
     O: n?.lazy ? REACTIVE_LAZY : REACTIVE_NONE,
     Ee: STATUS_UNINITIALIZED,
     J: clock,
-    ae: NOT_PENDING,
-    Ve: null,
+    le: NOT_PENDING,
     be: null,
-    Ie: null,
+    ve: null,
+    _e: null,
     ne: null
   };
   r.T = r;
-  const s = context?.t ? context.u : context;
+  const o = context?.t ? context.u : context;
   if (context) {
     const e = context.De;
     if (e === null) {
       context.De = r;
     } else {
-      r.ve = e;
+      r.ye = e;
       context.De = r;
     }
   }
-  if (s) r.o = s.o + 1;
+  if (o) r.o = o.o + 1;
   !n?.lazy && recompute(r, true);
   return r;
 }
@@ -967,6 +976,7 @@ function untrack(e, t) {
   const n = tracking;
   tracking = false;
   try {
+    if (externalSourceConfig) ;
     return e();
   } finally {
     tracking = n;
@@ -979,13 +989,13 @@ function read(e) {
     e.O &= ~REACTIVE_LAZY;
     recompute(e, true);
   }
-  const n = e.m || e;
+  const n = e.V || e;
   if (t && tracking) {
     if (e.L && e.O & REACTIVE_DISPOSED) recompute(e);
     link(e, t);
     if (n.L) {
       const i = e.O & REACTIVE_ZOMBIE;
-      if (n.o >= (i ? zombieQueue.N : dirtyQueue.N)) {
+      if (n.o >= (i ? zombieQueue.P : dirtyQueue.P)) {
         markNode(t);
         markHeap(i ? zombieQueue : dirtyQueue);
         updateIfNecessary(n);
@@ -997,65 +1007,64 @@ function read(e) {
     }
   }
   if (n.Ee & STATUS_PENDING) {
-    if (t && true) {
+    const i = n.q?.source;
+    if (i && !(i.Ee & STATUS_PENDING)) clearStatus(n);else if (t && true) {
       if (currentOptimisticLane) {
         const i = n.ie;
         const r = findLane(currentOptimisticLane);
         if (i && findLane(i) === r && !hasActiveOverride(n)) {
-          if (!tracking) link(e, t);
-          throw n.X;
+          if (!tracking && e !== t) link(e, t);
+          throw n.q;
         }
       } else {
-        if (!tracking) link(e, t);
-        throw n.X;
+        if (!tracking && e !== t) link(e, t);
+        throw n.q;
       }
     } else if (!t && n.Ee & STATUS_UNINITIALIZED) {
-      throw n.X;
+      throw n.q;
     }
   }
   if (e.L && e.Ee & STATUS_ERROR) {
     if (e.J < clock) {
       recompute(e, true);
       return read(e);
-    } else throw e.X;
+    } else throw e.q;
   }
-  return !t || currentOptimisticLane !== null && (e._e || e.ie || n === e || !!(n.Ee & STATUS_PENDING)) || e.ae === NOT_PENDING || stale ? e.fe : e.ae;
+  if (e.Te !== undefined && e.Te !== NOT_PENDING) return e.Te;
+  return !t || currentOptimisticLane !== null && (e.Te !== undefined || e.ie || n === e && stale || !!(n.Ee & STATUS_PENDING)) || e.le === NOT_PENDING || stale ? e.fe : e.le;
 }
 function setSignal(e, t) {
   if (e.ne && activeTransition !== e.ne) globalQueue.initTransition(e.ne);
-  const n = e._e && true;
-  const i = n ? e.fe : e.ae === NOT_PENDING ? e.fe : e.ae;
-  if (typeof t === "function") t = t(i);
-  const r = !e.pe || !e.pe(i, t) || !!(e.Ee & STATUS_UNINITIALIZED);
-  if (!r) {
-    if (n && e.ae !== NOT_PENDING && e.L) {
+  const n = e.Te !== undefined && true;
+  const i = e.Te !== undefined && e.Te !== NOT_PENDING;
+  const r = n ? i ? e.Te : e.fe : e.le === NOT_PENDING ? e.fe : e.le;
+  if (typeof t === "function") t = t(r);
+  const o = !e.Ie || !e.Ie(r, t) || !!(e.Ee & STATUS_UNINITIALIZED);
+  if (!o) {
+    if (n && i && e.L) {
       insertSubs(e, true);
       schedule();
     }
     return t;
   }
   if (n) {
-    const n = globalQueue.$.includes(e);
-    if (e.ne && n) {
-      globalQueue.initTransition(e.ne);
-    }
-    if (e.ae === NOT_PENDING) {
-      e.ae = e.fe;
-    }
-    if (!n) {
+    const n = e.Te === NOT_PENDING;
+    if (!n && e.ne) globalQueue.initTransition(e.ne);
+    if (n) {
+      e.le = e.fe;
       globalQueue.$.push(e);
     }
-    e.Oe = (e.Oe || 0) + 1;
+    e.Oe = true;
     const i = getOrCreateLane(e);
     e.ie = i;
-    e.fe = t;
+    e.Te = t;
   } else {
-    if (e.ae === NOT_PENDING) globalQueue.F.push(e);
-    e.ae = t;
+    if (e.le === NOT_PENDING) globalQueue.M.push(e);
+    e.le = t;
   }
   updatePendingSignal(e);
-  if (e.he) {
-    setSignal(e.he, t);
+  if (e.pe) {
+    setSignal(e.pe, t);
   }
   e.J = clock;
   insertSubs(e, n);
@@ -1064,21 +1073,21 @@ function setSignal(e, t) {
 }
 function computePendingState(e) {
   const t = e;
-  if (e._e && e.ae !== NOT_PENDING) {
+  if (e.Te !== undefined && e.Te !== NOT_PENDING) {
     if (t.Ee & STATUS_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
-    if (e.de) {
+    if (e.Se) {
       const t = e.ie ? findLane(e.ie) : null;
       return !!(t && t.U.size > 0);
     }
     return true;
   }
-  if (e.ae !== NOT_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
+  if (e.le !== NOT_PENDING && !(t.Ee & STATUS_UNINITIALIZED)) return true;
   return !!(t.Ee & STATUS_PENDING && !(t.Ee & STATUS_UNINITIALIZED));
 }
 function updatePendingSignal(e) {
-  if (e.Me) {
+  if (e.Fe) {
     const t = computePendingState(e);
-    const n = e.Me;
+    const n = e.Fe;
     setSignal(n, t);
     if (!t && n.ie) {
       const t = resolveLane(e);
@@ -1093,9 +1102,14 @@ function updatePendingSignal(e) {
     }
   }
 }
+function accessor(e) {
+  const t = read.bind(null, e);
+  t.$r = true;
+  return t;
+}
 function createMemo(e, t, n) {
   let i = computed(e, t, n);
-  return read.bind(null, i);
+  return accessor(i);
 }
 function isWrappable(e) {
   return e != null && typeof e === "object" && !Object.isFrozen(e);
@@ -1106,8 +1120,8 @@ function updatePath(e, t, n = 0) {
     r = e;
   if (n < t.length - 1) {
     i = t[n];
-    const s = typeof i;
-    const o = Array.isArray(e);
+    const o = typeof i;
+    const s = Array.isArray(e);
     if (Array.isArray(i)) {
       for (let r = 0; r < i.length; r++) {
         t[n] = i[r];
@@ -1115,7 +1129,7 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (o && s === "function") {
+    } else if (s && o === "function") {
       for (let r = 0; r < e.length; r++) {
         if (i(e[r], r)) {
           t[n] = r;
@@ -1124,13 +1138,13 @@ function updatePath(e, t, n = 0) {
       }
       t[n] = i;
       return;
-    } else if (o && s === "object") {
+    } else if (s && o === "object") {
       const {
         from: r = 0,
-        to: s = e.length - 1,
-        by: o = 1
+        to: o = e.length - 1,
+        by: s = 1
       } = i;
-      for (let i = r; i <= s; i += o) {
+      for (let i = r; i <= o; i += s) {
         t[n] = i;
         updatePath(e, t, n);
       }
@@ -1142,20 +1156,20 @@ function updatePath(e, t, n = 0) {
     }
     r = e[i];
   }
-  let s = t[t.length - 1];
-  if (typeof s === "function") {
-    s = s(r);
-    if (s === r) return;
+  let o = t[t.length - 1];
+  if (typeof o === "function") {
+    o = o(r);
+    if (o === r) return;
   }
-  if (i === undefined && s == undefined) return;
-  if (s === DELETE) {
+  if (i === undefined && o == undefined) return;
+  if (o === DELETE) {
     delete e[i];
-  } else if (i === undefined || isWrappable(r) && isWrappable(s) && !Array.isArray(s)) {
+  } else if (i === undefined || isWrappable(r) && isWrappable(o) && !Array.isArray(o)) {
     const t = i !== undefined ? e[i] : e;
-    const n = Object.keys(s);
-    for (let e = 0; e < n.length; e++) t[n[e]] = s[n[e]];
+    const n = Object.keys(o);
+    for (let e = 0; e < n.length; e++) t[n[e]] = o[n[e]];
   } else {
-    e[i] = s;
+    e[i] = o;
   }
 }
 Object.assign(function storePath(...e) {