@player-ui/player 0.4.0-next.9 → 0.4.1-next.0

package/dist/index.cjs.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, '__esModule', { value: true });
 
 var types = require('@player-ui/types');
 var tapableTs = require('tapable-ts');
-var NestedError = require('nested-error-stacks');
+var tsNestedError = require('ts-nested-error');
 var flatten$1 = require('arr-flatten');
 var P = require('parsimmon');
 var ebnf = require('ebnf');
@@ -17,7 +17,6 @@ var partialMatchRegistry = require('@player-ui/partial-match-registry');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
-var NestedError__default = /*#__PURE__*/_interopDefaultLegacy(NestedError);
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten$1);
 var P__default = /*#__PURE__*/_interopDefaultLegacy(P);
 var get__default = /*#__PURE__*/_interopDefaultLegacy(get);
@@ -106,7 +105,8 @@ const isIdentifierChar = (char) => {
     return false;
   }
   const charCode = char.charCodeAt(0);
-  return charCode >= 48 && charCode <= 57 || charCode >= 65 && charCode <= 90 || charCode >= 97 && charCode <= 122 || charCode === 95 || charCode === 45 || charCode === 64;
+  const matches = charCode === 32 || charCode === 34 || charCode === 39 || charCode === 40 || charCode === 41 || charCode === 42 || charCode === 46 || charCode === 61 || charCode === 91 || charCode === 93 || charCode === 96 || charCode === 123 || charCode === 125;
+  return !matches;
 };
 const parse$1 = (path) => {
   let index = 1;
@@ -392,7 +392,7 @@ function resolveBindingAST(bindingPathNode, options, hooks) {
       try {
         return options.convertToPath(options.getValue(nestedResolvedValue.path));
       } catch (e) {
-        throw new NestedError__default["default"](`Unable to resolve path segment: ${nestedResolvedValue.path}`, e);
+        throw new tsNestedError.NestedError(`Unable to resolve path segment: ${nestedResolvedValue.path}`, e);
       }
     }
     if (node.name === "Expression") {
@@ -400,7 +400,7 @@ function resolveBindingAST(bindingPathNode, options, hooks) {
         const actualValue = options.evaluate(node.value);
         return options.convertToPath(actualValue);
       } catch (e) {
-        throw new NestedError__default["default"](`Unable to resolve path: ${node.value}`, e);
+        throw new tsNestedError.NestedError(`Unable to resolve path: ${node.value}`, e);
       }
     }
     throw new Error(`Unable to resolve value for node: ${node.name}`);
@@ -470,6 +470,8 @@ var __spreadValues$d = (a, b) => {
   return a;
 };
 const SIMPLE_BINDING_REGEX = /^[\w\-@]+(\.[\w\-@]+)*$/;
+const BINDING_BRACKETS_REGEX = /[\s()*=`{}'"[\]]/;
+const LAZY_BINDING_REGEX = /^[^.]+(\..+)*$/;
 const DEFAULT_OPTIONS = {
   get: () => {
     throw new Error("Not Implemented");
@@ -494,7 +496,7 @@ class BindingParser {
   }
   normalizePath(path, resolveOptions) {
     var _a, _b;
-    if (path.match(SIMPLE_BINDING_REGEX) && this.hooks.skipOptimization.call(path) !== true) {
+    if (!BINDING_BRACKETS_REGEX.test(path) && LAZY_BINDING_REGEX.test(path) && this.hooks.skipOptimization.call(path) !== true) {
       return { path: path.split("."), updates: void 0 };
     }
     const ast = (_a = this.parseCache[path]) != null ? _a : parse$1(path);
@@ -505,7 +507,7 @@ class BindingParser {
     try {
       return resolveBindingAST(ast.path, resolveOptions, this.hooks);
     } catch (e) {
-      throw new NestedError__default["default"](`Cannot resolve binding: ${path}`, e);
+      throw new tsNestedError.NestedError(`Cannot resolve binding: ${path}`, e);
     }
   }
   getBindingForNormalizedResult(normalized) {
@@ -3757,6 +3759,14 @@ var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 const SCHEMA_VALIDATION_PROVIDER_NAME = "schema";
 const VIEW_VALIDATION_PROVIDER_NAME = "view";
 const VALIDATION_PROVIDER_NAME_SYMBOL = Symbol.for("validation-provider-name");
+function isSubset(subset, containingSet) {
+  if (subset.size > containingSet.size)
+    return false;
+  for (const entry of subset)
+    if (!containingSet.has(entry))
+      return false;
+  return true;
+}
 function createStatefulValidationObject(obj) {
   return {
     value: obj,
@@ -3818,24 +3828,27 @@ class ValidatedBinding {
       });
     }
   }
-  runApplicableValidations(runner, canDismiss) {
-    this.applicableValidations = this.applicableValidations.map((obj) => {
+  runApplicableValidations(runner, canDismiss, phase) {
+    this.applicableValidations = this.applicableValidations.map((originalValue) => {
       var _a, _b, _c;
-      if (obj.state === "dismissed") {
-        return obj;
+      if (originalValue.state === "dismissed") {
+        return originalValue;
       }
-      const blocking = (_a = obj.value.blocking) != null ? _a : obj.value.severity === "warning" && "once" || true;
+      const blocking = (_a = originalValue.value.blocking) != null ? _a : originalValue.value.severity === "warning" && "once" || true;
+      const obj = timm.setIn(originalValue, ["value", "blocking"], blocking);
       const isBlockingNavigation = blocking === true || blocking === "once" && !canDismiss;
-      const dismissable = canDismiss && blocking === "once";
-      if (this.currentPhase === "navigation" && obj.state === "active" && dismissable) {
+      if (phase === "navigation" && obj.state === "active" && obj.value.blocking !== true) {
         if (obj.value.severity === "warning") {
           const warn = obj;
-          if (warn.dismissable && warn.response.dismiss) {
+          if (warn.dismissable && warn.response.dismiss && (warn.response.blocking !== "once" || !warn.response.blocking)) {
             warn.response.dismiss();
           } else {
+            if ((warn == null ? void 0 : warn.response.blocking) === "once") {
+              warn.response.blocking = false;
+            }
             warn.dismissable = true;
           }
-          return obj;
+          return warn;
         }
       }
       const response = runner(obj.value);
@@ -3844,7 +3857,7 @@ class ValidatedBinding {
         value: obj.value,
         state: response ? "active" : "none",
         isBlockingNavigation,
-        dismissable: obj.value.severity === "warning" && this.currentPhase === "navigation",
+        dismissable: obj.value.severity === "warning" && phase === "navigation",
         response: response ? __spreadProps$2(__spreadValues$3({}, obj.value), {
           message: (_b = response.message) != null ? _b : "Something is broken",
           severity: obj.value.severity,
@@ -3862,11 +3875,12 @@ class ValidatedBinding {
     });
   }
   update(phase, canDismiss, runner) {
+    const newApplicableValidations = [];
     if (phase === "load" && this.currentPhase !== void 0) {
       return;
     }
     if (this.currentPhase === "navigation" || phase === this.currentPhase) {
-      this.runApplicableValidations(runner, canDismiss);
+      this.runApplicableValidations(runner, canDismiss, phase);
       return;
     }
     if (phase === "load") {
@@ -3879,14 +3893,19 @@ class ValidatedBinding {
         ...this.validationsByState.change
       ];
     } else if (phase === "navigation" && (this.currentPhase === "load" || this.currentPhase === "change")) {
+      this.applicableValidations.forEach((element) => {
+        if (!(element.type === "error" && element.state === "active" && element.isBlockingNavigation === false)) {
+          newApplicableValidations.push(element);
+        }
+      });
       this.applicableValidations = [
-        ...this.applicableValidations,
-        ...this.currentPhase === "load" ? this.validationsByState.change : [],
-        ...this.validationsByState.navigation
+        ...newApplicableValidations,
+        ...this.validationsByState.navigation,
+        ...this.currentPhase === "load" ? this.validationsByState.change : []
       ];
       this.currentPhase = "navigation";
     }
-    this.runApplicableValidations(runner, canDismiss);
+    this.runApplicableValidations(runner, canDismiss, phase);
   }
 }
 class ValidationController {
@@ -4120,19 +4139,11 @@ class ValidationController {
     updateValidations(!isNavigationTrigger);
     if (isNavigationTrigger) {
       const { activeBindings } = this;
-      if (this.setCompare(lastActiveBindings, activeBindings)) {
+      if (isSubset(activeBindings, lastActiveBindings)) {
         updateValidations(true);
       }
     }
   }
-  setCompare(set1, set2) {
-    if (set1.size !== set2.size)
-      return false;
-    for (const entry of set1)
-      if (!set2.has(entry))
-        return false;
-    return true;
-  }
   get activeBindings() {
     return new Set(Array.from(this.getBindings()).filter((b) => {
       var _a;
@@ -4480,6 +4491,25 @@ class ViewController {
   }
 }
 
+class ReadOnlyDataController {
+  constructor(controller, logger) {
+    this.controller = controller;
+    this.logger = logger;
+  }
+  get(binding, options) {
+    return this.controller.get(binding, options);
+  }
+  set(transaction, options) {
+    var _a;
+    (_a = this.logger) == null ? void 0 : _a.error("Error: Tried to set in a read only instance of the DataController");
+    return [];
+  }
+  delete(binding, options) {
+    var _a;
+    (_a = this.logger) == null ? void 0 : _a.error("Error: Tried to delete in a read only instance of the DataController");
+  }
+}
+
 class DataController {
   constructor(model, options) {
     this.hooks = {
@@ -4604,6 +4634,9 @@ class DataController {
   serialize() {
     return this.hooks.serialize.call(this.get(""));
   }
+  makeReadOnly() {
+    return new ReadOnlyDataController(this, this.logger);
+  }
 }
 
 var __defProp$1 = Object.defineProperty;
@@ -4783,8 +4816,8 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const PLAYER_VERSION = "0.4.0-next.9";
-const COMMIT = "e7681a2757fe0ab15d0c0e27c11d0ed33334d63f";
+const PLAYER_VERSION = "0.4.1-next.0";
+const COMMIT = "3fca14a3bf47195b400f5989a2f3ecbc5f73ac4b";
 const _Player = class {
   constructor(config) {
     this.logger = new TapableLogger();
@@ -5058,7 +5091,10 @@ const _Player = class {
         const endProps = {
           ref,
           status: "completed",
-          flow: state.flow
+          flow: state.flow,
+          controllers: {
+            data: state.controllers.data.makeReadOnly()
+          }
         };
         return maybeUpdateState(__spreadValues(__spreadValues({}, yield state.flowResult), endProps));
       } catch (error) {
@@ -5082,6 +5118,7 @@ Player.info = {
 
 exports.ApplicabilityPlugin = ApplicabilityPlugin;
 exports.AssetTransformCorePlugin = AssetTransformCorePlugin;
+exports.BINDING_BRACKETS_REGEX = BINDING_BRACKETS_REGEX;
 exports.BindingInstance = BindingInstance;
 exports.BindingParser = BindingParser;
 exports.Builder = Builder;

package/dist/index.d.ts

@@ -123,6 +123,8 @@ declare function getBindingSegments(binding: BindingLike): Array<string | number
 declare function findInArray<T extends Record<string | number, object>>(array: Array<T>, key: string | number, value: T): number | undefined;
 
 declare const SIMPLE_BINDING_REGEX: RegExp;
+declare const BINDING_BRACKETS_REGEX: RegExp;
+declare type BeforeResolveNodeContext = Required<NormalizedResult> & ResolveBindingASTOptions;
 /** A parser for creating bindings from a string */
 declare class BindingParser {
     private cache;
@@ -130,7 +132,7 @@ declare class BindingParser {
     private parserOptions;
     hooks: {
         skipOptimization: SyncBailHook<[string], boolean, Record<string, any>>;
-        beforeResolveNode: SyncWaterfallHook<[AnyNode, Required<NormalizedResult> & ResolveBindingASTOptions], Record<string, any>>;
+        beforeResolveNode: SyncWaterfallHook<[AnyNode, BeforeResolveNodeContext], Record<string, any>>;
     };
     constructor(options?: Partial<BindingParserOptions>);
     /**
@@ -1330,7 +1332,6 @@ declare class ValidationController implements BindingTracker {
         message: string;
     } | undefined;
     private updateValidationsForView;
-    private setCompare;
     private get activeBindings();
     getValidator(type: string): ValidatorFunction<unknown> | undefined;
     getBindings(): Set<BindingInstance>;
@@ -1378,6 +1379,16 @@ interface TransformFunctions {
 }
 declare type TransformRegistry = Registry<TransformFunctions>;
 
+/** Wrapper for the Data Controller Class that prevents writes */
+declare class ReadOnlyDataController implements DataModelWithParser<DataModelOptions> {
+    private controller;
+    private logger?;
+    constructor(controller: DataController, logger?: Logger);
+    get(binding: BindingLike, options?: DataModelOptions | undefined): any;
+    set(transaction: [BindingLike, any][], options?: DataModelOptions | undefined): Updates;
+    delete(binding: BindingLike, options?: DataModelOptions | undefined): void;
+}
+
 /** The status for a flow's execution state */
 declare type PlayerFlowStatus = 'not-started' | 'in-progress' | 'completed' | 'error';
 /** Common interface for the state of Player's flow execution */
@@ -1425,7 +1436,13 @@ declare type InProgressState = BaseFlowState<'in-progress'> & PlayerFlowExecutio
     logger: Logger;
 };
 /** The flow completed properly */
-declare type CompletedState = BaseFlowState<'completed'> & PlayerFlowExecutionData & FlowResult;
+declare type CompletedState = BaseFlowState<'completed'> & PlayerFlowExecutionData & FlowResult & {
+    /** Readonly Player controllers to provide Player functionality after the flow has ended */
+    controllers: {
+        /** A read only instance of the Data Controller */
+        data: ReadOnlyDataController;
+    };
+};
 /** The flow finished but not successfully */
 declare type ErrorState = BaseFlowState<'error'> & {
     /** The currently executing flow */
@@ -1472,6 +1489,7 @@ declare class DataController implements DataModelWithParser<DataModelOptions> {
     get(binding: BindingLike, options?: DataModelOptions): any;
     delete(binding: BindingLike, options?: DataModelOptions): void;
     serialize(): object;
+    makeReadOnly(): ReadOnlyDataController;
 }
 
 interface ViewControllerOptions {
@@ -1775,4 +1793,4 @@ declare class FlowExpPlugin implements PlayerPlugin {
     apply(player: Player): void;
 }
 
-export { AnyAssetType, ApplicabilityPlugin, ArrayExpressionNode, AssetTransformCorePlugin, AssignmentNode, BaseFlowState, BaseNode, BasicExpressionTypes, BatchSetTransaction, BeforeTransformFunction, BinaryNode, BinaryOperator, BinaryOperatorAdvanced, BinaryOperatorBasic, BindingFactory, BindingInstance, BindingLike, BindingParser, BindingParserOptions, BindingTracker, Builder, CallExpressionNode, CompletedState, CompoundNode, ConditionalExpressionNode, ConsoleLogger, ConstantsController, ConstantsProvider, ControllerState, DataController, DataModelImpl, DataModelMiddleware, DataModelOptions, DataModelWithParser, DataPipeline, DependencyMiddleware, DependencyModel, DependencySets, DependencyTracker, DirectionalNode, EMPTY_NODE, ErrorState, ErrorValidationResponse, ExpNodeOpaqueIdentifier, ExpressionContext, ExpressionEvaluator, ExpressionEvaluatorFunction, ExpressionEvaluatorOptions, ExpressionHandler, ExpressionLiteralType, ExpressionNode, ExpressionNodeType, ExpressionObjectType, ExpressionType, ExtendedPlayerPlugin, FlowController, FlowExpPlugin, FlowInstance, FormatDefinition, FormatFunction, FormatHandler, FormatOptions, FormatType, Getter, HookOptions, IdentifierNode, InProgressState, LiteralNode, LocalModel, LocalStateStore, LogFn, Logger, LoggerProvider, LogicalNode, MemberExpressionNode, MiddlewareChecker, ModelRefNode, ModificationNode, NOOPDataModel, NOOP_MODEL, NOT_STARTED_STATE, NamedState, Node, NodeLocation, NodePosition, NodeType, NoopLogger, NotStartedState, ObjectNode, OperatorProcessingOptions, Options, ParseObjectOptions, Parser, PipelinedDataModel, Player, PlayerConfigOptions, PlayerFlowExecutionData, PlayerFlowState, PlayerFlowStatus, PlayerInfo, PlayerPlugin, PlayerUtils, ProxyLogger, ROOT_BINDING, RawBinding, RawBindingSegment, RawSetTransaction, RawSetType, Resolve, Resolver, SCHEMA_VALIDATION_PROVIDER_NAME, SIMPLE_BINDING_REGEX, SchemaController, Severity, StatefulValidationObject, Store, StringResolverPlugin, StrongOrWeakBinding, SwitchPlugin, TapableLogger, TemplatePlugin, ThisNode, TransformFunction, TransformFunctions, TransformRegistry, TransitionFunction, TransitionOptions, UnaryNode, UnaryOperator, Updates, VALIDATION_PROVIDER_NAME_SYMBOL, VIEW_VALIDATION_PROVIDER_NAME, ValidationBindingTrackerViewPlugin, ValidationController, ValidationGetResolveOptions, ValidationMiddleware, ValidationObject, ValidationObjectWithHandler, ValidationObjectWithSource, ValidationProvider, ValidationResponse, ValidatorContext, ValidatorFunction, ValidatorRegistry, ViewController, ViewControllerOptions, ViewInstance, ViewPlugin, WarningValidationResponse, caresAboutDataChanges, constructModelForPipeline, findClosestNodeAtPosition, findInArray, findNextExp, getBindingSegments, isBinding, isExpressionNode, isObjectExpression, maybeConvertToNum, parse, parseExpression, removeBindingAndChildrenFromMap, resolveDataRefs, resolveDataRefsInString, resolveExpressionsInString, severities, toModel, toNodeResolveOptions, withParser, withoutContext };
+export { AnyAssetType, ApplicabilityPlugin, ArrayExpressionNode, AssetTransformCorePlugin, AssignmentNode, BINDING_BRACKETS_REGEX, BaseFlowState, BaseNode, BasicExpressionTypes, BatchSetTransaction, BeforeTransformFunction, BinaryNode, BinaryOperator, BinaryOperatorAdvanced, BinaryOperatorBasic, BindingFactory, BindingInstance, BindingLike, BindingParser, BindingParserOptions, BindingTracker, Builder, CallExpressionNode, CompletedState, CompoundNode, ConditionalExpressionNode, ConsoleLogger, ConstantsController, ConstantsProvider, ControllerState, DataController, DataModelImpl, DataModelMiddleware, DataModelOptions, DataModelWithParser, DataPipeline, DependencyMiddleware, DependencyModel, DependencySets, DependencyTracker, DirectionalNode, EMPTY_NODE, ErrorState, ErrorValidationResponse, ExpNodeOpaqueIdentifier, ExpressionContext, ExpressionEvaluator, ExpressionEvaluatorFunction, ExpressionEvaluatorOptions, ExpressionHandler, ExpressionLiteralType, ExpressionNode, ExpressionNodeType, ExpressionObjectType, ExpressionType, ExtendedPlayerPlugin, FlowController, FlowExpPlugin, FlowInstance, FormatDefinition, FormatFunction, FormatHandler, FormatOptions, FormatType, Getter, HookOptions, IdentifierNode, InProgressState, LiteralNode, LocalModel, LocalStateStore, LogFn, Logger, LoggerProvider, LogicalNode, MemberExpressionNode, MiddlewareChecker, ModelRefNode, ModificationNode, NOOPDataModel, NOOP_MODEL, NOT_STARTED_STATE, NamedState, Node, NodeLocation, NodePosition, NodeType, NoopLogger, NotStartedState, ObjectNode, OperatorProcessingOptions, Options, ParseObjectOptions, Parser, PipelinedDataModel, Player, PlayerConfigOptions, PlayerFlowExecutionData, PlayerFlowState, PlayerFlowStatus, PlayerInfo, PlayerPlugin, PlayerUtils, ProxyLogger, ROOT_BINDING, RawBinding, RawBindingSegment, RawSetTransaction, RawSetType, Resolve, Resolver, SCHEMA_VALIDATION_PROVIDER_NAME, SIMPLE_BINDING_REGEX, SchemaController, Severity, StatefulValidationObject, Store, StringResolverPlugin, StrongOrWeakBinding, SwitchPlugin, TapableLogger, TemplatePlugin, ThisNode, TransformFunction, TransformFunctions, TransformRegistry, TransitionFunction, TransitionOptions, UnaryNode, UnaryOperator, Updates, VALIDATION_PROVIDER_NAME_SYMBOL, VIEW_VALIDATION_PROVIDER_NAME, ValidationBindingTrackerViewPlugin, ValidationController, ValidationGetResolveOptions, ValidationMiddleware, ValidationObject, ValidationObjectWithHandler, ValidationObjectWithSource, ValidationProvider, ValidationResponse, ValidatorContext, ValidatorFunction, ValidatorRegistry, ViewController, ViewControllerOptions, ViewInstance, ViewPlugin, WarningValidationResponse, caresAboutDataChanges, constructModelForPipeline, findClosestNodeAtPosition, findInArray, findNextExp, getBindingSegments, isBinding, isExpressionNode, isObjectExpression, maybeConvertToNum, parse, parseExpression, removeBindingAndChildrenFromMap, resolveDataRefs, resolveDataRefsInString, resolveExpressionsInString, severities, toModel, toNodeResolveOptions, withParser, withoutContext };

package/dist/index.esm.js

@@ -1,6 +1,6 @@
 export * from '@player-ui/types';
 import { SyncBailHook, SyncWaterfallHook, SyncHook } from 'tapable-ts';
-import NestedError from 'nested-error-stacks';
+import { NestedError } from 'ts-nested-error';
 import flatten$1 from 'arr-flatten';
 import P from 'parsimmon';
 import { Grammars } from 'ebnf';
@@ -93,7 +93,8 @@ const isIdentifierChar = (char) => {
     return false;
   }
   const charCode = char.charCodeAt(0);
-  return charCode >= 48 && charCode <= 57 || charCode >= 65 && charCode <= 90 || charCode >= 97 && charCode <= 122 || charCode === 95 || charCode === 45 || charCode === 64;
+  const matches = charCode === 32 || charCode === 34 || charCode === 39 || charCode === 40 || charCode === 41 || charCode === 42 || charCode === 46 || charCode === 61 || charCode === 91 || charCode === 93 || charCode === 96 || charCode === 123 || charCode === 125;
+  return !matches;
 };
 const parse$1 = (path) => {
   let index = 1;
@@ -457,6 +458,8 @@ var __spreadValues$d = (a, b) => {
   return a;
 };
 const SIMPLE_BINDING_REGEX = /^[\w\-@]+(\.[\w\-@]+)*$/;
+const BINDING_BRACKETS_REGEX = /[\s()*=`{}'"[\]]/;
+const LAZY_BINDING_REGEX = /^[^.]+(\..+)*$/;
 const DEFAULT_OPTIONS = {
   get: () => {
     throw new Error("Not Implemented");
@@ -481,7 +484,7 @@ class BindingParser {
   }
   normalizePath(path, resolveOptions) {
     var _a, _b;
-    if (path.match(SIMPLE_BINDING_REGEX) && this.hooks.skipOptimization.call(path) !== true) {
+    if (!BINDING_BRACKETS_REGEX.test(path) && LAZY_BINDING_REGEX.test(path) && this.hooks.skipOptimization.call(path) !== true) {
       return { path: path.split("."), updates: void 0 };
     }
     const ast = (_a = this.parseCache[path]) != null ? _a : parse$1(path);
@@ -3744,6 +3747,14 @@ var __spreadProps$2 = (a, b) => __defProps$2(a, __getOwnPropDescs$2(b));
 const SCHEMA_VALIDATION_PROVIDER_NAME = "schema";
 const VIEW_VALIDATION_PROVIDER_NAME = "view";
 const VALIDATION_PROVIDER_NAME_SYMBOL = Symbol.for("validation-provider-name");
+function isSubset(subset, containingSet) {
+  if (subset.size > containingSet.size)
+    return false;
+  for (const entry of subset)
+    if (!containingSet.has(entry))
+      return false;
+  return true;
+}
 function createStatefulValidationObject(obj) {
   return {
     value: obj,
@@ -3805,24 +3816,27 @@ class ValidatedBinding {
       });
     }
   }
-  runApplicableValidations(runner, canDismiss) {
-    this.applicableValidations = this.applicableValidations.map((obj) => {
+  runApplicableValidations(runner, canDismiss, phase) {
+    this.applicableValidations = this.applicableValidations.map((originalValue) => {
       var _a, _b, _c;
-      if (obj.state === "dismissed") {
-        return obj;
+      if (originalValue.state === "dismissed") {
+        return originalValue;
       }
-      const blocking = (_a = obj.value.blocking) != null ? _a : obj.value.severity === "warning" && "once" || true;
+      const blocking = (_a = originalValue.value.blocking) != null ? _a : originalValue.value.severity === "warning" && "once" || true;
+      const obj = setIn(originalValue, ["value", "blocking"], blocking);
       const isBlockingNavigation = blocking === true || blocking === "once" && !canDismiss;
-      const dismissable = canDismiss && blocking === "once";
-      if (this.currentPhase === "navigation" && obj.state === "active" && dismissable) {
+      if (phase === "navigation" && obj.state === "active" && obj.value.blocking !== true) {
         if (obj.value.severity === "warning") {
           const warn = obj;
-          if (warn.dismissable && warn.response.dismiss) {
+          if (warn.dismissable && warn.response.dismiss && (warn.response.blocking !== "once" || !warn.response.blocking)) {
             warn.response.dismiss();
           } else {
+            if ((warn == null ? void 0 : warn.response.blocking) === "once") {
+              warn.response.blocking = false;
+            }
             warn.dismissable = true;
           }
-          return obj;
+          return warn;
         }
       }
       const response = runner(obj.value);
@@ -3831,7 +3845,7 @@ class ValidatedBinding {
         value: obj.value,
         state: response ? "active" : "none",
         isBlockingNavigation,
-        dismissable: obj.value.severity === "warning" && this.currentPhase === "navigation",
+        dismissable: obj.value.severity === "warning" && phase === "navigation",
         response: response ? __spreadProps$2(__spreadValues$3({}, obj.value), {
           message: (_b = response.message) != null ? _b : "Something is broken",
           severity: obj.value.severity,
@@ -3849,11 +3863,12 @@ class ValidatedBinding {
     });
   }
   update(phase, canDismiss, runner) {
+    const newApplicableValidations = [];
     if (phase === "load" && this.currentPhase !== void 0) {
       return;
     }
     if (this.currentPhase === "navigation" || phase === this.currentPhase) {
-      this.runApplicableValidations(runner, canDismiss);
+      this.runApplicableValidations(runner, canDismiss, phase);
       return;
     }
     if (phase === "load") {
@@ -3866,14 +3881,19 @@ class ValidatedBinding {
         ...this.validationsByState.change
       ];
     } else if (phase === "navigation" && (this.currentPhase === "load" || this.currentPhase === "change")) {
+      this.applicableValidations.forEach((element) => {
+        if (!(element.type === "error" && element.state === "active" && element.isBlockingNavigation === false)) {
+          newApplicableValidations.push(element);
+        }
+      });
       this.applicableValidations = [
-        ...this.applicableValidations,
-        ...this.currentPhase === "load" ? this.validationsByState.change : [],
-        ...this.validationsByState.navigation
+        ...newApplicableValidations,
+        ...this.validationsByState.navigation,
+        ...this.currentPhase === "load" ? this.validationsByState.change : []
       ];
       this.currentPhase = "navigation";
     }
-    this.runApplicableValidations(runner, canDismiss);
+    this.runApplicableValidations(runner, canDismiss, phase);
   }
 }
 class ValidationController {
@@ -4107,19 +4127,11 @@ class ValidationController {
     updateValidations(!isNavigationTrigger);
     if (isNavigationTrigger) {
       const { activeBindings } = this;
-      if (this.setCompare(lastActiveBindings, activeBindings)) {
+      if (isSubset(activeBindings, lastActiveBindings)) {
         updateValidations(true);
       }
     }
   }
-  setCompare(set1, set2) {
-    if (set1.size !== set2.size)
-      return false;
-    for (const entry of set1)
-      if (!set2.has(entry))
-        return false;
-    return true;
-  }
   get activeBindings() {
     return new Set(Array.from(this.getBindings()).filter((b) => {
       var _a;
@@ -4467,6 +4479,25 @@ class ViewController {
   }
 }
 
+class ReadOnlyDataController {
+  constructor(controller, logger) {
+    this.controller = controller;
+    this.logger = logger;
+  }
+  get(binding, options) {
+    return this.controller.get(binding, options);
+  }
+  set(transaction, options) {
+    var _a;
+    (_a = this.logger) == null ? void 0 : _a.error("Error: Tried to set in a read only instance of the DataController");
+    return [];
+  }
+  delete(binding, options) {
+    var _a;
+    (_a = this.logger) == null ? void 0 : _a.error("Error: Tried to delete in a read only instance of the DataController");
+  }
+}
+
 class DataController {
   constructor(model, options) {
     this.hooks = {
@@ -4591,6 +4622,9 @@ class DataController {
   serialize() {
     return this.hooks.serialize.call(this.get(""));
   }
+  makeReadOnly() {
+    return new ReadOnlyDataController(this, this.logger);
+  }
 }
 
 var __defProp$1 = Object.defineProperty;
@@ -4770,8 +4804,8 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const PLAYER_VERSION = "0.4.0-next.9";
-const COMMIT = "e7681a2757fe0ab15d0c0e27c11d0ed33334d63f";
+const PLAYER_VERSION = "0.4.1-next.0";
+const COMMIT = "3fca14a3bf47195b400f5989a2f3ecbc5f73ac4b";
 const _Player = class {
   constructor(config) {
     this.logger = new TapableLogger();
@@ -5045,7 +5079,10 @@ const _Player = class {
         const endProps = {
           ref,
           status: "completed",
-          flow: state.flow
+          flow: state.flow,
+          controllers: {
+            data: state.controllers.data.makeReadOnly()
+          }
         };
         return maybeUpdateState(__spreadValues(__spreadValues({}, yield state.flowResult), endProps));
       } catch (error) {
@@ -5067,5 +5104,5 @@ Player.info = {
   commit: COMMIT
 };
 
-export { ApplicabilityPlugin, AssetTransformCorePlugin, BindingInstance, BindingParser, Builder, ConsoleLogger, ConstantsController, DataController, DependencyMiddleware, DependencyModel, DependencyTracker, EMPTY_NODE, ExpNodeOpaqueIdentifier, ExpressionEvaluator, FlowController, FlowExpPlugin, FlowInstance, LocalModel, LocalStateStore, NOOPDataModel, NOOP_MODEL, NOT_STARTED_STATE, NodeType, NoopLogger, Parser, PipelinedDataModel, Player, ProxyLogger, ROOT_BINDING, Resolver, SCHEMA_VALIDATION_PROVIDER_NAME, SIMPLE_BINDING_REGEX, SchemaController, StringResolverPlugin, SwitchPlugin, TapableLogger, TemplatePlugin, VALIDATION_PROVIDER_NAME_SYMBOL, VIEW_VALIDATION_PROVIDER_NAME, ValidationBindingTrackerViewPlugin, ValidationController, ValidationMiddleware, ValidatorRegistry, ViewController, ViewInstance, caresAboutDataChanges, constructModelForPipeline, findClosestNodeAtPosition, findInArray, findNextExp, getBindingSegments, isBinding, isExpressionNode, isObjectExpression, maybeConvertToNum, parse, parseExpression, removeBindingAndChildrenFromMap, resolveDataRefs, resolveDataRefsInString, resolveExpressionsInString, severities, toModel, toNodeResolveOptions, withParser, withoutContext };
+export { ApplicabilityPlugin, AssetTransformCorePlugin, BINDING_BRACKETS_REGEX, BindingInstance, BindingParser, Builder, ConsoleLogger, ConstantsController, DataController, DependencyMiddleware, DependencyModel, DependencyTracker, EMPTY_NODE, ExpNodeOpaqueIdentifier, ExpressionEvaluator, FlowController, FlowExpPlugin, FlowInstance, LocalModel, LocalStateStore, NOOPDataModel, NOOP_MODEL, NOT_STARTED_STATE, NodeType, NoopLogger, Parser, PipelinedDataModel, Player, ProxyLogger, ROOT_BINDING, Resolver, SCHEMA_VALIDATION_PROVIDER_NAME, SIMPLE_BINDING_REGEX, SchemaController, StringResolverPlugin, SwitchPlugin, TapableLogger, TemplatePlugin, VALIDATION_PROVIDER_NAME_SYMBOL, VIEW_VALIDATION_PROVIDER_NAME, ValidationBindingTrackerViewPlugin, ValidationController, ValidationMiddleware, ValidatorRegistry, ViewController, ViewInstance, caresAboutDataChanges, constructModelForPipeline, findClosestNodeAtPosition, findInArray, findNextExp, getBindingSegments, isBinding, isExpressionNode, isObjectExpression, maybeConvertToNum, parse, parseExpression, removeBindingAndChildrenFromMap, resolveDataRefs, resolveDataRefsInString, resolveExpressionsInString, severities, toModel, toNodeResolveOptions, withParser, withoutContext };
 //# sourceMappingURL=index.esm.js.map