@player-ui/player 0.1.1-next.8 → 0.2.0

package/dist/index.cjs.js

@@ -976,12 +976,6 @@ class FlowExpPlugin {
         flow.hooks.onEnd.tap(this.name, (exp) => handleEval(exp));
         flow.hooks.resolveTransitionNode.intercept({
           call: (nextState) => {
-            var _a;
-            const currentState = () => player.getState();
-            const currentFlowState = (_a = currentState().controllers.flow.current) == null ? void 0 : _a.currentState;
-            if (currentFlowState == null ? void 0 : currentFlowState.value.onEnd) {
-              handleEval(currentFlowState.value.onEnd);
-            }
             if (nextState == null ? void 0 : nextState.onStart) {
               handleEval(nextState.onStart);
             }
@@ -1036,8 +1030,8 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const PLAYER_VERSION = "0.1.1-next.8";
-const COMMIT = "f48d91686d024164911827b75361163c827cea00";
+const PLAYER_VERSION = "0.2.0";
+const COMMIT = "9a8b9f907af5133f2321bb0f4cd56c744160676d";
 const _Player = class {
   constructor(config) {
     this.logger = new logger.TapableLogger();
@@ -1070,6 +1064,10 @@ const _Player = class {
       plugin.apply(this);
     });
   }
+  getPlugins() {
+    var _a;
+    return (_a = this.config.plugins) != null ? _a : [];
+  }
   findPlugin(symbol) {
     var _a;
     return (_a = this.config.plugins) == null ? void 0 : _a.find((el) => el.symbol === symbol);
@@ -1160,6 +1158,13 @@ const _Player = class {
     }
     flowController.hooks.flow.tap("player", (flow) => {
       flow.hooks.beforeTransition.tap("player", (state, transitionVal) => {
+        if (state.onEnd && (state.transitions[transitionVal] || state.transitions["*"])) {
+          if (typeof state.onEnd === "object" && "exp" in state.onEnd) {
+            expressionEvaluator == null ? void 0 : expressionEvaluator.evaluate(state.onEnd.exp);
+          } else {
+            expressionEvaluator == null ? void 0 : expressionEvaluator.evaluate(state.onEnd);
+          }
+        }
         if (!("transitions" in state) || !state.transitions[transitionVal]) {
           return state;
         }

package/dist/index.d.ts

@@ -14,6 +14,7 @@ export * from '@player-ui/logger';
 import { SchemaController } from '@player-ui/schema';
 export * from '@player-ui/schema';
 export * from '@player-ui/string-resolver';
+import * as _player_ui_validator from '@player-ui/validator';
 import { ValidatorRegistry, ValidationResponse, ValidatorContext, ValidationObject, WarningValidationResponse, ErrorValidationResponse } from '@player-ui/validator';
 export * from '@player-ui/validator';
 import { Node, Resolve, ViewPlugin, Resolver, ViewInstance } from '@player-ui/view';
@@ -175,7 +176,7 @@ declare class ValidationController implements BindingTracker {
     private updateValidationsForView;
     private setCompare;
     private get activeBindings();
-    private getValidator;
+    getValidator(type: string): _player_ui_validator.ValidatorFunction<unknown> | undefined;
     getBindings(): Set<BindingInstance>;
     /** Executes all known validations for the tracked bindings using the given model */
     validateView(trigger?: Validation.Trigger): {
@@ -395,6 +396,8 @@ declare class Player {
         resolveFlowContent: SyncWaterfallHook<[Flow<_player_ui_types.Asset<string>>], Record<string, any>>;
     };
     constructor(config?: PlayerConfigOptions);
+    /**  Returns currently registered plugins */
+    getPlugins(): PlayerPlugin[];
     /** Find instance of [Plugin] that has been registered to Player */
     findPlugin<Plugin extends PlayerPlugin>(symbol: symbol): Plugin | undefined;
     /** Retrieve an instance of [Plugin] and conditionally invoke [apply] if it exists */

package/dist/index.esm.js

@@ -976,12 +976,6 @@ class FlowExpPlugin {
         flow.hooks.onEnd.tap(this.name, (exp) => handleEval(exp));
         flow.hooks.resolveTransitionNode.intercept({
           call: (nextState) => {
-            var _a;
-            const currentState = () => player.getState();
-            const currentFlowState = (_a = currentState().controllers.flow.current) == null ? void 0 : _a.currentState;
-            if (currentFlowState == null ? void 0 : currentFlowState.value.onEnd) {
-              handleEval(currentFlowState.value.onEnd);
-            }
             if (nextState == null ? void 0 : nextState.onStart) {
               handleEval(nextState.onStart);
             }
@@ -1036,8 +1030,8 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const PLAYER_VERSION = "0.1.1-next.8";
-const COMMIT = "f48d91686d024164911827b75361163c827cea00";
+const PLAYER_VERSION = "0.2.0";
+const COMMIT = "9a8b9f907af5133f2321bb0f4cd56c744160676d";
 const _Player = class {
   constructor(config) {
     this.logger = new TapableLogger();
@@ -1070,6 +1064,10 @@ const _Player = class {
       plugin.apply(this);
     });
   }
+  getPlugins() {
+    var _a;
+    return (_a = this.config.plugins) != null ? _a : [];
+  }
   findPlugin(symbol) {
     var _a;
     return (_a = this.config.plugins) == null ? void 0 : _a.find((el) => el.symbol === symbol);
@@ -1160,6 +1158,13 @@ const _Player = class {
     }
     flowController.hooks.flow.tap("player", (flow) => {
       flow.hooks.beforeTransition.tap("player", (state, transitionVal) => {
+        if (state.onEnd && (state.transitions[transitionVal] || state.transitions["*"])) {
+          if (typeof state.onEnd === "object" && "exp" in state.onEnd) {
+            expressionEvaluator == null ? void 0 : expressionEvaluator.evaluate(state.onEnd.exp);
+          } else {
+            expressionEvaluator == null ? void 0 : expressionEvaluator.evaluate(state.onEnd);
+          }
+        }
         if (!("transitions" in state) || !state.transitions[transitionVal]) {
           return state;
         }

package/package.json

@@ -1,25 +1,25 @@
 {
   "name": "@player-ui/player",
-  "version": "0.1.1-next.8",
+  "version": "0.2.0",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {},
   "dependencies": {
-    "@player-ui/binding": "0.1.1-next.8",
-    "@player-ui/constants": "0.1.1-next.8",
-    "@player-ui/data": "0.1.1-next.8",
-    "@player-ui/expressions": "0.1.1-next.8",
-    "@player-ui/flow": "0.1.1-next.8",
-    "@player-ui/logger": "0.1.1-next.8",
-    "@player-ui/partial-match-registry": "0.1.1-next.8",
-    "@player-ui/schema": "0.1.1-next.8",
-    "@player-ui/string-resolver": "0.1.1-next.8",
-    "@player-ui/types": "0.1.1-next.8",
-    "@player-ui/utils": "0.1.1-next.8",
-    "@player-ui/validator": "0.1.1-next.8",
-    "@player-ui/view": "0.1.1-next.8",
+    "@player-ui/binding": "0.2.0",
+    "@player-ui/constants": "0.2.0",
+    "@player-ui/data": "0.2.0",
+    "@player-ui/expressions": "0.2.0",
+    "@player-ui/flow": "0.2.0",
+    "@player-ui/logger": "0.2.0",
+    "@player-ui/partial-match-registry": "0.2.0",
+    "@player-ui/schema": "0.2.0",
+    "@player-ui/string-resolver": "0.2.0",
+    "@player-ui/types": "0.2.0",
+    "@player-ui/utils": "0.2.0",
+    "@player-ui/validator": "0.2.0",
+    "@player-ui/view": "0.2.0",
     "babel-plugin-preval": "^5.0.0",
     "dequal": "^2.0.2",
     "p-defer": "^3.0.0",

package/src/player.ts

@@ -27,8 +27,8 @@ import type {
 import { NOT_STARTED_STATE } from './types';
 
 // Variables injected at build time
-const PLAYER_VERSION = '0.1.1-next.8';
-const COMMIT = 'f48d91686d024164911827b75361163c827cea00';
+const PLAYER_VERSION = '0.2.0';
+const COMMIT = '9a8b9f907af5133f2321bb0f4cd56c744160676d';
 
 export interface PlayerPlugin {
   /**
@@ -130,6 +130,11 @@ export class Player {
     });
   }
 
+  /**  Returns currently registered plugins */
+  public getPlugins(): PlayerPlugin[] {
+    return this.config.plugins ?? [];
+  }
+
   /** Find instance of [Plugin] that has been registered to Player */
   public findPlugin<Plugin extends PlayerPlugin>(
     symbol: symbol
@@ -278,6 +283,17 @@ export class Player {
 
     flowController.hooks.flow.tap('player', (flow: FlowInstance) => {
       flow.hooks.beforeTransition.tap('player', (state, transitionVal) => {
+        if (
+          state.onEnd &&
+          (state.transitions[transitionVal] || state.transitions['*'])
+        ) {
+          if (typeof state.onEnd === 'object' && 'exp' in state.onEnd) {
+            expressionEvaluator?.evaluate(state.onEnd.exp);
+          } else {
+            expressionEvaluator?.evaluate(state.onEnd);
+          }
+        }
+
         if (!('transitions' in state) || !state.transitions[transitionVal]) {
           return state;
         }

package/src/plugins/flow-exp-plugin.ts

@@ -47,17 +47,6 @@ export class FlowExpPlugin implements PlayerPlugin {
         // Eval state nodes
         flow.hooks.resolveTransitionNode.intercept({
           call: (nextState: NavigationFlowState) => {
-            /** Get the current state of Player */
-            const currentState = () => player.getState() as InProgressState;
-
-            /** Get the current flow state */
-            const currentFlowState =
-              currentState().controllers.flow.current?.currentState;
-
-            if (currentFlowState?.value.onEnd) {
-              handleEval(currentFlowState.value.onEnd);
-            }
-
             if (nextState?.onStart) {
               handleEval(nextState.onStart);
             }

package/src/validation/controller.ts

@@ -553,7 +553,7 @@ export class ValidationController implements BindingTracker {
     );
   }
 
-  private getValidator(type: string) {
+  public getValidator(type: string) {
     if (this.validatorRegistry) {
       return this.validatorRegistry.get(type);
     }