@player-ui/common-types-plugin 0.13.0-next.0 → 0.13.0-next.2

package/dist/CommonTypesPlugin.native.js

@@ -5174,20 +5174,15 @@ var CommonTypesPlugin = function() {
     }();
     var ViewInstance = /*#__PURE__*/ function() {
         function ViewInstance(initialView, resolverOptions) {
-            var _this = this;
             _class_call_check(this, ViewInstance);
             this.hooks = {
                 onUpdate: new SyncHook(),
                 parser: new SyncHook(),
                 resolver: new SyncHook(),
-                onTemplatePluginCreated: new SyncHook(),
                 templatePlugin: new SyncHook()
             };
             this.initialView = initialView;
             this.resolverOptions = resolverOptions;
-            this.hooks.onTemplatePluginCreated.tap("view", function(templatePlugin) {
-                _this.templatePlugin = templatePlugin;
-            });
         }
         _create_class(ViewInstance, [
             {
@@ -5234,6 +5229,12 @@ var CommonTypesPlugin = function() {
                     var _this_validationProvider;
                     return (_this_validationProvider = this.validationProvider) === null || _this_validationProvider === void 0 ? void 0 : _this_validationProvider.getValidationsForBinding(binding);
                 }
+            },
+            {
+                key: "setTemplatePlugin",
+                value: function setTemplatePlugin(plugin) {
+                    this.templatePlugin = plugin;
+                }
             }
         ]);
         return ViewInstance;
@@ -5405,6 +5406,7 @@ var CommonTypesPlugin = function() {
                 value: function apply(view) {
                     view.hooks.parser.tap("template", this.applyParser.bind(this));
                     view.hooks.resolver.tap("template", this.applyResolverHooks.bind(this));
+                    view.setTemplatePlugin(this);
                 }
             }
         ]);
@@ -5984,13 +5986,13 @@ var CommonTypesPlugin = function() {
             this.isTransitioning = false;
             this.hooks = {
                 beforeStart: new SyncBailHook(),
-                /** A callback when the onStart node was present */ onStart: new SyncHook(),
-                /** A callback when the onEnd node was present */ onEnd: new SyncHook(),
-                /** A hook to intercept and block a transition */ skipTransition: new SyncBailHook(),
-                /** A chance to manipulate the flow-node used to calculate the given transition used  */ beforeTransition: new SyncWaterfallHook(),
-                /** A chance to manipulate the flow-node calculated after a transition */ resolveTransitionNode: new SyncWaterfallHook(),
-                /** A callback when a transition from 1 state to another was made */ transition: new SyncHook(),
-                /** A callback to run actions after a transition occurs */ afterTransition: new SyncHook()
+                onStart: new SyncHook(),
+                onEnd: new SyncHook(),
+                skipTransition: new SyncBailHook(),
+                beforeTransition: new SyncWaterfallHook(),
+                resolveTransitionNode: new SyncWaterfallHook(),
+                transition: new SyncHook(),
+                afterTransition: new SyncHook()
             };
             this.id = id;
             this.flow = flow;
@@ -7013,8 +7015,7 @@ var CommonTypesPlugin = function() {
             var _this1 = this;
             _class_call_check(this, ViewController);
             this.hooks = {
-                /** Do any processing before the `View` instance is created */ resolveView: new SyncWaterfallHook(),
-                // The hook right before the View starts resolving. Attach anything custom here
+                resolveView: new SyncWaterfallHook(),
                 view: new SyncHook()
             };
             this.transformRegistry = new Registry();
@@ -7062,6 +7063,7 @@ var CommonTypesPlugin = function() {
                     ]));
                 }
             });
+            this.viewPlugins = this.createViewPlugins();
         }
         _create_class(ViewController, [
             {
@@ -7117,9 +7119,50 @@ var CommonTypesPlugin = function() {
                     }
                     var view = new ViewInstance(source, this.viewOptions);
                     this.currentView = view;
+                    this.applyViewPlugins(view);
                     this.hooks.view.call(view);
                     view.update();
                 }
+            },
+            {
+                key: "applyViewPlugins",
+                value: function applyViewPlugins(view) {
+                    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                    try {
+                        for(var _iterator = this.viewPlugins[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                            var plugin = _step.value;
+                            plugin.apply(view);
+                        }
+                    } catch (err) {
+                        _didIteratorError = true;
+                        _iteratorError = err;
+                    } finally{
+                        try {
+                            if (!_iteratorNormalCompletion && _iterator.return != null) {
+                                _iterator.return();
+                            }
+                        } finally{
+                            if (_didIteratorError) {
+                                throw _iteratorError;
+                            }
+                        }
+                    }
+                }
+            },
+            {
+                key: "createViewPlugins",
+                value: function createViewPlugins() {
+                    var pluginOptions = toNodeResolveOptions(this.viewOptions);
+                    return [
+                        new AssetPlugin(),
+                        new SwitchPlugin(pluginOptions),
+                        new ApplicabilityPlugin(),
+                        new AssetTransformCorePlugin(this.transformRegistry),
+                        new StringResolverPlugin(),
+                        new TemplatePlugin(pluginOptions),
+                        new MultiNodePlugin()
+                    ];
+                }
             }
         ]);
         return ViewController;
@@ -7492,35 +7535,6 @@ var CommonTypesPlugin = function() {
         ref: Symbol("not-started"),
         status: "not-started"
     };
-    var DefaultViewPlugin = /*#__PURE__*/ function() {
-        function DefaultViewPlugin() {
-            _class_call_check(this, DefaultViewPlugin);
-            this.name = "default-view-plugin";
-        }
-        _create_class(DefaultViewPlugin, [
-            {
-                key: "apply",
-                value: function apply(player) {
-                    var _this = this;
-                    player.hooks.viewController.tap(this.name, function(viewController) {
-                        viewController.hooks.view.tap(_this.name, function(view) {
-                            var pluginOptions = toNodeResolveOptions(view.resolverOptions);
-                            new AssetPlugin().apply(view);
-                            new SwitchPlugin(pluginOptions).apply(view);
-                            new ApplicabilityPlugin().apply(view);
-                            new AssetTransformCorePlugin(viewController.transformRegistry).apply(view);
-                            new StringResolverPlugin().apply(view);
-                            var templatePlugin = new TemplatePlugin(pluginOptions);
-                            templatePlugin.apply(view);
-                            view.hooks.onTemplatePluginCreated.call(templatePlugin);
-                            new MultiNodePlugin().apply(view);
-                        });
-                    });
-                }
-            }
-        ]);
-        return DefaultViewPlugin;
-    }();
     var PLAYER_VERSION = "__VERSION__";
     var COMMIT = "__GIT_COMMIT__";
     var _Player = /*#__PURE__*/ function() {
@@ -7550,8 +7564,7 @@ var CommonTypesPlugin = function() {
             }
             this.config = config || {};
             this.config.plugins = [
-                new DefaultExpPlugin(),
-                new DefaultViewPlugin()
+                new DefaultExpPlugin()
             ].concat(_to_consumable_array(this.config.plugins || []), [
                 new FlowExpPlugin()
             ]);
@@ -7738,95 +7751,41 @@ var CommonTypesPlugin = function() {
                                 validationController.reset();
                             }
                         });
-                        flow.hooks.afterTransition.tap("player", function(flowInstance) {
+                        flow.hooks.afterTransition.tap("player-action-states", function(flowInstance) {
                             var _flowInstance_currentState;
                             var value = (_flowInstance_currentState = flowInstance.currentState) === null || _flowInstance_currentState === void 0 ? void 0 : _flowInstance_currentState.value;
-                            if (value && value.state_type === "ACTION") {
+                            if (value && value.state_type === "ASYNC_ACTION") {
                                 var exp = value.exp;
-                                var result = expressionEvaluator.evaluate(exp);
-                                if (isPromiseLike(result)) {
+                                try {
+                                    var result = expressionEvaluator.evaluateAsync(exp);
+                                    if (isPromiseLike(result)) {
+                                        if (value.await) {
+                                            queueMicrotask(function() {
+                                                result.then(function(r) {
+                                                    return flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(r));
+                                                }).catch(flowResultDeferred.reject);
+                                            });
+                                        } else {
+                                            _this.logger.warn("Unawaited promise used as return value in in non-async context, transitioning with '*' value");
+                                            flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(result));
+                                        }
+                                    } else {
+                                        _this.logger.warn("Non async expression used in async action node");
+                                        flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(result));
+                                    }
+                                } catch (e) {
+                                    flowResultDeferred.reject(e);
+                                }
+                            } else if (value && value.state_type === "ACTION") {
+                                var exp1 = value.exp;
+                                var result1 = expressionEvaluator.evaluate(exp1);
+                                if (isPromiseLike(result1)) {
                                     _this.logger.warn("Async expression used as return value in in non-async context, transitioning with '*' value");
                                 }
-                                flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(result));
+                                flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(result1));
                             }
                             expressionEvaluator.reset();
                         });
-                        var _this1 = _this;
-                        flow.hooks.afterTransition.tap("player", function() {
-                            var _ref = _async_to_generator(function(flowInstance) {
-                                var _flowInstance_currentState, value, exp, result, e;
-                                return _ts_generator(this, function(_state) {
-                                    switch(_state.label){
-                                        case 0:
-                                            value = (_flowInstance_currentState = flowInstance.currentState) === null || _flowInstance_currentState === void 0 ? void 0 : _flowInstance_currentState.value;
-                                            if (!(value && value.state_type === "ASYNC_ACTION")) return [
-                                                3,
-                                                8
-                                            ];
-                                            exp = value.exp;
-                                            _state.label = 1;
-                                        case 1:
-                                            _state.trys.push([
-                                                1,
-                                                7,
-                                                ,
-                                                8
-                                            ]);
-                                            result = expressionEvaluator.evaluateAsync(exp);
-                                            if (!isPromiseLike(result)) return [
-                                                3,
-                                                5
-                                            ];
-                                            if (!value.await) return [
-                                                3,
-                                                3
-                                            ];
-                                            return [
-                                                4,
-                                                result
-                                            ];
-                                        case 2:
-                                            result = _state.sent();
-                                            return [
-                                                3,
-                                                4
-                                            ];
-                                        case 3:
-                                            _this1.logger.warn("Unawaited promise used as return value in in non-async context, transitioning with '*' value");
-                                            _state.label = 4;
-                                        case 4:
-                                            return [
-                                                3,
-                                                6
-                                            ];
-                                        case 5:
-                                            _this1.logger.warn("Non async expression used in async action node");
-                                            _state.label = 6;
-                                        case 6:
-                                            flowController === null || flowController === void 0 ? void 0 : flowController.transition(String(result));
-                                            return [
-                                                3,
-                                                8
-                                            ];
-                                        case 7:
-                                            e = _state.sent();
-                                            flowResultDeferred.reject(e);
-                                            return [
-                                                3,
-                                                8
-                                            ];
-                                        case 8:
-                                            expressionEvaluator.reset();
-                                            return [
-                                                2
-                                            ];
-                                    }
-                                });
-                            });
-                            return function(flowInstance) {
-                                return _ref.apply(this, arguments);
-                            };
-                        }());
                     });
                     this.hooks.dataController.call(dataController);
                     validationController.setOptions({
@@ -7864,11 +7823,9 @@ var CommonTypesPlugin = function() {
                         }),
                         constants: this.constantsController
                     });
-                    this.hooks.viewController.tap("player", function(vc) {
-                        vc.hooks.view.tap("player", function(view) {
-                            validationController.onView(view);
-                            _this.hooks.view.call(view);
-                        });
+                    viewController.hooks.view.tap("player", function(view) {
+                        validationController.onView(view);
+                        _this.hooks.view.call(view);
                     });
                     this.hooks.viewController.call(viewController);
                     return {