Sync changes up to 57537b9

core/flow/src/flow.ts

@@ -44,7 +44,7 @@ export class FlowInstance {
 
     /** A hook to intercept and block a transition */
     skipTransition: new SyncBailHook<
-      [NamedState | undefined, string],
+      [NamedState | undefined],
       boolean | undefined
     >(),
 
@@ -124,6 +124,19 @@ export class FlowInstance {
       throw new Error("Cannot transition when there's no current state");
     }
 
+    if (options?.force) {
+      this.log?.debug(`Forced transition. Skipping validation checks`);
+    } else {
+      const skipTransition = this.hooks.skipTransition.call(this.currentState);
+
+      if (skipTransition) {
+        this.log?.debug(
+          `Skipping transition from ${this.currentState} b/c hook told us to`
+        );
+        return;
+      }
+    }
+
     const state = this.hooks.beforeTransition.call(
       this.currentState.value,
       transitionValue
@@ -170,23 +183,6 @@ export class FlowInstance {
 
     const prevState = this.currentState;
 
-    if (options?.force) {
-      this.log?.debug(`Forced transition. Skipping validation checks`);
-    } else {
-      const skipTransition = this.hooks.skipTransition.call(
-        prevState,
-        stateName
-      );
-
-      if (skipTransition) {
-        this.log?.debug(
-          `Skipping transition to ${stateName} b/c hook told us to`
-        );
-
-        return;
-      }
-    }
-
     nextState = this.hooks.resolveTransitionNode.call(nextState);
 
     const newCurrentState = {

core/player/src/__tests__/view.test.ts

@@ -308,6 +308,56 @@ describe('state node expression tests', () => {
     });
   });
 
+  test('evaluates onEnd before transition', () => {
+    player.start({
+      ...minimal,
+      data: {
+        ...minimal.data,
+        viewRef: 'initial-view',
+      },
+      navigation: {
+        BEGIN: 'FLOW_1',
+        FLOW_1: {
+          startState: 'ACTION_1',
+          ACTION_1: {
+            state_type: 'ACTION',
+            exp: "{{viewRef}} = 'view-exp'",
+            onStart: "{{viewRef}} = 'view-onStart'",
+            onEnd: "{{viewRef}} = 'VIEW_1'",
+            transitions: {
+              Next: '{{viewRef}}',
+            },
+          },
+          VIEW_1: {
+            state_type: 'VIEW',
+            ref: 'view-1',
+            transitions: {},
+          },
+        },
+      },
+    });
+    jest.runOnlyPendingTimers();
+    flowController?.transition('Next');
+
+    /**
+     * Expected eval order:
+     * 1. onStart
+     * 2. exp
+     * 3. onEnd
+     */
+    expect(getView()).toStrictEqual({
+      id: 'view-1',
+      type: 'view',
+      label: {
+        asset: {
+          id: 'action-label',
+          type: 'text',
+          value: 'Clicked 0 times',
+        },
+      },
+    });
+  });
+
   test('triggers onStart before resolving view IDs', () => {
     player.start({
       id: 'resolve-view-flow',

core/player/src/player.ts

@@ -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;
         }

core/player/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);
             }

core/player/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);
     }

core/schema/src/schema.ts

@@ -87,7 +87,7 @@ export class SchemaController implements ValidationProvider {
     new Map();
 
   private types: Map<string, SchemaType.DataType<any>> = new Map();
-  private schema: Map<string, SchemaType.DataType> = new Map();
+  public readonly schema: Map<string, SchemaType.DataType> = new Map();
 
   private bindingSchemaNormalizedCache: Map<BindingInstance, string> =
     new Map();

core/view/src/parser/index.ts

@@ -3,7 +3,7 @@ import { SyncWaterfallHook } from 'tapable-ts';
 import type { Template, AssetSwitch } from '@player-ui/types';
 import type { Node, AnyAssetType } from './types';
 import { NodeType } from './types';
-import { hasSwitch } from './utils';
+import { hasSwitch, hasApplicability } from './utils';
 
 export * from './types';
 
@@ -56,6 +56,36 @@ export class Parser {
     return viewNode as Node.View;
   }
 
+  private parseApplicability(
+    obj: object,
+    type: Node.ChildrenTypes,
+    options: ParseObjectOptions
+  ): Node.Node | null {
+    const parsedApplicability = this.parseObject(
+      omit(obj, 'applicability'),
+      type,
+      options
+    );
+    if (parsedApplicability !== null) {
+      const applicabilityNode = this.createASTNode(
+        {
+          type: NodeType.Applicability,
+          expression: (obj as any).applicability,
+          value: parsedApplicability,
+        },
+        obj
+      );
+
+      if (applicabilityNode?.type === NodeType.Applicability) {
+        applicabilityNode.value.parent = applicabilityNode;
+      }
+
+      return applicabilityNode;
+    }
+
+    return null;
+  }
+
   private parseSwitch(
     obj: AssetSwitch,
     options: ParseObjectOptions
@@ -116,29 +146,8 @@ export class Parser {
     type: Node.ChildrenTypes = NodeType.Value,
     options: ParseObjectOptions = { templateDepth: 0 }
   ): Node.Node | null {
-    if (Object.prototype.hasOwnProperty.call(obj, 'applicability')) {
-      const parsedApplicability = this.parseObject(
-        omit(obj, 'applicability'),
-        type,
-        options
-      );
-
-      if (parsedApplicability !== null) {
-        const applicabilityNode = this.createASTNode(
-          {
-            type: NodeType.Applicability,
-            expression: (obj as any).applicability,
-            value: parsedApplicability,
-          },
-          obj
-        );
-
-        if (applicabilityNode?.type === NodeType.Applicability) {
-          applicabilityNode.value.parent = applicabilityNode;
-        }
-
-        return applicabilityNode;
-      }
+    if (hasApplicability(obj)) {
+      return this.parseApplicability(obj, type, options);
     }
 
     if (hasSwitch(obj)) {
@@ -249,7 +258,21 @@ export class Parser {
             }
           }
         } else if (localValue && typeof localValue === 'object') {
-          parseLocalObject(localValue, [...path, localKey]);
+          if (hasApplicability(localValue)) {
+            const applicabilityNode = this.parseApplicability(
+              localValue,
+              type,
+              options
+            );
+            if (applicabilityNode) {
+              children.push({
+                path: [...path, localKey],
+                value: applicabilityNode,
+              });
+            }
+          } else {
+            parseLocalObject(localValue, [...path, localKey]);
+          }
         } else {
           value = setIn(value, [...path, localKey], localValue);
         }

core/view/src/parser/utils.ts

@@ -7,3 +7,8 @@ export function hasSwitch(obj: object): obj is AssetSwitch<Asset> {
     Object.prototype.hasOwnProperty.call(obj, 'staticSwitch')
   );
 }
+
+/** Check to see if the object contains applicability */
+export function hasApplicability(obj: object): boolean {
+  return Object.prototype.hasOwnProperty.call(obj, 'applicability');
+}

core/view/src/plugins/__tests__/applicability.test.ts

@@ -61,6 +61,33 @@ describe('applicability', () => {
     });
   });
 
+  it('removes asset wrappers', () => {
+    const root = parser.parseObject({
+      asset: {
+        title: {
+          applicability: '{{foo}}',
+          asset: {
+            value: 'foo',
+          },
+        },
+        value: 'Hello World',
+      },
+    });
+    model.set([['foo', true]]);
+    const resolver = new Resolver(root!, resolverOptions);
+
+    new ApplicabilityPlugin().applyResolver(resolver);
+    new StringResolverPlugin().applyResolver(resolver);
+
+    expect(resolver.update()).toStrictEqual({
+      asset: { title: { asset: { value: 'foo' } }, value: 'Hello World' },
+    });
+    model.set([['foo', false]]);
+    expect(resolver.update()).toStrictEqual({
+      asset: { value: 'Hello World' },
+    });
+  });
+
   it('handles empty models', () => {
     const root = parser.parseObject({
       asset: {

core/view/src/view.ts

@@ -91,7 +91,7 @@ export class ViewInstance implements ValidationProvider {
 
   private resolver?: Resolver;
   public readonly initialView: ViewType;
-  private readonly resolverOptions: Resolve.ResolverOptions;
+  public readonly resolverOptions: Resolve.ResolverOptions;
   private rootNode?: Node.Node;
 
   private validationProvider?: CrossfieldProvider;

language/dsl/BUILD

@@ -15,6 +15,7 @@ javascript_pipeline(
       "@npm//react-flatten-children",
       "@npm//react-json-reconciler",
       "@npm//react-merge-refs",
+      "@npm//source-map-js",
       "@npm//signale",
       "@npm//ts-node",
       "@npm//typescript",