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

package/dist/CommonExpressionsPlugin.native.js

@@ -1462,22 +1462,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);
     };
@@ -2852,6 +2836,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 +2847,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 +2903,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 +2920,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 +2929,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 +2949,7 @@ var CommonExpressionsPlugin = function() {
                     whitespace();
                     if (equals()) {
                         whitespace();
-                        var second = optionallyQuotedSegment();
+                        var second = optionallyQuotedSegment(true);
                         value = toQuery(value, second);
                         whitespace();
                     }
@@ -3142,7 +3137,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":
                     {
@@ -4709,23 +4704,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()
             };
         }
@@ -4867,20 +4847,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 +4862,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 +4873,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;
@@ -4958,9 +4947,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 +4967,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 +4978,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 +5024,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 +5068,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 +5089,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 +5121,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 +5129,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 +5196,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);
                 }
@@ -5740,7 +5741,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 +5752,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 +5763,7 @@ var CommonExpressionsPlugin = function() {
                                     v.parent = multiNode;
                                 });
                             }
-                            return [
+                            return childOptions === void 0 ? multiNode : [
                                 {
                                     path: _to_consumable_array(childOptions.path).concat([
                                         childOptions.key