@solidjs/signals 0.0.9 → 0.0.10

package/dist/prod.js

@@ -30,6 +30,103 @@ var EFFECT_RENDER = 1;
 var EFFECT_USER = 2;
 var SUPPORTS_PROXY = typeof Proxy === "function";
 
+// src/core/scheduler.ts
+var clock = 0;
+function getClock() {
+  return clock;
+}
+function incrementClock() {
+  clock++;
+}
+var scheduled = false;
+function schedule() {
+  if (scheduled)
+    return;
+  scheduled = true;
+  if (!globalQueue.H)
+    queueMicrotask(flushSync);
+}
+var Queue = class {
+  H = false;
+  r = [[], [], []];
+  D = [];
+  enqueue(type, node) {
+    this.r[0].push(node);
+    if (type)
+      this.r[type].push(node);
+    schedule();
+  }
+  run(type) {
+    if (this.r[type].length) {
+      if (type === EFFECT_PURE) {
+        runPureQueue(this.r[type]);
+        this.r[type] = [];
+      } else {
+        const effects = this.r[type];
+        this.r[type] = [];
+        runEffectQueue(effects);
+      }
+    }
+    let rerun = false;
+    for (let i = 0; i < this.D.length; i++) {
+      rerun = this.D[i].run(type) || rerun;
+    }
+    if (type === EFFECT_PURE && this.r[type].length)
+      return true;
+  }
+  flush() {
+    if (this.H)
+      return;
+    this.H = true;
+    try {
+      while (this.run(EFFECT_PURE)) {
+      }
+      incrementClock();
+      scheduled = false;
+      this.run(EFFECT_RENDER);
+      this.run(EFFECT_USER);
+    } finally {
+      this.H = false;
+    }
+  }
+  addChild(child) {
+    this.D.push(child);
+  }
+  removeChild(child) {
+    const index = this.D.indexOf(child);
+    if (index >= 0)
+      this.D.splice(index, 1);
+  }
+};
+var globalQueue = new Queue();
+function flushSync() {
+  while (scheduled) {
+    globalQueue.flush();
+  }
+}
+function runTop(node) {
+  const ancestors = [];
+  for (let current = node; current !== null; current = current.s) {
+    if (current.a !== STATE_CLEAN) {
+      ancestors.push(current);
+    }
+  }
+  for (let i = ancestors.length - 1; i >= 0; i--) {
+    if (ancestors[i].a !== STATE_DISPOSED)
+      ancestors[i].y();
+  }
+}
+function runPureQueue(queue) {
+  for (let i = 0; i < queue.length; i++) {
+    if (queue[i].a !== STATE_CLEAN)
+      runTop(queue[i]);
+  }
+}
+function runEffectQueue(queue) {
+  for (let i = 0; i < queue.length; i++)
+    queue[i].T();
+}
+
 // src/core/utils.ts
 function isUndefined(value) {
   return typeof value === "undefined";
@@ -104,23 +201,23 @@ var Owner = class {
   // We flatten the owner tree into a linked list so that we don't need a pointer to .firstChild
   // However, the children are actually added in reverse creation order
   // See comment at the top of the file for an example of the _nextSibling traversal
-  r = null;
-  n = null;
   s = null;
+  n = null;
+  t = null;
   a = STATE_CLEAN;
   l = null;
   p = defaultContext;
   m = null;
-  b = null;
+  h = globalQueue;
   constructor(signal = false) {
     if (currentOwner && !signal)
       currentOwner.append(this);
   }
   append(child) {
-    child.r = this;
     child.s = this;
+    child.t = this;
     if (this.n)
-      this.n.s = child;
+      this.n.t = child;
     child.n = this.n;
     this.n = child;
     if (child.p !== this.p) {
@@ -129,32 +226,32 @@ var Owner = class {
     if (this.m) {
       child.m = !child.m ? this.m : [...child.m, ...this.m];
     }
-    if (this.b)
-      child.b = this.b;
+    if (this.h)
+      child.h = this.h;
   }
   dispose(self = true) {
     if (this.a === STATE_DISPOSED)
       return;
-    let head = self ? this.s || this.r : this, current = this.n, next = null;
-    while (current && current.r === this) {
+    let head = self ? this.t || this.s : this, current = this.n, next = null;
+    while (current && current.s === this) {
       current.dispose(true);
-      current.z();
+      current.A();
       next = current.n;
       current.n = null;
       current = next;
     }
     if (self)
-      this.z();
+      this.A();
     if (current)
-      current.s = !self ? this : this.s;
+      current.t = !self ? this : this.t;
     if (head)
       head.n = current;
   }
-  z() {
-    if (this.s)
-      this.s.n = null;
-    this.r = null;
+  A() {
+    if (this.t)
+      this.t.n = null;
     this.s = null;
+    this.t = null;
     this.p = defaultContext;
     this.m = null;
     this.a = STATE_DISPOSED;
@@ -179,7 +276,7 @@ var Owner = class {
     let i = 0, len = this.m.length;
     for (i = 0; i < len; i++) {
       try {
-        this.m[i](error);
+        this.m[i](error, this);
         break;
       } catch (e) {
         error = e;
@@ -243,58 +340,55 @@ var currentMask = DEFAULT_FLAGS;
 var newSources = null;
 var newSourcesIndex = 0;
 var newFlags = 0;
-var clock = 0;
 var notStale = false;
 var updateCheck = null;
 var staleCheck = null;
 function getObserver() {
   return currentObserver;
 }
-function getClock() {
-  return clock;
-}
-function incrementClock() {
-  clock++;
-}
 var UNCHANGED = Symbol(0);
 var Computation = class extends Owner {
-  g = null;
-  e = null;
+  f = null;
+  d = null;
   c;
-  D;
-  t;
+  E;
+  u;
   // Used in __DEV__ mode, hopefully removed in production
   Z;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
   N = isEqual;
-  T;
+  U;
   /** Whether the computation is an error or has ancestors that are unresolved */
-  d = 0;
+  b = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
   O = DEFAULT_FLAGS;
   P = null;
-  A = -1;
-  H = false;
+  z = -1;
+  I = false;
   constructor(initialValue, compute2, options) {
     super(compute2 === null);
-    this.t = compute2;
+    this.u = compute2;
     this.a = compute2 ? STATE_DIRTY : STATE_CLEAN;
-    this.d = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
+    this.b = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
     this.c = initialValue;
     if (options?.equals !== void 0)
       this.N = options.equals;
     if (options?.unobserved)
-      this.T = options?.unobserved;
+      this.U = options?.unobserved;
   }
-  U() {
-    if (this.t)
-      this.x();
-    if (!this.t || this.g?.length)
+  V() {
+    if (this.u) {
+      if (this.b & ERROR_BIT && this.z <= getClock())
+        update(this);
+      else
+        this.y();
+    }
+    if (!this.u || this.f?.length)
       track(this);
-    newFlags |= this.d & ~currentMask;
-    if (this.d & ERROR_BIT) {
-      throw this.D;
+    newFlags |= this.b & ~currentMask;
+    if (this.b & ERROR_BIT) {
+      throw this.E;
     } else {
       return this.c;
     }
@@ -304,7 +398,7 @@ var Computation = class extends Owner {
    * Automatically re-executes the surrounding computation when the value changes
    */
   read() {
-    return this.U();
+    return this.V();
   }
   /**
    * Return the current value of this computation
@@ -314,15 +408,15 @@ var Computation = class extends Owner {
    * before continuing
    */
   wait() {
-    if (this.t && this.d & ERROR_BIT && this.A <= clock) {
+    if (this.u && this.b & ERROR_BIT && this.z <= getClock()) {
       update(this);
     }
-    if ((notStale || this.d & UNINITIALIZED_BIT) && this.loading()) {
+    if ((notStale || this.b & UNINITIALIZED_BIT) && this.loading()) {
       throw new NotReadyError();
     }
-    if (staleCheck && this.d & LOADING_BIT)
+    if (staleCheck && this.b & LOADING_BIT)
       staleCheck.c = true;
-    return this.U();
+    return this.V();
   }
   /**
    * Return true if the computation is the value is dependent on an unresolved promise
@@ -340,20 +434,20 @@ var Computation = class extends Owner {
   /** Update the computation with a new value. */
   write(value, flags = 0, raw = false) {
     const newValue = !raw && typeof value === "function" ? value(this.c) : value;
-    const valueChanged = newValue !== UNCHANGED && (!!(this.d & UNINITIALIZED_BIT) || this.N === false || !this.N(this.c, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(this.b & UNINITIALIZED_BIT) || this.N === false || !this.N(this.c, newValue));
     if (valueChanged) {
       this.c = newValue;
-      this.D = void 0;
+      this.E = void 0;
     }
-    const changedFlagsMask = this.d ^ flags, changedFlags = changedFlagsMask & flags;
-    this.d = flags;
-    this.A = clock + 1;
-    if (this.e) {
-      for (let i = 0; i < this.e.length; i++) {
+    const changedFlagsMask = this.b ^ flags, changedFlags = changedFlagsMask & flags;
+    this.b = flags;
+    this.z = getClock() + 1;
+    if (this.d) {
+      for (let i = 0; i < this.d.length; i++) {
         if (valueChanged) {
-          this.e[i].q(STATE_DIRTY);
+          this.d[i].q(STATE_DIRTY);
         } else if (changedFlagsMask) {
-          this.e[i].V(changedFlagsMask, changedFlags);
+          this.d[i].W(changedFlagsMask, changedFlags);
         }
       }
     }
@@ -363,13 +457,13 @@ var Computation = class extends Owner {
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
   q(state, skipQueue) {
-    if (this.a >= state && !this.H)
+    if (this.a >= state && !this.I)
       return;
-    this.H = !!skipQueue;
+    this.I = !!skipQueue;
     this.a = state;
-    if (this.e) {
-      for (let i = 0; i < this.e.length; i++) {
-        this.e[i].q(STATE_CHECK, skipQueue);
+    if (this.d) {
+      for (let i = 0; i < this.d.length; i++) {
+        this.d[i].q(STATE_CHECK, skipQueue);
       }
     }
   }
@@ -379,7 +473,7 @@ var Computation = class extends Owner {
    * @param mask A bitmask for which flag(s) were changed.
    * @param newFlags The source's new flags, masked to just the changed ones.
    */
-  V(mask, newFlags2) {
+  W(mask, newFlags2) {
     if (this.a >= STATE_DIRTY)
       return;
     if (mask & this.O) {
@@ -388,22 +482,22 @@ var Computation = class extends Owner {
     }
     if (this.a >= STATE_CHECK)
       return;
-    const prevFlags = this.d & mask;
+    const prevFlags = this.b & mask;
     const deltaFlags = prevFlags ^ newFlags2;
     if (newFlags2 === prevFlags) ; else if (deltaFlags & prevFlags & mask) {
       this.q(STATE_CHECK);
     } else {
-      this.d ^= deltaFlags;
-      if (this.e) {
-        for (let i = 0; i < this.e.length; i++) {
-          this.e[i].V(mask, newFlags2);
+      this.b ^= deltaFlags;
+      if (this.d) {
+        for (let i = 0; i < this.d.length; i++) {
+          this.d[i].W(mask, newFlags2);
         }
       }
     }
   }
-  I(error) {
-    this.D = error;
-    this.write(UNCHANGED, this.d & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
+  J(error) {
+    this.E = error;
+    this.write(UNCHANGED, this.b & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
   }
   /**
    * This is the core part of the reactivity system, which makes sure that the values are updated
@@ -412,7 +506,7 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  x() {
+  y() {
     if (this.a === STATE_DISPOSED) {
       throw new Error("Tried to read a disposed computation");
     }
@@ -421,9 +515,9 @@ var Computation = class extends Owner {
     }
     let observerFlags = 0;
     if (this.a === STATE_CHECK) {
-      for (let i = 0; i < this.g.length; i++) {
-        this.g[i].x();
-        observerFlags |= this.g[i].d;
+      for (let i = 0; i < this.f.length; i++) {
+        this.f[i].y();
+        observerFlags |= this.f[i].b;
         if (this.a === STATE_DIRTY) {
           break;
         }
@@ -439,23 +533,23 @@ var Computation = class extends Owner {
   /**
    * Remove ourselves from the owner graph and the computation graph
    */
-  z() {
+  A() {
     if (this.a === STATE_DISPOSED)
       return;
-    if (this.g)
+    if (this.f)
       removeSourceObservers(this, 0);
-    super.z();
+    super.A();
   }
 };
 function loadingState(node) {
-  const prevOwner = setOwner(node.r);
+  const prevOwner = setOwner(node.s);
   const options = void 0;
   const computation = new Computation(
     void 0,
     () => {
       track(node);
-      node.x();
-      return !!(node.d & LOADING_BIT);
+      node.y();
+      return !!(node.b & LOADING_BIT);
     },
     options
   );
@@ -465,7 +559,7 @@ function loadingState(node) {
 }
 function track(computation) {
   if (currentObserver) {
-    if (!newSources && currentObserver.g && currentObserver.g[newSourcesIndex] === computation) {
+    if (!newSources && currentObserver.f && currentObserver.f[newSourcesIndex] === computation) {
       newSourcesIndex++;
     } else if (!newSources)
       newSources = [computation];
@@ -473,7 +567,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.c = computation.A > currentObserver.A;
+      updateCheck.c = computation.z > currentObserver.z;
     }
   }
 }
@@ -485,56 +579,56 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.t, node);
+    const result = compute(node, node.u, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
-      node.write(UNCHANGED, newFlags | LOADING_BIT | node.d & UNINITIALIZED_BIT);
+      node.write(UNCHANGED, newFlags | LOADING_BIT | node.b & UNINITIALIZED_BIT);
     } else {
-      node.I(error);
+      node.J(error);
     }
   } finally {
     if (newSources) {
-      if (node.g)
+      if (node.f)
         removeSourceObservers(node, newSourcesIndex);
-      if (node.g && newSourcesIndex > 0) {
-        node.g.length = newSourcesIndex + newSources.length;
+      if (node.f && newSourcesIndex > 0) {
+        node.f.length = newSourcesIndex + newSources.length;
         for (let i = 0; i < newSources.length; i++) {
-          node.g[newSourcesIndex + i] = newSources[i];
+          node.f[newSourcesIndex + i] = newSources[i];
         }
       } else {
-        node.g = newSources;
+        node.f = newSources;
       }
       let source;
-      for (let i = newSourcesIndex; i < node.g.length; i++) {
-        source = node.g[i];
-        if (!source.e)
-          source.e = [node];
+      for (let i = newSourcesIndex; i < node.f.length; i++) {
+        source = node.f[i];
+        if (!source.d)
+          source.d = [node];
         else
-          source.e.push(node);
+          source.d.push(node);
       }
-    } else if (node.g && newSourcesIndex < node.g.length) {
+    } else if (node.f && newSourcesIndex < node.f.length) {
       removeSourceObservers(node, newSourcesIndex);
-      node.g.length = newSourcesIndex;
+      node.f.length = newSourcesIndex;
     }
     newSources = prevSources;
     newSourcesIndex = prevSourcesIndex;
     newFlags = prevFlags;
-    node.A = clock + 1;
+    node.z = getClock() + 1;
     node.a = STATE_CLEAN;
   }
 }
 function removeSourceObservers(node, index) {
   let source;
   let swap;
-  for (let i = index; i < node.g.length; i++) {
-    source = node.g[i];
-    if (source.e) {
-      swap = source.e.indexOf(node);
-      source.e[swap] = source.e[source.e.length - 1];
-      source.e.pop();
-      if (!source.e.length)
-        source.T?.();
+  for (let i = index; i < node.f.length; i++) {
+    source = node.f[i];
+    if (source.d) {
+      swap = source.d.indexOf(node);
+      source.d[swap] = source.d[source.d.length - 1];
+      source.d.pop();
+      if (!source.d.length)
+        source.U?.();
     }
   }
 }
@@ -602,103 +696,13 @@ function compute(owner, fn, observer) {
     notStale = prevNotStale;
   }
 }
-
-// src/core/scheduler.ts
-var scheduled = false;
-function schedule() {
-  if (scheduled)
-    return;
-  scheduled = true;
-  if (!globalQueue.J)
-    queueMicrotask(flushSync);
-}
-var Queue = class {
-  J = false;
-  u = [[], [], []];
-  E = [];
-  enqueue(type, node) {
-    this.u[0].push(node);
-    if (type)
-      this.u[type].push(node);
-    schedule();
-  }
-  run(type) {
-    if (this.u[type].length) {
-      if (type === EFFECT_PURE) {
-        runPureQueue(this.u[type]);
-        this.u[type] = [];
-      } else {
-        const effects = this.u[type];
-        this.u[type] = [];
-        runEffectQueue(effects);
-      }
-    }
-    let rerun = false;
-    for (let i = 0; i < this.E.length; i++) {
-      rerun = this.E[i].run(type) || rerun;
-    }
-    if (type === EFFECT_PURE && this.u[type].length)
-      return true;
-  }
-  flush() {
-    if (this.J)
-      return;
-    this.J = true;
-    try {
-      while (this.run(EFFECT_PURE)) {
-      }
-      incrementClock();
-      scheduled = false;
-      this.run(EFFECT_RENDER);
-      this.run(EFFECT_USER);
-    } finally {
-      this.J = false;
-    }
-  }
-  addChild(child) {
-    this.E.push(child);
-  }
-  removeChild(child) {
-    const index = this.E.indexOf(child);
-    if (index >= 0)
-      this.E.splice(index, 1);
-  }
-};
-var globalQueue = new Queue();
-function flushSync() {
-  while (scheduled) {
-    globalQueue.flush();
-  }
-}
 function createBoundary(fn, queue) {
   const owner = new Owner();
-  const parentQueue = owner.b || globalQueue;
-  parentQueue.addChild(owner.b = queue);
-  onCleanup(() => parentQueue.removeChild(owner.b));
+  const parentQueue = owner.h;
+  parentQueue.addChild(owner.h = queue);
+  onCleanup(() => parentQueue.removeChild(owner.h));
   return compute(owner, fn, null);
 }
-function runTop(node) {
-  const ancestors = [];
-  for (let current = node; current !== null; current = current.r) {
-    if (current.a !== STATE_CLEAN) {
-      ancestors.push(current);
-    }
-  }
-  for (let i = ancestors.length - 1; i >= 0; i--) {
-    if (ancestors[i].a !== STATE_DISPOSED)
-      ancestors[i].x();
-  }
-}
-function runPureQueue(queue) {
-  for (let i = 0; i < queue.length; i++) {
-    if (queue[i].a !== STATE_CLEAN)
-      runTop(queue[i]);
-  }
-}
-function runEffectQueue(queue) {
-  for (let i = 0; i < queue.length; i++)
-    queue[i].W();
-}
 
 // src/core/effect.ts
 var Effect = class extends Computation {
@@ -707,29 +711,27 @@ var Effect = class extends Computation {
   B;
   Q = false;
   M;
-  y;
-  b;
+  w;
   constructor(initialValue, compute2, effect, error, options) {
     super(initialValue, compute2, options);
     this.K = effect;
     this.L = error;
     this.M = initialValue;
-    this.y = options?.render ? EFFECT_RENDER : EFFECT_USER;
-    if (this.y === EFFECT_RENDER) {
-      this.t = (p) => latest(() => compute2(p));
+    this.w = options?.render ? EFFECT_RENDER : EFFECT_USER;
+    if (this.w === EFFECT_RENDER) {
+      this.u = (p) => latest(() => compute2(p));
     }
-    this.b = getOwner()?.b || globalQueue;
     if (!options?.defer) {
-      this.x();
-      this.y === EFFECT_USER ? this.b.enqueue(this.y, this) : this.W();
+      this.y();
+      this.w === EFFECT_USER ? this.h.enqueue(this.w, this) : this.T();
     }
   }
   write(value, flags = 0) {
     if (this.a == STATE_DIRTY) {
-      const currentFlags = this.d;
-      this.d = flags;
-      if (this.y === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
-        this.b.R?.(this);
+      const currentFlags = this.b;
+      this.b = flags;
+      if (this.w === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
+        this.h.R?.(this);
       }
     }
     if (value === UNCHANGED)
@@ -742,16 +744,16 @@ var Effect = class extends Computation {
     if (this.a >= state || skipQueue)
       return;
     if (this.a === STATE_CLEAN)
-      this.b.enqueue(this.y, this);
+      this.h.enqueue(this.w, this);
     this.a = state;
   }
-  I(error) {
+  J(error) {
     this.B?.();
-    if (this.d & LOADING_BIT) {
-      this.d = 0;
-      this.b.R?.(this);
+    if (this.b & LOADING_BIT) {
+      this.b = 0;
+      this.h.R?.(this);
     }
-    if (this.y === EFFECT_USER) {
+    if (this.w === EFFECT_USER) {
       try {
         return this.L ? this.B = this.L(error) : console.error(new EffectError(this.K, error));
       } catch (e) {
@@ -760,7 +762,7 @@ var Effect = class extends Computation {
     }
     this.handleError(error);
   }
-  z() {
+  A() {
     if (this.a === STATE_DISPOSED)
       return;
     this.K = void 0;
@@ -768,9 +770,9 @@ var Effect = class extends Computation {
     this.L = void 0;
     this.B?.();
     this.B = void 0;
-    super.z();
+    super.A();
   }
-  W() {
+  T() {
     if (this.Q && this.a !== STATE_DISPOSED) {
       this.B?.();
       try {
@@ -785,38 +787,34 @@ var Effect = class extends Computation {
   }
 };
 var EagerComputation = class extends Computation {
-  b;
   constructor(initialValue, compute2, options) {
     super(initialValue, compute2, options);
-    this.b = getOwner()?.b || globalQueue;
-    this.x();
+    !options?.defer && this.y();
   }
   q(state, skipQueue) {
-    if (this.a >= state && !this.H)
+    if (this.a >= state && !this.I)
       return;
     if (this.a === STATE_CLEAN && !skipQueue)
-      this.b.enqueue(EFFECT_PURE, this);
+      this.h.enqueue(EFFECT_PURE, this);
     super.q(state, skipQueue);
   }
 };
 var ProjectionComputation = class extends Computation {
-  b;
   constructor(compute2) {
     super(null, compute2);
-    this.b = getOwner()?.b || globalQueue;
   }
   q(state, skipQueue) {
-    if (this.a >= state && !this.H)
+    if (this.a >= state && !this.I)
       return;
     if (this.a === STATE_CLEAN && !skipQueue)
-      this.b.enqueue(EFFECT_PURE, this);
+      this.h.enqueue(EFFECT_PURE, this);
     super.q(state, true);
   }
 };
 
 // src/core/suspense.ts
 var SuspenseQueue = class extends Queue {
-  f = /* @__PURE__ */ new Set();
+  e = /* @__PURE__ */ new Set();
   o = false;
   S = new Computation(false, null);
   run(type) {
@@ -825,15 +823,15 @@ var SuspenseQueue = class extends Queue {
     return super.run(type);
   }
   R(node) {
-    if (node.d & LOADING_BIT) {
-      this.f.add(node);
+    if (node.b & LOADING_BIT) {
+      this.e.add(node);
       if (!this.o) {
         this.o = true;
         this.S.write(true);
       }
     } else {
-      this.f.delete(node);
-      if (this.f.size === 0) {
+      this.e.delete(node);
+      if (this.e.size === 0) {
         this.o = false;
         this.S.write(false);
       }
@@ -842,10 +840,11 @@ var SuspenseQueue = class extends Queue {
 };
 var LiveComputation = class extends EagerComputation {
   write(value, flags = 0) {
-    const currentFlags = this.d;
+    const currentFlags = this.b;
+    const dirty = this.a === STATE_DIRTY;
     super.write(value, flags);
-    if ((flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
-      this.b.R?.(this);
+    if (dirty && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
+      this.h.R?.(this);
     }
     return this.c;
   }
@@ -887,10 +886,10 @@ function createMemo(compute2, value, options) {
   return () => {
     if (node) {
       resolvedValue = node.wait();
-      if (!node.g?.length && node.n?.r !== node) {
+      if (!node.f?.length && node.n?.s !== node) {
         node.dispose();
         node = void 0;
-      } else if (!node.r && !node.e?.length) {
+      } else if (!node.s && !node.d?.length) {
         node.dispose();
         node.a = STATE_DIRTY;
       }
@@ -920,7 +919,7 @@ function createAsync(compute2, value, options) {
       const signal = new Computation(value2, null, options);
       const w = signal.wait;
       signal.wait = function() {
-        if (signal.d & ERROR_BIT && signal.A <= getClock()) {
+        if (signal.b & ERROR_BIT && signal.z <= getClock()) {
           lhs.q(STATE_DIRTY);
           throw new NotReadyError();
         }
@@ -935,7 +934,7 @@ function createAsync(compute2, value, options) {
           },
           (error) => {
             uninitialized = true;
-            signal.I(error);
+            signal.J(error);
           }
         );
       } else {
@@ -987,16 +986,31 @@ function runWithOwner(owner, run) {
 }
 function createErrorBoundary(fn, fallback) {
   const owner = new Owner();
-  const error = new Computation(null, null);
-  const reset = new Computation(null, null, { equals: false });
-  const handler = (err) => error.write({ D: err });
+  const error = new Computation(void 0, null);
+  const nodes = /* @__PURE__ */ new Set();
+  function handler(err, node) {
+    if (nodes.has(node))
+      return;
+    compute(
+      node,
+      () => onCleanup(() => {
+        nodes.delete(node);
+        if (!nodes.size)
+          error.write(void 0);
+      }),
+      null
+    );
+    nodes.add(node);
+    if (nodes.size === 1)
+      error.write({ E: err });
+  }
   owner.m = owner.m ? [handler, ...owner.m] : [handler];
   const guarded = compute(
     owner,
     () => {
-      const c = new Computation(null, () => (reset.read(), fn()));
-      const f = new Computation(null, () => flatten(c.read()));
-      f.I = function(error2) {
+      const c = new Computation(void 0, fn);
+      const f = new EagerComputation(void 0, () => flatten(c.read()), { defer: true });
+      f.J = function(error2) {
         this.handleError(error2);
       };
       return f;
@@ -1009,24 +1023,29 @@ function createErrorBoundary(fn, fallback) {
       if (!error.read())
         return resolved;
     }
-    return fallback(error.read().D, () => {
-      error.write(null);
-      reset.write(null);
+    return fallback(error.read().E, () => {
+      incrementClock();
+      for (let node of nodes) {
+        node.a = STATE_DIRTY;
+        node.h?.enqueue(node.w, node);
+      }
     });
   });
   return decision.read.bind(decision);
 }
 function resolve(fn) {
   return new Promise((res, rej) => {
-    let node = new EagerComputation(void 0, () => {
-      try {
-        res(fn());
-      } catch (err) {
-        if (err instanceof NotReadyError)
-          throw err;
-        rej(err);
-      }
-      node.dispose(true);
+    createRoot((dispose) => {
+      new EagerComputation(void 0, () => {
+        try {
+          res(fn());
+        } catch (err) {
+          if (err instanceof NotReadyError)
+            throw err;
+          rej(err);
+        }
+        dispose();
+      });
     });
   });
 }
@@ -1037,10 +1056,10 @@ function createReaction(effect, error, options) {
     ...void 0
   });
   return (tracking) => {
-    node.t = tracking;
+    node.u = tracking;
     node.a = STATE_DIRTY;
-    node.x();
-    node.t = null;
+    node.y();
+    node.u = null;
   };
 }
 
@@ -1531,10 +1550,10 @@ function mapArray(list, map, options) {
     F: new Owner(),
     i: 0,
     X: list,
-    w: [],
+    x: [],
     G: map,
-    h: [],
-    f: [],
+    g: [],
+    e: [],
     C: keyFn,
     j: keyFn || options?.keyed === false ? [] : void 0,
     k: map.length > 1 ? [] : void 0,
@@ -1563,38 +1582,38 @@ function updateKeyedMap() {
     if (newLen === 0) {
       if (this.i !== 0) {
         this.F.dispose(false);
-        this.f = [];
-        this.w = [];
-        this.h = [];
+        this.e = [];
+        this.x = [];
+        this.g = [];
         this.i = 0;
         this.j && (this.j = []);
         this.k && (this.k = []);
       }
-      if (this.o && !this.h[0]) {
-        this.h[0] = compute(
-          this.f[0] = new Owner(),
+      if (this.o && !this.g[0]) {
+        this.g[0] = compute(
+          this.e[0] = new Owner(),
           this.o,
           null
         );
       }
     } else if (this.i === 0) {
-      if (this.f[0])
-        this.f[0].dispose();
-      this.h = new Array(newLen);
+      if (this.e[0])
+        this.e[0].dispose();
+      this.g = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.w[j] = newItems[j];
-        this.h[j] = compute(this.f[j] = new Owner(), mapper, null);
+        this.x[j] = newItems[j];
+        this.g[j] = compute(this.e[j] = new Owner(), mapper, null);
       }
       this.i = newLen;
     } else {
       let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.j ? new Array(newLen) : void 0, tempIndexes = this.k ? new Array(newLen) : void 0;
-      for (start = 0, end = Math.min(this.i, newLen); start < end && (this.w[start] === newItems[start] || this.j && compare(this.C, this.w[start], newItems[start])); start++) {
+      for (start = 0, end = Math.min(this.i, newLen); start < end && (this.x[start] === newItems[start] || this.j && compare(this.C, this.x[start], newItems[start])); start++) {
         if (this.j)
           this.j[start].write(newItems[start]);
       }
-      for (end = this.i - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.w[end] === newItems[newEnd] || this.j && compare(this.C, this.w[end], newItems[newEnd])); end--, newEnd--) {
-        temp[newEnd] = this.h[end];
-        tempNodes[newEnd] = this.f[end];
+      for (end = this.i - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.x[end] === newItems[newEnd] || this.j && compare(this.C, this.x[end], newItems[newEnd])); end--, newEnd--) {
+        temp[newEnd] = this.g[end];
+        tempNodes[newEnd] = this.e[end];
         tempRows && (tempRows[newEnd] = this.j[end]);
         tempIndexes && (tempIndexes[newEnd] = this.k[end]);
       }
@@ -1608,23 +1627,23 @@ function updateKeyedMap() {
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.w[i];
+        item = this.x[i];
         key = this.C ? this.C(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
-          temp[j] = this.h[i];
-          tempNodes[j] = this.f[i];
+          temp[j] = this.g[i];
+          tempNodes[j] = this.e[i];
           tempRows && (tempRows[j] = this.j[i]);
           tempIndexes && (tempIndexes[j] = this.k[i]);
           j = newIndicesNext[j];
           newIndices.set(key, j);
         } else
-          this.f[i].dispose();
+          this.e[i].dispose();
       }
       for (j = start; j < newLen; j++) {
         if (j in temp) {
-          this.h[j] = temp[j];
-          this.f[j] = tempNodes[j];
+          this.g[j] = temp[j];
+          this.e[j] = tempNodes[j];
           if (tempRows) {
             this.j[j] = tempRows[j];
             this.j[j].write(newItems[j]);
@@ -1634,14 +1653,14 @@ function updateKeyedMap() {
             this.k[j].write(j);
           }
         } else {
-          this.h[j] = compute(this.f[j] = new Owner(), mapper, null);
+          this.g[j] = compute(this.e[j] = new Owner(), mapper, null);
         }
       }
-      this.h = this.h.slice(0, this.i = newLen);
-      this.w = newItems.slice(0);
+      this.g = this.g.slice(0, this.i = newLen);
+      this.x = newItems.slice(0);
     }
   });
-  return this.h;
+  return this.g;
 }
 function repeat(count, map, options) {
   return updateRepeat.bind({
@@ -1649,8 +1668,8 @@ function repeat(count, map, options) {
     i: 0,
     Y: count,
     G: map,
-    f: [],
-    h: [],
+    e: [],
+    g: [],
     o: options?.fallback
   });
 }
@@ -1660,34 +1679,34 @@ function updateRepeat() {
     if (newLen === 0) {
       if (this.i !== 0) {
         this.F.dispose(false);
-        this.f = [];
-        this.h = [];
+        this.e = [];
+        this.g = [];
         this.i = 0;
       }
-      if (this.o && !this.h[0]) {
-        this.h[0] = compute(
-          this.f[0] = new Owner(),
+      if (this.o && !this.g[0]) {
+        this.g[0] = compute(
+          this.e[0] = new Owner(),
           this.o,
           null
         );
       }
     } else {
-      if (this.i === 0 && this.f[0])
-        this.f[0].dispose();
+      if (this.i === 0 && this.e[0])
+        this.e[0].dispose();
       for (let i = this.i; i < newLen; i++) {
-        this.h[i] = compute(
-          this.f[i] = new Owner(),
+        this.g[i] = compute(
+          this.e[i] = new Owner(),
           () => this.G(i),
           null
         );
       }
       for (let i = newLen; i < this.i; i++)
-        this.f[i].dispose();
-      this.h = this.h.slice(0, newLen);
+        this.e[i].dispose();
+      this.g = this.g.slice(0, newLen);
       this.i = newLen;
     }
   });
-  return this.h;
+  return this.g;
 }
 function compare(key, a, b) {
   return key ? key(a) === key(b) : true;