@b9g/crank 0.5.2 → 0.5.3

package/crank.js

@@ -1017,6 +1017,11 @@ class Context {
      */
     cleanup(callback) {
         const ctx = this[_ContextImpl];
+        if (ctx.f & IsUnmounted) {
+            const value = ctx.renderer.read(getValue(ctx.ret));
+            callback(value);
+            return;
+        }
         let callbacks = cleanupMap.get(ctx);
         if (!callbacks) {
             callbacks = new Set();
@@ -1427,6 +1432,9 @@ function enqueueComponentRun(ctx, hydrationData) {
         }
         catch (err) {
             if (!(ctx.f & IsUpdating)) {
+                if (!ctx.parent) {
+                    throw err;
+                }
                 return propagateError(ctx.parent, err);
             }
             throw err;
@@ -1450,6 +1458,9 @@ function enqueueComponentRun(ctx, hydrationData) {
             }
             catch (err) {
                 if (!(ctx.f & IsUpdating)) {
+                    if (!ctx.parent) {
+                        throw err;
+                    }
                     return propagateError(ctx.parent, err);
                 }
                 throw err;
@@ -1692,7 +1703,16 @@ async function runAsyncGenComponent(ctx, iterationP, hydrationData) {
                 // children. Sync generator components only resume when their children
                 // have fulfilled so the element’s inflight child values will never be
                 // defined.
-                oldValue = ctx.ret.inflightValue.then((value) => ctx.renderer.read(value), () => ctx.renderer.read(undefined));
+                oldValue = ctx.ret.inflightValue.then((value) => ctx.renderer.read(value));
+                oldValue.catch((err) => {
+                    if (ctx.f & IsUpdating) {
+                        return;
+                    }
+                    if (!ctx.parent) {
+                        throw err;
+                    }
+                    return propagateError(ctx.parent, err);
+                });
             }
             else {
                 oldValue = ctx.renderer.read(getValue(ctx.ret));
@@ -1770,7 +1790,10 @@ function unmountComponent(ctx) {
                         returnComponent(ctx);
                     }
                 }, (err) => {
-                    propagateError(ctx.parent, err);
+                    if (!ctx.parent) {
+                        throw err;
+                    }
+                    return propagateError(ctx.parent, err);
                 });
             }
             else {
@@ -1793,7 +1816,10 @@ function unmountComponent(ctx) {
                         returnComponent(ctx);
                     }
                 }, (err) => {
-                    propagateError(ctx.parent, err);
+                    if (!ctx.parent) {
+                        throw err;
+                    }
+                    return propagateError(ctx.parent, err);
                 });
             }
             else {
@@ -1811,7 +1837,12 @@ function returnComponent(ctx) {
             ctx.f |= IsSyncExecuting;
             const iteration = ctx.iterator.return();
             if (isPromiseLike(iteration)) {
-                iteration.catch((err) => propagateError(ctx.parent, err));
+                iteration.catch((err) => {
+                    if (!ctx.parent) {
+                        throw err;
+                    }
+                    return propagateError(ctx.parent, err);
+                });
             }
         }
         finally {
@@ -1924,18 +1955,23 @@ function handleChildError(ctx, err) {
     return updateComponentChildren(ctx, iteration.value);
 }
 function propagateError(ctx, err) {
-    if (ctx === undefined) {
-        throw err;
-    }
     let result;
     try {
         result = handleChildError(ctx, err);
     }
     catch (err) {
+        if (!ctx.parent) {
+            throw err;
+        }
         return propagateError(ctx.parent, err);
     }
     if (isPromiseLike(result)) {
-        return result.catch((err) => propagateError(ctx.parent, err));
+        return result.catch((err) => {
+            if (!ctx.parent) {
+                throw err;
+            }
+            return propagateError(ctx.parent, err);
+        });
     }
     return result;
 }