@solidjs/signals 0.3.0 → 0.3.1

package/dist/node.cjs

@@ -45,11 +45,12 @@ function schedule() {
   if (scheduled)
     return;
   scheduled = true;
-  if (!globalQueue.J)
+  if (!globalQueue.K)
     queueMicrotask(flushSync);
 }
 var Queue = class {
-  J = false;
+  n = null;
+  K = false;
   s = [[], [], []];
   F = [];
   created = clock;
@@ -78,9 +79,9 @@ var Queue = class {
       return rerun || !!this.s[type].length;
   }
   flush() {
-    if (this.J)
+    if (this.K)
       return;
-    this.J = true;
+    this.K = true;
     try {
       while (this.run(EFFECT_PURE)) {
       }
@@ -89,17 +90,23 @@ var Queue = class {
       this.run(EFFECT_RENDER);
       this.run(EFFECT_USER);
     } finally {
-      this.J = false;
+      this.K = false;
     }
   }
   addChild(child) {
     this.F.push(child);
+    child.n = this;
   }
   removeChild(child) {
     const index = this.F.indexOf(child);
     if (index >= 0)
       this.F.splice(index, 1);
   }
+  notify(...args) {
+    if (this.n)
+      return this.n.notify(...args);
+    return false;
+  }
 };
 var globalQueue = new Queue();
 function flushSync() {
@@ -109,14 +116,14 @@ function flushSync() {
 }
 function runTop(node) {
   const ancestors = [];
-  for (let current = node; current !== null; current = current.x) {
+  for (let current = node; current !== null; current = current.n) {
     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();
+      ancestors[i].x();
   }
 }
 function runPureQueue(queue) {
@@ -127,7 +134,7 @@ function runPureQueue(queue) {
 }
 function runEffectQueue(queue) {
   for (let i = 0; i < queue.length; i++)
-    queue[i].T();
+    queue[i].V();
 }
 
 // src/core/utils.ts
@@ -174,104 +181,80 @@ 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
-  x = null;
-  l = null;
+  n = null;
+  m = null;
   t = null;
   a = STATE_CLEAN;
-  m = null;
+  l = null;
   o = defaultContext;
-  n = null;
   h = globalQueue;
-  O = null;
-  X = 0;
+  W = 0;
   id = null;
   constructor(id = null, skipAppend = false) {
     this.id = id;
-    if (currentOwner && !skipAppend)
-      currentOwner.append(this);
+    if (currentOwner) {
+      if (!id && currentOwner.id)
+        this.id = currentOwner.getNextChildId();
+      !skipAppend && currentOwner.append(this);
+    }
   }
   append(child) {
-    child.x = this;
+    child.n = this;
     child.t = this;
-    if (this.id) {
-      child.O = this.l ? this.l.O + 1 : 0;
-      child.id = formatId(this.id, child.O);
-    }
-    if (this.l)
-      this.l.t = child;
-    child.l = this.l;
-    this.l = child;
+    if (this.m)
+      this.m.t = child;
+    child.m = this.m;
+    this.m = child;
     if (child.o !== this.o) {
       child.o = { ...this.o, ...child.o };
     }
-    if (this.n) {
-      child.n = !child.n ? this.n : [...child.n, ...this.n];
-    }
     if (this.h)
       child.h = this.h;
   }
   dispose(self = true) {
     if (this.a === STATE_DISPOSED)
       return;
-    let head = self ? this.t || this.x : this, current = this.l, next = null;
-    while (current && current.x === this) {
+    let head = self ? this.t || this.n : this, current = this.m, next = null;
+    while (current && current.n === this) {
       current.dispose(true);
-      current.z();
-      next = current.l;
-      current.l = null;
+      current.y();
+      next = current.m;
+      current.m = null;
       current = next;
     }
+    this.W = 0;
     if (self)
-      this.z();
+      this.y();
     if (current)
       current.t = !self ? this : this.t;
     if (head)
-      head.l = current;
+      head.m = current;
   }
-  z() {
+  y() {
     if (this.t)
-      this.t.l = null;
-    this.x = null;
+      this.t.m = null;
+    this.n = null;
     this.t = null;
     this.o = defaultContext;
-    this.n = null;
     this.a = STATE_DISPOSED;
     this.emptyDisposal();
   }
   emptyDisposal() {
-    if (!this.m)
+    if (!this.l)
       return;
-    if (Array.isArray(this.m)) {
-      for (let i = 0; i < this.m.length; i++) {
-        const callable = this.m[i];
+    if (Array.isArray(this.l)) {
+      for (let i = 0; i < this.l.length; i++) {
+        const callable = this.l[i];
         callable.call(callable);
       }
     } else {
-      this.m.call(this.m);
+      this.l.call(this.l);
     }
-    this.m = null;
-  }
-  addErrorHandler(handler) {
-    this.n = this.n ? [handler, ...this.n] : [handler];
-  }
-  handleError(error) {
-    if (!this.n)
-      throw error;
-    let i = 0, len = this.n.length;
-    for (i = 0; i < len; i++) {
-      try {
-        this.n[i](error, this);
-        break;
-      } catch (e) {
-        error = e;
-      }
-    }
-    if (i === len)
-      throw error;
+    this.l = null;
   }
   getNextChildId() {
     if (this.id)
-      return formatId(this.id + "-", this.X++);
+      return formatId(this.id, this.W++);
     throw new Error("Cannot get child id from owner without an id");
   }
 };
@@ -304,12 +287,12 @@ function onCleanup(fn) {
   if (!currentOwner)
     return fn;
   const node = currentOwner;
-  if (!node.m) {
-    node.m = fn;
-  } else if (Array.isArray(node.m)) {
-    node.m.push(fn);
+  if (!node.l) {
+    node.l = fn;
+  } else if (Array.isArray(node.l)) {
+    node.l.push(fn);
   } else {
-    node.m = [node.m, fn];
+    node.l = [node.l, fn];
   }
   return fn;
 }
@@ -338,43 +321,43 @@ function getObserver() {
 var UNCHANGED = Symbol(0);
 var Computation = class extends Owner {
   c = null;
-  f = null;
+  e = null;
   g;
   G;
-  A;
+  z;
   // Used in __DEV__ mode, hopefully removed in production
-  $;
+  ba;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  P = isEqual;
-  U;
+  S = isEqual;
+  X;
   /** Whether the computation is an error or has ancestors that are unresolved */
-  d = 0;
+  f = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
-  Q = DEFAULT_FLAGS;
-  B = -1;
-  K = false;
+  T = DEFAULT_FLAGS;
+  A = -1;
+  B = false;
   constructor(initialValue, compute2, options) {
     super(null, compute2 === null);
-    this.A = compute2;
+    this.z = compute2;
     this.a = compute2 ? STATE_DIRTY : STATE_CLEAN;
-    this.d = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
+    this.f = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
     this.g = initialValue;
     if ((options == null ? void 0 : options.equals) !== void 0)
-      this.P = options.equals;
+      this.S = options.equals;
     if (options == null ? void 0 : options.unobserved)
-      this.U = options == null ? void 0 : options.unobserved;
+      this.X = options == null ? void 0 : options.unobserved;
   }
-  V() {
-    if (this.A) {
-      if (this.d & ERROR_BIT && this.B <= getClock())
+  Y() {
+    if (this.z) {
+      if (this.f & ERROR_BIT && this.A <= getClock())
         update(this);
       else
-        this.y();
+        this.x();
     }
     track(this);
-    newFlags |= this.d & ~currentMask;
-    if (this.d & ERROR_BIT) {
+    newFlags |= this.f & ~currentMask;
+    if (this.f & ERROR_BIT) {
       throw this.G;
     } else {
       return this.g;
@@ -385,7 +368,7 @@ var Computation = class extends Owner {
    * Automatically re-executes the surrounding computation when the value changes
    */
   read() {
-    return this.V();
+    return this.Y();
   }
   /**
    * Return the current value of this computation
@@ -395,37 +378,37 @@ var Computation = class extends Owner {
    * before continuing
    */
   wait() {
-    if (this.A && this.d & ERROR_BIT && this.B <= getClock()) {
+    if (this.z && this.f & ERROR_BIT && this.A <= getClock()) {
       update(this);
     } else {
-      this.y();
+      this.x();
     }
     track(this);
-    if ((notStale || this.d & UNINITIALIZED_BIT) && this.d & LOADING_BIT) {
+    if ((notStale || this.f & UNINITIALIZED_BIT) && this.f & LOADING_BIT) {
       throw new NotReadyError();
     }
-    if (staleCheck && this.d & LOADING_BIT) {
+    if (staleCheck && this.f & LOADING_BIT) {
       staleCheck.g = true;
     }
-    return this.V();
+    return this.Y();
   }
   /** Update the computation with a new value. */
   write(value, flags = 0, raw = false) {
     const newValue = !raw && typeof value === "function" ? value(this.g) : value;
-    const valueChanged = newValue !== UNCHANGED && (!!(this.d & UNINITIALIZED_BIT) || this.d & LOADING_BIT & ~flags || this.P === false || !this.P(this.g, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(this.f & UNINITIALIZED_BIT) || this.f & LOADING_BIT & ~flags || this.S === false || !this.S(this.g, newValue));
     if (valueChanged) {
       this.g = newValue;
       this.G = void 0;
     }
-    const changedFlagsMask = this.d ^ flags, changedFlags = changedFlagsMask & flags;
-    this.d = flags;
-    this.B = getClock() + 1;
-    if (this.f) {
-      for (let i = 0; i < this.f.length; i++) {
+    const changedFlagsMask = this.f ^ flags, changedFlags = changedFlagsMask & flags;
+    this.f = flags;
+    this.A = getClock() + 1;
+    if (this.e) {
+      for (let i = 0; i < this.e.length; i++) {
         if (valueChanged) {
-          this.f[i].r(STATE_DIRTY);
+          this.e[i].r(STATE_DIRTY);
         } else if (changedFlagsMask) {
-          this.f[i].W(changedFlagsMask, changedFlags);
+          this.e[i].Z(changedFlagsMask, changedFlags);
         }
       }
     }
@@ -435,13 +418,13 @@ var Computation = class extends Owner {
    * Set the current node's state, and recursively mark all of this node's observers as STATE_CHECK
    */
   r(state, skipQueue) {
-    if (this.a >= state && !this.K)
+    if (this.a >= state && !this.B)
       return;
-    this.K = !!skipQueue;
+    this.B = !!skipQueue;
     this.a = state;
-    if (this.f) {
-      for (let i = 0; i < this.f.length; i++) {
-        this.f[i].r(STATE_CHECK, skipQueue);
+    if (this.e) {
+      for (let i = 0; i < this.e.length; i++) {
+        this.e[i].r(STATE_CHECK, skipQueue);
       }
     }
   }
@@ -451,31 +434,31 @@ 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.
    */
-  W(mask, newFlags2) {
+  Z(mask, newFlags2) {
     if (this.a >= STATE_DIRTY)
       return;
-    if (mask & this.Q) {
+    if (mask & this.T) {
       this.r(STATE_DIRTY);
       return;
     }
     if (this.a >= STATE_CHECK)
       return;
-    const prevFlags = this.d & mask;
+    const prevFlags = this.f & mask;
     const deltaFlags = prevFlags ^ newFlags2;
     if (newFlags2 === prevFlags) ; else if (deltaFlags & prevFlags & mask) {
       this.r(STATE_CHECK);
     } else {
-      this.d ^= deltaFlags;
-      if (this.f) {
-        for (let i = 0; i < this.f.length; i++) {
-          this.f[i].W(mask, newFlags2);
+      this.f ^= deltaFlags;
+      if (this.e) {
+        for (let i = 0; i < this.e.length; i++) {
+          this.e[i].Z(mask, newFlags2);
         }
       }
     }
   }
-  H(error) {
+  L(error) {
     this.G = error;
-    this.write(UNCHANGED, this.d & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
+    this.write(UNCHANGED, this.f & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
   }
   /**
    * This is the core part of the reactivity system, which makes sure that the values are updated
@@ -484,8 +467,8 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  y() {
-    if (!this.A) {
+  x() {
+    if (!this.z) {
       return;
     }
     if (this.a === STATE_DISPOSED) {
@@ -497,8 +480,8 @@ var Computation = class extends Owner {
     let observerFlags = 0;
     if (this.a === STATE_CHECK) {
       for (let i = 0; i < this.c.length; i++) {
-        this.c[i].y();
-        observerFlags |= this.c[i].d;
+        this.c[i].x();
+        observerFlags |= this.c[i].f;
         if (this.a === STATE_DIRTY) {
           break;
         }
@@ -514,12 +497,12 @@ var Computation = class extends Owner {
   /**
    * Remove ourselves from the owner graph and the computation graph
    */
-  z() {
+  y() {
     if (this.a === STATE_DISPOSED)
       return;
     if (this.c)
       removeSourceObservers(this, 0);
-    super.z();
+    super.y();
   }
 };
 function track(computation) {
@@ -532,7 +515,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.g = computation.B > currentObserver.B;
+      updateCheck.g = computation.A > currentObserver.A;
     }
   }
 }
@@ -544,13 +527,13 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.A, node);
+    const result = compute(node, node.z, 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.f & UNINITIALIZED_BIT);
     } else {
-      node.H(error);
+      node.L(error);
     }
   } finally {
     if (newSources) {
@@ -567,10 +550,10 @@ function update(node) {
       let source;
       for (let i = newSourcesIndex; i < node.c.length; i++) {
         source = node.c[i];
-        if (!source.f)
-          source.f = [node];
+        if (!source.e)
+          source.e = [node];
         else
-          source.f.push(node);
+          source.e.push(node);
       }
     } else if (node.c && newSourcesIndex < node.c.length) {
       removeSourceObservers(node, newSourcesIndex);
@@ -579,7 +562,7 @@ function update(node) {
     newSources = prevSources;
     newSourcesIndex = prevSourcesIndex;
     newFlags = prevFlags;
-    node.B = getClock() + 1;
+    node.A = getClock() + 1;
     node.a = STATE_CLEAN;
   }
 }
@@ -589,12 +572,12 @@ function removeSourceObservers(node, index) {
   let swap;
   for (let i = index; i < node.c.length; i++) {
     source = node.c[i];
-    if (source.f) {
-      swap = source.f.indexOf(node);
-      source.f[swap] = source.f[source.f.length - 1];
-      source.f.pop();
-      if (!source.f.length)
-        (_a = source.U) == null ? void 0 : _a.call(source);
+    if (source.e) {
+      swap = source.e.indexOf(node);
+      source.e[swap] = source.e[source.e.length - 1];
+      source.e.pop();
+      if (!source.e.length)
+        (_a = source.X) == null ? void 0 : _a.call(source);
     }
   }
 }
@@ -636,7 +619,7 @@ function isPending(fn, loadingValue) {
   if (!currentObserver)
     return pendingCheck(fn, loadingValue);
   const c = new Computation(void 0, () => pendingCheck(fn, loadingValue));
-  c.Q |= LOADING_BIT;
+  c.T |= LOADING_BIT;
   return c.read();
 }
 function latest(fn, fallback) {
@@ -666,10 +649,10 @@ function runWithObserver(observer, run) {
     if (error instanceof NotReadyError) {
       observer.write(
         UNCHANGED,
-        newFlags | LOADING_BIT | observer.d & UNINITIALIZED_BIT
+        newFlags | LOADING_BIT | observer.f & UNINITIALIZED_BIT
       );
     } else {
-      observer.H(error);
+      observer.L(error);
     }
   } finally {
     if (newSources) {
@@ -684,10 +667,10 @@ function runWithObserver(observer, run) {
       let source;
       for (let i = newSourcesIndex; i < observer.c.length; i++) {
         source = observer.c[i];
-        if (!source.f)
-          source.f = [observer];
+        if (!source.e)
+          source.e = [observer];
         else
-          source.f.push(observer);
+          source.e.push(observer);
       }
     }
     newSources = prevSources;
@@ -698,7 +681,7 @@ function runWithObserver(observer, run) {
 function compute(owner, fn, observer) {
   const prevOwner = setOwner(owner), prevObserver = currentObserver, prevMask = currentMask, prevNotStale = notStale;
   currentObserver = observer;
-  currentMask = (observer == null ? void 0 : observer.Q) ?? DEFAULT_FLAGS;
+  currentMask = (observer == null ? void 0 : observer.T) ?? DEFAULT_FLAGS;
   notStale = true;
   try {
     return fn(observer ? observer.g : void 0);
@@ -774,37 +757,36 @@ function flattenArray(children, results = [], options) {
 
 // src/core/effect.ts
 var Effect = class extends Computation {
-  L;
   M;
-  C;
-  R = false;
   N;
+  C;
+  U = false;
+  O;
   u;
   constructor(initialValue, compute2, effect, error, options) {
     super(initialValue, compute2, options);
-    this.L = effect;
-    this.M = error;
-    this.N = initialValue;
+    this.M = effect;
+    this.N = error;
+    this.O = initialValue;
     this.u = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
     if (this.u === EFFECT_RENDER) {
-      this.A = (p) => getClock() > this.h.created && !(this.d & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
+      this.z = (p) => getClock() > this.h.created && !(this.f & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
     }
-    this.y();
-    !(options == null ? void 0 : options.defer) && (this.u === EFFECT_USER ? this.h.enqueue(this.u, this) : this.T());
+    this.x();
+    !(options == null ? void 0 : options.defer) && (this.u === EFFECT_USER ? this.h.enqueue(this.u, this) : this.V());
   }
   write(value, flags = 0) {
-    var _a, _b;
     if (this.a == STATE_DIRTY) {
-      const currentFlags = this.d;
-      this.d = flags;
-      if (this.u === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
-        (_b = (_a = this.h).S) == null ? void 0 : _b.call(_a, this);
+      this.f;
+      this.f = flags;
+      if (this.u === EFFECT_RENDER) {
+        this.h.notify(this, LOADING_BIT | ERROR_BIT, flags);
       }
     }
     if (value === UNCHANGED)
       return this.g;
     this.g = value;
-    this.R = true;
+    this.U = true;
     return value;
   }
   r(state, skipQueue) {
@@ -814,44 +796,45 @@ var Effect = class extends Computation {
       this.h.enqueue(this.u, this);
     this.a = state;
   }
-  H(error) {
-    var _a, _b, _c;
+  L(error) {
+    var _a;
+    this.G = error;
     (_a = this.C) == null ? void 0 : _a.call(this);
-    if (this.d & LOADING_BIT) {
-      (_c = (_b = this.h).S) == null ? void 0 : _c.call(_b, this);
-    }
-    this.d = ERROR_BIT;
+    this.h.notify(this, LOADING_BIT, 0);
+    this.f = ERROR_BIT;
     if (this.u === EFFECT_USER) {
       try {
-        return this.M ? this.C = this.M(error) : console.error(new EffectError(this.L, error));
+        return this.N ? this.C = this.N(error) : console.error(new EffectError(this.M, error));
       } catch (e) {
         error = e;
       }
     }
-    this.handleError(error);
+    if (!this.h.notify(this, ERROR_BIT, ERROR_BIT))
+      throw error;
   }
-  z() {
+  y() {
     var _a;
     if (this.a === STATE_DISPOSED)
       return;
-    this.L = void 0;
-    this.N = void 0;
     this.M = void 0;
+    this.O = void 0;
+    this.N = void 0;
     (_a = this.C) == null ? void 0 : _a.call(this);
     this.C = void 0;
-    super.z();
+    super.y();
   }
-  T() {
+  V() {
     var _a;
-    if (this.R && this.a !== STATE_DISPOSED) {
+    if (this.U && this.a !== STATE_DISPOSED) {
       (_a = this.C) == null ? void 0 : _a.call(this);
       try {
-        this.C = this.L(this.g, this.N);
+        this.C = this.M(this.g, this.O);
       } catch (e) {
-        this.handleError(e);
+        if (!this.h.notify(this, ERROR_BIT, ERROR_BIT))
+          throw e;
       } finally {
-        this.N = this.g;
-        this.R = false;
+        this.O = this.g;
+        this.U = false;
       }
     }
   }
@@ -859,10 +842,10 @@ var Effect = class extends Computation {
 var EagerComputation = class extends Computation {
   constructor(initialValue, compute2, options) {
     super(initialValue, compute2, options);
-    !(options == null ? void 0 : options.defer) && this.y();
+    !(options == null ? void 0 : options.defer) && this.x();
   }
   r(state, skipQueue) {
-    if (this.a >= state && !this.K)
+    if (this.a >= state && !this.B)
       return;
     if (this.a === STATE_CLEAN && !skipQueue)
       this.h.enqueue(EFFECT_PURE, this);
@@ -874,51 +857,82 @@ var ProjectionComputation = class extends Computation {
     super(void 0, compute2);
   }
   r(state, skipQueue) {
-    if (this.a >= state && !this.K)
+    if (this.a >= state && !this.B)
       return;
-    if (this.a === STATE_CLEAN && !skipQueue)
+    if (!skipQueue && (this.a === STATE_CLEAN || this.a === STATE_CHECK && this.B))
       this.h.enqueue(EFFECT_PURE, this);
     super.r(state, true);
+    this.B = !!skipQueue;
   }
 };
 
 // src/core/boundaries.ts
-function createBoundary(owner, fn, queue) {
-  if (queue) {
-    const parentQueue = owner.h;
-    parentQueue.addChild(owner.h = queue);
-    onCleanup(() => parentQueue.removeChild(owner.h));
+var BoundaryComputation = class extends EagerComputation {
+  H;
+  constructor(compute2, propagationMask) {
+    super(void 0, compute2, { defer: true });
+    this.H = propagationMask;
+  }
+  write(value, flags) {
+    super.write(value, flags & ~this.H);
+    if (this.H & LOADING_BIT && !(this.f & UNINITIALIZED_BIT)) {
+      flags &= ~LOADING_BIT;
+    }
+    this.h.notify(this, this.H, flags);
+    return this.g;
   }
+};
+function createBoundChildren(owner, fn, queue, mask) {
+  const parentQueue = owner.h;
+  parentQueue.addChild(owner.h = queue);
+  onCleanup(() => parentQueue.removeChild(owner.h));
   return compute(
     owner,
     () => {
       const c = new Computation(void 0, fn);
-      return new EagerComputation(void 0, () => flatten(c.wait()), { defer: true });
+      return new BoundaryComputation(() => flatten(c.wait()), mask);
     },
     null
   );
 }
-function createDecision(main, condition, fallback) {
-  const decision = new Computation(void 0, () => {
-    if (!condition.read()) {
-      const resolved = main.read();
-      if (!condition.read())
-        return resolved;
-    }
-    return fallback();
-  });
-  return decision.read.bind(decision);
-}
-var SuspenseQueue = class extends Queue {
-  b = /* @__PURE__ */ new Set();
-  p = new Computation(false, null);
+var ConditionalQueue = class extends Queue {
+  p;
+  P = /* @__PURE__ */ new Set();
+  Q = /* @__PURE__ */ new Set();
+  constructor(disabled) {
+    super();
+    this.p = disabled;
+  }
   run(type) {
     if (type && this.p.read())
       return;
     return super.run(type);
   }
-  S(node) {
-    if (node.d & LOADING_BIT) {
+  notify(node, type, flags) {
+    if (this.p.read()) {
+      if (type === LOADING_BIT) {
+        flags & LOADING_BIT ? this.Q.add(node) : this.Q.delete(node);
+      }
+      if (type === ERROR_BIT) {
+        flags & ERROR_BIT ? this.P.add(node) : this.P.delete(node);
+      }
+      return true;
+    }
+    return super.notify(node, type, flags);
+  }
+};
+var CollectionQueue = class extends Queue {
+  R;
+  b = /* @__PURE__ */ new Set();
+  p = new Computation(false, null);
+  constructor(type) {
+    super();
+    this.R = type;
+  }
+  notify(node, type, flags) {
+    if (!(type & this.R))
+      return super.notify(node, type, flags);
+    if (flags & this.R) {
       this.b.add(node);
       if (this.b.size === 1)
         this.p.write(true);
@@ -927,55 +941,51 @@ var SuspenseQueue = class extends Queue {
       if (this.b.size === 0)
         this.p.write(false);
     }
+    type &= ~this.R;
+    return type ? super.notify(node, type, flags) : true;
   }
 };
-function createSuspense(fn, fallback) {
+function createBoundary(fn, condition) {
   const owner = new Owner();
-  const queue = new SuspenseQueue();
-  const tree = createBoundary(owner, fn, queue);
-  const ogWrite = tree.write;
-  tree.write = function(value, flags = 0) {
-    var _a, _b;
-    const currentFlags = this.d;
-    const dirty = this.a === STATE_DIRTY;
-    ogWrite.call(this, value, flags);
-    if (dirty && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
-      (_b = (_a = this.h).S) == null ? void 0 : _b.call(_a, this);
+  const queue = new ConditionalQueue(new Computation(void 0, () => condition() === "hidden" /* HIDDEN */));
+  const tree = createBoundChildren(owner, fn, queue, 0);
+  new EagerComputation(void 0, () => {
+    const disabled = queue.p.read();
+    tree.H = disabled ? ERROR_BIT | LOADING_BIT : 0;
+    if (!disabled) {
+      queue.Q.forEach((node) => queue.notify(node, LOADING_BIT, LOADING_BIT));
+      queue.P.forEach((node) => queue.notify(node, ERROR_BIT, ERROR_BIT));
+      queue.Q.clear();
+      queue.P.clear();
     }
-    return this.g;
-  };
-  return createDecision(tree, queue.p, fallback);
+  });
+  return () => queue.p.read() ? void 0 : tree.read();
 }
-function createErrorBoundary(fn, fallback) {
+function createCollectionBoundary(type, fn, fallback) {
   const owner = new Owner();
-  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({ G: err });
-  }
-  owner.addErrorHandler(handler);
-  const tree = createBoundary(owner, fn);
-  tree.H = tree.handleError;
-  return createDecision(
-    tree,
-    error,
-    () => fallback(error.read().G, () => {
+  const queue = new CollectionQueue(type);
+  const tree = createBoundChildren(owner, fn, queue, type);
+  const decision = new Computation(void 0, () => {
+    if (!queue.p.read()) {
+      const resolved = tree.read();
+      if (!queue.p.read())
+        return resolved;
+    }
+    return fallback(queue);
+  });
+  return decision.read.bind(decision);
+}
+function createSuspense(fn, fallback) {
+  return createCollectionBoundary(LOADING_BIT, fn, () => fallback());
+}
+function createErrorBoundary(fn, fallback) {
+  return createCollectionBoundary(
+    ERROR_BIT,
+    fn,
+    (queue) => fallback(queue.b.values().next().value.G, () => {
       var _a;
       incrementClock();
-      for (let node of nodes) {
+      for (let node of queue.b) {
         node.a = STATE_DIRTY;
         (_a = node.h) == null ? void 0 : _a.enqueue(node.u, node);
       }
@@ -1014,7 +1024,7 @@ function createMemo(compute2, value, options) {
         return resolvedValue;
       }
       resolvedValue = node.wait();
-      if (!((_a = node.c) == null ? void 0 : _a.length) && ((_b = node.l) == null ? void 0 : _b.x) !== node) {
+      if (!((_a = node.c) == null ? void 0 : _a.length) && ((_b = node.m) == null ? void 0 : _b.n) !== node) {
         node.dispose();
         node = void 0;
       }
@@ -1044,7 +1054,7 @@ function createAsync(compute2, value, options) {
           (error) => {
             if (abort)
               return;
-            node.H(error);
+            node.L(error);
           }
         );
       } else {
@@ -1235,7 +1245,7 @@ function ownKeys(target) {
   trackSelf(target);
   return Reflect.ownKeys(target[STORE_VALUE]);
 }
-var Writing = /* @__PURE__ */ new Set();
+var Writing = null;
 var proxyTraps = {
   get(target, property, receiver) {
     if (property === $TARGET)
@@ -1256,7 +1266,7 @@ var proxyTraps = {
       if (desc && desc.get)
         return desc.get.call(receiver);
     }
-    if (Writing.has(storeValue)) {
+    if (Writing == null ? void 0 : Writing.has(storeValue)) {
       const value2 = tracked ? tracked.g : storeValue[property];
       return isWrappable(value2) ? (Writing.add(value2[$RAW] || value2), wrap2(value2)) : value2;
     }
@@ -1279,11 +1289,11 @@ var proxyTraps = {
     return has;
   },
   set(target, property, value) {
-    Writing.has(target[STORE_VALUE]) && setProperty(target[STORE_VALUE], property, unwrap(value, false));
+    (Writing == null ? void 0 : Writing.has(target[STORE_VALUE])) && setProperty(target[STORE_VALUE], property, unwrap(value, false));
     return true;
   },
   deleteProperty(target, property) {
-    Writing.has(target[STORE_VALUE]) && setProperty(target[STORE_VALUE], property, void 0, true);
+    (Writing == null ? void 0 : Writing.has(target[STORE_VALUE])) && setProperty(target[STORE_VALUE], property, void 0, true);
     return true;
   },
   ownKeys,
@@ -1368,11 +1378,14 @@ function createStore(first, second) {
   const unwrappedStore = unwrap(store);
   let wrappedStore = wrap2(unwrappedStore);
   const setStore = (fn) => {
+    const prevWriting = Writing;
+    Writing = /* @__PURE__ */ new Set();
+    Writing.add(unwrappedStore);
     try {
-      Writing.add(unwrappedStore);
       fn(wrappedStore);
     } finally {
       Writing.clear();
+      Writing = prevWriting;
     }
   };
   if (derived)
@@ -1651,19 +1664,19 @@ function mapArray(list, map, options) {
   return updateKeyedMap.bind({
     I: new Owner(),
     i: 0,
-    Y: list,
+    _: list,
     w: [],
     D: map,
-    e: [],
+    d: [],
     b: [],
     E: keyFn,
     j: keyFn || (options == null ? void 0 : options.keyed) === false ? [] : void 0,
     k: map.length > 1 ? [] : void 0,
-    p: options == null ? void 0 : options.fallback
+    J: options == null ? void 0 : options.fallback
   });
 }
 function updateKeyedMap() {
-  const newItems = this.Y() || [], newLen = newItems.length;
+  const newItems = this._() || [], newLen = newItems.length;
   newItems[$TRACK];
   runWithOwner(this.I, () => {
     let i, j, mapper = this.j ? () => {
@@ -1686,25 +1699,25 @@ function updateKeyedMap() {
         this.I.dispose(false);
         this.b = [];
         this.w = [];
-        this.e = [];
+        this.d = [];
         this.i = 0;
         this.j && (this.j = []);
         this.k && (this.k = []);
       }
-      if (this.p && !this.e[0]) {
-        this.e[0] = compute(
+      if (this.J && !this.d[0]) {
+        this.d[0] = compute(
           this.b[0] = new Owner(),
-          this.p,
+          this.J,
           null
         );
       }
     } else if (this.i === 0) {
       if (this.b[0])
         this.b[0].dispose();
-      this.e = new Array(newLen);
+      this.d = new Array(newLen);
       for (j = 0; j < newLen; j++) {
         this.w[j] = newItems[j];
-        this.e[j] = compute(this.b[j] = new Owner(), mapper, null);
+        this.d[j] = compute(this.b[j] = new Owner(), mapper, null);
       }
       this.i = newLen;
     } else {
@@ -1714,7 +1727,7 @@ function updateKeyedMap() {
           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.E, this.w[end], newItems[newEnd])); end--, newEnd--) {
-        temp[newEnd] = this.e[end];
+        temp[newEnd] = this.d[end];
         tempNodes[newEnd] = this.b[end];
         tempRows && (tempRows[newEnd] = this.j[end]);
         tempIndexes && (tempIndexes[newEnd] = this.k[end]);
@@ -1733,7 +1746,7 @@ function updateKeyedMap() {
         key = this.E ? this.E(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
-          temp[j] = this.e[i];
+          temp[j] = this.d[i];
           tempNodes[j] = this.b[i];
           tempRows && (tempRows[j] = this.j[i]);
           tempIndexes && (tempIndexes[j] = this.k[i]);
@@ -1744,7 +1757,7 @@ function updateKeyedMap() {
       }
       for (j = start; j < newLen; j++) {
         if (j in temp) {
-          this.e[j] = temp[j];
+          this.d[j] = temp[j];
           this.b[j] = tempNodes[j];
           if (tempRows) {
             this.j[j] = tempRows[j];
@@ -1755,44 +1768,44 @@ function updateKeyedMap() {
             this.k[j].write(j);
           }
         } else {
-          this.e[j] = compute(this.b[j] = new Owner(), mapper, null);
+          this.d[j] = compute(this.b[j] = new Owner(), mapper, null);
         }
       }
-      this.e = this.e.slice(0, this.i = newLen);
+      this.d = this.d.slice(0, this.i = newLen);
       this.w = newItems.slice(0);
     }
   });
-  return this.e;
+  return this.d;
 }
 function repeat(count, map, options) {
   return updateRepeat.bind({
     I: new Owner(),
     i: 0,
     q: 0,
-    Z: count,
+    $: count,
     D: map,
     b: [],
-    e: [],
-    _: options == null ? void 0 : options.from,
-    p: options == null ? void 0 : options.fallback
+    d: [],
+    aa: options == null ? void 0 : options.from,
+    J: options == null ? void 0 : options.fallback
   });
 }
 function updateRepeat() {
   var _a;
-  const newLen = this.Z();
-  const from = ((_a = this._) == null ? void 0 : _a.call(this)) || 0;
+  const newLen = this.$();
+  const from = ((_a = this.aa) == null ? void 0 : _a.call(this)) || 0;
   runWithOwner(this.I, () => {
     if (newLen === 0) {
       if (this.i !== 0) {
         this.I.dispose(false);
         this.b = [];
-        this.e = [];
+        this.d = [];
         this.i = 0;
       }
-      if (this.p && !this.e[0]) {
-        this.e[0] = compute(
+      if (this.J && !this.d[0]) {
+        this.d[0] = compute(
           this.b[0] = new Owner(),
-          this.p,
+          this.J,
           null
         );
       }
@@ -1809,18 +1822,18 @@ function updateRepeat() {
       while (i < from && i < this.i)
         this.b[i++].dispose();
       this.b.splice(0, from - this.q);
-      this.e.splice(0, from - this.q);
+      this.d.splice(0, from - this.q);
     } else if (this.q > from) {
       let i = prevTo - this.q - 1;
       let difference = this.q - from;
-      this.b.length = this.e.length = newLen;
+      this.b.length = this.d.length = newLen;
       while (i >= difference) {
         this.b[i] = this.b[i - difference];
-        this.e[i] = this.e[i - difference];
+        this.d[i] = this.d[i - difference];
         i--;
       }
       for (let i2 = 0; i2 < difference; i2++) {
-        this.e[i2] = compute(
+        this.d[i2] = compute(
           this.b[i2] = new Owner(),
           () => this.D(i2 + from),
           null
@@ -1828,17 +1841,17 @@ function updateRepeat() {
       }
     }
     for (let i = prevTo; i < to; i++) {
-      this.e[i - from] = compute(
+      this.d[i - from] = compute(
         this.b[i - from] = new Owner(),
         () => this.D(i),
         null
       );
     }
-    this.e = this.e.slice(0, newLen);
+    this.d = this.d.slice(0, newLen);
     this.q = from;
     this.i = newLen;
   });
-  return this.e;
+  return this.d;
 }
 function compare(key, a, b) {
   return key ? key(a) === key(b) : true;
@@ -1856,6 +1869,7 @@ exports.Owner = Owner;
 exports.Queue = Queue;
 exports.SUPPORTS_PROXY = SUPPORTS_PROXY;
 exports.createAsync = createAsync;
+exports.createBoundary = createBoundary;
 exports.createContext = createContext;
 exports.createEffect = createEffect;
 exports.createErrorBoundary = createErrorBoundary;