@solidjs/signals 0.8.7 → 0.9.0

package/dist/node.cjs

@@ -319,7 +319,8 @@ let C = false;
 let v = false;
 let N = false;
 let k = null;
-let E = null;
+let j = false;
+let A = null;
 function notifySubs(e) {
   for (let t = e.O; t !== null; t = t.C) {
     const e = t.N.S & o ? S : _;
@@ -341,8 +342,8 @@ function recompute(t, n = false) {
       t.re = null;
     }
   }
-  const s = E;
-  E = t;
+  const s = A;
+  A = t;
   t.ie = null;
   t.S = r;
   t.se = b;
@@ -354,7 +355,7 @@ function recompute(t, n = false) {
   setStatusFlags(t, l | (h & a));
   C = true;
   try {
-    u = t.F(u);
+    u = handleAsync(t, t.F(u));
     t.$ &= ~a;
   } catch (e) {
     if (e instanceof NotReadyError) {
@@ -365,7 +366,7 @@ function recompute(t, n = false) {
     C = g;
   }
   t.S = e;
-  E = s;
+  A = s;
   if (!(t.$ & f)) {
     const e = t.ie;
     let n = e !== null ? e.P : t.W;
@@ -399,6 +400,53 @@ function recompute(t, n = false) {
   if ((!n || t.$ & f) && !t.ue && !t.J) O.M.push(t);
   if (t.J && i) runInTransition(t, recompute);
 }
+function handleAsync(e, t, n) {
+  const r = typeof t === "object" && t !== null;
+  const i = r && t instanceof Promise;
+  const s = r && untrack(() => t[Symbol.asyncIterator]);
+  if (!i && !s) {
+    e.fe = null;
+    return t;
+  }
+  e.fe = t;
+  if (i) {
+    t.then(r => {
+      if (e.fe !== t) return;
+      O.initTransition(e);
+      n?.(r) ?? setSignal(e, () => r);
+      flush();
+    }).catch(n => {
+      if (e.fe !== t) return;
+      O.initTransition(e);
+      setStatusFlags(e, c, n);
+      e.se = b;
+      notifySubs(e);
+      schedule();
+      flush();
+    });
+  } else {
+    (async () => {
+      try {
+        for await (let r of t) {
+          if (e.fe !== t) return;
+          O.initTransition(e);
+          n?.(r) ?? setSignal(e, () => r);
+          flush();
+        }
+      } catch (n) {
+        if (e.fe !== t) return;
+        O.initTransition(e);
+        setStatusFlags(e, c, n);
+        e.se = b;
+        notifySubs(e);
+        schedule();
+        flush();
+      }
+    })();
+  }
+  O.initTransition(e);
+  throw new NotReadyError(A);
+}
 function updateIfNecessary(r) {
   if (r.S & t) {
     for (let e = r.W; e; e = e.P) {
@@ -421,15 +469,15 @@ function unlinkSubs(e) {
   const t = e.H;
   const n = e.P;
   const r = e.C;
-  const i = e.fe;
-  if (r !== null) r.fe = i;
-  else t.ce = i;
+  const i = e.ce;
+  if (r !== null) r.ce = i;
+  else t.ae = i;
   if (i !== null) i.C = r;
   else {
     t.O = r;
     if (r === null) {
-      t.ae?.();
-      t.F && !t.de && unobserved(t);
+      t.de?.();
+      t.F && !t.he && unobserved(t);
     }
   }
   return n;
@@ -455,9 +503,9 @@ function link(e, t) {
       return;
     }
   }
-  const o = e.ce;
+  const o = e.ae;
   if (o !== null && o.N === t && (!s || isValidLink(o, t))) return;
-  const u = (t.ie = e.ce = { H: e, N: t, P: i, fe: o, C: null });
+  const u = (t.ie = e.ae = { H: e, N: t, P: i, ce: o, C: null });
   if (n !== null) n.P = u;
   else t.W = u;
   if (o !== null) o.C = u;
@@ -488,7 +536,7 @@ function markDisposal(e) {
       insertIntoHeap(t, S);
     }
     markDisposal(t);
-    t = t.he;
+    t = t.pe;
   }
 }
 function dispose(e) {
@@ -505,7 +553,7 @@ function disposeChildren(e, t = false, n) {
   if (t) e.S = u;
   let r = n ? e.ne : e.re;
   while (r) {
-    const e = r.he;
+    const e = r.pe;
     if (r.W) {
       const e = r;
       deleteFromHeap(e, e.S & o ? S : _);
@@ -523,7 +571,7 @@ function disposeChildren(e, t = false, n) {
     e.ne = null;
   } else {
     e.re = null;
-    e.he = null;
+    e.pe = null;
   }
   runDisposal(e, n);
 }
@@ -541,7 +589,7 @@ function runDisposal(e, t) {
   t ? (e.ee = null) : (e.te = null);
 }
 function getNextChildId(e) {
-  if (e.id != null) return formatId(e.id, e.pe++);
+  if (e.id != null) return formatId(e.id, e.ye++);
   throw new Error("Cannot get child id from owner without an id");
 }
 function formatId(e, t) {
@@ -551,14 +599,14 @@ function formatId(e, t) {
 }
 function computed(t, n, r) {
   const i = {
-    id: r?.id ?? (E?.id != null ? getNextChildId(E) : undefined),
+    id: r?.id ?? (A?.id != null ? getNextChildId(A) : undefined),
     oe: r?.equals != null ? r.equals : isEqual,
-    ye: !!r?.pureWrite,
-    ae: r?.unobserved,
+    ge: !!r?.pureWrite,
+    de: r?.unobserved,
     te: null,
-    ge: E?.ge ?? O,
-    we: E?.we ?? g,
-    pe: 0,
+    we: A?.we ?? O,
+    _e: A?._e ?? g,
+    ye: 0,
     F: t,
     G: n,
     o: 0,
@@ -568,9 +616,9 @@ function computed(t, n, r) {
     W: null,
     ie: null,
     O: null,
-    ce: null,
-    i: E,
-    he: null,
+    ae: null,
+    i: A,
+    pe: null,
     re: null,
     S: e,
     $: a,
@@ -578,92 +626,34 @@ function computed(t, n, r) {
     K: p,
     ee: null,
     ne: null,
+    fe: null,
     J: null
   };
-  if (r?._e) Object.assign(i, r._e);
+  if (r?.Se) Object.assign(i, r.Se);
   i.h = i;
-  const s = E?.t ? E.u : E;
-  if (E) {
-    const e = E.re;
+  const s = A?.t ? A.u : A;
+  if (A) {
+    const e = A.re;
     if (e === null) {
-      E.re = i;
+      A.re = i;
     } else {
-      i.he = e;
-      E.re = i;
+      i.pe = e;
+      A.re = i;
     }
   }
   if (s) i.o = s.o + 1;
   recompute(i, true);
   return i;
 }
-function asyncComputed(e, t, n) {
-  let r = undefined;
-  let i = false;
-  const fn = t => {
-    const n = e(t, i);
-    i = false;
-    r = n;
-    const o = n instanceof Promise;
-    const u = n[Symbol.asyncIterator];
-    if (!o && !u) {
-      return n;
-    }
-    if (o) {
-      n.then(e => {
-        if (r !== n) return;
-        O.initTransition(s);
-        setSignal(s, () => e);
-        flush();
-      }).catch(e => {
-        if (r !== n) return;
-        O.initTransition(s);
-        setStatusFlags(s, c, e);
-        s.se = b;
-        notifySubs(s);
-        schedule();
-        flush();
-      });
-    } else {
-      (async () => {
-        try {
-          for await (let e of n) {
-            if (r !== n) return;
-            O.initTransition(s);
-            setSignal(s, () => e);
-            flush();
-          }
-        } catch (e) {
-          if (r !== n) return;
-          O.initTransition(s);
-          setStatusFlags(s, c, e);
-          s.se = b;
-          notifySubs(s);
-          schedule();
-          flush();
-        }
-      })();
-    }
-    O.initTransition(E);
-    throw new NotReadyError(E);
-  };
-  const s = computed(fn, t, n);
-  s.Se = () => {
-    i = true;
-    recompute(s);
-    schedule();
-    flush();
-  };
-  return s;
-}
 function signal(e, t, n = null) {
   const r = {
-    id: t?.id ?? (E?.id != null ? getNextChildId(E) : undefined),
+    id: t?.id ?? (A?.id != null ? getNextChildId(A) : undefined),
     oe: t?.equals != null ? t.equals : isEqual,
-    ye: !!t?.pureWrite,
-    ae: t?.unobserved,
+    ge: !!t?.pureWrite,
+    de: t?.unobserved,
     G: e,
     O: null,
-    ce: null,
+    ae: null,
     $: l,
     se: b,
     I: n,
@@ -686,8 +676,9 @@ function untrack(e) {
   }
 }
 function read(e) {
-  let t = E;
+  let t = A;
   if (t?.t) t = t.u;
+  if (j && e.F) recompute(e);
   if (t && C && !k && !N) {
     if (e.F && e.S & u) recompute(e);
     link(e, t);
@@ -766,14 +757,14 @@ function setSignal(e, t) {
   return t;
 }
 function getObserver() {
-  return C ? E : null;
+  return C ? A : null;
 }
 function getOwner() {
-  return E;
+  return A;
 }
 function onCleanup(e) {
-  if (!E) return e;
-  const t = E;
+  if (!A) return e;
+  const t = A;
   if (!t.te) {
     t.te = e;
   } else if (Array.isArray(t.te)) {
@@ -784,17 +775,17 @@ function onCleanup(e) {
   return e;
 }
 function createOwner(e) {
-  const t = E;
+  const t = A;
   const n = {
     t: true,
     u: t?.t ? t.u : t,
     re: null,
-    he: null,
+    pe: null,
     te: null,
     id: e?.id ?? (t?.id != null ? getNextChildId(t) : undefined),
-    ge: t?.ge ?? O,
-    we: t?.we || g,
-    pe: 0,
+    we: t?.we ?? O,
+    _e: t?._e || g,
+    ye: 0,
     ee: null,
     ne: null,
     i: t,
@@ -807,7 +798,7 @@ function createOwner(e) {
     if (e === null) {
       t.re = n;
     } else {
-      n.he = e;
+      n.pe = e;
       t.re = n;
     }
   }
@@ -818,12 +809,12 @@ function createRoot(e, t) {
   return runWithOwner(n, () => e(n.dispose));
 }
 function runWithOwner(e, t) {
-  const n = E;
-  E = e;
+  const n = A;
+  A = e;
   try {
     return t();
   } finally {
-    E = n;
+    A = n;
   }
 }
 function staleValues(e, t = true) {
@@ -857,6 +848,22 @@ function isPending(e) {
     k = t;
   }
 }
+function refresh(e) {
+  let t = j;
+  j = true;
+  try {
+    return untrack(e);
+  } finally {
+    j = t;
+    if (!t) {
+      schedule();
+      flush();
+    }
+  }
+}
+function isRefreshing() {
+  return j;
+}
 function createContext(e, t) {
   return { id: Symbol(t), defaultValue: e };
 }
@@ -864,7 +871,7 @@ function getContext(e, t = getOwner()) {
   if (!t) {
     throw new NoOwnerError();
   }
-  const n = hasContext(e, t) ? t.we[e.id] : e.defaultValue;
+  const n = hasContext(e, t) ? t._e[e.id] : e.defaultValue;
   if (isUndefined(n)) {
     throw new ContextNotFoundError();
   }
@@ -874,10 +881,10 @@ function setContext(e, t, n = getOwner()) {
   if (!n) {
     throw new NoOwnerError();
   }
-  n.we = { ...n.we, [e.id]: isUndefined(t) ? e.defaultValue : t };
+  n._e = { ...n._e, [e.id]: isUndefined(t) ? e.defaultValue : t };
 }
 function hasContext(e, t) {
-  return !isUndefined(t?.we[e.id]);
+  return !isUndefined(t?._e[e.id]);
 }
 function isUndefined(e) {
   return typeof e === "undefined";
@@ -886,7 +893,7 @@ function effect(e, t, n, r, i) {
   let s = false;
   const o = computed(e, r, {
     ...i,
-    _e: {
+    Se: {
       U: true,
       be: r,
       me: t,
@@ -897,11 +904,11 @@ function effect(e, t, n, r, i) {
         if (s) {
           const n = this.$ && this.$ === t && e;
           this.U = !(this.$ & c) && !(this.$ & f & ~t) && !n;
-          if (this.U) this.ge.enqueue(this.T, runEffect.bind(this));
+          if (this.U) this.we.enqueue(this.T, runEffect.bind(this));
         }
         if (this.$ & c) {
           let e = this.L;
-          this.ge.notify(this, f, 0);
+          this.we.notify(this, f, 0);
           if (this.T === h) {
             try {
               return this.xe
@@ -914,9 +921,9 @@ function effect(e, t, n, r, i) {
               e = t;
             }
           }
-          if (!this.ge.notify(this, c, c)) throw e;
+          if (!this.we.notify(this, c, c)) throw e;
         } else if (this.T === d) {
-          this.ge.notify(this, f | c, this.$);
+          this.we.notify(this, f | c, this.$);
         }
       }
     }
@@ -925,7 +932,7 @@ function effect(e, t, n, r, i) {
   if (o.T === d) o.F = t => staleValues(() => e(t));
   !i?.defer &&
     !(o.$ & (c | f)) &&
-    (o.T === h ? o.ge.enqueue(o.T, runEffect.bind(o)) : runEffect.call(o));
+    (o.T === h ? o.we.enqueue(o.T, runEffect.bind(o)) : runEffect.call(o));
   onCleanup(() => o.Oe?.());
 }
 function runEffect() {
@@ -935,7 +942,7 @@ function runEffect() {
   try {
     this.Oe = this.me(this.G, this.be);
   } catch (e) {
-    if (!this.ge.notify(this, c, c)) throw e;
+    if (!this.we.notify(this, c, c)) throw e;
   } finally {
     this.be = this.G;
     this.U = false;
@@ -955,12 +962,6 @@ function createMemo(e, t, n) {
   let r = computed(e, t, n);
   return read.bind(null, r);
 }
-function createAsync(e, t, n) {
-  const r = asyncComputed(e, t, n);
-  const i = read.bind(null, r);
-  i.refresh = r.Se;
-  return i;
-}
 function createEffect(e, t, n, r) {
   void effect(e, t.effect || t, t.error, n, r);
 }
@@ -1016,7 +1017,7 @@ function onSettled(e) {
   });
 }
 function unwrap(e) {
-  return e?.[W]?.[R] ?? e;
+  return e?.[P]?.[V] ?? e;
 }
 function getOverrideValue(e, t, n, r) {
   return n && r in n ? read(n[r]) : t && r in t ? t[r] : e[r];
@@ -1027,15 +1028,15 @@ function getAllKeys(e, t, n) {
   return Array.from(new Set([...r, ...i]));
 }
 function applyState(e, t, n, r) {
-  const i = t?.[W];
+  const i = t?.[P];
   if (!i) return;
-  const s = i[F];
-  const o = i[Q];
-  let u = i[R];
+  const s = i[Q];
+  const o = i[R];
+  let u = i[V];
   if (e === s && !o) return;
-  (i[M] || B).set(e, i[P]);
-  i[F] = e;
-  i[Q] = undefined;
+  (i[D] || K).set(e, i[H]);
+  i[Q] = e;
+  i[R] = undefined;
   if (Array.isArray(s)) {
     let t = false;
     const l = getOverrideValue(s, o, u, "length");
@@ -1062,16 +1063,16 @@ function applyState(e, t, n, r) {
       if (a > h || a > d) {
         for (c = a; c <= h; c++) {
           t = true;
-          i[R][c] && setSignal(i[R][c], wrap(e[c], i));
+          i[V][c] && setSignal(i[V][c], wrap(e[c], i));
         }
         for (; c < e.length; c++) {
           t = true;
           const s = wrap(w[c], i);
-          i[R][c] && setSignal(i[R][c], s);
+          i[V][c] && setSignal(i[V][c], s);
           applyState(e[c], s, n, r);
         }
-        t && i[R][j] && setSignal(i[R][j], void 0);
-        l !== e.length && i[R].length && setSignal(i[R].length, e.length);
+        t && i[V][E] && setSignal(i[V][E], void 0);
+        l !== e.length && i[V].length && setSignal(i[V].length, e.length);
         return;
       }
       y = new Array(h + 1);
@@ -1095,9 +1096,9 @@ function applyState(e, t, n, r) {
       for (c = a; c < e.length; c++) {
         if (c in w) {
           const t = wrap(w[c], i);
-          i[R][c] && setSignal(i[R][c], t);
+          i[V][c] && setSignal(i[V][c], t);
           applyState(e[c], t, n, r);
-        } else i[R][c] && setSignal(i[R][c], wrap(e[c], i));
+        } else i[V][c] && setSignal(i[V][c], wrap(e[c], i));
       }
       if (a < e.length) t = true;
     } else if (l && e.length) {
@@ -1108,13 +1109,13 @@ function applyState(e, t, n, r) {
     }
     if (l !== e.length) {
       t = true;
-      i[R].length && setSignal(i[R].length, e.length);
+      i[V].length && setSignal(i[V].length, e.length);
     }
-    t && i[R][j] && setSignal(i[R][j], void 0);
+    t && i[V][E] && setSignal(i[V][E], void 0);
     return;
   }
   if (u) {
-    const t = u[j];
+    const t = u[E];
     const l = t || r ? getAllKeys(s, o, e) : Object.keys(u);
     for (let f = 0, c = l.length; f < c; f++) {
       const c = l[f];
@@ -1128,7 +1129,7 @@ function applyState(e, t, n, r) {
       } else applyState(h, wrap(d, i), n, r);
     }
   }
-  if ((u = i[V])) {
+  if ((u = i[q])) {
     const t = Object.keys(u);
     for (let n = 0, r = t.length; n < r; n++) {
       const r = t[n];
@@ -1151,11 +1152,11 @@ function createProjectionInternal(e, t = {}, n) {
   const i = new WeakMap();
   const wrapProjection = e => {
     if (i.has(e)) return i.get(e);
-    if (e[W]?.[q] === wrapProjection) return e;
-    const t = createStoreProxy(e, G, {
-      [q]: wrapProjection,
-      [M]: i,
-      [D]() {
+    if (e[P]?.[M] === wrapProjection) return e;
+    const t = createStoreProxy(e, T, {
+      [M]: wrapProjection,
+      [D]: i,
+      [B]() {
         return r;
       }
     });
@@ -1164,11 +1165,12 @@ function createProjectionInternal(e, t = {}, n) {
   };
   const s = wrapProjection(t);
   r = computed(() => {
-    storeSetter(s, t => {
-      const r = e(t);
-      if (r !== t && r !== undefined) {
-        reconcile(r, n?.key || "id", n?.all)(t);
-      }
+    const t = r || getOwner();
+    storeSetter(s, r => {
+      const i = handleAsync(t, e(r), e => {
+        e !== r && e !== undefined && storeSetter(s, reconcile(e, n?.key || "id", n?.all));
+      });
+      i !== r && i !== undefined && reconcile(i, n?.key || "id", n?.all)(r);
     });
   });
   return { store: s, node: r };
@@ -1176,33 +1178,33 @@ function createProjectionInternal(e, t = {}, n) {
 function createProjection(e, t = {}, n) {
   return createProjectionInternal(e, t, n).store;
 }
-const j = Symbol(0),
-  A = Symbol(0),
+const E = Symbol(0),
   W = Symbol(0),
   P = Symbol(0),
-  H = Symbol(0);
-const I = new WeakMap();
-const F = "v",
-  Q = "o",
-  R = "n",
-  V = "h",
-  q = "w",
-  M = "l",
-  D = "f";
-function createStoreProxy(e, t = G, n) {
+  H = Symbol(0),
+  I = Symbol(0);
+const F = new WeakMap();
+const Q = "v",
+  R = "o",
+  V = "n",
+  q = "h",
+  M = "w",
+  D = "l",
+  B = "f";
+function createStoreProxy(e, t = T, n) {
   let r;
   if (Array.isArray(e)) {
     r = [];
     r.v = e;
   } else r = { v: e };
   n && Object.assign(r, n);
-  return (r[P] = new Proxy(r, t));
+  return (r[H] = new Proxy(r, t));
 }
-const B = new WeakMap();
+const K = new WeakMap();
 function wrap(e, t) {
-  if (t?.[q]) return t[q](e, t);
-  let n = e[P] || B.get(e);
-  if (!n) B.set(e, (n = createStoreProxy(e)));
+  if (t?.[M]) return t[M](e, t);
+  let n = e[H] || K.get(e);
+  if (!n) K.set(e, (n = createStoreProxy(e)));
   return n;
 }
 function isWrappable(e) {
@@ -1226,8 +1228,8 @@ function getNode(e, t, n, r, i = isEqual) {
     r
   ));
 }
-function trackSelf(e, t = j) {
-  getObserver() && read(getNode(getNodes(e, R), t, undefined, e[D]?.(), false));
+function trackSelf(e, t = E) {
+  getObserver() && read(getNode(getNodes(e, V), t, undefined, e[B]?.(), false));
 }
 function getKeys(e, t, n = true) {
   const r = untrack(() => (n ? Object.keys(e) : Reflect.ownKeys(e)));
@@ -1235,7 +1237,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] !== H) i.add(e);
+    if (t[e] !== I) i.add(e);
     else i.delete(e);
   }
   return Array.from(i);
@@ -1243,124 +1245,124 @@ function getKeys(e, t, n = true) {
 function getPropertyDescriptor(e, t, n) {
   let r = e;
   if (t && n in t) {
-    if (r[n] === H) return void 0;
+    if (r[n] === I) return void 0;
     if (!(n in r)) r = t;
   }
   return Reflect.getOwnPropertyDescriptor(r, n);
 }
-let K = null;
-const G = {
+let G = null;
+const T = {
   get(e, t, n) {
-    if (t === W) return e;
-    if (t === P) return n;
-    if (t === j || t === A) {
+    if (t === P) return e;
+    if (t === H) return n;
+    if (t === E || t === W) {
       trackSelf(e, t);
       return n;
     }
-    const r = getNodes(e, R);
+    const r = getNodes(e, V);
     const i = r[t];
-    const s = e[Q] && t in e[Q];
-    const o = !!e[F][W];
-    const u = s ? e[Q] : e[F];
+    const s = e[R] && t in e[R];
+    const o = !!e[Q][P];
+    const u = s ? e[R] : e[Q];
     if (!i) {
       const e = Object.getOwnPropertyDescriptor(u, t);
       if (e && e.get) return e.get.call(n);
     }
-    if (K?.has(n)) {
+    if (G?.has(n)) {
       let n = i && (s || !o) ? (i.K !== p ? i.K : i.G) : u[t];
-      n === H && (n = undefined);
+      n === I && (n = undefined);
       if (!isWrappable(n)) return n;
       const r = wrap(n, e);
-      K.add(r);
+      G.add(r);
       return r;
     }
     let l = i ? (s || !o ? read(r[t]) : (read(r[t]), u[t])) : u[t];
-    l === H && (l = undefined);
+    l === I && (l = undefined);
     if (!i) {
       if (!s && typeof l === "function" && !u.hasOwnProperty(t)) {
         let t;
-        return !Array.isArray(e[F]) && (t = Object.getPrototypeOf(e[F])) && t !== Object.prototype
+        return !Array.isArray(e[Q]) && (t = Object.getPrototypeOf(e[Q])) && t !== Object.prototype
           ? l.bind(u)
           : l;
       } else if (getObserver()) {
-        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[D]?.()));
+        return read(getNode(r, t, isWrappable(l) ? wrap(l, e) : l, e[B]?.()));
       }
     }
     return isWrappable(l) ? wrap(l, e) : l;
   },
   has(e, t) {
-    if (t === P || t === j || t === "__proto__") return true;
-    const n = e[Q] && t in e[Q] ? e[Q][t] !== H : t in e[F];
-    getObserver() && read(getNode(getNodes(e, V), t, n, e[D]?.()));
+    if (t === H || t === E || t === "__proto__") return true;
+    const n = e[R] && t in e[R] ? e[R][t] !== I : t in e[Q];
+    getObserver() && read(getNode(getNodes(e, q), t, n, e[B]?.()));
     return n;
   },
   set(e, t, n) {
-    const r = e[P];
-    if (K?.has(e[P])) {
+    const r = e[H];
+    if (G?.has(e[H])) {
       untrack(() => {
-        const i = e[F];
+        const i = e[Q];
         const s = i[t];
-        const o = e[Q] && t in e[Q] ? e[Q][t] : s;
-        const u = n?.[W]?.[F] ?? n;
+        const o = e[R] && t in e[R] ? e[R][t] : s;
+        const u = n?.[P]?.[Q] ?? n;
         if (o === u) return true;
-        const l = e[Q]?.length || i.length;
-        if (u !== undefined && u === s) delete e[Q][t];
-        else (e[Q] || (e[Q] = Object.create(null)))[t] = u;
+        const l = e[R]?.length || i.length;
+        if (u !== undefined && u === s) delete e[R][t];
+        else (e[R] || (e[R] = Object.create(null)))[t] = u;
         const f = isWrappable(u);
         if (isWrappable(o)) {
-          const e = I.get(o);
-          e && (e instanceof Set ? e.delete(r) : I.delete(o));
+          const e = F.get(o);
+          e && (e instanceof Set ? e.delete(r) : F.delete(o));
         }
-        if (recursivelyNotify(r, B) && f) recursivelyAddParent(u, r);
-        e[V]?.[t] && setSignal(e[V][t], true);
-        const c = getNodes(e, R);
+        if (recursivelyNotify(r, K) && f) recursivelyAddParent(u, r);
+        e[q]?.[t] && setSignal(e[q][t], true);
+        const c = getNodes(e, V);
         c[t] && setSignal(c[t], () => (f ? wrap(u, e) : u));
         if (Array.isArray(i)) {
           const e = parseInt(t) + 1;
           if (e > l) c.length && setSignal(c.length, e);
         }
-        c[j] && setSignal(c[j], undefined);
+        c[E] && setSignal(c[E], undefined);
       });
     }
     return true;
   },
   deleteProperty(e, t) {
-    if (K?.has(e[P]) && e[Q]?.[t] !== H) {
+    if (G?.has(e[H]) && e[R]?.[t] !== I) {
       untrack(() => {
-        const n = e[Q] && t in e[Q] ? e[Q][t] : e[F][t];
-        if (t in e[F]) {
-          (e[Q] || (e[Q] = Object.create(null)))[t] = H;
-        } else if (e[Q] && t in e[Q]) {
-          delete e[Q][t];
+        const n = e[R] && t in e[R] ? e[R][t] : e[Q][t];
+        if (t in e[Q]) {
+          (e[R] || (e[R] = Object.create(null)))[t] = I;
+        } else if (e[R] && t in e[R]) {
+          delete e[R][t];
         } else return true;
         if (isWrappable(n)) {
-          const t = I.get(n);
-          t && (t instanceof Set ? t.delete(e) : I.delete(n));
+          const t = F.get(n);
+          t && (t instanceof Set ? t.delete(e) : F.delete(n));
         }
-        if (e[V]?.[t]) setSignal(e[V][t], false);
-        const r = getNodes(e, R);
+        if (e[q]?.[t]) setSignal(e[q][t], false);
+        const r = getNodes(e, V);
         r[t] && setSignal(r[t], undefined);
-        r[j] && setSignal(r[j], undefined);
+        r[E] && setSignal(r[E], undefined);
       });
     }
     return true;
   },
   ownKeys(e) {
     trackSelf(e);
-    return getKeys(e[F], e[Q], false);
+    return getKeys(e[Q], e[R], false);
   },
   getOwnPropertyDescriptor(e, t) {
-    if (t === P) return { value: e[P], writable: true, configurable: true };
-    return getPropertyDescriptor(e[F], e[Q], t);
+    if (t === H) return { value: e[H], writable: true, configurable: true };
+    return getPropertyDescriptor(e[Q], e[R], t);
   },
   getPrototypeOf(e) {
-    return Object.getPrototypeOf(e[F]);
+    return Object.getPrototypeOf(e[Q]);
   }
 };
 function storeSetter(e, t) {
-  const n = K;
-  K = new Set();
-  K.add(e);
+  const n = G;
+  G = new Set();
+  G.add(e);
   try {
     const n = t(e);
     if (n !== e && n !== undefined) {
@@ -1376,8 +1378,8 @@ function storeSetter(e, t) {
       }
     }
   } finally {
-    K.clear();
-    K = n;
+    G.clear();
+    G = n;
   }
 }
 function createStore(e, t, n) {
@@ -1386,17 +1388,17 @@ function createStore(e, t, n) {
   return [i, e => storeSetter(i, e)];
 }
 function recursivelyNotify(e, t) {
-  let n = e[W] || t?.get(e)?.[W];
+  let n = e[P] || t?.get(e)?.[P];
   let r = false;
   if (n) {
-    const e = getNodes(n, R)[A];
+    const e = getNodes(n, V)[W];
     if (e) {
       setSignal(e, undefined);
       r = true;
     }
-    t = n[M] || t;
+    t = n[D] || t;
   }
-  const i = I.get(n?.[F] || e);
+  const i = F.get(n?.[Q] || e);
   if (!i) return r;
   if (i instanceof Set) {
     for (let e of i) r = recursivelyNotify(e, t) || r;
@@ -1405,16 +1407,16 @@ function recursivelyNotify(e, t) {
 }
 function recursivelyAddParent(e, t) {
   let n;
-  const r = e[W];
+  const r = e[P];
   if (r) {
-    n = r[Q];
-    e = r[F];
+    n = r[R];
+    e = r[Q];
   }
   if (t) {
-    let n = I.get(e);
-    if (!n) I.set(e, t);
+    let n = F.get(e);
+    if (!n) F.set(e, t);
     else if (n !== t) {
-      if (!(n instanceof Set)) I.set(e, (n = new Set([n])));
+      if (!(n instanceof Set)) F.set(e, (n = new Set([n])));
       else if (n.has(t)) return;
       n.add(t);
     } else return;
@@ -1436,7 +1438,7 @@ function recursivelyAddParent(e, t) {
 }
 function deep(e) {
   recursivelyAddParent(e);
-  return e[A];
+  return e[W];
 }
 function createOptimisticStore(e, t, n) {
   return [];
@@ -1446,12 +1448,12 @@ function snapshot(e, t, n) {
   if (!isWrappable(e)) return e;
   if (t && t.has(e)) return t.get(e);
   if (!t) t = new Map();
-  if ((r = e[W] || n?.get(e)?.[W])) {
-    s = r[Q];
-    i = Array.isArray(r[F]);
-    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[F]))) : r[F]);
-    e = r[F];
-    n = B;
+  if ((r = e[P] || n?.get(e)?.[P])) {
+    s = r[R];
+    i = Array.isArray(r[Q]);
+    t.set(e, s ? (o = i ? [] : Object.create(Object.getPrototypeOf(r[Q]))) : r[Q]);
+    e = r[Q];
+    n = K;
   } else {
     i = Array.isArray(e);
     t.set(e, e);
@@ -1460,7 +1462,7 @@ function snapshot(e, t, n) {
     const r = s?.length || e.length;
     for (let i = 0; i < r; i++) {
       l = s && i in s ? s[i] : e[i];
-      if (l === H) continue;
+      if (l === I) continue;
       if ((u = snapshot(l, t, n)) !== l || o) {
         if (!o) t.set(e, (o = [...e]));
         o[i] = u;
@@ -1487,13 +1489,13 @@ function snapshot(e, t, n) {
 function trueFn() {
   return true;
 }
-const T = {
+const U = {
   get(e, t, n) {
-    if (t === P) return n;
+    if (t === H) return n;
     return e.get(t);
   },
   has(e, t) {
-    if (t === P) return true;
+    if (t === H) return true;
     return e.has(t);
   },
   set: trueFn,
@@ -1516,15 +1518,15 @@ const T = {
 function resolveSource(e) {
   return !(e = typeof e === "function" ? e() : e) ? {} : e;
 }
-const U = Symbol(0);
+const L = 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 && P in i);
-    const s = !!i && i[U];
+    t = t || (!!i && H in i);
+    const s = !!i && i[L];
     if (s) n.push(...s);
     else n.push(typeof i === "function" ? ((t = true), createMemo(i)) : i);
   }
@@ -1532,7 +1534,7 @@ function merge(...e) {
     return new Proxy(
       {
         get(e) {
-          if (e === U) return n;
+          if (e === L) return n;
           for (let t = n.length - 1; t >= 0; t--) {
             const r = resolveSource(n[t]);
             if (e in r) return r[e];
@@ -1550,7 +1552,7 @@ function merge(...e) {
           return [...new Set(e)];
         }
       },
-      T
+      U
     );
   }
   const r = Object.create(null);
@@ -1582,12 +1584,12 @@ function merge(...e) {
     if (n.get) Object.defineProperty(o, t, n);
     else o[t] = n.value;
   }
-  o[U] = n;
+  o[L] = n;
   return o;
 }
 function omit(e, ...t) {
   const n = new Set(t);
-  if (y && P in e) {
+  if (y && H in e) {
     return new Proxy(
       {
         get(t) {
@@ -1600,7 +1602,7 @@ function omit(e, ...t) {
           return Object.keys(e).filter(e => !n.has(e));
         }
       },
-      T
+      U
     );
   }
   const r = {};
@@ -1622,9 +1624,9 @@ function mapArray(e, t, n) {
       ve: 0,
       Ne: e,
       ke: [],
-      Ee: t,
-      je: [],
+      je: t,
       Ae: [],
+      Ee: [],
       We: r,
       Pe: r || n?.keyed === false ? [] : undefined,
       He: t.length > 1 ? [] : undefined,
@@ -1632,19 +1634,19 @@ function mapArray(e, t, n) {
     })
   );
 }
-const L = { pureWrite: true };
+const z = { pureWrite: true };
 function updateKeyedMap() {
   const e = this.Ne() || [],
     t = e.length;
-  e[j];
+  e[E];
   runWithOwner(this.Ce, () => {
     let n,
       r,
       i = this.Pe
         ? () => {
-            this.Pe[r] = signal(e[r], L);
-            this.He && (this.He[r] = signal(r, L));
-            return this.Ee(
+            this.Pe[r] = signal(e[r], z);
+            this.He && (this.He[r] = signal(r, z));
+            return this.je(
               read.bind(null, this.Pe[r]),
               this.He ? read.bind(null, this.He[r]) : undefined
             );
@@ -1652,32 +1654,32 @@ function updateKeyedMap() {
         : this.He
           ? () => {
               const t = e[r];
-              this.He[r] = signal(r, L);
-              return this.Ee(() => t, read.bind(null, this.He[r]));
+              this.He[r] = signal(r, z);
+              return this.je(() => t, read.bind(null, this.He[r]));
             }
           : () => {
               const t = e[r];
-              return this.Ee(() => t);
+              return this.je(() => t);
             };
     if (t === 0) {
       if (this.ve !== 0) {
         this.Ce.dispose(false);
-        this.Ae = [];
+        this.Ee = [];
         this.ke = [];
-        this.je = [];
+        this.Ae = [];
         this.ve = 0;
         this.Pe && (this.Pe = []);
         this.He && (this.He = []);
       }
-      if (this.Ie && !this.je[0]) {
-        this.je[0] = runWithOwner((this.Ae[0] = createOwner()), this.Ie);
+      if (this.Ie && !this.Ae[0]) {
+        this.Ae[0] = runWithOwner((this.Ee[0] = createOwner()), this.Ie);
       }
     } else if (this.ve === 0) {
-      if (this.Ae[0]) this.Ae[0].dispose();
-      this.je = new Array(t);
+      if (this.Ee[0]) this.Ee[0].dispose();
+      this.Ae = new Array(t);
       for (r = 0; r < t; r++) {
         this.ke[r] = e[r];
-        this.je[r] = runWithOwner((this.Ae[r] = createOwner()), i);
+        this.Ae[r] = runWithOwner((this.Ee[r] = createOwner()), i);
       }
       this.ve = t;
     } else {
@@ -1706,8 +1708,8 @@ function updateKeyedMap() {
         (this.ke[o] === e[u] || (this.Pe && compare(this.We, this.ke[o], e[u])));
         o--, u--
       ) {
-        d[u] = this.je[o];
-        h[u] = this.Ae[o];
+        d[u] = this.Ae[o];
+        h[u] = this.Ee[o];
         p && (p[u] = this.Pe[o]);
         y && (y[u] = this.He[o]);
       }
@@ -1725,18 +1727,18 @@ function updateKeyedMap() {
         f = this.We ? this.We(l) : l;
         r = c.get(f);
         if (r !== undefined && r !== -1) {
-          d[r] = this.je[n];
-          h[r] = this.Ae[n];
+          d[r] = this.Ae[n];
+          h[r] = this.Ee[n];
           p && (p[r] = this.Pe[n]);
           y && (y[r] = this.He[n]);
           r = a[r];
           c.set(f, r);
-        } else this.Ae[n].dispose();
+        } else this.Ee[n].dispose();
       }
       for (r = s; r < t; r++) {
         if (r in d) {
-          this.je[r] = d[r];
-          this.Ae[r] = h[r];
+          this.Ae[r] = d[r];
+          this.Ee[r] = h[r];
           if (p) {
             this.Pe[r] = p[r];
             setSignal(this.Pe[r], e[r]);
@@ -1746,14 +1748,14 @@ function updateKeyedMap() {
             setSignal(this.He[r], r);
           }
         } else {
-          this.je[r] = runWithOwner((this.Ae[r] = createOwner()), i);
+          this.Ae[r] = runWithOwner((this.Ee[r] = createOwner()), i);
         }
       }
-      this.je = this.je.slice(0, (this.ve = t));
+      this.Ae = this.Ae.slice(0, (this.ve = t));
       this.ke = e.slice(0);
     }
   });
-  return this.je;
+  return this.Ae;
 }
 function repeat(e, t, n) {
   return updateRepeat.bind({
@@ -1761,9 +1763,9 @@ function repeat(e, t, n) {
     ve: 0,
     Fe: 0,
     Qe: e,
-    Ee: t,
+    je: t,
+    Ee: [],
     Ae: [],
-    je: [],
     Re: n?.from,
     Ie: n?.fallback
   });
@@ -1775,71 +1777,71 @@ function updateRepeat() {
     if (e === 0) {
       if (this.ve !== 0) {
         this.Ce.dispose(false);
+        this.Ee = [];
         this.Ae = [];
-        this.je = [];
         this.ve = 0;
       }
-      if (this.Ie && !this.je[0]) {
-        this.je[0] = runWithOwner((this.Ae[0] = createOwner()), this.Ie);
+      if (this.Ie && !this.Ae[0]) {
+        this.Ae[0] = runWithOwner((this.Ee[0] = createOwner()), this.Ie);
       }
       return;
     }
     const n = t + e;
     const r = this.Fe + this.ve;
-    if (this.ve === 0 && this.Ae[0]) this.Ae[0].dispose();
-    for (let e = n; e < r; e++) this.Ae[e - this.Fe].dispose();
+    if (this.ve === 0 && this.Ee[0]) this.Ee[0].dispose();
+    for (let e = n; e < r; e++) this.Ee[e - this.Fe].dispose();
     if (this.Fe < t) {
       let e = this.Fe;
-      while (e < t && e < this.ve) this.Ae[e++].dispose();
+      while (e < t && e < this.ve) this.Ee[e++].dispose();
+      this.Ee.splice(0, t - this.Fe);
       this.Ae.splice(0, t - this.Fe);
-      this.je.splice(0, t - this.Fe);
     } else if (this.Fe > t) {
       let n = r - this.Fe - 1;
       let i = this.Fe - t;
-      this.Ae.length = this.je.length = e;
+      this.Ee.length = this.Ae.length = e;
       while (n >= i) {
+        this.Ee[n] = this.Ee[n - i];
         this.Ae[n] = this.Ae[n - i];
-        this.je[n] = this.je[n - i];
         n--;
       }
       for (let e = 0; e < i; e++) {
-        this.je[e] = runWithOwner((this.Ae[e] = createOwner()), () => this.Ee(e + t));
+        this.Ae[e] = runWithOwner((this.Ee[e] = createOwner()), () => this.je(e + t));
       }
     }
     for (let e = r; e < n; e++) {
-      this.je[e - t] = runWithOwner((this.Ae[e - t] = createOwner()), () => this.Ee(e));
+      this.Ae[e - t] = runWithOwner((this.Ee[e - t] = createOwner()), () => this.je(e));
     }
-    this.je = this.je.slice(0, e);
+    this.Ae = this.Ae.slice(0, e);
     this.Fe = t;
     this.ve = e;
   });
-  return this.je;
+  return this.Ae;
 }
 function compare(e, t, n) {
   return e ? e(t) === e(n) : true;
 }
 function boundaryComputed(e, t) {
   const n = computed(e, undefined, {
-    _e: {
+    Se: {
       le() {
         let e = this.$;
         this.$ &= ~this.Ve;
         if (this.Ve & f && !(this.$ & a)) {
           e &= ~f;
         }
-        this.ge.notify(this, this.Ve, e);
+        this.we.notify(this, this.Ve, e);
       },
       Ve: t
     }
   });
   n.Ve = t;
-  n.de = true;
+  n.he = true;
   return n;
 }
 function createBoundChildren(e, t, n, r) {
-  const i = e.ge;
-  i.addChild((e.ge = n));
-  onCleanup(() => i.removeChild(e.ge));
+  const i = e.we;
+  i.addChild((e.we = n));
+  onCleanup(() => i.removeChild(e.we));
   return runWithOwner(e, () => {
     const e = computed(t);
     return boundaryComputed(() => staleValues(() => flatten(read(e))), r);
@@ -1877,7 +1879,7 @@ class ConditionalQueue extends Queue {
 }
 class CollectionQueue extends Queue {
   De;
-  Ae = new Set();
+  Ee = new Set();
   qe = signal(false, { pureWrite: true });
   Be = false;
   constructor(e) {
@@ -1891,24 +1893,24 @@ class CollectionQueue extends Queue {
   notify(e, t, n) {
     if (!(t & this.De) || (this.De & f && this.Be)) return super.notify(e, t, n);
     if (n & this.De) {
-      this.Ae.add(e);
-      if (this.Ae.size === 1) setSignal(this.qe, true);
-    } else if (this.Ae.size > 0) {
-      this.Ae.delete(e);
-      if (this.Ae.size === 0) setSignal(this.qe, false);
+      this.Ee.add(e);
+      if (this.Ee.size === 1) setSignal(this.qe, true);
+    } else if (this.Ee.size > 0) {
+      this.Ee.delete(e);
+      if (this.Ee.size === 0) setSignal(this.qe, false);
     }
     t &= ~this.De;
     return t ? super.notify(e, t, n) : true;
   }
 }
-var z;
+var J;
 (function (e) {
   e["VISIBLE"] = "visible";
   e["HIDDEN"] = "hidden";
-})(z || (z = {}));
+})(J || (J = {}));
 function createBoundary(e, t) {
   const n = createOwner();
-  const r = new ConditionalQueue(computed(() => t() === z.HIDDEN));
+  const r = new ConditionalQueue(computed(() => t() === J.HIDDEN));
   const i = createBoundChildren(n, e, r, 0);
   computed(() => {
     const e = read(r.qe);
@@ -1954,10 +1956,10 @@ function collectErrorSources(e, t) {
 }
 function createErrorBoundary(e, t) {
   return createCollectionBoundary(c, e, e => {
-    let n = e.Ae.values().next().value;
+    let n = e.Ee.values().next().value;
     return t(n.L, () => {
       const t = [];
-      for (const n of e.Ae) collectErrorSources(n, t);
+      for (const n of e.Ee) collectErrorSources(n, t);
       for (const e of t) recompute(e);
       schedule();
     });
@@ -2012,14 +2014,13 @@ function flattenArray(e, t = [], n) {
   if (r) throw r;
   return i;
 }
-exports.$PROXY = P;
-exports.$TARGET = W;
-exports.$TRACK = j;
+exports.$PROXY = H;
+exports.$TARGET = P;
+exports.$TRACK = E;
 exports.ContextNotFoundError = ContextNotFoundError;
 exports.NoOwnerError = NoOwnerError;
 exports.NotReadyError = NotReadyError;
 exports.SUPPORTS_PROXY = y;
-exports.createAsync = createAsync;
 exports.createBoundary = createBoundary;
 exports.createContext = createContext;
 exports.createEffect = createEffect;
@@ -2044,6 +2045,7 @@ exports.getObserver = getObserver;
 exports.getOwner = getOwner;
 exports.isEqual = isEqual;
 exports.isPending = isPending;
+exports.isRefreshing = isRefreshing;
 exports.isWrappable = isWrappable;
 exports.mapArray = mapArray;
 exports.merge = merge;
@@ -2052,6 +2054,7 @@ exports.onCleanup = onCleanup;
 exports.onSettled = onSettled;
 exports.pending = pending;
 exports.reconcile = reconcile;
+exports.refresh = refresh;
 exports.repeat = repeat;
 exports.resolve = resolve;
 exports.runWithOwner = runWithOwner;