@b9g/crank 0.5.0-beta.1 → 0.5.0-beta.3

package/crank.js

@@ -158,22 +158,6 @@ function createElement(tag, props, ...children) {
     else if (children.length === 1) {
         props1.children = children[0];
     }
-    // string aliases for the special tags
-    // TODO: Does this logic belong here, or in the Element constructor
-    switch (tag) {
-        case "$FRAGMENT":
-            tag = Fragment;
-            break;
-        case "$PORTAL":
-            tag = Portal;
-            break;
-        case "$COPY":
-            tag = Copy;
-            break;
-        case "$RAW":
-            tag = Raw;
-            break;
-    }
     return new Element(tag, props1, key, ref, static_);
 }
 /** Clones a given element, shallowly copying the props object. */
@@ -252,13 +236,13 @@ function normalize(values) {
 class Retainer {
     constructor(el) {
         this.el = el;
-        this.value = undefined;
         this.ctx = undefined;
         this.children = undefined;
-        this.cached = undefined;
-        this.fallback = undefined;
-        this.inflight = undefined;
-        this.onCommit = undefined;
+        this.value = undefined;
+        this.cachedChildValues = undefined;
+        this.fallbackValue = undefined;
+        this.inflightValue = undefined;
+        this.onNextValues = undefined;
     }
 }
 /**
@@ -267,10 +251,10 @@ class Retainer {
  * @returns The value of the element.
  */
 function getValue(ret) {
-    if (typeof ret.fallback !== "undefined") {
-        return typeof ret.fallback === "object"
-            ? getValue(ret.fallback)
-            : ret.fallback;
+    if (typeof ret.fallbackValue !== "undefined") {
+        return typeof ret.fallbackValue === "object"
+            ? getValue(ret.fallbackValue)
+            : ret.fallbackValue;
     }
     else if (ret.el.tag === Portal) {
         return;
@@ -286,8 +270,8 @@ function getValue(ret) {
  * @returns A normalized array of nodes and strings.
  */
 function getChildValues(ret) {
-    if (ret.cached) {
-        return wrap(ret.cached);
+    if (ret.cachedChildValues) {
+        return wrap(ret.cachedChildValues);
     }
     const values = [];
     const children = wrap(ret.children);
@@ -300,7 +284,7 @@ function getChildValues(ret) {
     const values1 = normalize(values);
     const tag = ret.el.tag;
     if (typeof tag === "function" || (tag !== Fragment && tag !== Raw)) {
-        ret.cached = unwrap(values1);
+        ret.cachedChildValues = unwrap(values1);
     }
     return values1;
 }
@@ -317,7 +301,7 @@ const defaultRendererImpl = {
     dispose: NOOP,
     flush: NOOP,
 };
-const $RendererImpl = Symbol.for("crank.RendererImpl");
+const _RendererImpl = Symbol.for("crank.RendererImpl");
 /**
  * An abstract class which is subclassed to render to different target
  * environments. This class is responsible for kicking off the rendering
@@ -331,7 +315,7 @@ const $RendererImpl = Symbol.for("crank.RendererImpl");
 class Renderer {
     constructor(impl) {
         this.cache = new WeakMap();
-        this[$RendererImpl] = {
+        this[_RendererImpl] = {
             ...defaultRendererImpl,
             ...impl,
         };
@@ -343,7 +327,7 @@ class Renderer {
      * used root to delete the previously rendered element tree from the cache.
      * @param root - The node to be rendered into. The renderer will cache
      * element trees per root.
-     * @param ctx - An optional context that will be the ancestor context of all
+     * @param bridge - An optional context that will be the ancestor context of all
      * elements in the tree. Useful for connecting different renderers so that
      * events/provisions properly propagate. The context for a given root must be
      * the same or an error will be thrown.
@@ -353,7 +337,7 @@ class Renderer {
      */
     render(children, root, bridge) {
         let ret;
-        const ctx = bridge && bridge[$ContextImpl];
+        const ctx = bridge && bridge[_ContextImpl];
         if (typeof root === "object" && root !== null) {
             ret = this.cache.get(root);
         }
@@ -376,7 +360,7 @@ class Renderer {
                 this.cache.delete(root);
             }
         }
-        const impl = this[$RendererImpl];
+        const impl = this[_RendererImpl];
         const childValues = diffChildren(impl, root, ret, ctx, impl.scope(undefined, Portal, ret.el.props), ret, children);
         // We return the child values of the portal because portal elements
         // themselves have no readable value.
@@ -389,15 +373,15 @@ class Renderer {
 /*** PRIVATE RENDERER FUNCTIONS ***/
 function commitRootRender(renderer, root, ctx, ret, childValues, oldProps) {
     // element is a host or portal element
-    if (root !== undefined) {
-        renderer.arrange(Portal, root, ret.el.props, childValues, oldProps, wrap(ret.cached));
+    if (root != null) {
+        renderer.arrange(Portal, root, ret.el.props, childValues, oldProps, wrap(ret.cachedChildValues));
         flush(renderer, root);
     }
-    ret.cached = unwrap(childValues);
+    ret.cachedChildValues = unwrap(childValues);
     if (root == null) {
         unmount(renderer, ret, ctx, ret);
     }
-    return renderer.read(ret.cached);
+    return renderer.read(ret.cachedChildValues);
 }
 function diffChildren(renderer, root, host, ctx, scope, parent, children) {
     const oldRetained = wrap(parent.children);
@@ -469,7 +453,7 @@ function diffChildren(renderer, root, host, ctx, scope, parent, children) {
                     }
                     const fallback = ret;
                     ret = new Retainer(child);
-                    ret.fallback = fallback;
+                    ret.fallbackValue = fallback;
                 }
                 if (child.tag === Raw) {
                     value = updateRaw(renderer, ret, scope, oldProps);
@@ -537,27 +521,29 @@ function diffChildren(renderer, root, host, ctx, scope, parent, children) {
             childValues1,
             new Promise((resolve) => (onChildValues = resolve)),
         ]);
-        if (parent.onCommit) {
-            parent.onCommit(childValues1);
+        if (parent.onNextValues) {
+            parent.onNextValues(childValues1);
         }
-        parent.onCommit = onChildValues;
+        parent.onNextValues = onChildValues;
         return childValues1.then((childValues) => {
-            parent.inflight = parent.fallback = undefined;
+            parent.inflightValue = parent.fallbackValue = undefined;
             return normalize(childValues);
         });
     }
-    if (graveyard) {
-        for (let i = 0; i < graveyard.length; i++) {
-            unmount(renderer, host, ctx, graveyard[i]);
+    else {
+        if (graveyard) {
+            for (let i = 0; i < graveyard.length; i++) {
+                unmount(renderer, host, ctx, graveyard[i]);
+            }
         }
+        if (parent.onNextValues) {
+            parent.onNextValues(values);
+            parent.onNextValues = undefined;
+        }
+        parent.inflightValue = parent.fallbackValue = undefined;
+        // We can assert there are no promises in the array because isAsync is false
+        return normalize(values);
     }
-    if (parent.onCommit) {
-        parent.onCommit(values);
-        parent.onCommit = undefined;
-    }
-    parent.inflight = parent.fallback = undefined;
-    // We can assert there are no promises in the array because isAsync is false
-    return normalize(values);
 }
 function createChildrenByKey(children, offset) {
     const childrenByKey = new Map();
@@ -577,8 +563,8 @@ function getInflightValue(child) {
     if (ctx && ctx.f & IsUpdating && ctx.inflightValue) {
         return ctx.inflightValue;
     }
-    else if (child.inflight) {
-        return child.inflight;
+    else if (child.inflightValue) {
+        return child.inflightValue;
     }
     return getValue(child);
 }
@@ -597,8 +583,8 @@ function updateRaw(renderer, ret, scope, oldProps) {
 function updateFragment(renderer, root, host, ctx, scope, ret) {
     const childValues = diffChildren(renderer, root, host, ctx, scope, ret, ret.el.props.children);
     if (isPromiseLike(childValues)) {
-        ret.inflight = childValues.then((childValues) => unwrap(childValues));
-        return ret.inflight;
+        ret.inflightValue = childValues.then((childValues) => unwrap(childValues));
+        return ret.inflightValue;
     }
     return unwrap(childValues);
 }
@@ -615,8 +601,8 @@ function updateHost(renderer, root, ctx, scope, ret, oldProps) {
     scope = renderer.scope(scope, tag, el.props);
     const childValues = diffChildren(renderer, root, ret, ctx, scope, ret, ret.el.props.children);
     if (isPromiseLike(childValues)) {
-        ret.inflight = childValues.then((childValues) => commitHost(renderer, scope, ret, childValues, oldProps));
-        return ret.inflight;
+        ret.inflightValue = childValues.then((childValues) => commitHost(renderer, scope, ret, childValues, oldProps));
+        return ret.inflightValue;
     }
     return commitHost(renderer, scope, ret, childValues, oldProps);
 }
@@ -643,8 +629,8 @@ function commitHost(renderer, scope, ret, childValues, oldProps) {
         }
         ret.el = new Element(tag, props, ret.el.key, ret.el.ref);
     }
-    renderer.arrange(tag, value, props, childValues, oldProps, wrap(ret.cached));
-    ret.cached = unwrap(childValues);
+    renderer.arrange(tag, value, props, childValues, oldProps, wrap(ret.cachedChildValues));
+    ret.cachedChildValues = unwrap(childValues);
     if (tag === Portal) {
         flush(renderer, ret.value);
         return;
@@ -691,7 +677,7 @@ function unmount(renderer, host, ctx, ret) {
     }
     else if (ret.el.tag === Portal) {
         host = ret;
-        renderer.arrange(Portal, host.value, host.el.props, [], host.el.props, wrap(host.cached));
+        renderer.arrange(Portal, host.value, host.el.props, [], host.el.props, wrap(host.cachedChildValues));
         flush(renderer, host.value);
     }
     else if (ret.el.tag !== Fragment) {
@@ -715,38 +701,45 @@ function unmount(renderer, host, ctx, ret) {
 }
 /*** CONTEXT FLAGS ***/
 /**
- * A flag which is set when the component is being updated by the parent and
- * cleared when the component has committed. Used to determine things like
- * whether the nearest host ancestor needs to be rearranged.
+ * A flag which is true when the component is initialized or updated by an
+ * ancestor component or the root render call.
+ *
+ * Used to determine things like whether the nearest host ancestor needs to be
+ * rearranged.
  */
 const IsUpdating = 1 << 0;
 /**
- * A flag which is set when the component function or generator is
- * synchronously executing. This flags is used to ensure that a component which
- * triggers a second update in the course of rendering does not cause a stack
- * overflow or a generator error.
+ * A flag which is true when the component is synchronously executing.
+ *
+ * Used to guard against components triggering stack overflow or generator error.
+ */
+const IsSyncExecuting = 1 << 1;
+/**
+ * A flag which is true when the component is in the render loop.
  */
-const IsExecuting = 1 << 1;
+const IsInRenderLoop = 1 << 2;
 /**
- * A flag used to make sure multiple values are not pulled from context prop
- * iterators without a yield.
+ * A flag which is true when the component starts the render loop but has not
+ * yielded yet.
+ *
+ * Used to make sure that components yield at least once per loop.
  */
-const IsIterating = 1 << 2;
+const NeedsToYield = 1 << 3;
 /**
  * A flag used by async generator components in conjunction with the
- * onavailable (_oa) callback to mark whether new props can be pulled via the
- * context async iterator. See the Symbol.asyncIterator method and the
+ * onAvailable callback to mark whether new props can be pulled via the context
+ * async iterator. See the Symbol.asyncIterator method and the
  * resumeCtxIterator function.
  */
-const IsAvailable = 1 << 3;
+const PropsAvailable = 1 << 4;
 /**
  * A flag which is set when a generator components returns, i.e. the done
- * property on the iteration is set to true. Generator components will stick to
- * their last rendered value and ignore further updates.
+ * property on the iteration is true. Generator components will stick to their
+ * last rendered value and ignore further updates.
  */
-const IsDone = 1 << 4;
+const IsDone = 1 << 5;
 /**
- * A flag which is set when a generator component errors.
+ * A flag which is set when a component errors.
  *
  * NOTE: This is mainly used to prevent some false positives in component
  * yields or returns undefined warnings. The reason we’re using this versus
@@ -754,28 +747,28 @@ const IsDone = 1 << 4;
  * sync generator child) where synchronous code causes a stack overflow error
  * in a non-deterministic way. Deeply disturbing stuff.
  */
-const IsErrored = 1 << 5;
+const IsErrored = 1 << 6;
 /**
  * A flag which is set when the component is unmounted. Unmounted components
  * are no longer in the element tree and cannot refresh or rerender.
  */
-const IsUnmounted = 1 << 6;
+const IsUnmounted = 1 << 7;
 /**
  * A flag which indicates that the component is a sync generator component.
  */
-const IsSyncGen = 1 << 7;
+const IsSyncGen = 1 << 8;
 /**
  * A flag which indicates that the component is an async generator component.
  */
-const IsAsyncGen = 1 << 8;
+const IsAsyncGen = 1 << 9;
 /**
  * A flag which is set while schedule callbacks are called.
  */
-const IsScheduling = 1 << 9;
+const IsScheduling = 1 << 10;
 /**
  * A flag which is set when a schedule callback calls refresh.
  */
-const IsSchedulingRefresh = 1 << 10;
+const IsSchedulingRefresh = 1 << 11;
 const provisionMaps = new WeakMap();
 const scheduleMap = new WeakMap();
 const cleanupMap = new WeakMap();
@@ -783,7 +776,7 @@ const cleanupMap = new WeakMap();
 const flushMaps = new WeakMap();
 /**
  * @internal
- * The internal class which holds all context data.
+ * The internal class which holds context data.
  */
 class ContextImpl {
     constructor(renderer, root, host, parent, scope, ret) {
@@ -800,10 +793,11 @@ class ContextImpl {
         this.inflightValue = undefined;
         this.enqueuedBlock = undefined;
         this.enqueuedValue = undefined;
-        this.onAvailable = undefined;
+        this.onProps = undefined;
+        this.onPropsRequested = undefined;
     }
 }
-const $ContextImpl = Symbol.for("crank.ContextImpl");
+const _ContextImpl = Symbol.for("crank.ContextImpl");
 /**
  * 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
@@ -817,8 +811,10 @@ const $ContextImpl = Symbol.for("crank.ContextImpl");
  * schedule and cleanup callbacks.
  */
 class Context {
+    // TODO: If we could make the constructor function take a nicer value, it
+    // would be useful for testing purposes.
     constructor(impl) {
-        this[$ContextImpl] = impl;
+        this[_ContextImpl] = impl;
     }
     /**
      * The current props of the associated element.
@@ -828,7 +824,7 @@ class Context {
      * plugins or utilities which wrap contexts.
      */
     get props() {
-        return this[$ContextImpl].ret.el.props;
+        return this[_ContextImpl].ret.el.props;
     }
     // TODO: Should we rename this???
     /**
@@ -839,45 +835,70 @@ class Context {
      * mainly for plugins or utilities which wrap contexts.
      */
     get value() {
-        return this[$ContextImpl].renderer.read(getValue(this[$ContextImpl].ret));
+        return this[_ContextImpl].renderer.read(getValue(this[_ContextImpl].ret));
     }
     *[Symbol.iterator]() {
-        const impl = this[$ContextImpl];
-        while (!(impl.f & IsDone)) {
-            if (impl.f & IsIterating) {
-                throw new Error("Context iterated twice without a yield");
-            }
-            else if (impl.f & IsAsyncGen) {
-                throw new Error("Use for await…of in async generator components");
+        const impl = this[_ContextImpl];
+        if (impl.f & IsAsyncGen) {
+            throw new Error("Use for await…of in async generator components");
+        }
+        try {
+            impl.f |= IsInRenderLoop;
+            while (!(impl.f & IsUnmounted)) {
+                if (impl.f & NeedsToYield) {
+                    throw new Error("Context iterated twice without a yield");
+                }
+                else {
+                    impl.f |= NeedsToYield;
+                }
+                yield impl.ret.el.props;
             }
-            impl.f |= IsIterating;
-            yield impl.ret.el.props;
+        }
+        finally {
+            impl.f &= ~IsInRenderLoop;
         }
     }
     async *[Symbol.asyncIterator]() {
-        // We use a do while loop rather than a while loop to handle an edge case
-        // where an async generator component is unmounted synchronously and
-        // therefore “done” before it starts iterating over the context.
-        const impl = this[$ContextImpl];
-        do {
-            if (impl.f & IsIterating) {
-                throw new Error("Context iterated twice without a yield");
-            }
-            else if (impl.f & IsSyncGen) {
-                throw new Error("Use for…of in sync generator components");
-            }
-            impl.f |= IsIterating;
-            if (impl.f & IsAvailable) {
-                impl.f &= ~IsAvailable;
-            }
-            else {
-                await new Promise((resolve) => (impl.onAvailable = resolve));
-                if (impl.f & IsDone) {
-                    break;
+        const impl = this[_ContextImpl];
+        if (impl.f & IsSyncGen) {
+            throw new Error("Use for…of in sync generator components");
+        }
+        try {
+            // await an empty promise to prevent the IsInRenderLoop flag from
+            // returning false positives in the case of async generator components
+            // which immediately enter the loop
+            impl.f |= IsInRenderLoop;
+            while (!(impl.f & IsUnmounted)) {
+                if (impl.f & NeedsToYield) {
+                    throw new Error("Context iterated twice without a yield");
+                }
+                else {
+                    impl.f |= NeedsToYield;
+                }
+                if (impl.f & PropsAvailable) {
+                    impl.f &= ~PropsAvailable;
+                    yield impl.ret.el.props;
+                }
+                else {
+                    const props = await new Promise((resolve) => (impl.onProps = resolve));
+                    if (impl.f & IsUnmounted) {
+                        break;
+                    }
+                    yield props;
                 }
+                if (impl.onPropsRequested) {
+                    impl.onPropsRequested();
+                    impl.onPropsRequested = undefined;
+                }
+            }
+        }
+        finally {
+            impl.f &= ~IsInRenderLoop;
+            if (impl.onPropsRequested) {
+                impl.onPropsRequested();
+                impl.onPropsRequested = undefined;
             }
-            yield impl.ret.el.props;
-        } while (!(impl.f & IsDone));
+        }
     }
     /**
      * Re-executes a component.
@@ -892,17 +913,16 @@ class Context {
      * async iterator to suspend.
      */
     refresh() {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         if (impl.f & IsUnmounted) {
             console.error("Component is unmounted");
             return impl.renderer.read(undefined);
         }
-        else if (impl.f & IsExecuting) {
+        else if (impl.f & IsSyncExecuting) {
             console.error("Component is already executing");
             return this.value;
         }
-        resumeCtxIterator(impl);
-        const value = runComponent(impl);
+        const value = enqueueComponentRun(impl);
         if (isPromiseLike(value)) {
             return value.then((value) => impl.renderer.read(value));
         }
@@ -913,7 +933,7 @@ class Context {
      * fire once per callback and update.
      */
     schedule(callback) {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         let callbacks = scheduleMap.get(impl);
         if (!callbacks) {
             callbacks = new Set();
@@ -926,7 +946,7 @@ class Context {
      * rendered into the root. Will only fire once per callback and render.
      */
     flush(callback) {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         if (typeof impl.root !== "object" || impl.root === null) {
             return;
         }
@@ -947,7 +967,7 @@ class Context {
      * fire once per callback.
      */
     cleanup(callback) {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         let callbacks = cleanupMap.get(impl);
         if (!callbacks) {
             callbacks = new Set();
@@ -956,7 +976,7 @@ class Context {
         callbacks.add(callback);
     }
     consume(key) {
-        for (let parent = this[$ContextImpl].parent; parent !== undefined; parent = parent.parent) {
+        for (let parent = this[_ContextImpl].parent; parent !== undefined; parent = parent.parent) {
             const provisions = provisionMaps.get(parent);
             if (provisions && provisions.has(key)) {
                 return provisions.get(key);
@@ -964,7 +984,7 @@ class Context {
         }
     }
     provide(key, value) {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         let provisions = provisionMaps.get(impl);
         if (!provisions) {
             provisions = new Map();
@@ -973,7 +993,7 @@ class Context {
         provisions.set(key, value);
     }
     addEventListener(type, listener, options) {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         let listeners;
         if (!isListenerOrListenerObject(listener)) {
             return;
@@ -1020,7 +1040,7 @@ class Context {
         }
     }
     removeEventListener(type, listener, options) {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         const listeners = listenersMap.get(impl);
         if (listeners == null || !isListenerOrListenerObject(listener)) {
             return;
@@ -1042,7 +1062,7 @@ class Context {
         }
     }
     dispatchEvent(ev) {
-        const impl = this[$ContextImpl];
+        const impl = this[_ContextImpl];
         const path = [];
         for (let parent = impl.parent; parent !== undefined; parent = parent.parent) {
             path.push(parent);
@@ -1152,17 +1172,16 @@ function updateComponent(renderer, root, host, parent, scope, ret, oldProps) {
     let ctx;
     if (oldProps) {
         ctx = ret.ctx;
-        if (ctx.f & IsExecuting) {
+        if (ctx.f & IsSyncExecuting) {
             console.error("Component is already executing");
-            return ret.cached;
+            return ret.cachedChildValues;
         }
     }
     else {
         ctx = ret.ctx = new ContextImpl(renderer, root, host, parent, scope, ret);
     }
     ctx.f |= IsUpdating;
-    resumeCtxIterator(ctx);
-    return runComponent(ctx);
+    return enqueueComponentRun(ctx);
 }
 function updateComponentChildren(ctx, children) {
     if (ctx.f & IsUnmounted || ctx.f & IsErrored) {
@@ -1172,18 +1191,19 @@ function updateComponentChildren(ctx, children) {
         console.error("A component has returned or yielded undefined. If this was intentional, return or yield null instead.");
     }
     let childValues;
-    // We set the isExecuting flag in case a child component dispatches an event
-    // which bubbles to this component and causes a synchronous refresh().
-    ctx.f |= IsExecuting;
     try {
+        // TODO: WAT
+        // We set the isExecuting flag in case a child component dispatches an event
+        // which bubbles to this component and causes a synchronous refresh().
+        ctx.f |= IsSyncExecuting;
         childValues = diffChildren(ctx.renderer, ctx.root, ctx.host, ctx, ctx.scope, ctx.ret, narrow(children));
     }
     finally {
-        ctx.f &= ~IsExecuting;
+        ctx.f &= ~IsSyncExecuting;
     }
     if (isPromiseLike(childValues)) {
-        ctx.ret.inflight = childValues.then((childValues) => commitComponent(ctx, childValues));
-        return ctx.ret.inflight;
+        ctx.ret.inflightValue = childValues.then((childValues) => commitComponent(ctx, childValues));
+        return ctx.ret.inflightValue;
     }
     return commitComponent(ctx, childValues);
 }
@@ -1203,8 +1223,8 @@ function commitComponent(ctx, values) {
             }
         }
     }
-    const oldValues = wrap(ctx.ret.cached);
-    let value = (ctx.ret.cached = unwrap(values));
+    const oldValues = wrap(ctx.ret.cachedChildValues);
+    let value = (ctx.ret.cachedChildValues = unwrap(values));
     if (ctx.f & IsScheduling) {
         ctx.f |= IsSchedulingRefresh;
     }
@@ -1212,7 +1232,7 @@ function commitComponent(ctx, values) {
         // If we’re not updating the component, which happens when components are
         // refreshed, or when async generator components iterate, we have to do a
         // little bit housekeeping when a component’s child values have changed.
-        if (!valuesEqual(oldValues, values)) {
+        if (!arrayEqual(oldValues, values)) {
             const records = getListenerRecords(ctx.parent, ctx.host);
             if (records.length) {
                 for (let i = 0; i < values.length; i++) {
@@ -1227,7 +1247,7 @@ function commitComponent(ctx, values) {
             }
             // rearranging the nearest ancestor host element
             const host = ctx.host;
-            const oldHostValues = wrap(host.cached);
+            const oldHostValues = wrap(host.cachedChildValues);
             invalidate(ctx, host);
             const hostValues = getChildValues(host);
             ctx.renderer.arrange(host.el.tag, host.value, host.el.props, hostValues, 
@@ -1256,50 +1276,75 @@ function commitComponent(ctx, values) {
 }
 function invalidate(ctx, host) {
     for (let parent = ctx.parent; parent !== undefined && parent.host === host; parent = parent.parent) {
-        parent.ret.cached = undefined;
+        parent.ret.cachedChildValues = undefined;
     }
-    host.cached = undefined;
+    host.cachedChildValues = undefined;
 }
-function valuesEqual(values1, values2) {
-    if (values1.length !== values2.length) {
+function arrayEqual(arr1, arr2) {
+    if (arr1.length !== arr2.length) {
         return false;
     }
-    for (let i = 0; i < values1.length; i++) {
-        const value1 = values1[i];
-        const value2 = values2[i];
+    for (let i = 0; i < arr1.length; i++) {
+        const value1 = arr1[i];
+        const value2 = arr2[i];
         if (value1 !== value2) {
             return false;
         }
     }
     return true;
 }
-/**
- * Enqueues and executes the component associated with the context.
- *
- * The functions stepComponent and runComponent work together
- * to implement the async queueing behavior of components. The runComponent
- * function calls the stepComponent function, which returns two results in a
- * tuple. The first result, called the “block,” is a possible promise which
- * represents the duration for which the component is blocked from accepting
- * new updates. The second result, called the “value,” is the actual result of
- * the update. The runComponent function caches block/value from the
- * stepComponent function on the context, according to whether the component
- * blocks. The “inflight” block/value properties are the currently executing
- * update, and the “enqueued” block/value properties represent an enqueued next
- * stepComponent. Enqueued steps are dequeued every time the current block
- * promise settles.
- */
-function runComponent(ctx) {
-    if (!ctx.inflightBlock) {
+/** Enqueues and executes the component associated with the context. */
+function enqueueComponentRun(ctx) {
+    if (ctx.f & IsAsyncGen) {
+        // This branch will only run for async generator components after the
+        // initial render.
+        //
+        // Async generator components which are in the props loop can be in one of
+        // three states:
+        //
+        // 1. propsAvailable flag is true: "available"
+        //
+        //   The component is paused somewhere in the loop. When the component
+        //   reaches the bottom of the loop, it will run again with the next props.
+        //
+        // 2. onAvailable callback is defined: "suspended"
+        //
+        //   The component has reached the bottom of the loop and is waiting for
+        //   new props.
+        //
+        // 3. neither 1 or 2: "Running"
+        //
+        //   The component is paused somewhere in the loop. When the component
+        //   reaches the bottom of the loop, it will suspend.
+        //
+        // By definition, components will never be both available and suspended at
+        // the same time.
+        //
+        // If the component is at the loop bottom, this means that the next value
+        // produced by the component will have the most up to date props, so we can
+        // simply return the current inflight value. Otherwise, we have to wait for
+        // the bottom of the loop before returning the inflight value.
+        const isAtLoopbottom = ctx.f & IsInRenderLoop && !ctx.onProps;
+        resumePropsIterator(ctx);
+        if (isAtLoopbottom) {
+            if (ctx.inflightBlock == null) {
+                ctx.inflightBlock = new Promise((resolve) => (ctx.onPropsRequested = resolve));
+            }
+            return ctx.inflightBlock.then(() => {
+                ctx.inflightBlock = undefined;
+                return ctx.inflightValue;
+            });
+        }
+        return ctx.inflightValue;
+    }
+    else if (!ctx.inflightBlock) {
         try {
-            const [block, value] = stepComponent(ctx);
+            const [block, value] = runComponent(ctx);
             if (block) {
                 ctx.inflightBlock = block
-                    .catch((err) => {
-                    if (!(ctx.f & IsUpdating)) {
-                        return propagateError(ctx.parent, err);
-                    }
-                })
+                    // TODO: there is some fuckery going on here related to async
+                    // generator components resuming when they’re meant to be returned.
+                    .then((v) => v)
                     .finally(() => advanceComponent(ctx));
                 // stepComponent will only return a block if the value is asynchronous
                 ctx.inflightValue = value;
@@ -1313,38 +1358,43 @@ function runComponent(ctx) {
             throw err;
         }
     }
-    else if (ctx.f & IsAsyncGen) {
-        return ctx.inflightValue;
-    }
     else if (!ctx.enqueuedBlock) {
-        let resolve;
-        ctx.enqueuedBlock = ctx.inflightBlock
-            .then(() => {
+        // We need to assign enqueuedBlock and enqueuedValue synchronously, hence
+        // the Promise constructor call.
+        let resolveEnqueuedBlock;
+        ctx.enqueuedBlock = new Promise((resolve) => (resolveEnqueuedBlock = resolve));
+        ctx.enqueuedValue = ctx.inflightBlock.then(() => {
             try {
-                const [block, value] = stepComponent(ctx);
-                resolve(value);
+                const [block, value] = runComponent(ctx);
                 if (block) {
-                    return block.catch((err) => {
-                        if (!(ctx.f & IsUpdating)) {
-                            return propagateError(ctx.parent, err);
-                        }
-                    });
+                    resolveEnqueuedBlock(block.finally(() => advanceComponent(ctx)));
                 }
+                return value;
             }
             catch (err) {
                 if (!(ctx.f & IsUpdating)) {
                     return propagateError(ctx.parent, err);
                 }
+                throw err;
             }
-        })
-            .finally(() => advanceComponent(ctx));
-        ctx.enqueuedValue = new Promise((resolve1) => (resolve = resolve1));
+        });
     }
     return ctx.enqueuedValue;
 }
+/** Called when the inflight block promise settles. */
+function advanceComponent(ctx) {
+    if (ctx.f & IsAsyncGen) {
+        return;
+    }
+    ctx.inflightBlock = ctx.enqueuedBlock;
+    ctx.inflightValue = ctx.enqueuedValue;
+    ctx.enqueuedBlock = undefined;
+    ctx.enqueuedValue = undefined;
+}
 /**
  * This function is responsible for executing the component and handling all
- * the different component types.
+ * the different component types. We cannot identify whether a component is a
+ * generator or async without calling it and inspecting the return value.
  *
  * @returns {[block, value]} A tuple where
  * block - A possible promise which represents the duration during which the
@@ -1359,14 +1409,15 @@ function runComponent(ctx) {
  * - Sync generator components block while any children are executing, because
  * they are expected to only resume when they’ve actually rendered.
  */
-function stepComponent(ctx) {
+function runComponent(ctx) {
     const ret = ctx.ret;
     if (ctx.f & IsDone) {
         return [undefined, getValue(ret)];
     }
     const initial = !ctx.iterator;
     if (initial) {
-        ctx.f |= IsExecuting;
+        resumePropsIterator(ctx);
+        ctx.f |= IsSyncExecuting;
         clearEventListeners(ctx);
         let result;
         try {
@@ -1377,7 +1428,7 @@ function stepComponent(ctx) {
             throw err;
         }
         finally {
-            ctx.f &= ~IsExecuting;
+            ctx.f &= ~IsSyncExecuting;
         }
         if (isIteratorLike(result)) {
             ctx.iterator = result;
@@ -1389,120 +1440,179 @@ function stepComponent(ctx) {
                 ctx.f |= IsErrored;
                 throw err;
             });
-            return [result1, value];
+            return [result1.catch(NOOP), value];
         }
         else {
             // sync function component
             return [undefined, updateComponentChildren(ctx, result)];
         }
     }
-    let oldValue;
-    if (initial) {
-        // The argument passed to the first call to next is ignored.
-        oldValue = undefined;
-    }
-    else if (ctx.ret.inflight) {
-        // The value passed back into the generator as the argument to the next
-        // method is a promise if an async generator component has async 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.inflight.then((value) => ctx.renderer.read(value), () => ctx.renderer.read(undefined));
-    }
-    else {
-        oldValue = ctx.renderer.read(getValue(ret));
-    }
     let iteration;
-    ctx.f |= IsExecuting;
-    try {
-        iteration = ctx.iterator.next(oldValue);
-    }
-    catch (err) {
-        ctx.f |= IsDone | IsErrored;
-        throw err;
-    }
-    finally {
-        ctx.f &= ~IsExecuting;
-    }
-    if (isPromiseLike(iteration)) {
-        // async generator component
-        if (initial) {
+    if (initial) {
+        try {
+            ctx.f |= IsSyncExecuting;
+            iteration = ctx.iterator.next();
+        }
+        catch (err) {
+            ctx.f |= IsDone | IsErrored;
+            throw err;
+        }
+        finally {
+            ctx.f &= ~IsSyncExecuting;
+        }
+        if (isPromiseLike(iteration)) {
             ctx.f |= IsAsyncGen;
+            runAsyncGenComponent(ctx, iteration);
         }
-        const value = iteration.then((iteration) => {
-            if (!(ctx.f & IsIterating)) {
-                ctx.f &= ~IsAvailable;
-            }
-            ctx.f &= ~IsIterating;
-            if (iteration.done) {
-                ctx.f |= IsDone;
-            }
+        else {
+            ctx.f |= IsSyncGen;
+        }
+    }
+    if (ctx.f & IsSyncGen) {
+        // sync generator component
+        ctx.f &= ~NeedsToYield;
+        if (!initial) {
             try {
-                const value = updateComponentChildren(ctx, iteration.value);
-                if (isPromiseLike(value)) {
-                    return value.catch((err) => handleChildError(ctx, err));
-                }
-                return value;
+                ctx.f |= IsSyncExecuting;
+                const oldValue = ctx.renderer.read(getValue(ret));
+                iteration = ctx.iterator.next(oldValue);
             }
             catch (err) {
-                return handleChildError(ctx, err);
+                ctx.f |= IsDone | IsErrored;
+                throw err;
             }
-        }, (err) => {
-            ctx.f |= IsDone | IsErrored;
-            throw err;
-        });
-        return [iteration, value];
-    }
-    // sync generator component
-    if (initial) {
-        ctx.f |= IsSyncGen;
-    }
-    ctx.f &= ~IsIterating;
-    if (iteration.done) {
-        ctx.f |= IsDone;
-    }
-    let value;
-    try {
-        value = updateComponentChildren(ctx, iteration.value);
+            finally {
+                ctx.f &= ~IsSyncExecuting;
+            }
+        }
+        if (isPromiseLike(iteration)) {
+            throw new Error("Sync generator component returned an async iteration");
+        }
+        if (iteration.done) {
+            ctx.f |= IsDone;
+        }
+        let value;
+        try {
+            value = updateComponentChildren(ctx, 
+            // Children can be void so we eliminate that here
+            iteration.value);
+            if (isPromiseLike(value)) {
+                value = value.catch((err) => handleChildError(ctx, err));
+            }
+        }
+        catch (err) {
+            value = handleChildError(ctx, err);
+        }
         if (isPromiseLike(value)) {
-            value = value.catch((err) => handleChildError(ctx, err));
+            return [value.catch(NOOP), value];
         }
+        return [undefined, value];
     }
-    catch (err) {
-        value = handleChildError(ctx, err);
-    }
-    if (isPromiseLike(value)) {
-        return [value.catch(NOOP), value];
+    else {
+        // async generator component
+        return [undefined, ctx.inflightValue];
     }
-    return [undefined, value];
 }
-/**
- * Called when the inflight block promise settles.
- */
-function advanceComponent(ctx) {
-    ctx.inflightBlock = ctx.enqueuedBlock;
-    ctx.inflightValue = ctx.enqueuedValue;
-    ctx.enqueuedBlock = undefined;
-    ctx.enqueuedValue = undefined;
-    if (ctx.f & IsAsyncGen && !(ctx.f & IsDone) && !(ctx.f & IsUnmounted)) {
-        runComponent(ctx);
-    }
+async function runAsyncGenComponent(ctx, iterationP) {
+    do {
+        // block and value must be assigned at the same time.
+        let onValue;
+        ctx.inflightValue = new Promise((resolve) => (onValue = resolve));
+        if (ctx.f & IsUpdating) {
+            // We should not swallow unhandled promise rejections if the component is
+            // updating independently.
+            // TODO: Does this handle this.refresh() calls?
+            ctx.inflightValue.catch(NOOP);
+        }
+        let iteration;
+        try {
+            iteration = await iterationP;
+        }
+        catch (err) {
+            ctx.f |= IsDone;
+            ctx.f |= IsErrored;
+            onValue(Promise.reject(err));
+            break;
+        }
+        finally {
+            if (!(ctx.f & IsInRenderLoop)) {
+                ctx.f &= ~PropsAvailable;
+            }
+        }
+        if (ctx.f & NeedsToYield) {
+            ctx.f &= ~NeedsToYield;
+        }
+        if (iteration.done) {
+            ctx.f |= IsDone;
+        }
+        let value;
+        try {
+            value = updateComponentChildren(ctx, iteration.value);
+            if (isPromiseLike(value)) {
+                value = value.catch((err) => handleChildError(ctx, err));
+            }
+            onValue(value);
+        }
+        catch (err) {
+            // Do we need to catch potential errors here in the case of unhandled
+            // promise rejections?
+            value = handleChildError(ctx, err);
+        }
+        // TODO: this can be done more elegantly
+        let oldValue;
+        if (ctx.ret.inflightValue) {
+            // The value passed back into the generator as the argument to the next
+            // method is a promise if an async generator component has async
+            // 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));
+        }
+        else {
+            oldValue = ctx.renderer.read(getValue(ctx.ret));
+        }
+        if (ctx.f & IsUnmounted) {
+            if (ctx.f & IsInRenderLoop) {
+                try {
+                    ctx.f |= IsSyncExecuting;
+                    iterationP = ctx.iterator.next(oldValue);
+                }
+                finally {
+                    ctx.f &= ~IsSyncExecuting;
+                }
+            }
+            else {
+                returnComponent(ctx);
+                break;
+            }
+        }
+        else if (!(ctx.f & IsDone)) {
+            try {
+                ctx.f |= IsSyncExecuting;
+                iterationP = ctx.iterator.next(oldValue);
+            }
+            finally {
+                ctx.f &= ~IsSyncExecuting;
+            }
+        }
+    } while (!(ctx.f & IsDone));
 }
 /**
  * Called to make props available to the props async iterator for async
  * generator components.
  */
-function resumeCtxIterator(ctx) {
-    if (ctx.onAvailable) {
-        ctx.onAvailable();
-        ctx.onAvailable = undefined;
+function resumePropsIterator(ctx) {
+    if (ctx.onProps) {
+        ctx.onProps(ctx.ret.el.props);
+        ctx.onProps = undefined;
+        ctx.f &= ~PropsAvailable;
     }
     else {
-        ctx.f |= IsAvailable;
+        ctx.f |= PropsAvailable;
     }
 }
 // TODO: async unmounting
 function unmountComponent(ctx) {
-    ctx.f |= IsUnmounted;
     clearEventListeners(ctx);
     const callbacks = cleanupMap.get(ctx);
     if (callbacks) {
@@ -1512,22 +1622,55 @@ function unmountComponent(ctx) {
             callback(value);
         }
     }
-    if (!(ctx.f & IsDone)) {
-        ctx.f |= IsDone;
-        resumeCtxIterator(ctx);
-        if (ctx.iterator && typeof ctx.iterator.return === "function") {
-            ctx.f |= IsExecuting;
-            try {
-                const iteration = ctx.iterator.return();
-                if (isPromiseLike(iteration)) {
-                    iteration.catch((err) => propagateError(ctx.parent, err));
+    ctx.f |= IsUnmounted;
+    if (ctx.iterator && !(ctx.f & IsDone)) {
+        if (ctx.f & IsSyncGen) {
+            let value;
+            if (ctx.f & IsInRenderLoop) {
+                value = enqueueComponentRun(ctx);
+            }
+            if (isPromiseLike(value)) {
+                value.then(() => {
+                    if (ctx.f & IsInRenderLoop) {
+                        unmountComponent(ctx);
+                    }
+                    else {
+                        returnComponent(ctx);
+                    }
+                }, (err) => {
+                    propagateError(ctx.parent, err);
+                });
+            }
+            else {
+                if (ctx.f & IsInRenderLoop) {
+                    unmountComponent(ctx);
+                }
+                else {
+                    returnComponent(ctx);
                 }
             }
-            finally {
-                ctx.f &= ~IsExecuting;
+        }
+        else {
+            // async generator component
+            resumePropsIterator(ctx);
+        }
+    }
+}
+function returnComponent(ctx) {
+    resumePropsIterator(ctx);
+    if (!(ctx.f & IsDone) && typeof ctx.iterator.return === "function") {
+        ctx.f |= IsSyncExecuting;
+        try {
+            const iteration = ctx.iterator.return();
+            if (isPromiseLike(iteration)) {
+                iteration.catch((err) => propagateError(ctx.parent, err));
             }
         }
+        finally {
+            ctx.f &= ~IsSyncExecuting;
+        }
     }
+    ctx.f |= IsDone;
 }
 /*** EVENT TARGET UTILITIES ***/
 // EVENT PHASE CONSTANTS
@@ -1604,10 +1747,10 @@ function handleChildError(ctx, err) {
         typeof ctx.iterator.throw !== "function") {
         throw err;
     }
-    resumeCtxIterator(ctx);
+    resumePropsIterator(ctx);
     let iteration;
     try {
-        ctx.f |= IsExecuting;
+        ctx.f |= IsSyncExecuting;
         iteration = ctx.iterator.throw(err);
     }
     catch (err) {
@@ -1615,7 +1758,7 @@ function handleChildError(ctx, err) {
         throw err;
     }
     finally {
-        ctx.f &= ~IsExecuting;
+        ctx.f &= ~IsSyncExecuting;
     }
     if (isPromiseLike(iteration)) {
         return iteration.then((iteration) => {