@b9g/crank 0.5.1 → 0.5.3

package/crank.d.ts

@@ -377,20 +377,20 @@ declare class ContextImpl<TNode = unknown, TScope = unknown, TRoot extends TNode
     constructor(renderer: RendererImpl<TNode, TScope, TRoot, TResult>, root: TRoot | undefined, host: Retainer<TNode>, parent: ContextImpl<TNode, TScope, TRoot, TResult> | undefined, scope: TScope | undefined, ret: Retainer<TNode>);
 }
 declare const _ContextImpl: unique symbol;
-type ComponentProps<T> = T extends (props: infer U) => any ? U : T;
+type ComponentProps<T> = T extends () => any ? {} : T extends (props: infer U) => any ? U : T;
 /**
  * A class which is instantiated and passed to every component as its this
  * value. Contexts form a tree just like elements and all components in the
  * element tree are connected via contexts. Components can use this tree to
  * communicate data upwards via events and downwards via provisions.
  *
- * @template [TProps=*] - The expected shape of the props passed to the
- * component. Used to strongly type the Context iterator methods.
+ * @template [T=*] - The expected shape of the props passed to the component,
+ * or a component function. Used to strongly type the Context iterator methods.
  * @template [TResult=*] - The readable element value type. It is used in
  * places such as the return value of refresh and the argument passed to
  * schedule and cleanup callbacks.
  */
-export declare class Context<TProps = any, TResult = any> implements EventTarget {
+export declare class Context<T = any, TResult = any> implements EventTarget {
     /**
      * @internal
      */
@@ -403,7 +403,7 @@ export declare class Context<TProps = any, TResult = any> implements EventTarget
      * component or via the context iterator methods. This property is mainly for
      * plugins or utilities which wrap contexts.
      */
-    get props(): ComponentProps<TProps>;
+    get props(): ComponentProps<T>;
     /**
      * The current value of the associated element.
      *
@@ -412,8 +412,8 @@ export declare class Context<TProps = any, TResult = any> implements EventTarget
      * mainly for plugins or utilities which wrap contexts.
      */
     get value(): TResult;
-    [Symbol.iterator](): Generator<ComponentProps<TProps>>;
-    [Symbol.asyncIterator](): AsyncGenerator<ComponentProps<TProps>>;
+    [Symbol.iterator](): Generator<ComponentProps<T>>;
+    [Symbol.asyncIterator](): AsyncGenerator<ComponentProps<T>>;
     /**
      * Re-executes a component.
      *

package/crank.js

@@ -859,8 +859,8 @@ const _ContextImpl = Symbol.for("crank.ContextImpl");
  * element tree are connected via contexts. Components can use this tree to
  * communicate data upwards via events and downwards via provisions.
  *
- * @template [TProps=*] - The expected shape of the props passed to the
- * component. Used to strongly type the Context iterator methods.
+ * @template [T=*] - The expected shape of the props passed to the component,
+ * or a component function. Used to strongly type the Context iterator methods.
  * @template [TResult=*] - The readable element value type. It is used in
  * places such as the return value of refresh and the argument passed to
  * schedule and cleanup callbacks.
@@ -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;
 }