@solidjs/signals 0.2.5 → 0.3.0

package/dist/node.cjs

@@ -74,8 +74,8 @@ var Queue = class {
     for (let i = 0; i < this.F.length; i++) {
       rerun = this.F[i].run(type) || rerun;
     }
-    if (type === EFFECT_PURE && this.s[type].length)
-      return true;
+    if (type === EFFECT_PURE)
+      return rerun || !!this.s[type].length;
   }
   flush() {
     if (this.J)
@@ -109,14 +109,14 @@ function flushSync() {
 }
 function runTop(node) {
   const ancestors = [];
-  for (let current = node; current !== null; current = current.t) {
+  for (let current = node; current !== null; current = current.x) {
     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].z();
+      ancestors[i].y();
   }
 }
 function runPureQueue(queue) {
@@ -127,13 +127,33 @@ function runPureQueue(queue) {
 }
 function runEffectQueue(queue) {
   for (let i = 0; i < queue.length; i++)
-    queue[i].U();
+    queue[i].T();
 }
 
 // src/core/utils.ts
 function isUndefined(value) {
   return typeof value === "undefined";
 }
+function tryCatch(fn) {
+  try {
+    const v = fn();
+    if (v instanceof Promise) {
+      return v.then(
+        (v2) => [void 0, v2],
+        (e) => {
+          if (e instanceof NotReadyError)
+            throw e;
+          return [e];
+        }
+      );
+    }
+    return [void 0, v];
+  } catch (e) {
+    if (e instanceof NotReadyError)
+      throw e;
+    return [e];
+  }
+}
 
 // src/core/owner.ts
 var currentOwner = null;
@@ -146,34 +166,46 @@ function setOwner(owner) {
   currentOwner = owner;
   return out;
 }
+function formatId(prefix, id) {
+  const num = id.toString(36), len = num.length - 1;
+  return prefix + (len ? String.fromCharCode(64 + len) : "") + num;
+}
 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;
   t = null;
-  n = null;
-  u = null;
   a = STATE_CLEAN;
-  l = null;
-  p = defaultContext;
   m = null;
+  o = defaultContext;
+  n = null;
   h = globalQueue;
-  constructor(signal = false) {
-    if (currentOwner && !signal)
+  O = null;
+  X = 0;
+  id = null;
+  constructor(id = null, skipAppend = false) {
+    this.id = id;
+    if (currentOwner && !skipAppend)
       currentOwner.append(this);
   }
   append(child) {
+    child.x = this;
     child.t = this;
-    child.u = this;
-    if (this.n)
-      this.n.u = child;
-    child.n = this.n;
-    this.n = child;
-    if (child.p !== this.p) {
-      child.p = { ...this.p, ...child.p };
+    if (this.id) {
+      child.O = this.l ? this.l.O + 1 : 0;
+      child.id = formatId(this.id, child.O);
     }
-    if (this.m) {
-      child.m = !child.m ? this.m : [...child.m, ...this.m];
+    if (this.l)
+      this.l.t = child;
+    child.l = this.l;
+    this.l = 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;
@@ -181,51 +213,54 @@ var Owner = class {
   dispose(self = true) {
     if (this.a === STATE_DISPOSED)
       return;
-    let head = self ? this.u || this.t : this, current = this.n, next = null;
-    while (current && current.t === this) {
+    let head = self ? this.t || this.x : this, current = this.l, next = null;
+    while (current && current.x === this) {
       current.dispose(true);
-      current.A();
-      next = current.n;
-      current.n = null;
+      current.z();
+      next = current.l;
+      current.l = null;
       current = next;
     }
     if (self)
-      this.A();
+      this.z();
     if (current)
-      current.u = !self ? this : this.u;
+      current.t = !self ? this : this.t;
     if (head)
-      head.n = current;
+      head.l = current;
   }
-  A() {
-    if (this.u)
-      this.u.n = null;
+  z() {
+    if (this.t)
+      this.t.l = null;
+    this.x = null;
     this.t = null;
-    this.u = null;
-    this.p = defaultContext;
-    this.m = null;
+    this.o = defaultContext;
+    this.n = null;
     this.a = STATE_DISPOSED;
     this.emptyDisposal();
   }
   emptyDisposal() {
-    if (!this.l)
+    if (!this.m)
       return;
-    if (Array.isArray(this.l)) {
-      for (let i = 0; i < this.l.length; i++) {
-        const callable = this.l[i];
+    if (Array.isArray(this.m)) {
+      for (let i = 0; i < this.m.length; i++) {
+        const callable = this.m[i];
         callable.call(callable);
       }
     } else {
-      this.l.call(this.l);
+      this.m.call(this.m);
     }
-    this.l = null;
+    this.m = null;
+  }
+  addErrorHandler(handler) {
+    this.n = this.n ? [handler, ...this.n] : [handler];
   }
   handleError(error) {
-    if (!this.m)
+    if (!this.n)
       throw error;
-    let i = 0, len = this.m.length;
+    let i = 0, len = this.n.length;
     for (i = 0; i < len; i++) {
       try {
-        this.m[i](error, this);
+        this.n[i](error, this);
         break;
       } catch (e) {
         error = e;
@@ -234,6 +269,11 @@ var Owner = class {
     if (i === len)
       throw error;
   }
+  getNextChildId() {
+    if (this.id)
+      return formatId(this.id + "-", this.X++);
+    throw new Error("Cannot get child id from owner without an id");
+  }
 };
 function createContext(defaultValue, description) {
   return { id: Symbol(description), defaultValue };
@@ -242,7 +282,7 @@ function getContext(context, owner = currentOwner) {
   if (!owner) {
     throw new NoOwnerError();
   }
-  const value = hasContext(context, owner) ? owner.p[context.id] : context.defaultValue;
+  const value = hasContext(context, owner) ? owner.o[context.id] : context.defaultValue;
   if (isUndefined(value)) {
     throw new ContextNotFoundError();
   }
@@ -252,24 +292,24 @@ function setContext(context, value, owner = currentOwner) {
   if (!owner) {
     throw new NoOwnerError();
   }
-  owner.p = {
-    ...owner.p,
+  owner.o = {
+    ...owner.o,
     [context.id]: isUndefined(value) ? context.defaultValue : value
   };
 }
 function hasContext(context, owner = currentOwner) {
-  return !isUndefined(owner == null ? void 0 : owner.p[context.id]);
+  return !isUndefined(owner == null ? void 0 : owner.o[context.id]);
 }
 function onCleanup(fn) {
   if (!currentOwner)
     return fn;
   const node = currentOwner;
-  if (!node.l) {
-    node.l = fn;
-  } else if (Array.isArray(node.l)) {
-    node.l.push(fn);
+  if (!node.m) {
+    node.m = fn;
+  } else if (Array.isArray(node.m)) {
+    node.m.push(fn);
   } else {
-    node.l = [node.l, fn];
+    node.m = [node.m, fn];
   }
   return fn;
 }
@@ -297,47 +337,44 @@ function getObserver() {
 }
 var UNCHANGED = Symbol(0);
 var Computation = class extends Owner {
-  b = null;
-  e = null;
+  c = null;
+  f = null;
   g;
   G;
-  B;
+  A;
   // Used in __DEV__ mode, hopefully removed in production
   $;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  O = isEqual;
-  V;
+  P = isEqual;
+  U;
   /** Whether the computation is an error or has ancestors that are unresolved */
-  f = 0;
+  d = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
-  P = DEFAULT_FLAGS;
-  Q = null;
-  y = -1;
+  Q = DEFAULT_FLAGS;
+  B = -1;
   K = false;
   constructor(initialValue, compute2, options) {
-    super(compute2 === null);
-    this.B = compute2;
+    super(null, compute2 === null);
+    this.A = compute2;
     this.a = compute2 ? STATE_DIRTY : STATE_CLEAN;
-    this.f = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
+    this.d = compute2 && initialValue === void 0 ? UNINITIALIZED_BIT : 0;
     this.g = initialValue;
     if ((options == null ? void 0 : options.equals) !== void 0)
-      this.O = options.equals;
+      this.P = options.equals;
     if (options == null ? void 0 : options.unobserved)
-      this.V = options == null ? void 0 : options.unobserved;
+      this.U = options == null ? void 0 : options.unobserved;
   }
-  W() {
-    var _a;
-    if (this.B) {
-      if (this.f & ERROR_BIT && this.y <= getClock())
+  V() {
+    if (this.A) {
+      if (this.d & ERROR_BIT && this.B <= getClock())
         update(this);
       else
-        this.z();
+        this.y();
     }
-    if (!this.B || ((_a = this.b) == null ? void 0 : _a.length))
-      track(this);
-    newFlags |= this.f & ~currentMask;
-    if (this.f & ERROR_BIT) {
+    track(this);
+    newFlags |= this.d & ~currentMask;
+    if (this.d & ERROR_BIT) {
       throw this.G;
     } else {
       return this.g;
@@ -348,7 +385,7 @@ var Computation = class extends Owner {
    * Automatically re-executes the surrounding computation when the value changes
    */
   read() {
-    return this.W();
+    return this.V();
   }
   /**
    * Return the current value of this computation
@@ -358,46 +395,37 @@ var Computation = class extends Owner {
    * before continuing
    */
   wait() {
-    if (this.B && this.f & ERROR_BIT && this.y <= getClock()) {
+    if (this.A && this.d & ERROR_BIT && this.B <= getClock()) {
       update(this);
+    } else {
+      this.y();
     }
-    if ((notStale || this.f & UNINITIALIZED_BIT) && this.loading()) {
+    track(this);
+    if ((notStale || this.d & UNINITIALIZED_BIT) && this.d & LOADING_BIT) {
       throw new NotReadyError();
     }
-    if (staleCheck && this.loading())
+    if (staleCheck && this.d & LOADING_BIT) {
       staleCheck.g = true;
-    return this.W();
-  }
-  /**
-   * Return true if the computation is the value is dependent on an unresolved promise
-   * Triggers re-execution of the computation when the loading state changes
-   *
-   * This is useful especially when effects want to re-execute when a computation's
-   * loading state changes
-   */
-  loading() {
-    if (this.Q === null) {
-      this.Q = loadingState(this);
     }
-    return this.Q.read();
+    return this.V();
   }
   /** 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.f & UNINITIALIZED_BIT) || this.O === false || !this.O(this.g, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(this.d & UNINITIALIZED_BIT) || this.d & LOADING_BIT & ~flags || this.P === false || !this.P(this.g, newValue));
     if (valueChanged) {
       this.g = newValue;
       this.G = void 0;
     }
-    const changedFlagsMask = this.f ^ flags, changedFlags = changedFlagsMask & flags;
-    this.f = flags;
-    this.y = getClock() + 1;
-    if (this.e) {
-      for (let i = 0; i < this.e.length; i++) {
+    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++) {
         if (valueChanged) {
-          this.e[i].q(STATE_DIRTY);
+          this.f[i].r(STATE_DIRTY);
         } else if (changedFlagsMask) {
-          this.e[i].X(changedFlagsMask, changedFlags);
+          this.f[i].W(changedFlagsMask, changedFlags);
         }
       }
     }
@@ -406,14 +434,14 @@ 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) {
+  r(state, skipQueue) {
     if (this.a >= state && !this.K)
       return;
     this.K = !!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.f) {
+      for (let i = 0; i < this.f.length; i++) {
+        this.f[i].r(STATE_CHECK, skipQueue);
       }
     }
   }
@@ -423,31 +451,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.
    */
-  X(mask, newFlags2) {
+  W(mask, newFlags2) {
     if (this.a >= STATE_DIRTY)
       return;
-    if (mask & this.P) {
-      this.q(STATE_DIRTY);
+    if (mask & this.Q) {
+      this.r(STATE_DIRTY);
       return;
     }
     if (this.a >= STATE_CHECK)
       return;
-    const prevFlags = this.f & mask;
+    const prevFlags = this.d & mask;
     const deltaFlags = prevFlags ^ newFlags2;
     if (newFlags2 === prevFlags) ; else if (deltaFlags & prevFlags & mask) {
-      this.q(STATE_CHECK);
+      this.r(STATE_CHECK);
     } else {
-      this.f ^= deltaFlags;
-      if (this.e) {
-        for (let i = 0; i < this.e.length; i++) {
-          this.e[i].X(mask, newFlags2);
+      this.d ^= deltaFlags;
+      if (this.f) {
+        for (let i = 0; i < this.f.length; i++) {
+          this.f[i].W(mask, newFlags2);
         }
       }
     }
   }
   H(error) {
     this.G = error;
-    this.write(UNCHANGED, this.f & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
+    this.write(UNCHANGED, this.d & ~LOADING_BIT | ERROR_BIT | UNINITIALIZED_BIT);
   }
   /**
    * This is the core part of the reactivity system, which makes sure that the values are updated
@@ -456,18 +484,21 @@ var Computation = class extends Owner {
    *
    * This function will ensure that the value and states we read from the computation are up to date
    */
-  z() {
+  y() {
+    if (!this.A) {
+      return;
+    }
     if (this.a === STATE_DISPOSED) {
-      throw new Error("Tried to read a disposed computation");
+      return;
     }
     if (this.a === STATE_CLEAN) {
       return;
     }
     let observerFlags = 0;
     if (this.a === STATE_CHECK) {
-      for (let i = 0; i < this.b.length; i++) {
-        this.b[i].z();
-        observerFlags |= this.b[i].f;
+      for (let i = 0; i < this.c.length; i++) {
+        this.c[i].y();
+        observerFlags |= this.c[i].d;
         if (this.a === STATE_DIRTY) {
           break;
         }
@@ -483,33 +514,17 @@ var Computation = class extends Owner {
   /**
    * Remove ourselves from the owner graph and the computation graph
    */
-  A() {
+  z() {
     if (this.a === STATE_DISPOSED)
       return;
-    if (this.b)
+    if (this.c)
       removeSourceObservers(this, 0);
-    super.A();
+    super.z();
   }
 };
-function loadingState(node) {
-  const prevOwner = setOwner(node.t);
-  const options = void 0;
-  const computation = new Computation(
-    void 0,
-    () => {
-      track(node);
-      node.z();
-      return !!(node.f & LOADING_BIT);
-    },
-    options
-  );
-  computation.P = ERROR_BIT | LOADING_BIT;
-  setOwner(prevOwner);
-  return computation;
-}
 function track(computation) {
   if (currentObserver) {
-    if (!newSources && currentObserver.b && currentObserver.b[newSourcesIndex] === computation) {
+    if (!newSources && currentObserver.c && currentObserver.c[newSourcesIndex] === computation) {
       newSourcesIndex++;
     } else if (!newSources)
       newSources = [computation];
@@ -517,7 +532,7 @@ function track(computation) {
       newSources.push(computation);
     }
     if (updateCheck) {
-      updateCheck.g = computation.y > currentObserver.y;
+      updateCheck.g = computation.B > currentObserver.B;
     }
   }
 }
@@ -529,42 +544,42 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.B, node);
+    const result = compute(node, node.A, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
-      node.write(UNCHANGED, newFlags | LOADING_BIT | node.f & UNINITIALIZED_BIT);
+      node.write(UNCHANGED, newFlags | LOADING_BIT | node.d & UNINITIALIZED_BIT);
     } else {
       node.H(error);
     }
   } finally {
     if (newSources) {
-      if (node.b)
+      if (node.c)
         removeSourceObservers(node, newSourcesIndex);
-      if (node.b && newSourcesIndex > 0) {
-        node.b.length = newSourcesIndex + newSources.length;
+      if (node.c && newSourcesIndex > 0) {
+        node.c.length = newSourcesIndex + newSources.length;
         for (let i = 0; i < newSources.length; i++) {
-          node.b[newSourcesIndex + i] = newSources[i];
+          node.c[newSourcesIndex + i] = newSources[i];
         }
       } else {
-        node.b = newSources;
+        node.c = newSources;
       }
       let source;
-      for (let i = newSourcesIndex; i < node.b.length; i++) {
-        source = node.b[i];
-        if (!source.e)
-          source.e = [node];
+      for (let i = newSourcesIndex; i < node.c.length; i++) {
+        source = node.c[i];
+        if (!source.f)
+          source.f = [node];
         else
-          source.e.push(node);
+          source.f.push(node);
       }
-    } else if (node.b && newSourcesIndex < node.b.length) {
+    } else if (node.c && newSourcesIndex < node.c.length) {
       removeSourceObservers(node, newSourcesIndex);
-      node.b.length = newSourcesIndex;
+      node.c.length = newSourcesIndex;
     }
     newSources = prevSources;
     newSourcesIndex = prevSourcesIndex;
     newFlags = prevFlags;
-    node.y = getClock() + 1;
+    node.B = getClock() + 1;
     node.a = STATE_CLEAN;
   }
 }
@@ -572,14 +587,14 @@ function removeSourceObservers(node, index) {
   var _a;
   let source;
   let swap;
-  for (let i = index; i < node.b.length; i++) {
-    source = node.b[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)
-        (_a = source.V) == null ? void 0 : _a.call(source);
+  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);
     }
   }
 }
@@ -601,8 +616,7 @@ function hasUpdated(fn) {
     updateCheck = current;
   }
 }
-function isPending(fn, loadingValue) {
-  const argLength = arguments.length;
+function pendingCheck(fn, loadingValue) {
   const current = staleCheck;
   staleCheck = { g: false };
   try {
@@ -611,13 +625,20 @@ function isPending(fn, loadingValue) {
   } catch (err) {
     if (!(err instanceof NotReadyError))
       return false;
-    if (argLength > 1)
+    if (loadingValue !== void 0)
       return loadingValue;
     throw err;
   } finally {
     staleCheck = current;
   }
 }
+function isPending(fn, loadingValue) {
+  if (!currentObserver)
+    return pendingCheck(fn, loadingValue);
+  const c = new Computation(void 0, () => pendingCheck(fn, loadingValue));
+  c.Q |= LOADING_BIT;
+  return c.read();
+}
 function latest(fn, fallback) {
   const argLength = arguments.length;
   const prevFlags = newFlags;
@@ -634,19 +655,10 @@ function latest(fn, fallback) {
     notStale = prevNotStale;
   }
 }
-function catchError(fn) {
-  try {
-    fn();
-  } catch (e) {
-    if (e instanceof NotReadyError)
-      throw e;
-    return e;
-  }
-}
 function runWithObserver(observer, run) {
   const prevSources = newSources, prevSourcesIndex = newSourcesIndex, prevFlags = newFlags;
   newSources = null;
-  newSourcesIndex = observer.b ? observer.b.length : 0;
+  newSourcesIndex = observer.c ? observer.c.length : 0;
   newFlags = 0;
   try {
     return compute(observer, run, observer);
@@ -654,7 +666,7 @@ function runWithObserver(observer, run) {
     if (error instanceof NotReadyError) {
       observer.write(
         UNCHANGED,
-        newFlags | LOADING_BIT | observer.f & UNINITIALIZED_BIT
+        newFlags | LOADING_BIT | observer.d & UNINITIALIZED_BIT
       );
     } else {
       observer.H(error);
@@ -662,20 +674,20 @@ function runWithObserver(observer, run) {
   } finally {
     if (newSources) {
       if (newSourcesIndex > 0) {
-        observer.b.length = newSourcesIndex + newSources.length;
+        observer.c.length = newSourcesIndex + newSources.length;
         for (let i = 0; i < newSources.length; i++) {
-          observer.b[newSourcesIndex + i] = newSources[i];
+          observer.c[newSourcesIndex + i] = newSources[i];
         }
       } else {
-        observer.b = newSources;
+        observer.c = newSources;
       }
       let source;
-      for (let i = newSourcesIndex; i < observer.b.length; i++) {
-        source = observer.b[i];
-        if (!source.e)
-          source.e = [observer];
+      for (let i = newSourcesIndex; i < observer.c.length; i++) {
+        source = observer.c[i];
+        if (!source.f)
+          source.f = [observer];
         else
-          source.e.push(observer);
+          source.f.push(observer);
       }
     }
     newSources = prevSources;
@@ -686,7 +698,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.P) ?? DEFAULT_FLAGS;
+  currentMask = (observer == null ? void 0 : observer.Q) ?? DEFAULT_FLAGS;
   notStale = true;
   try {
     return fn(observer ? observer.g : void 0);
@@ -759,13 +771,6 @@ function flattenArray(children, results = [], options) {
     throw notReady;
   return needsUnwrap;
 }
-function createBoundary(fn, queue) {
-  const owner = new Owner();
-  const parentQueue = owner.h;
-  parentQueue.addChild(owner.h = queue);
-  onCleanup(() => parentQueue.removeChild(owner.h));
-  return compute(owner, fn, null);
-}
 
 // src/core/effect.ts
 var Effect = class extends Computation {
@@ -774,25 +779,25 @@ var Effect = class extends Computation {
   C;
   R = false;
   N;
-  w;
+  u;
   constructor(initialValue, compute2, effect, error, options) {
     super(initialValue, compute2, options);
     this.L = effect;
     this.M = error;
     this.N = initialValue;
-    this.w = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
-    if (this.w === EFFECT_RENDER) {
-      this.B = (p) => getClock() > this.h.created && !(this.f & ERROR_BIT) ? latest(() => compute2(p)) : compute2(p);
+    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();
-    !(options == null ? void 0 : options.defer) && (this.w === EFFECT_USER ? this.h.enqueue(this.w, this) : this.U());
+    this.y();
+    !(options == null ? void 0 : options.defer) && (this.u === EFFECT_USER ? this.h.enqueue(this.u, this) : this.T());
   }
   write(value, flags = 0) {
     var _a, _b;
     if (this.a == STATE_DIRTY) {
-      const currentFlags = this.f;
-      this.f = flags;
-      if (this.w === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
+      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);
       }
     }
@@ -802,21 +807,21 @@ var Effect = class extends Computation {
     this.R = true;
     return value;
   }
-  q(state, skipQueue) {
+  r(state, skipQueue) {
     if (this.a >= state || skipQueue)
       return;
     if (this.a === STATE_CLEAN)
-      this.h.enqueue(this.w, this);
+      this.h.enqueue(this.u, this);
     this.a = state;
   }
   H(error) {
     var _a, _b, _c;
     (_a = this.C) == null ? void 0 : _a.call(this);
-    if (this.f & LOADING_BIT) {
+    if (this.d & LOADING_BIT) {
       (_c = (_b = this.h).S) == null ? void 0 : _c.call(_b, this);
     }
-    this.f = ERROR_BIT;
-    if (this.w === EFFECT_USER) {
+    this.d = ERROR_BIT;
+    if (this.u === EFFECT_USER) {
       try {
         return this.M ? this.C = this.M(error) : console.error(new EffectError(this.L, error));
       } catch (e) {
@@ -825,7 +830,7 @@ var Effect = class extends Computation {
     }
     this.handleError(error);
   }
-  A() {
+  z() {
     var _a;
     if (this.a === STATE_DISPOSED)
       return;
@@ -834,9 +839,9 @@ var Effect = class extends Computation {
     this.M = void 0;
     (_a = this.C) == null ? void 0 : _a.call(this);
     this.C = void 0;
-    super.A();
+    super.z();
   }
-  U() {
+  T() {
     var _a;
     if (this.R && this.a !== STATE_DISPOSED) {
       (_a = this.C) == null ? void 0 : _a.call(this);
@@ -854,76 +859,128 @@ 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.z();
+    !(options == null ? void 0 : options.defer) && this.y();
   }
-  q(state, skipQueue) {
+  r(state, skipQueue) {
     if (this.a >= state && !this.K)
       return;
     if (this.a === STATE_CLEAN && !skipQueue)
       this.h.enqueue(EFFECT_PURE, this);
-    super.q(state, skipQueue);
+    super.r(state, skipQueue);
   }
 };
 var ProjectionComputation = class extends Computation {
   constructor(compute2) {
-    super(null, compute2);
+    super(void 0, compute2);
   }
-  q(state, skipQueue) {
+  r(state, skipQueue) {
     if (this.a >= state && !this.K)
       return;
     if (this.a === STATE_CLEAN && !skipQueue)
       this.h.enqueue(EFFECT_PURE, this);
-    super.q(state, true);
+    super.r(state, true);
   }
 };
 
-// src/core/suspense.ts
+// 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));
+  }
+  return compute(
+    owner,
+    () => {
+      const c = new Computation(void 0, fn);
+      return new EagerComputation(void 0, () => flatten(c.wait()), { defer: true });
+    },
+    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 {
-  c = /* @__PURE__ */ new Set();
-  o = false;
-  T = new Computation(false, null);
+  b = /* @__PURE__ */ new Set();
+  p = new Computation(false, null);
   run(type) {
-    if (type && this.o)
+    if (type && this.p.read())
       return;
     return super.run(type);
   }
   S(node) {
-    if (node.f & LOADING_BIT) {
-      this.c.add(node);
-      if (!this.o) {
-        this.o = true;
-        this.T.write(true);
-      }
+    if (node.d & LOADING_BIT) {
+      this.b.add(node);
+      if (this.b.size === 1)
+        this.p.write(true);
     } else {
-      this.c.delete(node);
-      if (this.c.size === 0) {
-        this.o = false;
-        this.T.write(false);
-      }
+      this.b.delete(node);
+      if (this.b.size === 0)
+        this.p.write(false);
     }
   }
 };
-var LiveComputation = class extends EagerComputation {
-  write(value, flags = 0) {
+function createSuspense(fn, fallback) {
+  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.f;
+    const currentFlags = this.d;
     const dirty = this.a === STATE_DIRTY;
-    super.write(value, flags);
+    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);
     }
     return this.g;
+  };
+  return createDecision(tree, queue.p, fallback);
+}
+function createErrorBoundary(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 });
   }
-};
-function createSuspense(fn, fallback) {
-  const queue = new SuspenseQueue();
-  const tree = createBoundary(() => {
-    const child = new Computation(null, fn);
-    return new LiveComputation(null, () => flatten(child.wait()));
-  }, queue);
-  const equality = new Computation(null, () => queue.T.read() || queue.o);
-  const comp = new Computation(null, () => equality.read() ? fallback() : tree.read());
-  return comp.read.bind(comp);
+  owner.addErrorHandler(handler);
+  const tree = createBoundary(owner, fn);
+  tree.H = tree.handleError;
+  return createDecision(
+    tree,
+    error,
+    () => fallback(error.read().G, () => {
+      var _a;
+      incrementClock();
+      for (let node of nodes) {
+        node.a = STATE_DIRTY;
+        (_a = node.h) == null ? void 0 : _a.enqueue(node.u, node);
+      }
+    })
+  );
 }
 
 // src/signals.ts
@@ -950,79 +1007,66 @@ function createMemo(compute2, value, options) {
   );
   let resolvedValue;
   return () => {
-    var _a, _b, _c;
+    var _a, _b;
     if (node) {
+      if (node.a === STATE_DISPOSED) {
+        node = void 0;
+        return resolvedValue;
+      }
       resolvedValue = node.wait();
-      if (!((_a = node.b) == null ? void 0 : _a.length) && ((_b = node.n) == null ? void 0 : _b.t) !== node) {
+      if (!((_a = node.c) == null ? void 0 : _a.length) && ((_b = node.l) == null ? void 0 : _b.x) !== node) {
         node.dispose();
         node = void 0;
-      } else if (!node.t && !((_c = node.e) == null ? void 0 : _c.length)) {
-        node.dispose();
-        node.a = STATE_DIRTY;
       }
     }
     return resolvedValue;
   };
 }
 function createAsync(compute2, value, options) {
-  let uninitialized = value === void 0;
-  const lhs = new EagerComputation(
-    {
-      g: value
-    },
+  const node = new EagerComputation(
+    value,
     (p) => {
-      const value2 = p == null ? void 0 : p.g;
-      const source = compute2(value2);
+      const source = compute2(p);
       const isPromise = source instanceof Promise;
       const iterator = source[Symbol.asyncIterator];
       if (!isPromise && !iterator) {
-        return {
-          wait() {
-            return source;
-          },
-          g: source
-        };
+        return source;
       }
-      const signal = new Computation(value2, null, iterator ? { ...options, equals: false } : options);
-      const w = signal.wait;
-      signal.wait = function() {
-        if (signal.f & ERROR_BIT && signal.y <= getClock()) {
-          lhs.q(STATE_DIRTY);
-          throw new NotReadyError();
-        }
-        return w.call(this);
-      };
-      signal.write(UNCHANGED, LOADING_BIT | (uninitialized ? UNINITIALIZED_BIT : 0));
+      let abort = false;
+      onCleanup(() => abort = true);
       if (isPromise) {
         source.then(
           (value3) => {
-            uninitialized = false;
-            signal.write(value3, 0, true);
+            if (abort)
+              return;
+            node.write(value3, 0, true);
           },
           (error) => {
-            uninitialized = true;
-            signal.H(error);
+            if (abort)
+              return;
+            node.H(error);
           }
         );
       } else {
-        let abort = false;
-        onCleanup(() => abort = true);
         (async () => {
           try {
             for await (let value3 of source) {
               if (abort)
                 return;
-              signal.write(value3, 0, true);
+              node.write(value3, 0, true);
             }
           } catch (error) {
-            signal.write(error, ERROR_BIT);
+            if (abort)
+              return;
+            node.write(error, ERROR_BIT);
           }
         })();
       }
-      return signal;
-    }
+      throw new NotReadyError();
+    },
+    options
   );
-  return () => lhs.wait().wait();
+  return node.wait.bind(node);
 }
 function createEffect(compute2, effect, error, value, options) {
   void new Effect(
@@ -1039,63 +1083,13 @@ function createRenderEffect(compute2, effect, value, options) {
     ...options
   });
 }
-function createRoot(init) {
-  const owner = new Owner();
+function createRoot(init, options) {
+  const owner = new Owner(options == null ? void 0 : options.id);
   return compute(owner, !init.length ? init : () => init(() => owner.dispose()), null);
 }
 function runWithOwner(owner, run) {
   return compute(owner, run, null);
 }
-function createErrorBoundary(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.m = owner.m ? [handler, ...owner.m] : [handler];
-  const guarded = compute(
-    owner,
-    () => {
-      const c = new Computation(void 0, fn);
-      const f = new EagerComputation(void 0, () => flatten(c.read()), { defer: true });
-      f.H = function(error2) {
-        this.handleError(error2);
-      };
-      return f;
-    },
-    null
-  );
-  const decision = new Computation(null, () => {
-    if (!error.read()) {
-      const resolved = guarded.read();
-      if (!error.read())
-        return resolved;
-    }
-    return fallback(error.read().G, () => {
-      var _a;
-      incrementClock();
-      for (let node of nodes) {
-        node.a = STATE_DIRTY;
-        (_a = node.h) == null ? void 0 : _a.enqueue(node.w, node);
-      }
-    });
-  });
-  return decision.read.bind(decision);
-}
 function resolve(fn) {
   return new Promise((res, rej) => {
     createRoot((dispose) => {
@@ -1658,14 +1652,14 @@ function mapArray(list, map, options) {
     I: new Owner(),
     i: 0,
     Y: list,
-    x: [],
+    w: [],
     D: map,
-    d: [],
-    c: [],
+    e: [],
+    b: [],
     E: keyFn,
     j: keyFn || (options == null ? void 0 : options.keyed) === false ? [] : void 0,
     k: map.length > 1 ? [] : void 0,
-    o: options == null ? void 0 : options.fallback
+    p: options == null ? void 0 : options.fallback
   });
 }
 function updateKeyedMap() {
@@ -1690,38 +1684,38 @@ function updateKeyedMap() {
     if (newLen === 0) {
       if (this.i !== 0) {
         this.I.dispose(false);
-        this.c = [];
-        this.x = [];
-        this.d = [];
+        this.b = [];
+        this.w = [];
+        this.e = [];
         this.i = 0;
         this.j && (this.j = []);
         this.k && (this.k = []);
       }
-      if (this.o && !this.d[0]) {
-        this.d[0] = compute(
-          this.c[0] = new Owner(),
-          this.o,
+      if (this.p && !this.e[0]) {
+        this.e[0] = compute(
+          this.b[0] = new Owner(),
+          this.p,
           null
         );
       }
     } else if (this.i === 0) {
-      if (this.c[0])
-        this.c[0].dispose();
-      this.d = new Array(newLen);
+      if (this.b[0])
+        this.b[0].dispose();
+      this.e = new Array(newLen);
       for (j = 0; j < newLen; j++) {
-        this.x[j] = newItems[j];
-        this.d[j] = compute(this.c[j] = new Owner(), mapper, null);
+        this.w[j] = newItems[j];
+        this.e[j] = compute(this.b[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.x[start] === newItems[start] || this.j && compare(this.E, this.x[start], newItems[start])); start++) {
+      for (start = 0, end = Math.min(this.i, newLen); start < end && (this.w[start] === newItems[start] || this.j && compare(this.E, this.w[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.x[end] === newItems[newEnd] || this.j && compare(this.E, this.x[end], newItems[newEnd])); end--, newEnd--) {
-        temp[newEnd] = this.d[end];
-        tempNodes[newEnd] = this.c[end];
+      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];
+        tempNodes[newEnd] = this.b[end];
         tempRows && (tempRows[newEnd] = this.j[end]);
         tempIndexes && (tempIndexes[newEnd] = this.k[end]);
       }
@@ -1735,23 +1729,23 @@ function updateKeyedMap() {
         newIndices.set(key, j);
       }
       for (i = start; i <= end; i++) {
-        item = this.x[i];
+        item = this.w[i];
         key = this.E ? this.E(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
-          temp[j] = this.d[i];
-          tempNodes[j] = this.c[i];
+          temp[j] = this.e[i];
+          tempNodes[j] = this.b[i];
           tempRows && (tempRows[j] = this.j[i]);
           tempIndexes && (tempIndexes[j] = this.k[i]);
           j = newIndicesNext[j];
           newIndices.set(key, j);
         } else
-          this.c[i].dispose();
+          this.b[i].dispose();
       }
       for (j = start; j < newLen; j++) {
         if (j in temp) {
-          this.d[j] = temp[j];
-          this.c[j] = tempNodes[j];
+          this.e[j] = temp[j];
+          this.b[j] = tempNodes[j];
           if (tempRows) {
             this.j[j] = tempRows[j];
             this.j[j].write(newItems[j]);
@@ -1761,26 +1755,26 @@ function updateKeyedMap() {
             this.k[j].write(j);
           }
         } else {
-          this.d[j] = compute(this.c[j] = new Owner(), mapper, null);
+          this.e[j] = compute(this.b[j] = new Owner(), mapper, null);
         }
       }
-      this.d = this.d.slice(0, this.i = newLen);
-      this.x = newItems.slice(0);
+      this.e = this.e.slice(0, this.i = newLen);
+      this.w = newItems.slice(0);
     }
   });
-  return this.d;
+  return this.e;
 }
 function repeat(count, map, options) {
   return updateRepeat.bind({
     I: new Owner(),
     i: 0,
-    r: 0,
+    q: 0,
     Z: count,
     D: map,
-    c: [],
-    d: [],
+    b: [],
+    e: [],
     _: options == null ? void 0 : options.from,
-    o: options == null ? void 0 : options.fallback
+    p: options == null ? void 0 : options.fallback
   });
 }
 function updateRepeat() {
@@ -1791,60 +1785,60 @@ function updateRepeat() {
     if (newLen === 0) {
       if (this.i !== 0) {
         this.I.dispose(false);
-        this.c = [];
-        this.d = [];
+        this.b = [];
+        this.e = [];
         this.i = 0;
       }
-      if (this.o && !this.d[0]) {
-        this.d[0] = compute(
-          this.c[0] = new Owner(),
-          this.o,
+      if (this.p && !this.e[0]) {
+        this.e[0] = compute(
+          this.b[0] = new Owner(),
+          this.p,
           null
         );
       }
       return;
     }
     const to = from + newLen;
-    const prevTo = this.r + this.i;
-    if (this.i === 0 && this.c[0])
-      this.c[0].dispose();
+    const prevTo = this.q + this.i;
+    if (this.i === 0 && this.b[0])
+      this.b[0].dispose();
     for (let i = to; i < prevTo; i++)
-      this.c[i - this.r].dispose();
-    if (this.r < from) {
-      let i = this.r;
+      this.b[i - this.q].dispose();
+    if (this.q < from) {
+      let i = this.q;
       while (i < from && i < this.i)
-        this.c[i++].dispose();
-      this.c.splice(0, from - this.r);
-      this.d.splice(0, from - this.r);
-    } else if (this.r > from) {
-      let i = prevTo - this.r - 1;
-      let difference = this.r - from;
-      this.c.length = this.d.length = newLen;
+        this.b[i++].dispose();
+      this.b.splice(0, from - this.q);
+      this.e.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;
       while (i >= difference) {
-        this.c[i] = this.c[i - difference];
-        this.d[i] = this.d[i - difference];
+        this.b[i] = this.b[i - difference];
+        this.e[i] = this.e[i - difference];
         i--;
       }
       for (let i2 = 0; i2 < difference; i2++) {
-        this.d[i2] = compute(
-          this.c[i2] = new Owner(),
+        this.e[i2] = compute(
+          this.b[i2] = new Owner(),
           () => this.D(i2 + from),
           null
         );
       }
     }
     for (let i = prevTo; i < to; i++) {
-      this.d[i - from] = compute(
-        this.c[i - from] = new Owner(),
+      this.e[i - from] = compute(
+        this.b[i - from] = new Owner(),
         () => this.D(i),
         null
       );
     }
-    this.d = this.d.slice(0, newLen);
-    this.r = from;
+    this.e = this.e.slice(0, newLen);
+    this.q = from;
     this.i = newLen;
   });
-  return this.d;
+  return this.e;
 }
 function compare(key, a, b) {
   return key ? key(a) === key(b) : true;
@@ -1861,9 +1855,7 @@ exports.NotReadyError = NotReadyError;
 exports.Owner = Owner;
 exports.Queue = Queue;
 exports.SUPPORTS_PROXY = SUPPORTS_PROXY;
-exports.catchError = catchError;
 exports.createAsync = createAsync;
-exports.createBoundary = createBoundary;
 exports.createContext = createContext;
 exports.createEffect = createEffect;
 exports.createErrorBoundary = createErrorBoundary;
@@ -1896,5 +1888,6 @@ exports.resolve = resolve;
 exports.runWithObserver = runWithObserver;
 exports.runWithOwner = runWithOwner;
 exports.setContext = setContext;
+exports.tryCatch = tryCatch;
 exports.untrack = untrack;
 exports.unwrap = unwrap;