@player-ui/markdown-plugin 0.12.1-next.0 → 0.13.0-next.1

package/dist/MarkdownPlugin.native.js

@@ -1184,12 +1184,61 @@ var MarkdownPlugin = function() {
             };
         }
     };
+    var isPromiseLike = function isPromiseLike(value) {
+        var // Check for standard Promise constructor name
+        _value_constructor;
+        return value != null && typeof value === "object" && typeof value.then === "function" && // Additional safeguards against false positives
+        (_instanceof(value, Promise) || ((_value_constructor = value.constructor) === null || _value_constructor === void 0 ? void 0 : _value_constructor.name) === "Promise" || // Verify it has other Promise-like methods to reduce false positives
+        typeof value.catch === "function" && typeof value.finally === "function");
+    };
+    var isAwaitable = function isAwaitable(val) {
+        return isPromiseLike(val) && val[AwaitableSymbol] !== void 0;
+    };
+    var collateAwaitable = function collateAwaitable(promises) {
+        var result = Promise.all(promises);
+        return makeAwaitable(result);
+    };
     var isObjectExpression = function isObjectExpression(expr) {
         if (isExpressionNode(expr)) {
             return false;
         }
         return typeof expr === "object" && expr !== null && !Array.isArray(expr) && "value" in expr;
     };
+    var makePromiseAwareBinaryOp = function makePromiseAwareBinaryOp(operation) {
+        return function(a, b, async) {
+            if (async && (isAwaitable(a) || isAwaitable(b))) {
+                return collateAwaitable([
+                    Promise.resolve(a),
+                    Promise.resolve(b)
+                ]).awaitableThen(function(param) {
+                    var _param = _sliced_to_array(param, 2), resolvedA = _param[0], resolvedB = _param[1];
+                    return operation(resolvedA, resolvedB);
+                });
+            }
+            return operation(a, b);
+        };
+    };
+    var makePromiseAwareUnaryOp = function makePromiseAwareUnaryOp(operation) {
+        return function(a, async) {
+            if (async && isAwaitable(a)) {
+                return a.awaitableThen(function(resolved) {
+                    return operation(resolved);
+                });
+            }
+            return operation(a);
+        };
+    };
+    var handleConditionalBranching = function handleConditionalBranching(testValue, getTrueBranch, getFalseBranch, resolveNode, async) {
+        if (async && isAwaitable(testValue)) {
+            return testValue.awaitableThen(function(resolved) {
+                var branch2 = resolved ? getTrueBranch() : getFalseBranch();
+                var branchResult = resolveNode(branch2);
+                return isAwaitable(branchResult) ? Promise.resolve(branchResult) : branchResult;
+            });
+        }
+        var branch = testValue ? getTrueBranch() : getFalseBranch();
+        return resolveNode(branch);
+    };
     var parse2 = function parse2(schema) {
         var _loop = function() {
             var next = parseQueue.shift();
@@ -7831,8 +7880,19 @@ var MarkdownPlugin = function() {
         },
         setDataVal: function() {
             return setDataVal;
+        },
+        waitFor: function() {
+            return waitFor;
         }
     });
+    var AwaitableSymbol = Symbol("Awaitable");
+    function makeAwaitable(promise) {
+        promise[AwaitableSymbol] = AwaitableSymbol;
+        promise.awaitableThen = function(arg) {
+            return makeAwaitable(promise.then(arg));
+        };
+        return promise;
+    }
     var setDataVal = function(_context, binding, value) {
         _context.model.set([
             [
@@ -7848,8 +7908,19 @@ var MarkdownPlugin = function() {
         return _context.model.delete(binding);
     };
     var conditional = function(ctx, condition, ifTrue, ifFalse) {
-        var resolution = ctx.evaluate(condition);
-        if (resolution) {
+        var testResult = ctx.evaluate(condition);
+        if (isAwaitable(testResult)) {
+            return testResult.awaitableThen(function(resolvedTest) {
+                if (resolvedTest) {
+                    return ctx.evaluate(ifTrue);
+                }
+                if (ifFalse) {
+                    return ctx.evaluate(ifFalse);
+                }
+                return null;
+            });
+        }
+        if (testResult) {
             return ctx.evaluate(ifTrue);
         }
         if (ifFalse) {
@@ -7858,12 +7929,15 @@ var MarkdownPlugin = function() {
         return null;
     };
     conditional.resolveParams = false;
-    var andandOperator = function(ctx, a, b) {
-        return ctx.evaluate(a) && ctx.evaluate(b);
+    var waitFor = function(ctx, promise) {
+        return makeAwaitable(promise);
+    };
+    var andandOperator = function(ctx, a, b, async) {
+        return LogicalOperators.and(ctx, a, b, async);
     };
     andandOperator.resolveParams = false;
-    var ororOperator = function(ctx, a, b) {
-        return ctx.evaluate(a) || ctx.evaluate(b);
+    var ororOperator = function(ctx, a, b, async) {
+        return LogicalOperators.or(ctx, a, b, async);
     };
     ororOperator.resolveParams = false;
     var DEFAULT_BINARY_OPERATORS = {
@@ -7883,34 +7957,35 @@ var MarkdownPlugin = function() {
         "%": function(a, b) {
             return a % b;
         },
+        // Promise-aware comparison operators
         // eslint-disable-next-line
-        "==": function(a, b) {
+        "==": makePromiseAwareBinaryOp(function(a, b) {
             return a == b;
-        },
+        }),
         // eslint-disable-next-line
-        "!=": function(a, b) {
+        "!=": makePromiseAwareBinaryOp(function(a, b) {
             return a != b;
-        },
-        ">": function(a, b) {
+        }),
+        ">": makePromiseAwareBinaryOp(function(a, b) {
             return a > b;
-        },
-        ">=": function(a, b) {
+        }),
+        ">=": makePromiseAwareBinaryOp(function(a, b) {
             return a >= b;
-        },
-        "<": function(a, b) {
+        }),
+        "<": makePromiseAwareBinaryOp(function(a, b) {
             return a < b;
-        },
-        "<=": function(a, b) {
+        }),
+        "<=": makePromiseAwareBinaryOp(function(a, b) {
             return a <= b;
-        },
-        "&&": andandOperator,
-        "||": ororOperator,
-        "!==": function(a, b) {
+        }),
+        "!==": makePromiseAwareBinaryOp(function(a, b) {
             return a !== b;
-        },
-        "===": function(a, b) {
+        }),
+        "===": makePromiseAwareBinaryOp(function(a, b) {
             return a === b;
-        },
+        }),
+        "&&": andandOperator,
+        "||": ororOperator,
         // eslint-disable-next-line
         "|": function(a, b) {
             return a | b;
@@ -7941,8 +8016,73 @@ var MarkdownPlugin = function() {
         "+": function(a) {
             return Number(a);
         },
-        "!": function(a) {
+        "!": makePromiseAwareUnaryOp(function(a) {
             return !a;
+        })
+    };
+    var PromiseCollectionHandler = {
+        /**
+     * Handle array with potential Promise elements
+     */ handleArray: function handleArray(items, async) {
+            if (!async) {
+                return items;
+            }
+            var hasPromises = items.some(function(item) {
+                return isAwaitable(item);
+            });
+            return hasPromises ? collateAwaitable(items) : items;
+        },
+        /**
+     * Handle object with potential Promise keys/values
+     */ handleObject: function handleObject(attributes, resolveNode, async) {
+            var resolvedAttributes = {};
+            var promises = [];
+            var hasPromises = false;
+            attributes.forEach(function(attr) {
+                var key = resolveNode(attr.key);
+                var value = resolveNode(attr.value);
+                if (async && (isAwaitable(key) || isAwaitable(value))) {
+                    hasPromises = true;
+                    var keyPromise = Promise.resolve(key);
+                    var valuePromise = Promise.resolve(value);
+                    promises.push(collateAwaitable([
+                        keyPromise,
+                        valuePromise
+                    ]).awaitableThen(function(param) {
+                        var _param = _sliced_to_array(param, 2), resolvedKey = _param[0], resolvedValue = _param[1];
+                        resolvedAttributes[resolvedKey] = resolvedValue;
+                    }));
+                } else {
+                    resolvedAttributes[key] = value;
+                }
+            });
+            return hasPromises ? collateAwaitable(promises).awaitableThen(function() {
+                return resolvedAttributes;
+            }) : resolvedAttributes;
+        }
+    };
+    var LogicalOperators = {
+        and: function(ctx, leftNode, rightNode, async) {
+            var leftResult = ctx.evaluate(leftNode);
+            if (async && isAwaitable(leftResult)) {
+                return leftResult.awaitableThen(function(awaitedLeft) {
+                    if (!awaitedLeft) return awaitedLeft;
+                    var rightResult = ctx.evaluate(rightNode);
+                    return isAwaitable(rightResult) ? rightResult : Promise.resolve(rightResult);
+                });
+            }
+            return leftResult && ctx.evaluate(rightNode);
+        },
+        or: function(ctx, leftNode, rightNode, async) {
+            var leftResult = ctx.evaluate(leftNode);
+            if (async && isAwaitable(leftResult)) {
+                return leftResult.awaitableThen(function(awaitedLeft) {
+                    if (awaitedLeft) return awaitedLeft;
+                    var rightResult = ctx.evaluate(rightNode);
+                    return isAwaitable(rightResult) ? rightResult : Promise.resolve(rightResult);
+                });
+            }
+            return leftResult || ctx.evaluate(rightNode);
         }
     };
     var ExpressionEvaluator = /*#__PURE__*/ function() {
@@ -7963,7 +8103,12 @@ var MarkdownPlugin = function() {
             this.operators = {
                 binary: new Map(Object.entries(DEFAULT_BINARY_OPERATORS)),
                 unary: new Map(Object.entries(DEFAULT_UNARY_OPERATORS)),
-                expressions: new Map(Object.entries(evaluator_functions_exports))
+                expressions: new Map(_to_consumable_array(Object.entries(evaluator_functions_exports)).concat([
+                    [
+                        "await",
+                        waitFor
+                    ]
+                ]))
             };
             this.defaultHookOptions = _object_spread_props(_object_spread({}, defaultOptions), {
                 evaluate: function(expr) {
@@ -7973,7 +8118,9 @@ var MarkdownPlugin = function() {
                     return _this._execAST(node2, _this.defaultHookOptions);
                 }
             });
-            this.hooks.resolve.tap("ExpressionEvaluator", this._resolveNode.bind(this));
+            this.hooks.resolve.tap("ExpressionEvaluator", function(result, node2, options) {
+                return _this._resolveNode(result, node2, options);
+            });
             this.evaluate = this.evaluate.bind(this);
         }
         _create_class(ExpressionEvaluator, [
@@ -8011,6 +8158,38 @@ var MarkdownPlugin = function() {
                     return this._execString(String(expression), resolvedOpts);
                 }
             },
+            {
+                /**
+     * Evaluate functions in an async context
+     * @experimental These Player APIs are in active development and may change. Use with caution
+     */ key: "evaluateAsync",
+                value: function evaluateAsync(expr, options) {
+                    if (Array.isArray(expr)) {
+                        var _this = this;
+                        return collateAwaitable(expr.map(function() {
+                            var _ref = _async_to_generator(function(exp) {
+                                return _ts_generator(this, function(_state) {
+                                    return [
+                                        2,
+                                        _this.evaluate(exp, _object_spread_props(_object_spread({}, options), {
+                                            async: true
+                                        }))
+                                    ];
+                                });
+                            });
+                            return function(exp) {
+                                return _ref.apply(this, arguments);
+                            };
+                        }())).awaitableThen(function(values) {
+                            return values.pop();
+                        });
+                    } else {
+                        return this.evaluate(expr, _object_spread_props(_object_spread({}, options), {
+                            async: true
+                        }));
+                    }
+                }
+            },
             {
                 key: "addExpressionFunction",
                 value: function addExpressionFunction(name, handler) {
@@ -8056,8 +8235,10 @@ var MarkdownPlugin = function() {
                     var matches = exp.match(/^@\[(.*)\]@$/);
                     var matchedExp = exp;
                     if (matches) {
-                        var ref;
-                        ref = _sliced_to_array(Array.from(matches), 2), matchedExp = ref[1], ref;
+                        var _Array_from = _sliced_to_array(Array.from(matches), 2), matched = _Array_from[1];
+                        if (matched) {
+                            matchedExp = matched;
+                        }
                     }
                     var storedAST;
                     try {
@@ -8086,6 +8267,8 @@ var MarkdownPlugin = function() {
                 value: function _resolveNode(_currentValue, node2, options) {
                     var _this = this;
                     var resolveNode = options.resolveNode, model = options.model;
+                    var _options_async;
+                    var isAsync = (_options_async = options.async) !== null && _options_async !== void 0 ? _options_async : false;
                     var expressionContext = _object_spread_props(_object_spread({}, options), {
                         evaluate: function(expr) {
                             return _this.evaluate(expr, options);
@@ -8105,11 +8288,33 @@ var MarkdownPlugin = function() {
                         if (operator) {
                             if ("resolveParams" in operator) {
                                 if (operator.resolveParams === false) {
-                                    return operator(expressionContext, node2.left, node2.right);
+                                    return operator(expressionContext, node2.left, node2.right, isAsync);
+                                }
+                                var left2 = resolveNode(node2.left);
+                                var right2 = resolveNode(node2.right);
+                                if (options.async && (isAwaitable(left2) || isAwaitable(right2))) {
+                                    return collateAwaitable([
+                                        left2,
+                                        right2
+                                    ]).awaitableThen(function(param) {
+                                        var _param = _sliced_to_array(param, 2), leftVal = _param[0], rightVal = _param[1];
+                                        return operator(expressionContext, leftVal, rightVal, isAsync);
+                                    });
                                 }
-                                return operator(expressionContext, resolveNode(node2.left), resolveNode(node2.right));
+                                return operator(expressionContext, left2, right2, isAsync);
+                            }
+                            var left = resolveNode(node2.left);
+                            var right = resolveNode(node2.right);
+                            if (options.async && (isAwaitable(left) || isAwaitable(right))) {
+                                return collateAwaitable([
+                                    left,
+                                    right
+                                ]).awaitableThen(function(param) {
+                                    var _param = _sliced_to_array(param, 2), leftVal = _param[0], rightVal = _param[1];
+                                    return operator(leftVal, rightVal, isAsync);
+                                });
                             }
-                            return operator(resolveNode(node2.left), resolveNode(node2.right));
+                            return operator(left, right, isAsync);
                         }
                         return;
                     }
@@ -8117,21 +8322,29 @@ var MarkdownPlugin = function() {
                         var operator1 = this.operators.unary.get(node2.operator);
                         if (operator1) {
                             if ("resolveParams" in operator1) {
-                                return operator1(expressionContext, operator1.resolveParams === false ? node2.argument : resolveNode(node2.argument));
+                                if (operator1.resolveParams === false) {
+                                    return operator1(expressionContext, node2.argument, isAsync);
+                                }
+                                var arg2 = resolveNode(node2.argument);
+                                if (options.async && isAwaitable(arg2)) {
+                                    return arg2.awaitableThen(function(argVal) {
+                                        return operator1(expressionContext, argVal, isAsync);
+                                    });
+                                }
+                                return operator1(expressionContext, arg2, isAsync);
                             }
-                            return operator1(resolveNode(node2.argument));
+                            var arg = resolveNode(node2.argument);
+                            if (options.async && isAwaitable(arg)) {
+                                return arg.awaitableThen(function(argVal) {
+                                    return operator1(argVal, isAsync);
+                                });
+                            }
+                            return operator1(arg, isAsync);
                         }
                         return;
                     }
                     if (node2.type === "Object") {
-                        var attributes = node2.attributes;
-                        var resolvedAttributes = {};
-                        attributes.forEach(function(attr) {
-                            var key = resolveNode(attr.key);
-                            var value = resolveNode(attr.value);
-                            resolvedAttributes[key] = value;
-                        });
-                        return resolvedAttributes;
+                        return PromiseCollectionHandler.handleObject(node2.attributes, resolveNode, options.async || false);
                     }
                     if (node2.type === "CallExpression") {
                         var expressionName = node2.callTarget.name;
@@ -8139,6 +8352,9 @@ var MarkdownPlugin = function() {
                         if (!operator2) {
                             throw new Error("Unknown expression function: ".concat(expressionName));
                         }
+                        if (operator2.name === waitFor.name && !options.async) {
+                            throw new Error("Usage of await outside of async context");
+                        }
                         if ("resolveParams" in operator2 && operator2.resolveParams === false) {
                             return operator2.apply(void 0, [
                                 expressionContext
@@ -8147,6 +8363,16 @@ var MarkdownPlugin = function() {
                         var args = node2.args.map(function(n) {
                             return resolveNode(n);
                         });
+                        if (options.async) {
+                            var hasPromises = args.some(isAwaitable);
+                            if (hasPromises) {
+                                return collateAwaitable(args).awaitableThen(function(resolvedArgs) {
+                                    return operator2.apply(void 0, [
+                                        expressionContext
+                                    ].concat(_to_consumable_array(resolvedArgs)));
+                                });
+                            }
+                        }
                         return operator2.apply(void 0, [
                             expressionContext
                         ].concat(_to_consumable_array(args)));
@@ -8161,11 +8387,36 @@ var MarkdownPlugin = function() {
                     if (node2.type === "MemberExpression") {
                         var obj = resolveNode(node2.object);
                         var prop = resolveNode(node2.property);
+                        if (options.async && (isAwaitable(obj) || isAwaitable(prop))) {
+                            return collateAwaitable([
+                                obj,
+                                prop
+                            ]).awaitableThen(function(param) {
+                                var _param = _sliced_to_array(param, 2), objVal = _param[0], propVal = _param[1];
+                                return objVal[propVal];
+                            });
+                        }
                         return obj[prop];
                     }
                     if (node2.type === "Assignment") {
                         if (node2.left.type === "ModelRef") {
                             var value = resolveNode(node2.right);
+                            if (isPromiseLike(value)) {
+                                if (options.async && isAwaitable(value)) {
+                                    return value.awaitableThen(function(resolvedValue) {
+                                        model.set([
+                                            [
+                                                node2.left.ref,
+                                                resolvedValue
+                                            ]
+                                        ]);
+                                        return resolvedValue;
+                                    });
+                                } else {
+                                    var _options_logger;
+                                    (_options_logger = options.logger) === null || _options_logger === void 0 ? void 0 : _options_logger.warn("Unawaited promise written to mode, this behavior is undefined and may change in future releases");
+                                }
+                            }
                             model.set([
                                 [
                                     node2.left.ref,
@@ -8176,19 +8427,30 @@ var MarkdownPlugin = function() {
                         }
                         if (node2.left.type === "Identifier") {
                             var value1 = resolveNode(node2.right);
+                            if (options.async && isAwaitable(value1)) {
+                                return value1.awaitableThen(function(resolvedValue) {
+                                    _this.vars[node2.left.name] = resolvedValue;
+                                    return resolvedValue;
+                                });
+                            }
                             this.vars[node2.left.name] = value1;
                             return value1;
                         }
                         return;
                     }
                     if (node2.type === "ConditionalExpression") {
-                        var result = resolveNode(node2.test) ? node2.consequent : node2.alternate;
-                        return resolveNode(result);
+                        var testResult = resolveNode(node2.test);
+                        return handleConditionalBranching(testResult, function() {
+                            return node2.consequent;
+                        }, function() {
+                            return node2.alternate;
+                        }, resolveNode, isAsync);
                     }
                     if (node2.type === "ArrayExpression") {
-                        return node2.elements.map(function(ele) {
+                        var results = node2.elements.map(function(ele) {
                             return resolveNode(ele);
                         });
+                        return PromiseCollectionHandler.handleArray(results, isAsync);
                     }
                     if (node2.type === "Modification") {
                         var operation = this.operators.binary.get(node2.operator);
@@ -8196,14 +8458,49 @@ var MarkdownPlugin = function() {
                             var newValue;
                             if ("resolveParams" in operation) {
                                 if (operation.resolveParams === false) {
-                                    newValue = operation(expressionContext, node2.left, node2.right);
+                                    newValue = operation(expressionContext, node2.left, node2.right, isAsync);
                                 } else {
-                                    newValue = operation(expressionContext, resolveNode(node2.left), resolveNode(node2.right));
+                                    var left1 = resolveNode(node2.left);
+                                    var right1 = resolveNode(node2.right);
+                                    if (options.async && (isAwaitable(left1) || isAwaitable(right1))) {
+                                        newValue = collateAwaitable([
+                                            left1,
+                                            right1
+                                        ]).awaitableThen(function(param) {
+                                            var _param = _sliced_to_array(param, 2), leftVal = _param[0], rightVal = _param[1];
+                                            return operation(expressionContext, leftVal, rightVal, isAsync);
+                                        });
+                                    } else {
+                                        newValue = operation(expressionContext, left1, right1, isAsync);
+                                    }
                                 }
                             } else {
-                                newValue = operation(resolveNode(node2.left), resolveNode(node2.right));
+                                var left3 = resolveNode(node2.left);
+                                var right3 = resolveNode(node2.right);
+                                if (options.async && (isAwaitable(left3) || isAwaitable(right3))) {
+                                    newValue = collateAwaitable([
+                                        left3,
+                                        right3
+                                    ]).awaitableThen(function(param) {
+                                        var _param = _sliced_to_array(param, 2), leftVal = _param[0], rightVal = _param[1];
+                                        return operation(leftVal, rightVal, isAsync);
+                                    });
+                                } else {
+                                    newValue = operation(left3, right3, isAsync);
+                                }
                             }
                             if (node2.left.type === "ModelRef") {
+                                if (options.async && isAwaitable(newValue)) {
+                                    return newValue.awaitableThen(function(resolvedValue) {
+                                        model.set([
+                                            [
+                                                node2.left.ref,
+                                                resolvedValue
+                                            ]
+                                        ]);
+                                        return resolvedValue;
+                                    });
+                                }
                                 model.set([
                                     [
                                         node2.left.ref,
@@ -8211,6 +8508,12 @@ var MarkdownPlugin = function() {
                                     ]
                                 ]);
                             } else if (node2.left.type === "Identifier") {
+                                if (options.async && isAwaitable(newValue)) {
+                                    return newValue.awaitableThen(function(resolvedValue) {
+                                        _this.vars[node2.left.name] = resolvedValue;
+                                        return resolvedValue;
+                                    });
+                                }
                                 this.vars[node2.left.name] = newValue;
                             }
                             return newValue;
@@ -9089,20 +9392,15 @@ var MarkdownPlugin = function() {
     }();
     var ViewInstance = /*#__PURE__*/ function() {
         function ViewInstance(initialView, resolverOptions) {
-            var _this = this;
             _class_call_check(this, ViewInstance);
             this.hooks = {
                 onUpdate: new SyncHook(),
                 parser: new SyncHook(),
                 resolver: new SyncHook(),
-                onTemplatePluginCreated: new SyncHook(),
                 templatePlugin: new SyncHook()
             };
             this.initialView = initialView;
             this.resolverOptions = resolverOptions;
-            this.hooks.onTemplatePluginCreated.tap("view", function(templatePlugin) {
-                _this.templatePlugin = templatePlugin;
-            });
         }
         _create_class(ViewInstance, [
             {
@@ -9149,6 +9447,12 @@ var MarkdownPlugin = function() {
                     var _this_validationProvider;
                     return (_this_validationProvider = this.validationProvider) === null || _this_validationProvider === void 0 ? void 0 : _this_validationProvider.getValidationsForBinding(binding);
                 }
+            },
+            {
+                key: "setTemplatePlugin",
+                value: function setTemplatePlugin(plugin) {
+                    this.templatePlugin = plugin;
+                }
             }
         ]);
         return ViewInstance;
@@ -9320,6 +9624,7 @@ var MarkdownPlugin = function() {
                 value: function apply(view) {
                     view.hooks.parser.tap("template", this.applyParser.bind(this));
                     view.hooks.resolver.tap("template", this.applyResolverHooks.bind(this));
+                    view.setTemplatePlugin(this);
                 }
             }
         ]);
@@ -10928,8 +11233,7 @@ var MarkdownPlugin = function() {
             var _this1 = this;
             _class_call_check(this, ViewController);
             this.hooks = {
-                /** Do any processing before the `View` instance is created */ resolveView: new SyncWaterfallHook(),
-                // The hook right before the View starts resolving. Attach anything custom here
+                resolveView: new SyncWaterfallHook(),
                 view: new SyncHook()
             };
             this.transformRegistry = new Registry();
@@ -10977,6 +11281,7 @@ var MarkdownPlugin = function() {
                     ]));
                 }
             });
+            this.viewPlugins = this.createViewPlugins();
         }
         _create_class(ViewController, [
             {
@@ -11032,9 +11337,50 @@ var MarkdownPlugin = function() {
                     }
                     var view = new ViewInstance(source, this.viewOptions);
                     this.currentView = view;
+                    this.applyViewPlugins(view);
                     this.hooks.view.call(view);
                     view.update();
                 }
+            },
+            {
+                key: "applyViewPlugins",
+                value: function applyViewPlugins(view) {
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(var _iterator = this.viewPlugins[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var plugin = _step.value;
+                            plugin.apply(view);
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
+                }
+            },
+            {
+                key: "createViewPlugins",
+                value: function createViewPlugins() {
+                    var pluginOptions = toNodeResolveOptions(this.viewOptions);
+                    return [
+                        new AssetPlugin(),
+                        new SwitchPlugin(pluginOptions),
+                        new ApplicabilityPlugin(),
+                        new AssetTransformCorePlugin(this.transformRegistry),
+                        new StringResolverPlugin(),
+                        new TemplatePlugin(pluginOptions),
+                        new MultiNodePlugin()
+                    ];
+                }
             }
         ]);
         return ViewController;
@@ -11407,35 +11753,6 @@ var MarkdownPlugin = function() {
         ref: Symbol("not-started"),
         status: "not-started"
     };
-    var DefaultViewPlugin = /*#__PURE__*/ function() {
-        function DefaultViewPlugin() {
-            _class_call_check(this, DefaultViewPlugin);
-            this.name = "default-view-plugin";
-        }
-        _create_class(DefaultViewPlugin, [
-            {
-                key: "apply",
-                value: function apply(player) {
-                    var _this = this;
-                    player.hooks.viewController.tap(this.name, function(viewController) {
-                        viewController.hooks.view.tap(_this.name, function(view) {
-                            var pluginOptions = toNodeResolveOptions(view.resolverOptions);
-                            new AssetPlugin().apply(view);
-                            new SwitchPlugin(pluginOptions).apply(view);
-                            new ApplicabilityPlugin().apply(view);
-                            new AssetTransformCorePlugin(viewController.transformRegistry).apply(view);
-                            new StringResolverPlugin().apply(view);
-                            var templatePlugin = new TemplatePlugin(pluginOptions);
-                            templatePlugin.apply(view);
-                            view.hooks.onTemplatePluginCreated.call(templatePlugin);
-                            new MultiNodePlugin().apply(view);
-                        });
-                    });
-                }
-            }
-        ]);
-        return DefaultViewPlugin;
-    }();
     var PLAYER_VERSION = "__VERSION__";
     var COMMIT = "__GIT_COMMIT__";
     var _Player = /*#__PURE__*/ function() {
@@ -11447,26 +11764,25 @@ var MarkdownPlugin = function() {
             this.constantsController = new ConstantsController();
             this.state = NOT_STARTED_STATE;
             this.hooks = {
-                /** The hook that fires every time we create a new flowController (a new Content blob is passed in) */ flowController: new SyncHook(),
-                /** The hook that updates/handles views */ viewController: new SyncHook(),
-                /** A hook called every-time there's a new view. This is equivalent to the view hook on the view-controller */ view: new SyncHook(),
-                /** Called when an expression evaluator was created */ expressionEvaluator: new SyncHook(),
-                /** The hook that creates and manages data */ dataController: new SyncHook(),
-                /** Called after the schema is created for a flow */ schema: new SyncHook(),
-                /** Manages validations (schema and x-field ) */ validationController: new SyncHook(),
-                /** Manages parsing binding */ bindingParser: new SyncHook(),
-                /** A that's called for state changes in the flow execution */ state: new SyncHook(),
-                /** A hook to access the current flow */ onStart: new SyncHook(),
-                /** A hook for when the flow ends either in success or failure */ onEnd: new SyncHook(),
-                /** Mutate the Content flow before starting */ resolveFlowContent: new SyncWaterfallHook()
+                flowController: new SyncHook(),
+                viewController: new SyncHook(),
+                view: new SyncHook(),
+                expressionEvaluator: new SyncHook(),
+                dataController: new SyncHook(),
+                schema: new SyncHook(),
+                validationController: new SyncHook(),
+                bindingParser: new SyncHook(),
+                state: new SyncHook(),
+                onStart: new SyncHook(),
+                onEnd: new SyncHook(),
+                resolveFlowContent: new SyncWaterfallHook()
             };
             if (config === null || config === void 0 ? void 0 : config.logger) {
                 this.logger.addHandler(config.logger);
             }
             this.config = config || {};
             this.config.plugins = [
-                new DefaultExpPlugin(),
-                new DefaultViewPlugin()
+                new DefaultExpPlugin()
             ].concat(_to_consumable_array(this.config.plugins || []), [
                 new FlowExpPlugin()
             ]);
@@ -11658,10 +11974,90 @@ var MarkdownPlugin = function() {
                             var value = (_flowInstance_currentState = flowInstance.currentState) === null || _flowInstance_currentState === void 0 ? void 0 : _flowInstance_currentState.value;
                             if (value && value.state_type === "ACTION") {
                                 var exp = value.exp;
-                                flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(expressionEvaluator === null || expressionEvaluator === void 0 ? void 0 : expressionEvaluator.evaluate(exp)));
+                                var result = expressionEvaluator.evaluate(exp);
+                                if (isPromiseLike(result)) {
+                                    _this.logger.warn("Async expression used as return value in in non-async context, transitioning with '*' value");
+                                }
+                                flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(result));
                             }
                             expressionEvaluator.reset();
                         });
+                        var _this1 = _this;
+                        flow3.hooks.afterTransition.tap("player", function() {
+                            var _ref = _async_to_generator(function(flowInstance) {
+                                var _flowInstance_currentState, value, exp, result, e;
+                                return _ts_generator(this, function(_state) {
+                                    switch(_state.label){
+                                        case 0:
+                                            value = (_flowInstance_currentState = flowInstance.currentState) === null || _flowInstance_currentState === void 0 ? void 0 : _flowInstance_currentState.value;
+                                            if (!(value && value.state_type === "ASYNC_ACTION")) return [
+                                                3,
+                                                8
+                                            ];
+                                            exp = value.exp;
+                                            _state.label = 1;
+                                        case 1:
+                                            _state.trys.push([
+                                                1,
+                                                7,
+                                                ,
+                                                8
+                                            ]);
+                                            result = expressionEvaluator.evaluateAsync(exp);
+                                            if (!isPromiseLike(result)) return [
+                                                3,
+                                                5
+                                            ];
+                                            if (!value.await) return [
+                                                3,
+                                                3
+                                            ];
+                                            return [
+                                                4,
+                                                result
+                                            ];
+                                        case 2:
+                                            result = _state.sent();
+                                            return [
+                                                3,
+                                                4
+                                            ];
+                                        case 3:
+                                            _this1.logger.warn("Unawaited promise used as return value in in non-async context, transitioning with '*' value");
+                                            _state.label = 4;
+                                        case 4:
+                                            return [
+                                                3,
+                                                6
+                                            ];
+                                        case 5:
+                                            _this1.logger.warn("Non async expression used in async action node");
+                                            _state.label = 6;
+                                        case 6:
+                                            flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(result));
+                                            return [
+                                                3,
+                                                8
+                                            ];
+                                        case 7:
+                                            e = _state.sent();
+                                            flowResultDeferred.reject(e);
+                                            return [
+                                                3,
+                                                8
+                                            ];
+                                        case 8:
+                                            expressionEvaluator.reset();
+                                            return [
+                                                2
+                                            ];
+                                    }
+                                });
+                            });
+                            return function(flowInstance) {
+                                return _ref.apply(this, arguments);
+                            };
+                        }());
                     });
                     this.hooks.dataController.call(dataController);
                     validationController.setOptions({
@@ -11699,11 +12095,9 @@ var MarkdownPlugin = function() {
                         }),
                         constants: this.constantsController
                     });
-                    this.hooks.viewController.tap("player", function(vc) {
-                        vc.hooks.view.tap("player", function(view) {
-                            validationController.onView(view);
-                            _this.hooks.view.call(view);
-                        });
+                    viewController.hooks.view.tap("player", function(view) {
+                        validationController.onView(view);
+                        _this.hooks.view.call(view);
                     });
                     this.hooks.viewController.call(viewController);
                     return {