@solidjs/signals 0.0.5 → 0.0.6

package/dist/dev.js

@@ -803,14 +803,14 @@ var LiveComputation = class extends EagerComputation {
     return this._value;
   }
 };
-function createSuspense(fn, fallbackFn) {
+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._signal.read() || queue._fallback);
-  const comp = new Computation(null, () => equality.read() ? untrack(fallbackFn) : tree.read());
+  const comp = new Computation(null, () => equality.read() ? fallback() : tree.read());
   return comp.read.bind(comp);
 }
 
@@ -926,14 +926,36 @@ function runWithOwner(owner, run) {
     return void 0;
   }
 }
-function catchError(fn, handler) {
+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({ _error: err });
   owner._handlers = owner._handlers ? [handler, ...owner._handlers] : [handler];
-  try {
-    return compute(owner, fn, null);
-  } catch (error) {
-    owner.handleError(error);
-  }
+  const guarded = compute(
+    owner,
+    () => {
+      const c = new Computation(null, () => (reset.read(), fn()));
+      const f = new Computation(null, () => flatten(c.read()));
+      f._setError = 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()._error, () => {
+      error.write(null);
+      reset.write(null);
+    });
+  });
+  return decision.read.bind(decision);
 }
 
 // src/store/store.ts
@@ -1414,10 +1436,10 @@ function updateKeyedMap() {
   runWithOwner(this._owner, () => {
     let i, j, mapper = this._rows ? () => {
       this._rows[j] = new Computation(newItems[j], null);
-      this._indexes[j] = new Computation(j, null);
+      this._indexes && (this._indexes[j] = new Computation(j, null));
       return this._map(
         Computation.prototype.read.bind(this._rows[j]),
-        Computation.prototype.read.bind(this._indexes[j])
+        this._indexes ? Computation.prototype.read.bind(this._indexes[j]) : void 0
       );
     } : this._indexes ? () => {
       const item = newItems[j];
@@ -1514,4 +1536,4 @@ function compare(key, a, b) {
   return key ? key(a) === key(b) : true;
 }
 
-export { $PROXY, $RAW, $TARGET, $TRACK, Computation, ContextNotFoundError, NoOwnerError, NotReadyError, Owner, Queue, SUPPORTS_PROXY, catchError, createAsync, createBoundary, createContext, createEffect, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, createSuspense, flatten, flushSync, getContext, getObserver, getOwner, hasContext, hasUpdated, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, runWithOwner, setContext, untrack, unwrap };
+export { $PROXY, $RAW, $TARGET, $TRACK, Computation, ContextNotFoundError, NoOwnerError, NotReadyError, Owner, Queue, SUPPORTS_PROXY, createAsync, createBoundary, createContext, createEffect, createErrorBoundary, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, createSuspense, flatten, flushSync, getContext, getObserver, getOwner, hasContext, hasUpdated, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, runWithOwner, setContext, untrack, unwrap };

package/dist/node.cjs

@@ -105,9 +105,9 @@ var Owner = class {
   m = null;
   p = null;
   a = STATE_CLEAN;
-  i = null;
-  n = defaultContext;
   j = null;
+  n = defaultContext;
+  k = null;
   e = null;
   constructor(signal = false) {
     if (currentOwner && !signal)
@@ -123,8 +123,8 @@ var Owner = class {
     if (child.n !== this.n) {
       child.n = { ...this.n, ...child.n };
     }
-    if (this.j) {
-      child.j = !child.j ? this.j : [...child.j, ...this.j];
+    if (this.k) {
+      child.k = !child.k ? this.k : [...child.k, ...this.k];
     }
     if (this.e)
       child.e = this.e;
@@ -153,30 +153,30 @@ var Owner = class {
     this.o = null;
     this.p = null;
     this.n = defaultContext;
-    this.j = null;
+    this.k = null;
     this.a = STATE_DISPOSED;
     this.emptyDisposal();
   }
   emptyDisposal() {
-    if (!this.i)
+    if (!this.j)
       return;
-    if (Array.isArray(this.i)) {
-      for (let i = 0; i < this.i.length; i++) {
-        const callable = this.i[i];
+    if (Array.isArray(this.j)) {
+      for (let i = 0; i < this.j.length; i++) {
+        const callable = this.j[i];
         callable.call(callable);
       }
     } else {
-      this.i.call(this.i);
+      this.j.call(this.j);
     }
-    this.i = null;
+    this.j = null;
   }
   handleError(error) {
-    if (!this.j)
+    if (!this.k)
       throw error;
-    let i = 0, len = this.j.length;
+    let i = 0, len = this.k.length;
     for (i = 0; i < len; i++) {
       try {
-        this.j[i](error);
+        this.k[i](error);
         break;
       } catch (e) {
         error = e;
@@ -215,12 +215,12 @@ function onCleanup(fn) {
   if (!currentOwner)
     return fn;
   const node = currentOwner;
-  if (!node.i) {
-    node.i = fn;
-  } else if (Array.isArray(node.i)) {
-    node.i.push(fn);
+  if (!node.j) {
+    node.j = fn;
+  } else if (Array.isArray(node.j)) {
+    node.j.push(fn);
   } else {
-    node.i = [node.i, fn];
+    node.j = [node.j, fn];
   }
   return fn;
 }
@@ -252,35 +252,35 @@ var Computation = class extends Owner {
   c = null;
   b = null;
   d;
-  B;
+  C;
   // Used in __DEV__ mode, hopefully removed in production
   V;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  F = isEqual;
-  N;
+  G = isEqual;
+  O;
   /** Whether the computation is an error or has ancestors that are unresolved */
   f = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
-  C = DEFAULT_FLAGS;
-  G = null;
+  D = DEFAULT_FLAGS;
+  z = null;
   H = null;
   I = -1;
   constructor(initialValue, compute2, options) {
     super(compute2 === null);
-    this.B = compute2;
+    this.C = compute2;
     this.a = compute2 ? STATE_UNINITIALIZED : STATE_CLEAN;
     this.d = initialValue;
     if ((options == null ? void 0 : options.equals) !== void 0)
-      this.F = options.equals;
+      this.G = options.equals;
     if (options == null ? void 0 : options.unobserved)
-      this.N = options == null ? void 0 : options.unobserved;
+      this.O = options == null ? void 0 : options.unobserved;
   }
-  O() {
+  P() {
     var _a;
-    if (this.B)
+    if (this.C)
       this.s();
-    if (!this.B || ((_a = this.c) == null ? void 0 : _a.length))
+    if (!this.C || ((_a = this.c) == null ? void 0 : _a.length))
       track(this);
     newFlags |= this.f & ~currentMask;
     if (this.f & ERROR_BIT) {
@@ -294,7 +294,7 @@ var Computation = class extends Owner {
    * Automatically re-executes the surrounding computation when the value changes
    */
   read() {
-    return this.O();
+    return this.P();
   }
   /**
    * Return the current value of this computation
@@ -307,7 +307,7 @@ var Computation = class extends Owner {
     if (!syncResolve && this.loading()) {
       throw new NotReadyError();
     }
-    return this.O();
+    return this.P();
   }
   /**
    * Return true if the computation is the value is dependent on an unresolved promise
@@ -327,15 +327,15 @@ var Computation = class extends Owner {
    * Triggers re-execution of the computation when the error state changes
    */
   error() {
-    if (this.G === null) {
-      this.G = errorState(this);
+    if (this.z === null) {
+      this.z = errorState(this);
     }
-    return this.G.read();
+    return this.z.read();
   }
   /** Update the computation with a new value. */
   write(value, flags = 0, raw = false) {
     const newValue = !raw && typeof value === "function" ? value(this.d) : value;
-    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.a === STATE_UNINITIALIZED || this.F === false || !this.F(this.d, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.a === STATE_UNINITIALIZED || this.G === false || !this.G(this.d, newValue));
     if (valueChanged)
       this.d = newValue;
     const changedFlagsMask = this.f ^ flags, changedFlags = changedFlagsMask & flags;
@@ -346,7 +346,7 @@ var Computation = class extends Owner {
         if (valueChanged) {
           this.b[i].t(STATE_DIRTY);
         } else if (changedFlagsMask) {
-          this.b[i].P(changedFlagsMask, changedFlags);
+          this.b[i].Q(changedFlagsMask, changedFlags);
         }
       }
     }
@@ -371,10 +371,10 @@ 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.
    */
-  P(mask, newFlags2) {
+  Q(mask, newFlags2) {
     if (this.a >= STATE_DIRTY)
       return;
-    if (mask & this.C) {
+    if (mask & this.D) {
       this.t(STATE_DIRTY);
       return;
     }
@@ -388,12 +388,12 @@ var Computation = class extends Owner {
       this.f ^= deltaFlags;
       if (this.b) {
         for (let i = 0; i < this.b.length; i++) {
-          this.b[i].P(mask, newFlags2);
+          this.b[i].Q(mask, newFlags2);
         }
       }
     }
   }
-  Q(error) {
+  J(error) {
     this.write(error, this.f | ERROR_BIT);
   }
   /**
@@ -450,7 +450,7 @@ function loadingState(node) {
     },
     options
   );
-  computation.C = ERROR_BIT | LOADING_BIT;
+  computation.D = ERROR_BIT | LOADING_BIT;
   setOwner(prevOwner);
   return computation;
 }
@@ -466,7 +466,7 @@ function errorState(node) {
     },
     options
   );
-  computation.C = ERROR_BIT;
+  computation.D = ERROR_BIT;
   setOwner(prevOwner);
   return computation;
 }
@@ -492,13 +492,13 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.B, node);
+    const result = compute(node, node.C, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
       node.write(UNCHANGED, newFlags | LOADING_BIT);
     } else {
-      node.Q(error);
+      node.J(error);
     }
   } finally {
     if (newSources) {
@@ -541,7 +541,7 @@ function removeSourceObservers(node, index) {
       source.b[swap] = source.b[source.b.length - 1];
       source.b.pop();
       if (!source.b.length)
-        (_a = source.N) == null ? void 0 : _a.call(source);
+        (_a = source.O) == null ? void 0 : _a.call(source);
     }
   }
 }
@@ -585,7 +585,7 @@ function latest(fn) {
 function compute(owner, compute2, observer) {
   const prevOwner = setOwner(owner), prevObserver = currentObserver, prevMask = currentMask;
   currentObserver = observer;
-  currentMask = (observer == null ? void 0 : observer.C) ?? DEFAULT_FLAGS;
+  currentMask = (observer == null ? void 0 : observer.D) ?? DEFAULT_FLAGS;
   try {
     return compute2(observer ? observer.d : void 0);
   } finally {
@@ -601,13 +601,13 @@ function schedule() {
   if (scheduled)
     return;
   scheduled = true;
-  if (!globalQueue.D)
+  if (!globalQueue.E)
     queueMicrotask(flushSync);
 }
 var Queue = class {
-  D = false;
+  E = false;
   u = [[], [], []];
-  z = [];
+  A = [];
   enqueue(type, node) {
     this.u[0].push(node);
     if (type)
@@ -625,14 +625,14 @@ var Queue = class {
         runEffectQueue(effects);
       }
     }
-    for (let i = 0; i < this.z.length; i++) {
-      this.z[i].run(type);
+    for (let i = 0; i < this.A.length; i++) {
+      this.A[i].run(type);
     }
   }
   flush() {
-    if (this.D)
+    if (this.E)
       return;
-    this.D = true;
+    this.E = true;
     try {
       this.run(EFFECT_PURE);
       incrementClock();
@@ -640,16 +640,16 @@ var Queue = class {
       this.run(EFFECT_RENDER);
       this.run(EFFECT_USER);
     } finally {
-      this.D = false;
+      this.E = false;
     }
   }
   addChild(child) {
-    this.z.push(child);
+    this.A.push(child);
   }
   removeChild(child) {
-    const index = this.z.indexOf(child);
+    const index = this.A.indexOf(child);
     if (index >= 0)
-      this.z.splice(index, 1);
+      this.A.splice(index, 1);
   }
 };
 var globalQueue = new Queue();
@@ -698,54 +698,54 @@ function runEffectQueue(queue) {
 
 // src/core/effect.ts
 var Effect = class extends Computation {
-  J;
-  K = false;
-  E;
-  A;
+  K;
+  L = false;
+  F;
+  B;
   e;
   constructor(initialValue, compute2, effect, options) {
     var _a;
     super(initialValue, compute2, options);
-    this.J = effect;
-    this.E = initialValue;
-    this.A = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
+    this.K = effect;
+    this.F = initialValue;
+    this.B = (options == null ? void 0 : options.render) ? EFFECT_RENDER : EFFECT_USER;
     this.e = ((_a = getOwner()) == null ? void 0 : _a.e) || globalQueue;
     this.s();
-    this.A === EFFECT_USER ? this.e.enqueue(this.A, this) : this.R();
+    this.B === EFFECT_USER ? this.e.enqueue(this.B, this) : this.R();
   }
   write(value, flags = 0) {
     var _a, _b;
     const currentFlags = this.f;
     this.f = flags;
-    if (this.A === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
+    if (this.B === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
       (_b = (_a = this.e).S) == null ? void 0 : _b.call(_a, this);
     }
     if (value === UNCHANGED)
       return this.d;
     this.d = value;
-    this.K = true;
+    this.L = true;
     return value;
   }
   t(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
-      this.e.enqueue(this.A, this);
+      this.e.enqueue(this.B, this);
     this.a = state;
   }
-  Q(error) {
+  J(error) {
     this.handleError(error);
   }
   x() {
-    this.J = void 0;
-    this.E = void 0;
+    this.K = void 0;
+    this.F = void 0;
     super.x();
   }
   R() {
-    if (this.K && this.a !== STATE_DISPOSED) {
-      this.J(this.d, this.E);
-      this.E = this.d;
-      this.K = false;
+    if (this.L && this.a !== STATE_DISPOSED) {
+      this.K(this.d, this.F);
+      this.F = this.d;
+      this.L = false;
     }
   }
 };
@@ -770,7 +770,7 @@ var EagerComputation = class extends Computation {
 var SuspenseQueue = class extends Queue {
   g = /* @__PURE__ */ new Set();
   q = false;
-  L = new Computation(false, null);
+  M = new Computation(false, null);
   run(type) {
     if (type && this.q)
       return;
@@ -781,13 +781,13 @@ var SuspenseQueue = class extends Queue {
       this.g.add(node);
       if (!this.q) {
         this.q = true;
-        queueTask(() => this.L.write(true));
+        queueTask(() => this.M.write(true));
       }
     } else {
       this.g.delete(node);
       if (this.g.size === 0) {
         this.q = false;
-        queueTask(() => this.L.write(false));
+        queueTask(() => this.M.write(false));
       }
     }
   }
@@ -803,14 +803,14 @@ var LiveComputation = class extends EagerComputation {
     return this.d;
   }
 };
-function createSuspense(fn, fallbackFn) {
+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.L.read() || queue.q);
-  const comp = new Computation(null, () => equality.read() ? untrack(fallbackFn) : tree.read());
+  const equality = new Computation(null, () => queue.M.read() || queue.q);
+  const comp = new Computation(null, () => equality.read() ? fallback() : tree.read());
   return comp.read.bind(comp);
 }
 
@@ -927,14 +927,36 @@ function runWithOwner(owner, run) {
     return void 0;
   }
 }
-function catchError(fn, handler) {
+function createErrorBoundary(fn, fallback) {
   const owner = new Owner();
-  owner.j = owner.j ? [handler, ...owner.j] : [handler];
-  try {
-    return compute(owner, fn, null);
-  } catch (error) {
-    owner.handleError(error);
-  }
+  const error = new Computation(null, null);
+  const reset = new Computation(null, null, { equals: false });
+  const handler = (err) => error.write({ z: err });
+  owner.k = owner.k ? [handler, ...owner.k] : [handler];
+  const guarded = compute(
+    owner,
+    () => {
+      const c = new Computation(null, () => (reset.read(), fn()));
+      const f = new Computation(null, () => flatten(c.read()));
+      f.J = 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().z, () => {
+      error.write(null);
+      reset.write(null);
+    });
+  });
+  return decision.read.bind(decision);
 }
 
 // src/store/store.ts
@@ -1402,12 +1424,12 @@ function mapArray(list, map, options) {
     w: 0,
     U: list,
     r: [],
-    M: map,
-    k: [],
+    N: map,
+    l: [],
     g: [],
     y: keyFn,
     h: keyFn || (options == null ? void 0 : options.keyed) === false ? [] : void 0,
-    l: map.length > 1 ? [] : void 0,
+    i: map.length > 1 ? [] : void 0,
     q: options == null ? void 0 : options.fallback
   });
 }
@@ -1417,31 +1439,31 @@ function updateKeyedMap() {
   runWithOwner(this.T, () => {
     let i, j, mapper = this.h ? () => {
       this.h[j] = new Computation(newItems[j], null);
-      this.l[j] = new Computation(j, null);
-      return this.M(
+      this.i && (this.i[j] = new Computation(j, null));
+      return this.N(
         Computation.prototype.read.bind(this.h[j]),
-        Computation.prototype.read.bind(this.l[j])
+        this.i ? Computation.prototype.read.bind(this.i[j]) : void 0
       );
-    } : this.l ? () => {
+    } : this.i ? () => {
       const item = newItems[j];
-      this.l[j] = new Computation(j, null);
-      return this.M(() => item, Computation.prototype.read.bind(this.l[j]));
+      this.i[j] = new Computation(j, null);
+      return this.N(() => item, Computation.prototype.read.bind(this.i[j]));
     } : () => {
       const item = newItems[j];
-      return this.M(() => item);
+      return this.N(() => item);
     };
     if (newLen === 0) {
       if (this.w !== 0) {
         this.T.dispose(false);
         this.g = [];
         this.r = [];
-        this.k = [];
+        this.l = [];
         this.w = 0;
         this.h && (this.h = []);
-        this.l && (this.l = []);
+        this.i && (this.i = []);
       }
-      if (this.q && !this.k[0]) {
-        this.k[0] = compute(
+      if (this.q && !this.l[0]) {
+        this.l[0] = compute(
           this.g[0] = new Owner(),
           this.q,
           null
@@ -1450,23 +1472,23 @@ function updateKeyedMap() {
     } else if (this.w === 0) {
       if (this.g[0])
         this.g[0].dispose();
-      this.k = new Array(newLen);
+      this.l = new Array(newLen);
       for (j = 0; j < newLen; j++) {
         this.r[j] = newItems[j];
-        this.k[j] = compute(this.g[j] = new Owner(), mapper, null);
+        this.l[j] = compute(this.g[j] = new Owner(), mapper, null);
       }
       this.w = newLen;
     } else {
-      let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.h ? new Array(newLen) : void 0, tempIndexes = this.l ? new Array(newLen) : void 0;
+      let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.h ? new Array(newLen) : void 0, tempIndexes = this.i ? new Array(newLen) : void 0;
       for (start = 0, end = Math.min(this.w, newLen); start < end && (this.r[start] === newItems[start] || this.h && compare(this.y, this.r[start], newItems[start])); start++) {
         if (this.h)
           this.h[start].write(newItems[start]);
       }
       for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.r[end] === newItems[newEnd] || this.h && compare(this.y, this.r[end], newItems[newEnd])); end--, newEnd--) {
-        temp[newEnd] = this.k[end];
+        temp[newEnd] = this.l[end];
         tempNodes[newEnd] = this.g[end];
         tempRows && (tempRows[newEnd] = this.h[end]);
-        tempIndexes && (tempIndexes[newEnd] = this.l[end]);
+        tempIndexes && (tempIndexes[newEnd] = this.i[end]);
       }
       newIndices = /* @__PURE__ */ new Map();
       newIndicesNext = new Array(newEnd + 1);
@@ -1482,10 +1504,10 @@ function updateKeyedMap() {
         key = this.y ? this.y(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
-          temp[j] = this.k[i];
+          temp[j] = this.l[i];
           tempNodes[j] = this.g[i];
           tempRows && (tempRows[j] = this.h[i]);
-          tempIndexes && (tempIndexes[j] = this.l[i]);
+          tempIndexes && (tempIndexes[j] = this.i[i]);
           j = newIndicesNext[j];
           newIndices.set(key, j);
         } else
@@ -1493,25 +1515,25 @@ function updateKeyedMap() {
       }
       for (j = start; j < newLen; j++) {
         if (j in temp) {
-          this.k[j] = temp[j];
+          this.l[j] = temp[j];
           this.g[j] = tempNodes[j];
           if (tempRows) {
             this.h[j] = tempRows[j];
             this.h[j].write(newItems[j]);
           }
           if (tempIndexes) {
-            this.l[j] = tempIndexes[j];
-            this.l[j].write(j);
+            this.i[j] = tempIndexes[j];
+            this.i[j].write(j);
           }
         } else {
-          this.k[j] = compute(this.g[j] = new Owner(), mapper, null);
+          this.l[j] = compute(this.g[j] = new Owner(), mapper, null);
         }
       }
-      this.k = this.k.slice(0, this.w = newLen);
+      this.l = this.l.slice(0, this.w = newLen);
       this.r = newItems.slice(0);
     }
   });
-  return this.k;
+  return this.l;
 }
 function compare(key, a, b) {
   return key ? key(a) === key(b) : true;
@@ -1528,11 +1550,11 @@ 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;
 exports.createMemo = createMemo;
 exports.createProjection = createProjection;
 exports.createRenderEffect = createRenderEffect;

package/dist/prod.js

@@ -103,9 +103,9 @@ var Owner = class {
   m = null;
   p = null;
   a = STATE_CLEAN;
-  i = null;
-  n = defaultContext;
   j = null;
+  n = defaultContext;
+  k = null;
   e = null;
   constructor(signal = false) {
     if (currentOwner && !signal)
@@ -121,8 +121,8 @@ var Owner = class {
     if (child.n !== this.n) {
       child.n = { ...this.n, ...child.n };
     }
-    if (this.j) {
-      child.j = !child.j ? this.j : [...child.j, ...this.j];
+    if (this.k) {
+      child.k = !child.k ? this.k : [...child.k, ...this.k];
     }
     if (this.e)
       child.e = this.e;
@@ -151,30 +151,30 @@ var Owner = class {
     this.o = null;
     this.p = null;
     this.n = defaultContext;
-    this.j = null;
+    this.k = null;
     this.a = STATE_DISPOSED;
     this.emptyDisposal();
   }
   emptyDisposal() {
-    if (!this.i)
+    if (!this.j)
       return;
-    if (Array.isArray(this.i)) {
-      for (let i = 0; i < this.i.length; i++) {
-        const callable = this.i[i];
+    if (Array.isArray(this.j)) {
+      for (let i = 0; i < this.j.length; i++) {
+        const callable = this.j[i];
         callable.call(callable);
       }
     } else {
-      this.i.call(this.i);
+      this.j.call(this.j);
     }
-    this.i = null;
+    this.j = null;
   }
   handleError(error) {
-    if (!this.j)
+    if (!this.k)
       throw error;
-    let i = 0, len = this.j.length;
+    let i = 0, len = this.k.length;
     for (i = 0; i < len; i++) {
       try {
-        this.j[i](error);
+        this.k[i](error);
         break;
       } catch (e) {
         error = e;
@@ -213,12 +213,12 @@ function onCleanup(fn) {
   if (!currentOwner)
     return fn;
   const node = currentOwner;
-  if (!node.i) {
-    node.i = fn;
-  } else if (Array.isArray(node.i)) {
-    node.i.push(fn);
+  if (!node.j) {
+    node.j = fn;
+  } else if (Array.isArray(node.j)) {
+    node.j.push(fn);
   } else {
-    node.i = [node.i, fn];
+    node.j = [node.j, fn];
   }
   return fn;
 }
@@ -250,34 +250,34 @@ var Computation = class extends Owner {
   c = null;
   b = null;
   d;
-  B;
+  C;
   // Used in __DEV__ mode, hopefully removed in production
   V;
   // Using false is an optimization as an alternative to _equals: () => false
   // which could enable more efficient DIRTY notification
-  F = isEqual;
-  N;
+  G = isEqual;
+  O;
   /** Whether the computation is an error or has ancestors that are unresolved */
   f = 0;
   /** Which flags raised by sources are handled, vs. being passed through. */
-  C = DEFAULT_FLAGS;
-  G = null;
+  D = DEFAULT_FLAGS;
+  z = null;
   H = null;
   I = -1;
   constructor(initialValue, compute2, options) {
     super(compute2 === null);
-    this.B = compute2;
+    this.C = compute2;
     this.a = compute2 ? STATE_UNINITIALIZED : STATE_CLEAN;
     this.d = initialValue;
     if (options?.equals !== void 0)
-      this.F = options.equals;
+      this.G = options.equals;
     if (options?.unobserved)
-      this.N = options?.unobserved;
+      this.O = options?.unobserved;
   }
-  O() {
-    if (this.B)
+  P() {
+    if (this.C)
       this.s();
-    if (!this.B || this.c?.length)
+    if (!this.C || this.c?.length)
       track(this);
     newFlags |= this.f & ~currentMask;
     if (this.f & ERROR_BIT) {
@@ -291,7 +291,7 @@ var Computation = class extends Owner {
    * Automatically re-executes the surrounding computation when the value changes
    */
   read() {
-    return this.O();
+    return this.P();
   }
   /**
    * Return the current value of this computation
@@ -304,7 +304,7 @@ var Computation = class extends Owner {
     if (!syncResolve && this.loading()) {
       throw new NotReadyError();
     }
-    return this.O();
+    return this.P();
   }
   /**
    * Return true if the computation is the value is dependent on an unresolved promise
@@ -324,15 +324,15 @@ var Computation = class extends Owner {
    * Triggers re-execution of the computation when the error state changes
    */
   error() {
-    if (this.G === null) {
-      this.G = errorState(this);
+    if (this.z === null) {
+      this.z = errorState(this);
     }
-    return this.G.read();
+    return this.z.read();
   }
   /** Update the computation with a new value. */
   write(value, flags = 0, raw = false) {
     const newValue = !raw && typeof value === "function" ? value(this.d) : value;
-    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.a === STATE_UNINITIALIZED || this.F === false || !this.F(this.d, newValue));
+    const valueChanged = newValue !== UNCHANGED && (!!(flags & ERROR_BIT) || this.a === STATE_UNINITIALIZED || this.G === false || !this.G(this.d, newValue));
     if (valueChanged)
       this.d = newValue;
     const changedFlagsMask = this.f ^ flags, changedFlags = changedFlagsMask & flags;
@@ -343,7 +343,7 @@ var Computation = class extends Owner {
         if (valueChanged) {
           this.b[i].t(STATE_DIRTY);
         } else if (changedFlagsMask) {
-          this.b[i].P(changedFlagsMask, changedFlags);
+          this.b[i].Q(changedFlagsMask, changedFlags);
         }
       }
     }
@@ -368,10 +368,10 @@ 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.
    */
-  P(mask, newFlags2) {
+  Q(mask, newFlags2) {
     if (this.a >= STATE_DIRTY)
       return;
-    if (mask & this.C) {
+    if (mask & this.D) {
       this.t(STATE_DIRTY);
       return;
     }
@@ -385,12 +385,12 @@ var Computation = class extends Owner {
       this.f ^= deltaFlags;
       if (this.b) {
         for (let i = 0; i < this.b.length; i++) {
-          this.b[i].P(mask, newFlags2);
+          this.b[i].Q(mask, newFlags2);
         }
       }
     }
   }
-  Q(error) {
+  J(error) {
     this.write(error, this.f | ERROR_BIT);
   }
   /**
@@ -447,7 +447,7 @@ function loadingState(node) {
     },
     options
   );
-  computation.C = ERROR_BIT | LOADING_BIT;
+  computation.D = ERROR_BIT | LOADING_BIT;
   setOwner(prevOwner);
   return computation;
 }
@@ -463,7 +463,7 @@ function errorState(node) {
     },
     options
   );
-  computation.C = ERROR_BIT;
+  computation.D = ERROR_BIT;
   setOwner(prevOwner);
   return computation;
 }
@@ -489,13 +489,13 @@ function update(node) {
   try {
     node.dispose(false);
     node.emptyDisposal();
-    const result = compute(node, node.B, node);
+    const result = compute(node, node.C, node);
     node.write(result, newFlags, true);
   } catch (error) {
     if (error instanceof NotReadyError) {
       node.write(UNCHANGED, newFlags | LOADING_BIT);
     } else {
-      node.Q(error);
+      node.J(error);
     }
   } finally {
     if (newSources) {
@@ -537,7 +537,7 @@ function removeSourceObservers(node, index) {
       source.b[swap] = source.b[source.b.length - 1];
       source.b.pop();
       if (!source.b.length)
-        source.N?.();
+        source.O?.();
     }
   }
 }
@@ -581,7 +581,7 @@ function latest(fn) {
 function compute(owner, compute2, observer) {
   const prevOwner = setOwner(owner), prevObserver = currentObserver, prevMask = currentMask;
   currentObserver = observer;
-  currentMask = observer?.C ?? DEFAULT_FLAGS;
+  currentMask = observer?.D ?? DEFAULT_FLAGS;
   try {
     return compute2(observer ? observer.d : void 0);
   } finally {
@@ -597,13 +597,13 @@ function schedule() {
   if (scheduled)
     return;
   scheduled = true;
-  if (!globalQueue.D)
+  if (!globalQueue.E)
     queueMicrotask(flushSync);
 }
 var Queue = class {
-  D = false;
+  E = false;
   u = [[], [], []];
-  z = [];
+  A = [];
   enqueue(type, node) {
     this.u[0].push(node);
     if (type)
@@ -621,14 +621,14 @@ var Queue = class {
         runEffectQueue(effects);
       }
     }
-    for (let i = 0; i < this.z.length; i++) {
-      this.z[i].run(type);
+    for (let i = 0; i < this.A.length; i++) {
+      this.A[i].run(type);
     }
   }
   flush() {
-    if (this.D)
+    if (this.E)
       return;
-    this.D = true;
+    this.E = true;
     try {
       this.run(EFFECT_PURE);
       incrementClock();
@@ -636,16 +636,16 @@ var Queue = class {
       this.run(EFFECT_RENDER);
       this.run(EFFECT_USER);
     } finally {
-      this.D = false;
+      this.E = false;
     }
   }
   addChild(child) {
-    this.z.push(child);
+    this.A.push(child);
   }
   removeChild(child) {
-    const index = this.z.indexOf(child);
+    const index = this.A.indexOf(child);
     if (index >= 0)
-      this.z.splice(index, 1);
+      this.A.splice(index, 1);
   }
 };
 var globalQueue = new Queue();
@@ -694,52 +694,52 @@ function runEffectQueue(queue) {
 
 // src/core/effect.ts
 var Effect = class extends Computation {
-  J;
-  K = false;
-  E;
-  A;
+  K;
+  L = false;
+  F;
+  B;
   e;
   constructor(initialValue, compute2, effect, options) {
     super(initialValue, compute2, options);
-    this.J = effect;
-    this.E = initialValue;
-    this.A = options?.render ? EFFECT_RENDER : EFFECT_USER;
+    this.K = effect;
+    this.F = initialValue;
+    this.B = options?.render ? EFFECT_RENDER : EFFECT_USER;
     this.e = getOwner()?.e || globalQueue;
     this.s();
-    this.A === EFFECT_USER ? this.e.enqueue(this.A, this) : this.R();
+    this.B === EFFECT_USER ? this.e.enqueue(this.B, this) : this.R();
   }
   write(value, flags = 0) {
     const currentFlags = this.f;
     this.f = flags;
-    if (this.A === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
+    if (this.B === EFFECT_RENDER && (flags & LOADING_BIT) !== (currentFlags & LOADING_BIT)) {
       this.e.S?.(this);
     }
     if (value === UNCHANGED)
       return this.d;
     this.d = value;
-    this.K = true;
+    this.L = true;
     return value;
   }
   t(state) {
     if (this.a >= state)
       return;
     if (this.a === STATE_CLEAN)
-      this.e.enqueue(this.A, this);
+      this.e.enqueue(this.B, this);
     this.a = state;
   }
-  Q(error) {
+  J(error) {
     this.handleError(error);
   }
   x() {
-    this.J = void 0;
-    this.E = void 0;
+    this.K = void 0;
+    this.F = void 0;
     super.x();
   }
   R() {
-    if (this.K && this.a !== STATE_DISPOSED) {
-      this.J(this.d, this.E);
-      this.E = this.d;
-      this.K = false;
+    if (this.L && this.a !== STATE_DISPOSED) {
+      this.K(this.d, this.F);
+      this.F = this.d;
+      this.L = false;
     }
   }
 };
@@ -763,7 +763,7 @@ var EagerComputation = class extends Computation {
 var SuspenseQueue = class extends Queue {
   g = /* @__PURE__ */ new Set();
   q = false;
-  L = new Computation(false, null);
+  M = new Computation(false, null);
   run(type) {
     if (type && this.q)
       return;
@@ -774,13 +774,13 @@ var SuspenseQueue = class extends Queue {
       this.g.add(node);
       if (!this.q) {
         this.q = true;
-        queueTask(() => this.L.write(true));
+        queueTask(() => this.M.write(true));
       }
     } else {
       this.g.delete(node);
       if (this.g.size === 0) {
         this.q = false;
-        queueTask(() => this.L.write(false));
+        queueTask(() => this.M.write(false));
       }
     }
   }
@@ -795,14 +795,14 @@ var LiveComputation = class extends EagerComputation {
     return this.d;
   }
 };
-function createSuspense(fn, fallbackFn) {
+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.L.read() || queue.q);
-  const comp = new Computation(null, () => equality.read() ? untrack(fallbackFn) : tree.read());
+  const equality = new Computation(null, () => queue.M.read() || queue.q);
+  const comp = new Computation(null, () => equality.read() ? fallback() : tree.read());
   return comp.read.bind(comp);
 }
 
@@ -918,14 +918,36 @@ function runWithOwner(owner, run) {
     return void 0;
   }
 }
-function catchError(fn, handler) {
+function createErrorBoundary(fn, fallback) {
   const owner = new Owner();
-  owner.j = owner.j ? [handler, ...owner.j] : [handler];
-  try {
-    return compute(owner, fn, null);
-  } catch (error) {
-    owner.handleError(error);
-  }
+  const error = new Computation(null, null);
+  const reset = new Computation(null, null, { equals: false });
+  const handler = (err) => error.write({ z: err });
+  owner.k = owner.k ? [handler, ...owner.k] : [handler];
+  const guarded = compute(
+    owner,
+    () => {
+      const c = new Computation(null, () => (reset.read(), fn()));
+      const f = new Computation(null, () => flatten(c.read()));
+      f.J = 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().z, () => {
+      error.write(null);
+      reset.write(null);
+    });
+  });
+  return decision.read.bind(decision);
 }
 
 // src/store/store.ts
@@ -1391,12 +1413,12 @@ function mapArray(list, map, options) {
     w: 0,
     U: list,
     r: [],
-    M: map,
-    k: [],
+    N: map,
+    l: [],
     g: [],
     y: keyFn,
     h: keyFn || options?.keyed === false ? [] : void 0,
-    l: map.length > 1 ? [] : void 0,
+    i: map.length > 1 ? [] : void 0,
     q: options?.fallback
   });
 }
@@ -1406,31 +1428,31 @@ function updateKeyedMap() {
   runWithOwner(this.T, () => {
     let i, j, mapper = this.h ? () => {
       this.h[j] = new Computation(newItems[j], null);
-      this.l[j] = new Computation(j, null);
-      return this.M(
+      this.i && (this.i[j] = new Computation(j, null));
+      return this.N(
         Computation.prototype.read.bind(this.h[j]),
-        Computation.prototype.read.bind(this.l[j])
+        this.i ? Computation.prototype.read.bind(this.i[j]) : void 0
       );
-    } : this.l ? () => {
+    } : this.i ? () => {
       const item = newItems[j];
-      this.l[j] = new Computation(j, null);
-      return this.M(() => item, Computation.prototype.read.bind(this.l[j]));
+      this.i[j] = new Computation(j, null);
+      return this.N(() => item, Computation.prototype.read.bind(this.i[j]));
     } : () => {
       const item = newItems[j];
-      return this.M(() => item);
+      return this.N(() => item);
     };
     if (newLen === 0) {
       if (this.w !== 0) {
         this.T.dispose(false);
         this.g = [];
         this.r = [];
-        this.k = [];
+        this.l = [];
         this.w = 0;
         this.h && (this.h = []);
-        this.l && (this.l = []);
+        this.i && (this.i = []);
       }
-      if (this.q && !this.k[0]) {
-        this.k[0] = compute(
+      if (this.q && !this.l[0]) {
+        this.l[0] = compute(
           this.g[0] = new Owner(),
           this.q,
           null
@@ -1439,23 +1461,23 @@ function updateKeyedMap() {
     } else if (this.w === 0) {
       if (this.g[0])
         this.g[0].dispose();
-      this.k = new Array(newLen);
+      this.l = new Array(newLen);
       for (j = 0; j < newLen; j++) {
         this.r[j] = newItems[j];
-        this.k[j] = compute(this.g[j] = new Owner(), mapper, null);
+        this.l[j] = compute(this.g[j] = new Owner(), mapper, null);
       }
       this.w = newLen;
     } else {
-      let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.h ? new Array(newLen) : void 0, tempIndexes = this.l ? new Array(newLen) : void 0;
+      let start, end, newEnd, item, key, newIndices, newIndicesNext, temp = new Array(newLen), tempNodes = new Array(newLen), tempRows = this.h ? new Array(newLen) : void 0, tempIndexes = this.i ? new Array(newLen) : void 0;
       for (start = 0, end = Math.min(this.w, newLen); start < end && (this.r[start] === newItems[start] || this.h && compare(this.y, this.r[start], newItems[start])); start++) {
         if (this.h)
           this.h[start].write(newItems[start]);
       }
       for (end = this.w - 1, newEnd = newLen - 1; end >= start && newEnd >= start && (this.r[end] === newItems[newEnd] || this.h && compare(this.y, this.r[end], newItems[newEnd])); end--, newEnd--) {
-        temp[newEnd] = this.k[end];
+        temp[newEnd] = this.l[end];
         tempNodes[newEnd] = this.g[end];
         tempRows && (tempRows[newEnd] = this.h[end]);
-        tempIndexes && (tempIndexes[newEnd] = this.l[end]);
+        tempIndexes && (tempIndexes[newEnd] = this.i[end]);
       }
       newIndices = /* @__PURE__ */ new Map();
       newIndicesNext = new Array(newEnd + 1);
@@ -1471,10 +1493,10 @@ function updateKeyedMap() {
         key = this.y ? this.y(item) : item;
         j = newIndices.get(key);
         if (j !== void 0 && j !== -1) {
-          temp[j] = this.k[i];
+          temp[j] = this.l[i];
           tempNodes[j] = this.g[i];
           tempRows && (tempRows[j] = this.h[i]);
-          tempIndexes && (tempIndexes[j] = this.l[i]);
+          tempIndexes && (tempIndexes[j] = this.i[i]);
           j = newIndicesNext[j];
           newIndices.set(key, j);
         } else
@@ -1482,28 +1504,28 @@ function updateKeyedMap() {
       }
       for (j = start; j < newLen; j++) {
         if (j in temp) {
-          this.k[j] = temp[j];
+          this.l[j] = temp[j];
           this.g[j] = tempNodes[j];
           if (tempRows) {
             this.h[j] = tempRows[j];
             this.h[j].write(newItems[j]);
           }
           if (tempIndexes) {
-            this.l[j] = tempIndexes[j];
-            this.l[j].write(j);
+            this.i[j] = tempIndexes[j];
+            this.i[j].write(j);
           }
         } else {
-          this.k[j] = compute(this.g[j] = new Owner(), mapper, null);
+          this.l[j] = compute(this.g[j] = new Owner(), mapper, null);
         }
       }
-      this.k = this.k.slice(0, this.w = newLen);
+      this.l = this.l.slice(0, this.w = newLen);
       this.r = newItems.slice(0);
     }
   });
-  return this.k;
+  return this.l;
 }
 function compare(key, a, b) {
   return key ? key(a) === key(b) : true;
 }
 
-export { $PROXY, $RAW, $TARGET, $TRACK, Computation, ContextNotFoundError, NoOwnerError, NotReadyError, Owner, Queue, SUPPORTS_PROXY, catchError, createAsync, createBoundary, createContext, createEffect, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, createSuspense, flatten, flushSync, getContext, getObserver, getOwner, hasContext, hasUpdated, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, runWithOwner, setContext, untrack, unwrap };
+export { $PROXY, $RAW, $TARGET, $TRACK, Computation, ContextNotFoundError, NoOwnerError, NotReadyError, Owner, Queue, SUPPORTS_PROXY, createAsync, createBoundary, createContext, createEffect, createErrorBoundary, createMemo, createProjection, createRenderEffect, createRoot, createSignal, createStore, createSuspense, flatten, flushSync, getContext, getObserver, getOwner, hasContext, hasUpdated, isEqual, isPending, isWrappable, latest, mapArray, merge, omit, onCleanup, reconcile, runWithOwner, setContext, untrack, unwrap };

package/dist/types/core/index.d.ts

@@ -2,7 +2,7 @@ export { ContextNotFoundError, NoOwnerError, NotReadyError, type ErrorHandler }
 export { Owner, createContext, getContext, setContext, hasContext, getOwner, onCleanup, type Context, type ContextRecord, type Disposable } from "./owner.js";
 export { Computation, getObserver, isEqual, untrack, hasUpdated, isPending, latest, UNCHANGED, compute, type SignalOptions } from "./core.js";
 export { Effect, EagerComputation } from "./effect.js";
-export { flushSync, createBoundary, type IQueue, Queue } from "./scheduler.js";
+export { flushSync, createBoundary, queueTask, type IQueue, Queue } from "./scheduler.js";
 export { createSuspense } from "./suspense.js";
 export { SUPPORTS_PROXY } from "./constants.js";
 export * from "./flags.js";

package/dist/types/core/suspense.d.ts

@@ -8,4 +8,4 @@ export declare class SuspenseQueue extends Queue {
     run(type: number): void;
     _update(node: Effect): void;
 }
-export declare function createSuspense(fn: () => any, fallbackFn: () => any): () => any;
+export declare function createSuspense(fn: () => any, fallback: () => any): () => any;

package/dist/types/signals.d.ts

@@ -130,12 +130,12 @@ export declare function createRoot<T>(init: ((dispose: () => void) => T) | (() =
  */
 export declare function runWithOwner<T>(owner: Owner | null, run: () => T): T | undefined;
 /**
- * Runs an effect whenever an error is thrown within the context of the child scopes
+ * Switches to fallback whenever an error is thrown within the context of the child scopes
  * @param fn boundary for the error
- * @param handler an error handler that receives the error
+ * @param fallback an error handler that receives the error
  *
  * * If the error is thrown again inside the error handler, it will trigger the next available parent handler
  *
  * @description https://docs.solidjs.com/reference/reactive-utilities/catch-error
  */
-export declare function catchError<T>(fn: () => T, handler: (error: unknown) => void): T | undefined;
+export declare function createErrorBoundary<T, U>(fn: () => T, fallback: (error: unknown, reset: () => void) => U): Accessor<T | U>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@solidjs/signals",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "",
   "author": "Ryan Carniato",
   "license": "MIT",