@player-ui/player 0.3.1-next.1 → 0.4.0-next.0

package/dist/index.esm.js

@@ -834,6 +834,15 @@ function throwError(message, index) {
   err.description = message;
   throw err;
 }
+function createSpanningLocation(start, end) {
+  if (!start || !end) {
+    return;
+  }
+  return {
+    start: start.start,
+    end: end.end
+  };
+}
 function getMaxKeyLen(obj) {
   let maxLen = 0;
   Object.keys(obj).forEach((key) => {
@@ -855,7 +864,7 @@ const thisStr = "this";
 function binaryPrecedence(opVal) {
   return binaryOps[opVal] || 0;
 }
-function createBinaryExpression(operator, left, right) {
+function createBinaryExpression(operator, left, right, location) {
   let type;
   if (operator === "||" || operator === "&&") {
     type = "LogicalExpression";
@@ -871,7 +880,8 @@ function createBinaryExpression(operator, left, right) {
     type,
     operator,
     left,
-    right
+    right,
+    location
   };
 }
 function isDecimalDigit(ch) {
@@ -891,6 +901,16 @@ function parseExpression(expr) {
   const charCodeAtFunc = expr.charCodeAt;
   const { length } = expr;
   let index = 0;
+  const getLocation = (startChar) => {
+    return {
+      start: {
+        character: startChar
+      },
+      end: {
+        character: index
+      }
+    };
+  };
   function exprI(i) {
     return charAtFunc.call(expr, i);
   }
@@ -904,6 +924,7 @@ function parseExpression(expr) {
     let key;
     let value;
     let chCode;
+    const startCharIndex = index;
     ++index;
     while (index < length) {
       gobbleSpaces();
@@ -949,7 +970,8 @@ function parseExpression(expr) {
     return {
       __id: ExpNodeOpaqueIdentifier,
       type: "Object",
-      attributes
+      attributes,
+      location: getLocation(startCharIndex)
     };
   }
   function gobbleSpaces() {
@@ -961,6 +983,7 @@ function parseExpression(expr) {
   function gobbleExpression() {
     const test = gobbleBinaryExpression();
     gobbleSpaces();
+    const startCharIndex = index;
     if (index < length && exprICode(index) === QUMARK_CODE) {
       index++;
       const consequent = gobbleExpression();
@@ -979,7 +1002,8 @@ function parseExpression(expr) {
           type: "ConditionalExpression",
           test,
           consequent,
-          alternate
+          alternate,
+          location: getLocation(startCharIndex)
         };
       }
       throwError("Expected :", index);
@@ -1025,7 +1049,7 @@ function parseExpression(expr) {
         right = stack.pop();
         biop = stack.pop().value;
         left = stack.pop();
-        node = createBinaryExpression(biop, left, right);
+        node = createBinaryExpression(biop, left, right, createSpanningLocation(left.location, right.location));
         stack.push(node);
       }
       node = gobbleToken();
@@ -1038,7 +1062,7 @@ function parseExpression(expr) {
     i = stack.length - 1;
     node = stack[i];
     while (i > 1) {
-      node = createBinaryExpression(stack[i - 1].value, stack[i - 2], node);
+      node = createBinaryExpression(stack[i - 1].value, stack[i - 2], node, createSpanningLocation(stack[i - 2].location, node.location));
       i -= 2;
     }
     return node;
@@ -1046,6 +1070,7 @@ function parseExpression(expr) {
   function gobbleToken() {
     gobbleSpaces();
     const ch = exprICode(index);
+    const startCharIndex = index;
     if (isDecimalDigit(ch) || ch === PERIOD_CODE) {
       return gobbleNumericLiteral();
     }
@@ -1074,7 +1099,8 @@ function parseExpression(expr) {
           type: "UnaryExpression",
           operator: toCheck,
           argument: gobbleToken(),
-          prefix: true
+          prefix: true,
+          location: getLocation(startCharIndex)
         };
       }
       toCheck = toCheck.substr(0, --tcLen);
@@ -1083,6 +1109,7 @@ function parseExpression(expr) {
   }
   function gobbleNumericLiteral() {
     let num = "";
+    const startCharIndex = index;
     while (isDecimalDigit(exprICode(index))) {
       num += exprI(index++);
     }
@@ -1116,13 +1143,15 @@ function parseExpression(expr) {
       __id: ExpNodeOpaqueIdentifier,
       type: "Literal",
       value: parseFloat(num),
-      raw: num
+      raw: num,
+      location: getLocation(startCharIndex)
     };
   }
   function gobbleStringLiteral() {
     const quote = exprI(index++);
     let str = "";
     let closed = false;
+    const startCharIndex = index;
     while (index < length) {
       let ch = exprI(index++);
       if (ch === quote) {
@@ -1162,13 +1191,15 @@ function parseExpression(expr) {
       __id: ExpNodeOpaqueIdentifier,
       type: "Literal",
       value: str,
-      raw: `${quote}${str}${quote}`
+      raw: `${quote}${str}${quote}`,
+      location: getLocation(startCharIndex)
     };
   }
   function gobbleModelRef() {
     let str = "";
     let closed = false;
     let openBraceCount = 1;
+    const startCharIndex = index;
     index += 2;
     while (index < length) {
       const ch = exprI(index++);
@@ -1194,7 +1225,8 @@ function parseExpression(expr) {
     return {
       __id: ExpNodeOpaqueIdentifier,
       type: "ModelRef",
-      ref: str
+      ref: str,
+      location: getLocation(startCharIndex)
     };
   }
   function gobbleIdentifier() {
@@ -1219,19 +1251,22 @@ function parseExpression(expr) {
         __id: ExpNodeOpaqueIdentifier,
         type: "Literal",
         value: literals[identifier],
-        raw: identifier
+        raw: identifier,
+        location: getLocation(start)
       };
     }
     if (identifier === thisStr) {
       return {
         __id: ExpNodeOpaqueIdentifier,
-        type: "ThisExpression"
+        type: "ThisExpression",
+        location: getLocation(start)
       };
     }
     return {
       __id: ExpNodeOpaqueIdentifier,
       type: "Identifier",
-      name: identifier
+      name: identifier,
+      location: getLocation(start)
     };
   }
   function gobbleArguments(termination) {
@@ -1260,6 +1295,7 @@ function parseExpression(expr) {
   function gobbleVariable() {
     let charIndex = exprICode(index);
     let node = charIndex === OPAREN_CODE ? gobbleGroup() : gobbleIdentifier();
+    const startCharIndex = index;
     gobbleSpaces();
     charIndex = exprICode(index);
     while (charIndex === PERIOD_CODE || charIndex === OBRACK_CODE || charIndex === OPAREN_CODE) {
@@ -1271,7 +1307,8 @@ function parseExpression(expr) {
           type: "MemberExpression",
           computed: false,
           object: node,
-          property: gobbleIdentifier()
+          property: gobbleIdentifier(),
+          location: getLocation(startCharIndex)
         };
       } else if (charIndex === OBRACK_CODE) {
         node = {
@@ -1279,7 +1316,8 @@ function parseExpression(expr) {
           type: "MemberExpression",
           computed: true,
           object: node,
-          property: gobbleExpression()
+          property: gobbleExpression(),
+          location: getLocation(startCharIndex)
         };
         gobbleSpaces();
         charIndex = exprICode(index);
@@ -1292,7 +1330,8 @@ function parseExpression(expr) {
           __id: ExpNodeOpaqueIdentifier,
           type: "CallExpression",
           args: gobbleArguments(CPAREN_CODE),
-          callTarget: node
+          callTarget: node,
+          location: getLocation(startCharIndex)
         };
       }
       gobbleSpaces();
@@ -1311,11 +1350,13 @@ function parseExpression(expr) {
     throwError("Unclosed (", index);
   }
   function gobbleArray() {
+    const startCharIndex = index;
     index++;
     return {
       __id: ExpNodeOpaqueIdentifier,
       type: "ArrayExpression",
-      elements: gobbleArguments(CBRACK_CODE)
+      elements: gobbleArguments(CBRACK_CODE),
+      location: getLocation(startCharIndex)
     };
   }
   const nodes = [];
@@ -1338,7 +1379,8 @@ function parseExpression(expr) {
   return {
     __id: ExpNodeOpaqueIdentifier,
     type: "Compound",
-    body: nodes
+    body: nodes,
+    location: getLocation(0)
   };
 }
 
@@ -1616,6 +1658,76 @@ class ExpressionEvaluator {
 function withoutContext(fn) {
   return (_context, ...args) => fn(...args);
 }
+function isInRange(position, location) {
+  return position.character >= location.start.character && position.character <= location.end.character;
+}
+function findClosestNodeAtPosition(node, position) {
+  var _a, _b, _c, _d, _e;
+  switch (node.type) {
+    case "Modification":
+    case "Assignment":
+    case "LogicalExpression":
+    case "BinaryExpression": {
+      const check = (_a = findClosestNodeAtPosition(node.left, position)) != null ? _a : findClosestNodeAtPosition(node.right, position);
+      if (check) {
+        return check;
+      }
+      break;
+    }
+    case "UnaryExpression": {
+      const checkArg = findClosestNodeAtPosition(node.argument, position);
+      if (checkArg) {
+        return checkArg;
+      }
+      break;
+    }
+    case "MemberExpression": {
+      const checkObject = (_b = findClosestNodeAtPosition(node.object, position)) != null ? _b : findClosestNodeAtPosition(node.property, position);
+      if (checkObject) {
+        return checkObject;
+      }
+      break;
+    }
+    case "ConditionalExpression": {
+      const checkObject = (_d = (_c = findClosestNodeAtPosition(node.test, position)) != null ? _c : findClosestNodeAtPosition(node.consequent, position)) != null ? _d : findClosestNodeAtPosition(node.alternate, position);
+      if (checkObject) {
+        return checkObject;
+      }
+      break;
+    }
+    case "ArrayExpression":
+    case "Compound": {
+      const elements = node.type === "ArrayExpression" ? node.elements : node.body;
+      const anyElements = elements.find((e) => findClosestNodeAtPosition(e, position));
+      if (anyElements) {
+        return anyElements;
+      }
+      break;
+    }
+    case "Object": {
+      const checkObject = node.attributes.reduce((found, next) => {
+        var _a2;
+        return (_a2 = found != null ? found : findClosestNodeAtPosition(next.key, position)) != null ? _a2 : findClosestNodeAtPosition(next.value, position);
+      }, void 0);
+      if (checkObject) {
+        return checkObject;
+      }
+      break;
+    }
+    case "CallExpression": {
+      const anyArgs = (_e = node.args.find((arg) => {
+        return findClosestNodeAtPosition(arg, position);
+      })) != null ? _e : findClosestNodeAtPosition(node.callTarget, position);
+      if (anyArgs) {
+        return anyArgs;
+      }
+      break;
+    }
+  }
+  if (node.location && isInRange(position, node.location)) {
+    return node;
+  }
+}
 
 const severities = ["trace", "debug", "info", "warn", "error"];
 
@@ -1952,6 +2064,8 @@ function traverseObject(val, options) {
       return resolveDataRefsInString(val, options);
     }
     case "object": {
+      if (!val)
+        return val;
       const keys = Object.keys(val);
       let newVal = val;
       if (keys.length > 0) {
@@ -2007,14 +2121,22 @@ class ValidationMiddleware {
       if (validations === void 0) {
         nextTransaction.push([binding, value]);
       } else if (validations instanceof Set) {
-        invalidBindings.push(...validations);
+        validations.forEach((validation) => {
+          invalidBindings.push(validation.binding);
+          if (!validation.isStrong) {
+            nextTransaction.push([validation.binding, value]);
+          }
+        });
       } else {
         (_a = this.logger) == null ? void 0 : _a.debug(`Invalid value for path: ${binding.asString()} - ${validations.severity} - ${validations.message}`);
       }
     });
     if (next && nextTransaction.length > 0) {
       nextTransaction.forEach(([binding]) => this.shadowModelPaths.delete(binding));
-      return next.set(nextTransaction, options);
+      const result = next.set(nextTransaction, options);
+      if (invalidBindings.length === 0) {
+        return result;
+      }
     }
     return invalidBindings.map((binding) => {
       return {
@@ -2680,14 +2802,27 @@ const findBasePath = (node) => {
   return findBasePath(parentNode);
 };
 class StringResolverPlugin {
+  constructor() {
+    this.propertiesToSkipCache = new Map();
+  }
   applyResolver(resolver) {
     resolver.hooks.resolve.tap("string-resolver", (value, node, options) => {
-      var _a, _b, _c, _d;
+      var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j;
       if (node.type === NodeType.Empty || node.type === NodeType.Unknown) {
         return null;
       }
       if (node.type === NodeType.Value || node.type === NodeType.Asset || node.type === NodeType.View) {
-        const propsToSkip = new Set(((_b = (_a = node.plugins) == null ? void 0 : _a.stringResolver) == null ? void 0 : _b.propertiesToSkip) ? (_d = (_c = node.plugins) == null ? void 0 : _c.stringResolver) == null ? void 0 : _d.propertiesToSkip : []);
+        let propsToSkip;
+        if (node.type === NodeType.Asset || node.type === NodeType.View) {
+          propsToSkip = new Set((_c = (_b = (_a = node.plugins) == null ? void 0 : _a.stringResolver) == null ? void 0 : _b.propertiesToSkip) != null ? _c : ["exp"]);
+          if ((_d = node.value) == null ? void 0 : _d.id) {
+            this.propertiesToSkipCache.set(node.value.id, propsToSkip);
+          }
+        } else if (((_e = node.parent) == null ? void 0 : _e.type) === NodeType.MultiNode && (((_g = (_f = node.parent) == null ? void 0 : _f.parent) == null ? void 0 : _g.type) === NodeType.Asset || ((_i = (_h = node.parent) == null ? void 0 : _h.parent) == null ? void 0 : _i.type) === NodeType.View) && ((_j = node.parent.parent.value) == null ? void 0 : _j.id) && this.propertiesToSkipCache.has(node.parent.parent.value.id)) {
+          propsToSkip = this.propertiesToSkipCache.get(node.parent.parent.value.id);
+        } else {
+          propsToSkip = new Set(["exp"]);
+        }
         const nodePath = findBasePath(node);
         if (nodePath.length > 0 && nodePath.some((segment) => propsToSkip.has(segment.toString()))) {
           return node.value;
@@ -3513,19 +3648,30 @@ class ValidationController {
   getDataMiddleware() {
     return [
       new ValidationMiddleware((binding) => {
+        var _a;
         if (!this.options) {
           return;
         }
         this.updateValidationsForBinding(binding, "change", this.options);
         const strongValidation = this.getValidationForBinding(binding);
-        if (strongValidation == null ? void 0 : strongValidation.get())
+        if (((_a = strongValidation == null ? void 0 : strongValidation.get()) == null ? void 0 : _a.severity) === "error") {
           return strongValidation.get();
+        }
         const newInvalidBindings = new Set();
-        for (const [, weakValidation] of Array.from(this.validations)) {
-          if (caresAboutDataChanges(new Set([binding]), weakValidation.weakBindings) && (weakValidation == null ? void 0 : weakValidation.get())) {
-            weakValidation == null ? void 0 : weakValidation.weakBindings.forEach(newInvalidBindings.add, newInvalidBindings);
+        this.validations.forEach((weakValidation, strongBinding) => {
+          var _a2;
+          if (caresAboutDataChanges(new Set([binding]), weakValidation.weakBindings) && ((_a2 = weakValidation == null ? void 0 : weakValidation.get()) == null ? void 0 : _a2.severity) === "error") {
+            weakValidation == null ? void 0 : weakValidation.weakBindings.forEach((weakBinding) => {
+              weakBinding === strongBinding ? newInvalidBindings.add({
+                binding: weakBinding,
+                isStrong: true
+              }) : newInvalidBindings.add({
+                binding: weakBinding,
+                isStrong: false
+              });
+            });
           }
-        }
+        });
         if (newInvalidBindings.size > 0) {
           return newInvalidBindings;
         }
@@ -3551,7 +3697,9 @@ class ValidationController {
             ignoreDefaultValue: true
           });
           if (originalValue !== withoutDefault) {
-            this.options.model.set([[binding, originalValue]]);
+            this.options.model.set([[binding, originalValue]], {
+              silent: true
+            });
           }
           this.updateValidationsForBinding(binding, "load", this.options, () => {
             view.update(new Set([binding]));
@@ -3591,7 +3739,7 @@ class ValidationController {
       this.validations.forEach((validation, vBinding) => {
         if (vBinding !== binding && caresAboutDataChanges(new Set([binding]), validation.weakBindings)) {
           validation.update(trigger, true, (validationObj) => {
-            const response = this.validationRunner(validationObj, context, binding);
+            const response = this.validationRunner(validationObj, context, vBinding);
             return response ? { message: response.message } : void 0;
           });
         }
@@ -3678,16 +3826,16 @@ class ValidationController {
     return (_b = (_a = this.tracker) == null ? void 0 : _a.getBindings()) != null ? _b : new Set();
   }
   validateView(trigger = "navigation") {
-    var _a, _b;
     this.updateValidationsForView(trigger);
     const validations = new Map();
-    for (const b of this.getBindings()) {
+    this.getBindings().forEach((b) => {
+      var _a, _b;
       const invalid = (_a = this.getValidationForBinding(b)) == null ? void 0 : _a.get();
       if (invalid) {
         (_b = this.options) == null ? void 0 : _b.logger.debug(`Validation on binding: ${b.asString()} is preventing navigation. ${JSON.stringify(invalid)}`);
         validations.set(b, invalid);
       }
-    }
+    });
     return {
       canTransition: validations.size === 0,
       validations: validations.size ? validations : void 0
@@ -4057,8 +4205,9 @@ class DataController {
       }
     });
     this.hooks.onSet.call(normalizedTransaction);
+    this.hooks.onSet.call(normalizedTransaction);
     if (setUpdates.length > 0) {
-      this.hooks.onUpdate.call(setUpdates);
+      this.hooks.onUpdate.call(setUpdates, options);
     }
     return result;
   }
@@ -4259,8 +4408,8 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-const PLAYER_VERSION = "0.3.1-next.1";
-const COMMIT = "b51603be07572111ca68e73d1b710ed2d0aa9412";
+const PLAYER_VERSION = "0.4.0-next.0";
+const COMMIT = "6f7a8b3424cb819dfcbe830586a92711adf130ba";
 const _Player = class {
   constructor(config) {
     this.logger = new TapableLogger();
@@ -4387,17 +4536,18 @@ const _Player = class {
     }
     flowController.hooks.flow.tap("player", (flow) => {
       flow.hooks.beforeTransition.tap("player", (state, transitionVal) => {
-        if (state.onEnd && (state.transitions[transitionVal] || state.transitions["*"])) {
+        const computedTransitionVal = state.transitions[transitionVal] ? transitionVal : "*";
+        if (state.onEnd && state.transitions[computedTransitionVal]) {
           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]) {
+        if (!("transitions" in state) || !state.transitions[computedTransitionVal]) {
           return state;
         }
-        return setIn(state, ["transitions", transitionVal], resolveStrings(state.transitions[transitionVal]));
+        return setIn(state, ["transitions", computedTransitionVal], resolveStrings(state.transitions[computedTransitionVal]));
       });
       flow.hooks.skipTransition.tap("validation", (currentState) => {
         var _a;
@@ -4425,7 +4575,14 @@ const _Player = class {
         if (newState.value.state_type === "ACTION") {
           const { exp } = newState.value;
           queueMicrotask(() => {
-            flowController == null ? void 0 : flowController.transition(String(expressionEvaluator == null ? void 0 : expressionEvaluator.evaluate(exp)));
+            try {
+              flowController == null ? void 0 : flowController.transition(String(expressionEvaluator == null ? void 0 : expressionEvaluator.evaluate(exp)));
+            } catch (error) {
+              const state = this.getState();
+              if (error instanceof Error && state.status === "in-progress") {
+                state.fail(error);
+              }
+            }
           });
         }
         expressionEvaluator.reset();
@@ -4548,5 +4705,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, SIMPLE_BINDING_REGEX, SchemaController, StringResolverPlugin, SwitchPlugin, TapableLogger, TemplatePlugin, ValidationBindingTrackerViewPlugin, ValidationController, ValidationMiddleware, ValidatorRegistry, ViewController, ViewInstance, caresAboutDataChanges, constructModelForPipeline, findInArray, findNextExp, getBindingSegments, isBinding, isExpressionNode, maybeConvertToNum, parse, resolveDataRefs, resolveDataRefsInString, resolveExpressionsInString, severities, toModel, toNodeResolveOptions, withParser, withoutContext };
+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, SIMPLE_BINDING_REGEX, SchemaController, StringResolverPlugin, SwitchPlugin, TapableLogger, TemplatePlugin, ValidationBindingTrackerViewPlugin, ValidationController, ValidationMiddleware, ValidatorRegistry, ViewController, ViewInstance, caresAboutDataChanges, constructModelForPipeline, findClosestNodeAtPosition, findInArray, findNextExp, getBindingSegments, isBinding, isExpressionNode, maybeConvertToNum, parse, resolveDataRefs, resolveDataRefsInString, resolveExpressionsInString, severities, toModel, toNodeResolveOptions, withParser, withoutContext };
 //# sourceMappingURL=index.esm.js.map

package/package.json

@@ -1,18 +1,18 @@
 {
   "name": "@player-ui/player",
-  "version": "0.3.1-next.1",
+  "version": "0.4.0-next.0",
   "private": false,
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },
   "peerDependencies": {},
   "dependencies": {
-    "@player-ui/partial-match-registry": "0.3.1-next.1",
-    "@player-ui/types": "0.3.1-next.1",
+    "@player-ui/partial-match-registry": "0.4.0-next.0",
+    "@player-ui/types": "0.4.0-next.0",
     "dequal": "^2.0.2",
     "p-defer": "^3.0.0",
     "queue-microtask": "^1.2.3",
-    "tapable-ts": "^0.1.0",
+    "tapable-ts": "^0.2.2",
     "nested-error-stacks": "^2.1.1",
     "@types/nested-error-stacks": "^2.1.0",
     "parsimmon": "^1.12.0",
@@ -20,6 +20,7 @@
     "arr-flatten": "^1.1.0",
     "ebnf": "^1.9.0",
     "timm": "^1.6.2",
+    "error-polyfill": "^0.1.3",
     "@babel/runtime": "7.15.4"
   },
   "main": "dist/index.cjs.js",

package/src/binding/resolver.ts

@@ -1,9 +1,7 @@
 import NestedError from 'nested-error-stacks';
 import type { SyncWaterfallHook } from 'tapable-ts';
 import type { PathNode, AnyNode } from '../binding-grammar';
-
-import { maybeConvertToNum } from '.';
-import { findInArray } from './utils';
+import { findInArray, maybeConvertToNum } from './utils';
 
 export interface NormalizedResult {
   /** The normalized path */

package/src/controllers/data.ts

@@ -27,7 +27,7 @@ export class DataController implements DataModelWithParser<DataModelOptions> {
     onDelete: new SyncHook<[any]>(),
     onSet: new SyncHook<[BatchSetTransaction]>(),
     onGet: new SyncHook<[any, any]>(),
-    onUpdate: new SyncHook<[Updates]>(),
+    onUpdate: new SyncHook<[Updates, DataModelOptions | undefined]>(),
 
     format: new SyncWaterfallHook<[any, BindingInstance]>(),
     deformat: new SyncWaterfallHook<[any, BindingInstance]>(),
@@ -157,8 +157,10 @@ export class DataController implements DataModelWithParser<DataModelOptions> {
 
     this.hooks.onSet.call(normalizedTransaction);
 
+    this.hooks.onSet.call(normalizedTransaction);
+
     if (setUpdates.length > 0) {
-      this.hooks.onUpdate.call(setUpdates);
+      this.hooks.onUpdate.call(setUpdates, options);
     }
 
     return result;