@player-ui/common-expressions-plugin 0.13.0 → 0.14.0-next.1

package/dist/CommonExpressionsPlugin.native.js

@@ -45,6 +45,10 @@ function _async_to_generator(fn) {
         });
     };
 }
+function _call_super(_this, derived, args) {
+    derived = _get_prototype_of(derived);
+    return _possible_constructor_return(_this, _is_native_reflect_construct() ? Reflect.construct(derived, args || [], _get_prototype_of(_this).constructor) : derived.apply(_this, args));
+}
 function _class_call_check(instance, Constructor) {
     if (!(instance instanceof Constructor)) {
         throw new TypeError("Cannot call a class as a function");
@@ -283,31 +287,15 @@ function _wrap_native_super(Class) {
     return _wrap_native_super(Class);
 }
 function _is_native_reflect_construct() {
-    if (typeof Reflect === "undefined" || !Reflect.construct) return false;
-    if (Reflect.construct.sham) return false;
-    if (typeof Proxy === "function") return true;
     try {
-        Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
-        return true;
-    } catch (e) {
-        return false;
-    }
-}
-function _create_super(Derived) {
-    var hasNativeReflectConstruct = _is_native_reflect_construct();
-    return function _createSuperInternal() {
-        var Super = _get_prototype_of(Derived), result;
-        if (hasNativeReflectConstruct) {
-            var NewTarget = _get_prototype_of(this).constructor;
-            result = Reflect.construct(Super, arguments, NewTarget);
-        } else {
-            result = Super.apply(this, arguments);
-        }
-        return _possible_constructor_return(this, result);
-    };
+        var result = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function() {}));
+    } catch (_) {}
+    return (_is_native_reflect_construct = function() {
+        return !!result;
+    })();
 }
 function _ts_generator(thisArg, body) {
-    var f, y, t, g, _ = {
+    var f, y, t, _ = {
         label: 0,
         sent: function() {
             if (t[0] & 1) throw t[1];
@@ -315,12 +303,8 @@ function _ts_generator(thisArg, body) {
         },
         trys: [],
         ops: []
-    };
-    return g = {
-        next: verb(0),
-        "throw": verb(1),
-        "return": verb(2)
-    }, typeof Symbol === "function" && (g[Symbol.iterator] = function() {
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() {
         return this;
     }), g;
     function verb(n) {
@@ -333,7 +317,7 @@ function _ts_generator(thisArg, body) {
     }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while(_)try {
+        while(g && (g = 0, op[0] && (_ = 0)), _)try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [
                 op[0] & 2,
@@ -505,7 +489,7 @@ var CommonExpressionsPlugin = function() {
     };
     var findInArray = function findInArray(array, key, value) {
         return array.findIndex(function(obj) {
-            if (obj && typeof obj === "object") {
+            if (obj && (typeof obj === "undefined" ? "undefined" : _type_of(obj)) === "object") {
                 return obj[key] == value;
             }
             return false;
@@ -599,7 +583,7 @@ var CommonExpressionsPlugin = function() {
         };
     };
     var isExpressionNode = function isExpressionNode(x) {
-        return typeof x === "object" && x !== null && !Array.isArray(x) && x.__id === ExpNodeOpaqueIdentifier;
+        return (typeof x === "undefined" ? "undefined" : _type_of(x)) === "object" && x !== null && !Array.isArray(x) && x.__id === ExpNodeOpaqueIdentifier;
     };
     var throwError = function throwError(message, index) {
         var err = new Error("".concat(message, " at character ").concat(index));
@@ -1187,7 +1171,7 @@ var CommonExpressionsPlugin = 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
+        return value != null && (typeof value === "undefined" ? "undefined" : _type_of(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");
     };
@@ -1210,7 +1194,7 @@ var CommonExpressionsPlugin = function() {
         if (isExpressionNode(expr)) {
             return false;
         }
-        return typeof expr === "object" && expr !== null && !Array.isArray(expr) && "value" in expr;
+        return (typeof expr === "undefined" ? "undefined" : _type_of(expr)) === "object" && expr !== null && !Array.isArray(expr) && "value" in expr;
     };
     var makePromiseAwareBinaryOp = function makePromiseAwareBinaryOp(operation) {
         return function(a, b, async) {
@@ -1427,7 +1411,7 @@ var CommonExpressionsPlugin = function() {
         if (!node) {
             return;
         }
-        if ("value" in node && typeof node.value === "object" && typeof ((_node_value = node.value) === null || _node_value === void 0 ? void 0 : _node_value.id) === "string") {
+        if ("value" in node && _type_of(node.value) === "object" && typeof ((_node_value = node.value) === null || _node_value === void 0 ? void 0 : _node_value.id) === "string") {
             return node.value.id;
         }
     };
@@ -1462,22 +1446,6 @@ var CommonExpressionsPlugin = function() {
             }
         });
     };
-    var unpackNode = function unpackNode(item) {
-        var _item_children_, _item_children, _item_children_1, _item_children1;
-        var unpacked = [];
-        if ("children" in item && ((_item_children = item.children) === null || _item_children === void 0 ? void 0 : (_item_children_ = _item_children[0]) === null || _item_children_ === void 0 ? void 0 : _item_children_.value.type) === "asset" && ((_item_children1 = item.children) === null || _item_children1 === void 0 ? void 0 : (_item_children_1 = _item_children1[0]) === null || _item_children_1 === void 0 ? void 0 : _item_children_1.value).children) {
-            var _item_children__value_children_, _item_children__value_children, _item_children_2, _item_children2;
-            if (((_item_children__value_children = ((_item_children2 = item.children) === null || _item_children2 === void 0 ? void 0 : (_item_children_2 = _item_children2[0]) === null || _item_children_2 === void 0 ? void 0 : _item_children_2.value).children) === null || _item_children__value_children === void 0 ? void 0 : (_item_children__value_children_ = _item_children__value_children[0]) === null || _item_children__value_children_ === void 0 ? void 0 : _item_children__value_children_.value.type) === "multi-node") {
-                var _item_children__value_children_1, _item_children__value_children1, _item_children_3, _item_children3;
-                ((_item_children__value_children1 = ((_item_children3 = item.children) === null || _item_children3 === void 0 ? void 0 : (_item_children_3 = _item_children3[0]) === null || _item_children_3 === void 0 ? void 0 : _item_children_3.value).children) === null || _item_children__value_children1 === void 0 ? void 0 : (_item_children__value_children_1 = _item_children__value_children1[0]) === null || _item_children__value_children_1 === void 0 ? void 0 : _item_children__value_children_1.value).values.forEach(function(value) {
-                    unpacked.push(value);
-                });
-            }
-        } else {
-            unpacked.push(item);
-        }
-        return unpacked;
-    };
     var hasSomethingToResolve = function hasSomethingToResolve(str) {
         return bindingResolveLookup(str) || expressionResolveLookup(str);
     };
@@ -1578,7 +1546,7 @@ var CommonExpressionsPlugin = function() {
         });
     };
     var __copyProps = function(to, from, except, desc) {
-        if (from && typeof from === "object" || typeof from === "function") {
+        if (from && (typeof from === "undefined" ? "undefined" : _type_of(from)) === "object" || typeof from === "function") {
             var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
             try {
                 var _loop = function() {
@@ -1633,15 +1601,16 @@ var CommonExpressionsPlugin = function() {
             exports.toError = exports.NestedError = void 0;
             var NestedError4 = /*#__PURE__*/ function(Error1) {
                 _inherits(_NestedError, Error1);
-                var _super = _create_super(_NestedError);
                 function _NestedError(message) {
                     for(var _len = arguments.length, innerErrors = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
                         innerErrors[_key - 1] = arguments[_key];
                     }
                     _class_call_check(this, _NestedError);
                     var _this;
-                    _this = _super.call(this, message);
-                    var thisErrorReport = _NestedError.getErrorReport(_assert_this_initialized(_this));
+                    _this = _call_super(this, _NestedError, [
+                        message
+                    ]);
+                    var thisErrorReport = _NestedError.getErrorReport(_this);
                     if (innerErrors.length === 1) {
                         var innerError = toError(innerErrors[0]);
                         _this.innerErrors = [
@@ -1777,7 +1746,7 @@ var CommonExpressionsPlugin = function() {
                 return out;
             }
             function isObject(o) {
-                return o != null && typeof o === "object";
+                return o != null && (typeof o === "undefined" ? "undefined" : _type_of(o)) === "object";
             }
             function addLast2(array, val) {
                 if (Array.isArray(val)) return array.concat(val);
@@ -2120,7 +2089,7 @@ var CommonExpressionsPlugin = function() {
                     else return 0;
                 }
             }();
-            if (typeof module === "object") module.exports = SortedArray2;
+            if ((typeof module === "undefined" ? "undefined" : _type_of(module)) === "object") module.exports = SortedArray2;
             if (typeof define === "function" && define.amd) define(function() {
                 return SortedArray2;
             });
@@ -2409,10 +2378,9 @@ var CommonExpressionsPlugin = function() {
     }();
     var SyncHook = /*#__PURE__*/ function(Hook) {
         _inherits(SyncHook, Hook);
-        var _super = _create_super(SyncHook);
         function SyncHook() {
             _class_call_check(this, SyncHook);
-            return _super.apply(this, arguments);
+            return _call_super(this, SyncHook, arguments);
         }
         _create_class(SyncHook, [
             {
@@ -2445,10 +2413,9 @@ var CommonExpressionsPlugin = function() {
     }(Hook);
     var SyncBailHook = /*#__PURE__*/ function(Hook) {
         _inherits(SyncBailHook, Hook);
-        var _super = _create_super(SyncBailHook);
         function SyncBailHook() {
             _class_call_check(this, SyncBailHook);
-            return _super.apply(this, arguments);
+            return _call_super(this, SyncBailHook, arguments);
         }
         _create_class(SyncBailHook, [
             {
@@ -2480,10 +2447,9 @@ var CommonExpressionsPlugin = function() {
     }(Hook);
     var SyncWaterfallHook = /*#__PURE__*/ function(Hook) {
         _inherits(SyncWaterfallHook, Hook);
-        var _super = _create_super(SyncWaterfallHook);
         function SyncWaterfallHook() {
             _class_call_check(this, SyncWaterfallHook);
-            return _super.apply(this, arguments);
+            return _call_super(this, SyncWaterfallHook, arguments);
         }
         _create_class(SyncWaterfallHook, [
             {
@@ -2545,7 +2511,7 @@ var CommonExpressionsPlugin = function() {
                     for(var _iterator = foo[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                         len = _step.value;
                         tmp = len;
-                        if (tmp && typeof tmp === "object") {
+                        if (tmp && (typeof tmp === "undefined" ? "undefined" : _type_of(tmp)) === "object") {
                             tmp = find(bar, tmp);
                             if (!tmp) return false;
                         }
@@ -2576,7 +2542,7 @@ var CommonExpressionsPlugin = function() {
                     for(var _iterator1 = foo[Symbol.iterator](), _step1; !(_iteratorNormalCompletion1 = (_step1 = _iterator1.next()).done); _iteratorNormalCompletion1 = true){
                         len = _step1.value;
                         tmp = len[0];
-                        if (tmp && typeof tmp === "object") {
+                        if (tmp && (typeof tmp === "undefined" ? "undefined" : _type_of(tmp)) === "object") {
                             tmp = find(bar, tmp);
                             if (!tmp) return false;
                         }
@@ -2615,7 +2581,7 @@ var CommonExpressionsPlugin = function() {
                 }
                 return len === -1;
             }
-            if (!ctor || typeof foo === "object") {
+            if (!ctor || (typeof foo === "undefined" ? "undefined" : _type_of(foo)) === "object") {
                 len = 0;
                 for(ctor in foo){
                     if (has.call(foo, ctor) && ++len && !has.call(bar, ctor)) return false;
@@ -2648,7 +2614,7 @@ var CommonExpressionsPlugin = function() {
                 var nestedPath = _to_consumable_array(path).concat([
                     key
                 ]);
-                if (typeof val === "object") {
+                if ((typeof val === "undefined" ? "undefined" : _type_of(val)) === "object") {
                     traverseObj(val, nestedPath, pairs);
                 } else {
                     pairs.set(nestedPath, val);
@@ -2689,7 +2655,7 @@ var CommonExpressionsPlugin = function() {
             {
                 /** Add match -> value mapping to the registry */ key: "set",
                 value: function set(match, value) {
-                    var matcher = typeof match === "object" ? createMatcher(match) : createBasicMatcher(match);
+                    var matcher = (typeof match === "undefined" ? "undefined" : _type_of(match)) === "object" ? createMatcher(match) : createBasicMatcher(match);
                     this.store.insert({
                         key: match,
                         value: value,
@@ -2852,6 +2818,7 @@ var CommonExpressionsPlugin = function() {
             }
         };
         var identifier = function() {
+            var allowBoolValue = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
             if (!isIdentifierChar(ch)) {
                 return;
             }
@@ -2862,6 +2829,14 @@ var CommonExpressionsPlugin = function() {
                 }
                 value += ch;
             }
+            if (allowBoolValue) {
+                if (value === "true") {
+                    return toValue(true);
+                }
+                if (value === "false") {
+                    return toValue(false);
+                }
+            }
             if (value) {
                 var maybeNumber = Number(value);
                 value = isNaN(maybeNumber) ? value : maybeNumber;
@@ -2910,8 +2885,9 @@ var CommonExpressionsPlugin = function() {
             }
         };
         var simpleSegment = function() {
+            var allowBoolValue = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
             var _nestedPath, _ref;
-            return (_ref = (_nestedPath = nestedPath()) !== null && _nestedPath !== void 0 ? _nestedPath : expression()) !== null && _ref !== void 0 ? _ref : identifier();
+            return (_ref = (_nestedPath = nestedPath()) !== null && _nestedPath !== void 0 ? _nestedPath : expression()) !== null && _ref !== void 0 ? _ref : identifier(allowBoolValue);
         };
         var segment = function() {
             var segments = [];
@@ -2926,6 +2902,7 @@ var CommonExpressionsPlugin = function() {
             return toConcatenatedNode(segments);
         };
         var optionallyQuotedSegment = function() {
+            var allowBoolValue = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : false;
             whitespace();
             if (ch === SINGLE_QUOTE || ch === DOUBLE_QUOTE) {
                 var singleQuote = ch === SINGLE_QUOTE;
@@ -2934,7 +2911,7 @@ var CommonExpressionsPlugin = function() {
                 next(singleQuote ? SINGLE_QUOTE : DOUBLE_QUOTE);
                 return id;
             }
-            return simpleSegment();
+            return simpleSegment(allowBoolValue);
         };
         var equals = function() {
             if (ch !== EQUALS) {
@@ -2954,7 +2931,7 @@ var CommonExpressionsPlugin = function() {
                     whitespace();
                     if (equals()) {
                         whitespace();
-                        var second = optionallyQuotedSegment();
+                        var second = optionallyQuotedSegment(true);
                         value = toQuery(value, second);
                         whitespace();
                     }
@@ -3142,7 +3119,7 @@ var CommonExpressionsPlugin = function() {
                     appendPathSegments(getValueForNode(resolvedNode));
                     break;
                 case "Value":
-                    appendPathSegments(resolvedNode.value);
+                    appendPathSegments(typeof resolvedNode.value === "boolean" ? String(resolvedNode.value) : resolvedNode.value);
                     break;
                 case "Query":
                     {
@@ -3218,7 +3195,7 @@ var CommonExpressionsPlugin = function() {
                     var _this_parseCache_path;
                     var ast = (_this_parseCache_path = this.parseCache[path]) !== null && _this_parseCache_path !== void 0 ? _this_parseCache_path : parse(path);
                     this.parseCache[path] = ast;
-                    if (typeof ast !== "object" || !(ast === null || ast === void 0 ? void 0 : ast.status)) {
+                    if ((typeof ast === "undefined" ? "undefined" : _type_of(ast)) !== "object" || !(ast === null || ast === void 0 ? void 0 : ast.status)) {
                         var _ast_error;
                         throw new TypeError('Cannot normalize path "'.concat(path, '": ').concat((_ast_error = ast === null || ast === void 0 ? void 0 : ast.error) !== null && _ast_error !== void 0 ? _ast_error : "Unknown Error."));
                     }
@@ -3418,14 +3395,13 @@ var CommonExpressionsPlugin = function() {
     }();
     var DependencyModel = /*#__PURE__*/ function(DependencyTracker) {
         _inherits(DependencyModel, DependencyTracker);
-        var _super = _create_super(DependencyModel);
         function DependencyModel(rootModel) {
             _class_call_check(this, DependencyModel);
             var _this;
-            _this = _super.call(this);
+            _this = _call_super(this, DependencyModel);
             _this.rootModel = rootModel;
-            _this.set = _this.set.bind(_assert_this_initialized(_this));
-            _this.get = _this.get.bind(_assert_this_initialized(_this));
+            _this.set = _this.set.bind(_this);
+            _this.get = _this.get.bind(_this);
             return _this;
         }
         _create_class(DependencyModel, [
@@ -3969,23 +3945,20 @@ var CommonExpressionsPlugin = function() {
      * @experimental These Player APIs are in active development and may change. Use with caution
      */ key: "evaluateAsync",
                 value: function evaluateAsync(expr, options) {
+                    var _this = this;
                     if (Array.isArray(expr)) {
-                        var _this = this;
-                        return collateAwaitable(expr.map(function() {
-                            var _ref = _async_to_generator(function(exp) {
+                        return collateAwaitable(expr.map(function(exp) {
+                            return _async_to_generator(function() {
                                 return _ts_generator(this, function(_state) {
                                     return [
                                         2,
-                                        _this.evaluate(exp, _object_spread_props(_object_spread({}, options), {
+                                        this.evaluate(exp, _object_spread_props(_object_spread({}, options), {
                                             async: true
                                         }))
                                     ];
                                 });
-                            });
-                            return function(exp) {
-                                return _ref.apply(this, arguments);
-                            };
-                        }())).awaitableThen(function(values) {
+                            }).call(_this);
+                        })).awaitableThen(function(values) {
                             return values.pop();
                         });
                     } else {
@@ -4709,23 +4682,8 @@ var CommonExpressionsPlugin = function() {
         function Parser() {
             _class_call_check(this, Parser);
             this.hooks = {
-                /**
-         * A hook to interact with an object _before_ parsing it into an AST
-         *
-         * @param value - The object we're are about to parse
-         * @returns - A new value to parse.
-         *  If undefined, the original value is used.
-         *  If null, we stop parsing this node.
-         */ onParseObject: new SyncWaterfallHook(),
-                /**
-         * A callback to interact with an AST _after_ we parse it into the AST
-         *
-         * @param value - The object we parsed
-         * @param node - The AST node we generated
-         * @returns - A new AST node to use
-         *   If undefined, the original value is used.
-         *   If null, we ignore this node all together
-         */ onCreateASTNode: new SyncWaterfallHook(),
+                onParseObject: new SyncWaterfallHook(),
+                onCreateASTNode: new SyncWaterfallHook(),
                 parseNode: new SyncBailHook()
             };
         }
@@ -4763,7 +4721,7 @@ var CommonExpressionsPlugin = function() {
                     }
                     var parseLocalObject = function(currentValue, objToParse) {
                         var path = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : [];
-                        if (typeof objToParse !== "object" || objToParse === null) {
+                        if ((typeof objToParse === "undefined" ? "undefined" : _type_of(objToParse)) !== "object" || objToParse === null) {
                             return {
                                 value: objToParse,
                                 children: []
@@ -4800,7 +4758,7 @@ var CommonExpressionsPlugin = function() {
                             if (newChildren) {
                                 var _children2;
                                 (_children2 = children2).push.apply(_children2, _to_consumable_array(newChildren));
-                            } else if (localValue && typeof localValue === "object") {
+                            } else if (localValue && (typeof localValue === "undefined" ? "undefined" : _type_of(localValue)) === "object") {
                                 var _children21;
                                 var result = parseLocalObject(accumulation.value, localValue, _to_consumable_array(path).concat([
                                     localKey
@@ -4867,20 +4825,14 @@ var CommonExpressionsPlugin = function() {
         function Resolver(root, options) {
             _class_call_check(this, Resolver);
             this.hooks = {
-                /** A hook to allow skipping of the resolution tree for a specific node */ skipResolve: new SyncWaterfallHook(),
-                /** An event emitted before calculating the next update */ beforeUpdate: new SyncHook(),
-                /** An event emitted after calculating the next update */ afterUpdate: new SyncHook(),
-                /** The options passed to a node to resolve it to an object */ resolveOptions: new SyncWaterfallHook(),
-                /** A hook to transform the AST node into a new AST node before resolving it */ beforeResolve: new SyncWaterfallHook(),
-                /**
-         * A hook to transform an AST node into it's resolved value.
-         * This runs _before_ any children are resolved
-         */ resolve: new SyncWaterfallHook(),
-                /**
-         * A hook to transform the resolved value of an AST node.
-         * This runs _after_ all children nodes are resolved
-         */ afterResolve: new SyncWaterfallHook(),
-                /** Called at the very end of a node's tree being updated */ afterNodeUpdate: new SyncHook()
+                skipResolve: new SyncWaterfallHook(),
+                beforeUpdate: new SyncHook(),
+                afterUpdate: new SyncHook(),
+                resolveOptions: new SyncWaterfallHook(),
+                beforeResolve: new SyncWaterfallHook(),
+                resolve: new SyncWaterfallHook(),
+                afterResolve: new SyncWaterfallHook(),
+                afterNodeUpdate: new SyncHook()
             };
             this.root = root;
             this.options = options;
@@ -4888,6 +4840,7 @@ var CommonExpressionsPlugin = function() {
             this.ASTMap = /* @__PURE__ */ new Map();
             this.logger = options.logger;
             this.idCache = /* @__PURE__ */ new Set();
+            this.AsyncIdMap = /* @__PURE__ */ new Map();
         }
         _create_class(Resolver, [
             {
@@ -4898,13 +4851,27 @@ var CommonExpressionsPlugin = function() {
             },
             {
                 key: "update",
-                value: function update(changes) {
+                value: function update(changes, asyncChanges) {
+                    var _this = this;
                     this.hooks.beforeUpdate.call(changes);
                     var resolveCache = /* @__PURE__ */ new Map();
                     this.idCache.clear();
                     var prevASTMap = new Map(this.ASTMap);
                     this.ASTMap.clear();
-                    var updated = this.computeTree(this.root, void 0, changes, resolveCache, toNodeResolveOptions(this.options), void 0, prevASTMap);
+                    var prevAsyncIdMap = new Map(this.AsyncIdMap);
+                    var nextAsyncIdMap = /* @__PURE__ */ new Map();
+                    asyncChanges === null || asyncChanges === void 0 ? void 0 : asyncChanges.forEach(function(id) {
+                        var current = prevAsyncIdMap.get(id);
+                        while(current && prevASTMap.has(current)){
+                            var next = prevASTMap.get(current);
+                            if (next && _this.resolveCache.has(next)) {
+                                _this.resolveCache.delete(next);
+                            }
+                            current = current.parent;
+                        }
+                    });
+                    var updated = this.computeTree(this.root, void 0, changes, resolveCache, toNodeResolveOptions(this.options), void 0, prevASTMap, nextAsyncIdMap);
+                    this.AsyncIdMap = nextAsyncIdMap;
                     this.resolveCache = resolveCache;
                     this.hooks.afterUpdate.call(updated.value);
                     return updated.value;
@@ -4949,7 +4916,7 @@ var CommonExpressionsPlugin = function() {
                     Object.keys(clonedNode).forEach(function(key) {
                         if (key === "parent") return;
                         var value = clonedNode[key];
-                        if (typeof value === "object" && value !== null) {
+                        if ((typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && value !== null) {
                             clonedNode[key] = Array.isArray(value) ? _to_consumable_array(value) : _object_spread({}, value);
                         }
                     });
@@ -4958,9 +4925,8 @@ var CommonExpressionsPlugin = function() {
             },
             {
                 key: "computeTree",
-                value: function computeTree(node, rawParent, dataChanges, cacheUpdate, options, partiallyResolvedParent, prevASTMap) {
+                value: function computeTree(node, rawParent, dataChanges, cacheUpdate, options, partiallyResolvedParent, prevASTMap, nextAsyncIdMap) {
                     var _this = this;
-                    var _partiallyResolvedParent_parent_parent, _partiallyResolvedParent_parent, _resolvedAST_parent, _partiallyResolvedParent_parent1;
                     var dependencyModel = new DependencyModel(options.data.model);
                     dependencyModel.trackSubset("core");
                     var depModelWithParser = withContext(withParser(dependencyModel, this.options.parseBinding));
@@ -4979,15 +4945,6 @@ var CommonExpressionsPlugin = function() {
                     var previousDeps = previousResult === null || previousResult === void 0 ? void 0 : previousResult.dependencies;
                     var dataChanged = caresAboutDataChanges(dataChanges, previousDeps);
                     var shouldUseLastValue = this.hooks.skipResolve.call(!dataChanged, node, resolveOptions);
-                    var clonedNode = _object_spread_props(_object_spread({}, this.cloneNode(node)), {
-                        parent: partiallyResolvedParent
-                    });
-                    var _this_hooks_beforeResolve_call;
-                    var resolvedAST = (_this_hooks_beforeResolve_call = this.hooks.beforeResolve.call(clonedNode, resolveOptions)) !== null && _this_hooks_beforeResolve_call !== void 0 ? _this_hooks_beforeResolve_call : {
-                        type: "empty"
-                    };
-                    var isNestedMultiNodeWithAsync = resolvedAST.type === "multi-node" && (partiallyResolvedParent === null || partiallyResolvedParent === void 0 ? void 0 : (_partiallyResolvedParent_parent = partiallyResolvedParent.parent) === null || _partiallyResolvedParent_parent === void 0 ? void 0 : (_partiallyResolvedParent_parent_parent = _partiallyResolvedParent_parent.parent) === null || _partiallyResolvedParent_parent_parent === void 0 ? void 0 : _partiallyResolvedParent_parent_parent.type) === "multi-node" && partiallyResolvedParent.parent.type === "value" && ((_resolvedAST_parent = resolvedAST.parent) === null || _resolvedAST_parent === void 0 ? void 0 : _resolvedAST_parent.type) === "asset" && resolvedAST.parent.value.id.includes("async");
-                    var isNestedMultiNode = resolvedAST.type === "multi-node" && (partiallyResolvedParent === null || partiallyResolvedParent === void 0 ? void 0 : (_partiallyResolvedParent_parent1 = partiallyResolvedParent.parent) === null || _partiallyResolvedParent_parent1 === void 0 ? void 0 : _partiallyResolvedParent_parent1.type) === "multi-node" && partiallyResolvedParent.type === "value";
                     if (previousResult && shouldUseLastValue) {
                         var update2 = _object_spread_props(_object_spread({}, previousResult), {
                             updated: false
@@ -4999,6 +4956,30 @@ var CommonExpressionsPlugin = function() {
                                 updated: false
                             });
                             cacheUpdate.set(AST, resolvedUpdate);
+                            if (resolvedUpdate.node.type === "async") {
+                                nextAsyncIdMap.set(resolvedUpdate.node.id, resolvedUpdate.node);
+                            }
+                            var _resolvedUpdate_node_asyncNodesResolved;
+                            var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                            try {
+                                for(var _iterator = ((_resolvedUpdate_node_asyncNodesResolved = resolvedUpdate.node.asyncNodesResolved) !== null && _resolvedUpdate_node_asyncNodesResolved !== void 0 ? _resolvedUpdate_node_asyncNodesResolved : [])[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                                    var key = _step.value;
+                                    nextAsyncIdMap.set(key, resolvedUpdate.node);
+                                }
+                            } catch (err) {
+                                _didIteratorError = true;
+                                _iteratorError = err;
+                            } finally{
+                                try {
+                                    if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                        _iterator.return();
+                                    }
+                                } finally{
+                                    if (_didIteratorError) {
+                                        throw _iteratorError;
+                                    }
+                                }
+                            }
                             var handleChildNode = function(childNode) {
                                 var _prevASTMap_get;
                                 var originalChildNode = (_prevASTMap_get = prevASTMap.get(childNode)) !== null && _prevASTMap_get !== void 0 ? _prevASTMap_get : childNode;
@@ -5021,10 +5002,37 @@ var CommonExpressionsPlugin = function() {
                         repopulateASTMapFromCache(previousResult, node, rawParent);
                         return update2;
                     }
-                    if (isNestedMultiNodeWithAsync) {
-                        resolvedAST.parent = partiallyResolvedParent.parent;
-                    } else {
-                        resolvedAST.parent = partiallyResolvedParent;
+                    var clonedNode = _object_spread_props(_object_spread({}, this.cloneNode(node)), {
+                        parent: partiallyResolvedParent
+                    });
+                    var _this_hooks_beforeResolve_call;
+                    var resolvedAST = (_this_hooks_beforeResolve_call = this.hooks.beforeResolve.call(clonedNode, resolveOptions)) !== null && _this_hooks_beforeResolve_call !== void 0 ? _this_hooks_beforeResolve_call : {
+                        type: "empty"
+                    };
+                    resolvedAST.parent = partiallyResolvedParent;
+                    if (resolvedAST.type === "async") {
+                        nextAsyncIdMap.set(resolvedAST.id, resolvedAST);
+                    }
+                    var _resolvedAST_asyncNodesResolved;
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(var _iterator = ((_resolvedAST_asyncNodesResolved = resolvedAST.asyncNodesResolved) !== null && _resolvedAST_asyncNodesResolved !== void 0 ? _resolvedAST_asyncNodesResolved : [])[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var id = _step.value;
+                            nextAsyncIdMap.set(id, resolvedAST);
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
                     }
                     resolveOptions.node = resolvedAST;
                     this.ASTMap.set(resolvedAST, node);
@@ -5038,7 +5046,7 @@ var CommonExpressionsPlugin = function() {
                     if ("children" in resolvedAST) {
                         var _resolvedAST_children;
                         var newChildren = (_resolvedAST_children = resolvedAST.children) === null || _resolvedAST_children === void 0 ? void 0 : _resolvedAST_children.map(function(child) {
-                            var computedChildTree = _this.computeTree(child.value, node, dataChanges, cacheUpdate, resolveOptions, resolvedAST, prevASTMap);
+                            var computedChildTree = _this.computeTree(child.value, node, dataChanges, cacheUpdate, resolveOptions, resolvedAST, prevASTMap, nextAsyncIdMap);
                             var childTreeDeps = computedChildTree.dependencies, childNode = computedChildTree.node, childUpdated = computedChildTree.updated, childValue = computedChildTree.value;
                             childTreeDeps.forEach(function(binding) {
                                 return childDependencies.add(binding);
@@ -5059,40 +5067,18 @@ var CommonExpressionsPlugin = function() {
                         resolvedAST.children = newChildren;
                     } else if (resolvedAST.type === "multi-node") {
                         var childValue = [];
-                        var rawParentToPassIn = isNestedMultiNode ? partiallyResolvedParent === null || partiallyResolvedParent === void 0 ? void 0 : partiallyResolvedParent.parent : node;
-                        var hasAsync = resolvedAST.values.map(function(value, index) {
-                            return value.type === "async" ? index : -1;
-                        }).filter(function(index) {
-                            return index !== -1;
-                        });
-                        var newValues = resolvedAST.values.map(function(mValue) {
-                            var mTree = _this.computeTree(mValue, rawParentToPassIn, dataChanges, cacheUpdate, resolveOptions, resolvedAST, prevASTMap);
+                        var rawParentToPassIn = node;
+                        resolvedAST.values = resolvedAST.values.map(function(mValue) {
+                            var mTree = _this.computeTree(mValue, rawParentToPassIn, dataChanges, cacheUpdate, resolveOptions, resolvedAST, prevASTMap, nextAsyncIdMap);
                             if (mTree.value !== void 0 && mTree.value !== null) {
-                                if (mValue.type === "async" && mValue.flatten && mTree.value.asset && Array.isArray(mTree.value.asset.values)) {
-                                    unpackAndPush(mTree.value, childValue);
-                                } else {
-                                    childValue.push(mTree.value);
-                                }
+                                mTree.dependencies.forEach(function(bindingDep) {
+                                    return childDependencies.add(bindingDep);
+                                });
+                                updated = updated || mTree.updated;
+                                childValue.push(mTree.value);
                             }
-                            mTree.dependencies.forEach(function(bindingDep) {
-                                return childDependencies.add(bindingDep);
-                            });
-                            updated = updated || mTree.updated;
                             return mTree.node;
                         });
-                        if (hasAsync.length > 0) {
-                            var copy = newValues;
-                            hasAsync.forEach(function(index) {
-                                var _copy;
-                                if (copy[index]) (_copy = copy).splice.apply(_copy, [
-                                    index,
-                                    1
-                                ].concat(_to_consumable_array(unpackNode(copy[index]))));
-                            });
-                            resolvedAST.values = copy;
-                        } else {
-                            resolvedAST.values = newValues;
-                        }
                         resolved = childValue;
                     }
                     childDependencies.forEach(function(bindingDep) {
@@ -5113,7 +5099,7 @@ var CommonExpressionsPlugin = function() {
                         value: resolved,
                         dependencies: /* @__PURE__ */ new Set(_to_consumable_array(dependencyModel.getDependencies()).concat(_to_consumable_array(childDependencies)))
                     };
-                    this.hooks.afterNodeUpdate.call(node, isNestedMultiNode ? partiallyResolvedParent === null || partiallyResolvedParent === void 0 ? void 0 : partiallyResolvedParent.parent : rawParent, update);
+                    this.hooks.afterNodeUpdate.call(node, rawParent, update);
                     cacheUpdate.set(node, update);
                     return update;
                 }
@@ -5121,15 +5107,6 @@ var CommonExpressionsPlugin = function() {
         ]);
         return Resolver;
     }();
-    function unpackAndPush(item, initial) {
-        if (item.asset.values && Array.isArray(item.asset.values)) {
-            item.asset.values.forEach(function(i) {
-                unpackAndPush(i, initial);
-            });
-        } else {
-            initial.push(item);
-        }
-    }
     var CrossfieldProvider = /*#__PURE__*/ function() {
         function CrossfieldProvider(initialView, parser, logger) {
             _class_call_check(this, CrossfieldProvider);
@@ -5197,9 +5174,11 @@ var CommonExpressionsPlugin = function() {
         _create_class(ViewInstance, [
             {
                 key: "updateAsync",
-                value: function updateAsync() {
+                value: function updateAsync(asyncNode) {
                     var _this_resolver;
-                    var update = (_this_resolver = this.resolver) === null || _this_resolver === void 0 ? void 0 : _this_resolver.update();
+                    var update = (_this_resolver = this.resolver) === null || _this_resolver === void 0 ? void 0 : _this_resolver.update(/* @__PURE__ */ new Set(), /* @__PURE__ */ new Set([
+                        asyncNode
+                    ]));
                     this.lastUpdate = update;
                     this.hooks.onUpdate.call(update);
                 }
@@ -5289,7 +5268,7 @@ var CommonExpressionsPlugin = function() {
                             for(var _iterator = templateSubstitutions[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
                                 var _step_value = _step.value, expression = _step_value.expression, value = _step_value.value;
                                 var flags = "g";
-                                if (typeof expression === "object") {
+                                if ((typeof expression === "undefined" ? "undefined" : _type_of(expression)) === "object") {
                                     flags = "".concat(expression.flags).concat(expression.global ? "" : "g");
                                 }
                                 templateStr = templateStr.replace(new RegExp(expression, flags), value);
@@ -5438,7 +5417,7 @@ var CommonExpressionsPlugin = function() {
     var bindingResolveLookup = createPatternMatcher("{{", "}}");
     var expressionResolveLookup = createPatternMatcher("@[", "]@");
     function resolveAllRefs(node, resolveOptions, propertiesToSkip) {
-        if (node === null || node === void 0 || typeof node !== "object" && typeof node !== "string") {
+        if (node === null || node === void 0 || (typeof node === "undefined" ? "undefined" : _type_of(node)) !== "object" && typeof node !== "string") {
             return node;
         }
         if (typeof node === "string") {
@@ -5451,7 +5430,7 @@ var CommonExpressionsPlugin = function() {
             }
             var val = node[key];
             var newVal = val;
-            if (typeof val === "object") {
+            if ((typeof val === "undefined" ? "undefined" : _type_of(val)) === "object") {
                 newVal = resolveAllRefs(val, resolveOptions, propertiesToSkip);
             } else if (typeof val === "string") {
                 newVal = resolveString(val, resolveOptions);
@@ -5740,7 +5719,7 @@ var CommonExpressionsPlugin = function() {
                 key: "applyParser",
                 value: function applyParser(parser) {
                     parser.hooks.parseNode.tap("multi-node", function(obj, nodeType, options, childOptions) {
-                        if (childOptions && !hasTemplateKey(childOptions.key) && Array.isArray(obj)) {
+                        if ((childOptions === void 0 || !hasTemplateKey(childOptions.key)) && Array.isArray(obj)) {
                             var values = obj.map(function(childVal) {
                                 return parser.parseObject(childVal, "value", options);
                             }).filter(function(child) {
@@ -5751,7 +5730,7 @@ var CommonExpressionsPlugin = function() {
                             }
                             var multiNode = parser.createASTNode({
                                 type: "multi-node",
-                                override: !hasTemplateValues(childOptions.parentObj, childOptions.key),
+                                override: childOptions !== void 0 && !hasTemplateValues(childOptions.parentObj, childOptions.key),
                                 values: values
                             }, obj);
                             if (!multiNode) {
@@ -5762,7 +5741,7 @@ var CommonExpressionsPlugin = function() {
                                     v.parent = multiNode;
                                 });
                             }
-                            return [
+                            return childOptions === void 0 ? multiNode : [
                                 {
                                     path: _to_consumable_array(childOptions.path).concat([
                                         childOptions.key
@@ -5792,7 +5771,7 @@ var CommonExpressionsPlugin = function() {
                 key: "applyParser",
                 value: function applyParser(parser) {
                     parser.hooks.parseNode.tap("asset", function(obj, nodeType, options, childOptions) {
-                        if ((childOptions === null || childOptions === void 0 ? void 0 : childOptions.key) === "asset" && typeof obj === "object") {
+                        if ((childOptions === null || childOptions === void 0 ? void 0 : childOptions.key) === "asset" && (typeof obj === "undefined" ? "undefined" : _type_of(obj)) === "object") {
                             var assetAST = parser.parseObject(obj, "asset", options);
                             if (!assetAST) {
                                 return [];
@@ -5992,6 +5971,7 @@ var CommonExpressionsPlugin = function() {
     }();
     var FlowInstance = /*#__PURE__*/ function() {
         function FlowInstance(id, flow, options) {
+            var _this = this;
             _class_call_check(this, FlowInstance);
             this.isTransitioning = false;
             this.hooks = {
@@ -6008,60 +5988,55 @@ var CommonExpressionsPlugin = function() {
             this.flow = flow;
             this.log = options === null || options === void 0 ? void 0 : options.logger;
             this.history = [];
-            var _this = this;
-            this.hooks.transition.tap("startPromise", function() {
-                var _ref = _async_to_generator(function(_oldState, nextState) {
+            this.hooks.transition.tap("startPromise", function(_oldState, nextState) {
+                return _async_to_generator(function() {
                     var newState;
                     return _ts_generator(this, function(_state) {
                         newState = nextState.value;
-                        if (_this.flowPromise && newState.state_type === "END") {
-                            _this.flowPromise.resolve(newState);
+                        if (this.flowPromise && newState.state_type === "END") {
+                            this.flowPromise.resolve(newState);
                         }
                         return [
                             2
                         ];
                     });
-                });
-                return function(_oldState, nextState) {
-                    return _ref.apply(this, arguments);
-                };
-            }());
+                }).call(_this);
+            });
         }
         _create_class(FlowInstance, [
             {
                 key: "start",
                 value: /** Start the state machine */ function start() {
-                    var _this = this;
                     return _async_to_generator(function() {
                         var _this_log, initialState;
                         return _ts_generator(this, function(_state) {
-                            if (_this.flowPromise) {
+                            if (this.flowPromise) {
                                 ;
-                                (_this_log = _this.log) === null || _this_log === void 0 ? void 0 : _this_log.warn("Already called start for flow");
+                                (_this_log = this.log) === null || _this_log === void 0 ? void 0 : _this_log.warn("Already called start for flow");
                                 return [
                                     2,
-                                    _this.flowPromise.promise
+                                    this.flowPromise.promise
                                 ];
                             }
-                            _this.flow = _this.hooks.beforeStart.call(_this.flow) || _this.flow;
-                            if (_this.flow.onStart) {
-                                _this.hooks.onStart.call(_this.flow.onStart);
+                            this.flow = this.hooks.beforeStart.call(this.flow) || this.flow;
+                            if (this.flow.onStart) {
+                                this.hooks.onStart.call(this.flow.onStart);
                             }
-                            initialState = _this.flow.startState;
+                            initialState = this.flow.startState;
                             if (!initialState) {
                                 return [
                                     2,
                                     Promise.reject(new Error("No 'startState' defined for flow"))
                                 ];
                             }
-                            _this.flowPromise = (0, import_p_defer2.default)();
-                            _this.pushHistory(initialState);
+                            this.flowPromise = (0, import_p_defer2.default)();
+                            this.pushHistory(initialState);
                             return [
                                 2,
-                                _this.flowPromise.promise
+                                this.flowPromise.promise
                             ];
                         });
-                    })();
+                    }).call(this);
                 }
             },
             {
@@ -6113,7 +6088,7 @@ var CommonExpressionsPlugin = function() {
                         throw new Error("No flow definition for: ".concat(stateName, " was found."));
                     }
                     var nextState = this.flow[stateName];
-                    if (!this.flow[stateName] || typeof nextState !== "object" || !("state_type" in nextState)) {
+                    if (!this.flow[stateName] || (typeof nextState === "undefined" ? "undefined" : _type_of(nextState)) !== "object" || !("state_type" in nextState)) {
                         var _this_log;
                         (_this_log = this.log) === null || _this_log === void 0 ? void 0 : _this_log.error("Flow doesn't contain any states named: ".concat(stateName));
                         return;
@@ -6173,30 +6148,30 @@ var CommonExpressionsPlugin = function() {
             {
                 key: "run",
                 value: function run(startState) {
-                    var _this = this;
                     return _async_to_generator(function() {
-                        var _this_log, startFlow, flow, end, firstItem;
+                        var _this, _this_log, startFlow, flow, end, firstItem;
                         return _ts_generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
-                                    if (!Object.prototype.hasOwnProperty.call(_this.navigation, startState)) {
+                                    _this = this;
+                                    if (!Object.prototype.hasOwnProperty.call(this.navigation, startState)) {
                                         return [
                                             2,
                                             Promise.reject(new Error("No flow defined for: ".concat(startState)))
                                         ];
                                     }
-                                    startFlow = _this.navigation[startState];
-                                    if (startFlow === null || typeof startFlow !== "object") {
+                                    startFlow = this.navigation[startState];
+                                    if (startFlow === null || (typeof startFlow === "undefined" ? "undefined" : _type_of(startFlow)) !== "object") {
                                         return [
                                             2,
                                             Promise.reject(new Error("Flow: ".concat(startState, " needs to be an object")))
                                         ];
                                     }
-                                    (_this_log = _this.log) === null || _this_log === void 0 ? void 0 : _this_log.debug("Starting flow: ".concat(startState));
+                                    (_this_log = this.log) === null || _this_log === void 0 ? void 0 : _this_log.debug("Starting flow: ".concat(startState));
                                     flow = new FlowInstance(startState, startFlow, {
-                                        logger: _this.log
+                                        logger: this.log
                                     });
-                                    _this.addNewFlow(flow);
+                                    this.addNewFlow(flow);
                                     flow.hooks.afterTransition.tap("flow-controller", function(flowInstance) {
                                         var _flowInstance_currentState;
                                         if (((_flowInstance_currentState = flowInstance.currentState) === null || _flowInstance_currentState === void 0 ? void 0 : _flowInstance_currentState.value.state_type) === "FLOW") {
@@ -6216,10 +6191,10 @@ var CommonExpressionsPlugin = function() {
                                     ];
                                 case 1:
                                     end = _state.sent();
-                                    _this.navStack.pop();
-                                    if (_this.navStack.length > 0) {
+                                    this.navStack.pop();
+                                    if (this.navStack.length > 0) {
                                         firstItem = 0;
-                                        _this.current = _this.navStack[firstItem];
+                                        this.current = this.navStack[firstItem];
                                     }
                                     return [
                                         2,
@@ -6227,16 +6202,15 @@ var CommonExpressionsPlugin = function() {
                                     ];
                             }
                         });
-                    })();
+                    }).call(this);
                 }
             },
             {
                 key: "start",
                 value: function start() {
-                    var _this = this;
                     return _async_to_generator(function() {
                         return _ts_generator(this, function(_state) {
-                            if (!_this.navigation.BEGIN) {
+                            if (!this.navigation.BEGIN) {
                                 return [
                                     2,
                                     Promise.reject(new Error("Must supply a BEGIN state"))
@@ -6244,10 +6218,10 @@ var CommonExpressionsPlugin = function() {
                             }
                             return [
                                 2,
-                                _this.run(_this.navigation.BEGIN)
+                                this.run(this.navigation.BEGIN)
                             ];
                         });
-                    })();
+                    }).call(this);
                 }
             }
         ]);
@@ -7354,7 +7328,7 @@ var CommonExpressionsPlugin = function() {
                     var parentBinding = resolved.parent();
                     var property = resolved.key();
                     var parentValue = this.get(parentBinding);
-                    var existedBeforeDelete = typeof parentValue === "object" && parentValue !== null && Object.prototype.hasOwnProperty.call(parentValue, property);
+                    var existedBeforeDelete = (typeof parentValue === "undefined" ? "undefined" : _type_of(parentValue)) === "object" && parentValue !== null && Object.prototype.hasOwnProperty.call(parentValue, property);
                     this.getModel().delete(resolved, options);
                     if (existedBeforeDelete && !this.get(resolved)) {
                         this.trash.add(resolved);
@@ -7455,7 +7429,7 @@ var CommonExpressionsPlugin = function() {
                     var expressionEvaluator;
                     var handleEval = function(exp) {
                         if (exp) {
-                            if (typeof exp === "object" && "exp" in exp) {
+                            if ((typeof exp === "undefined" ? "undefined" : _type_of(exp)) === "object" && "exp" in exp) {
                                 expressionEvaluator === null || expressionEvaluator === void 0 ? void 0 : expressionEvaluator.evaluate(exp.exp);
                             } else {
                                 expressionEvaluator === null || expressionEvaluator === void 0 ? void 0 : expressionEvaluator.evaluate(exp);
@@ -7716,7 +7690,7 @@ var CommonExpressionsPlugin = function() {
                         flow.hooks.beforeTransition.tap("player", function(state, transitionVal) {
                             var computedTransitionVal = state.transitions[transitionVal] ? transitionVal : "*";
                             if (state.onEnd && state.transitions[computedTransitionVal]) {
-                                if (typeof state.onEnd === "object" && "exp" in state.onEnd) {
+                                if (_type_of(state.onEnd) === "object" && "exp" in state.onEnd) {
                                     expressionEvaluator === null || expressionEvaluator === void 0 ? void 0 : expressionEvaluator.evaluate(state.onEnd.exp);
                                 } else {
                                     expressionEvaluator === null || expressionEvaluator === void 0 ? void 0 : expressionEvaluator.evaluate(state.onEnd);
@@ -7875,12 +7849,12 @@ var CommonExpressionsPlugin = function() {
             {
                 key: "start",
                 value: function start(payload) {
-                    var _this = this;
                     return _async_to_generator(function() {
-                        var _payload_id, ref, maybeUpdateState, _this_setupFlow, state, start, endProps, _tmp, error, errorState;
+                        var _this, _payload_id, ref, maybeUpdateState, _this_setupFlow, state, start, endProps, _tmp, error, errorState;
                         return _ts_generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
+                                    _this = this;
                                     ref = Symbol((_payload_id = payload === null || payload === void 0 ? void 0 : payload.id) !== null && _payload_id !== void 0 ? _payload_id : "payload");
                                     maybeUpdateState = function(newState) {
                                         if (_this.state.ref !== ref) {
@@ -7890,7 +7864,7 @@ var CommonExpressionsPlugin = function() {
                                         _this.setState(newState);
                                         return newState;
                                     };
-                                    _this.setState({
+                                    this.setState({
                                         status: "not-started",
                                         ref: ref
                                     });
@@ -7902,8 +7876,8 @@ var CommonExpressionsPlugin = function() {
                                         ,
                                         4
                                     ]);
-                                    _this_setupFlow = _this.setupFlow(payload), state = _this_setupFlow.state, start = _this_setupFlow.start;
-                                    _this.setState(_object_spread({
+                                    _this_setupFlow = this.setupFlow(payload), state = _this_setupFlow.state, start = _this_setupFlow.start;
+                                    this.setState(_object_spread({
                                         ref: ref
                                     }, state));
                                     start();
@@ -7948,7 +7922,7 @@ var CommonExpressionsPlugin = function() {
                                     ];
                             }
                         });
-                    })();
+                    }).call(this);
                 }
             }
         ]);
@@ -7962,7 +7936,7 @@ var CommonExpressionsPlugin = function() {
         if (typeof val === "string") {
             return val.length;
         }
-        if (typeof val === "object" && val !== null) {
+        if ((typeof val === "undefined" ? "undefined" : _type_of(val)) === "object" && val !== null) {
             return Object.keys(val).length;
         }
         return 0;
@@ -7972,7 +7946,7 @@ var CommonExpressionsPlugin = function() {
         if (val === void 0 || val === null) {
             return true;
         }
-        if (typeof val === "object" || typeof val === "string") {
+        if ((typeof val === "undefined" ? "undefined" : _type_of(val)) === "object" || typeof val === "string") {
             return size(ctx, val) === 0;
         }
         return false;
@@ -8081,7 +8055,7 @@ var CommonExpressionsPlugin = function() {
             return -1;
         }
         return searchArray.findIndex(function(value) {
-            var propVal = typeof value === "object" && propToCheck !== void 0 ? value[propToCheck] : value;
+            var propVal = (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && propToCheck !== void 0 ? value[propToCheck] : value;
             return valueToCheck === propVal;
         });
     };
@@ -8091,13 +8065,13 @@ var CommonExpressionsPlugin = function() {
             return defaultValue;
         }
         var foundValue = searchArray.find(function(value) {
-            var propVal = typeof value === "object" && propToCheck !== void 0 ? value[propToCheck] : value;
+            var propVal = (typeof value === "undefined" ? "undefined" : _type_of(value)) === "object" && propToCheck !== void 0 ? value[propToCheck] : value;
             return valueToCheck === propVal;
         });
         if (foundValue === void 0) {
             return defaultValue;
         }
-        if (typeof foundValue === "object" && propToReturn) {
+        if ((typeof foundValue === "undefined" ? "undefined" : _type_of(foundValue)) === "object" && propToReturn) {
             var _foundValue_propToReturn;
             return (_foundValue_propToReturn = foundValue[propToReturn]) !== null && _foundValue_propToReturn !== void 0 ? _foundValue_propToReturn : defaultValue;
         }