xstate 5.0.0-alpha.2 → 5.0.0-alpha.3

package/dist/{actions-acb29ffe.cjs.prod.js → actions-3910d35f.cjs.prod.js}

@@ -346,14 +346,21 @@ function toArray(value) {
 }
 function mapContext(mapper, context, _event) {
   if (isFunction(mapper)) {
-    return mapper(context, _event.data);
+    return mapper({
+      context: context,
+      event: _event.data
+    });
   }
   var result = {};
+  var args = {
+    context: context,
+    event: _event.data
+  };
   for (var _i4 = 0, _Object$keys2 = Object.keys(mapper); _i4 < _Object$keys2.length; _i4++) {
     var _key3 = _Object$keys2[_i4];
     var subMapper = mapper[_key3];
     if (isFunction(subMapper)) {
-      result[_key3] = subMapper(context, _event.data);
+      result[_key3] = subMapper(args);
     } else {
       result[_key3] = subMapper;
     }
@@ -502,7 +509,9 @@ function send$1(eventOrExpr, options) {
       // there is too big chance of the ID collision
       id: options && options.id !== undefined ? options.id : isFunction(eventOrExpr) ? eventOrExpr.name : eventOrExpr.type
     };
-    var meta = {
+    var args = {
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
       self: (_actorContext$self = actorContext === null || actorContext === void 0 ? void 0 : actorContext.self) !== null && _actorContext$self !== void 0 ? _actorContext$self : null,
@@ -511,15 +520,15 @@ function send$1(eventOrExpr, options) {
     var delaysMap = state.machine.options.delays;
 
     // TODO: helper function for resolving Expr
-    var resolvedEvent = toSCXMLEvent(isFunction(eventOrExpr) ? eventOrExpr(state.context, _event.data, meta) : eventOrExpr);
+    var resolvedEvent = toSCXMLEvent(isFunction(eventOrExpr) ? eventOrExpr(args) : eventOrExpr);
     var resolvedDelay;
     if (isString(params.delay)) {
       var configDelay = delaysMap && delaysMap[params.delay];
-      resolvedDelay = isFunction(configDelay) ? configDelay(state.context, _event.data, meta) : configDelay;
+      resolvedDelay = isFunction(configDelay) ? configDelay(args) : configDelay;
     } else {
-      resolvedDelay = isFunction(params.delay) ? params.delay(state.context, _event.data, meta) : params.delay;
+      resolvedDelay = isFunction(params.delay) ? params.delay(args) : params.delay;
     }
-    var resolvedTarget = isFunction(params.to) ? params.to(state.context, _event.data, meta) : params.to;
+    var resolvedTarget = isFunction(params.to) ? params.to(args) : params.to;
     var targetActorRef;
     if (typeof resolvedTarget === 'string') {
       if (resolvedTarget === exports.SpecialTargets.Parent) {
@@ -591,7 +600,7 @@ function sendParent(event, options) {
  */
 function respond(event, options) {
   return send$1(event, _objectSpread2(_objectSpread2({}, options), {}, {
-    to: function to(_, __, _ref2) {
+    to: function to(_ref2) {
       var _event = _ref2._event;
       return _event.origin; // TODO: handle when _event.origin is undefined
     }
@@ -615,7 +624,8 @@ function forwardTo(target, options) {
       return resolvedTarget;
     };
   }
-  return send$1(function (_, event) {
+  return send$1(function (_ref3) {
+    var event = _ref3.event;
     return event;
   }, _objectSpread2(_objectSpread2({}, options), {}, {
     to: target
@@ -630,10 +640,10 @@ function forwardTo(target, options) {
  * @param options Options to pass into the send action creator.
  */
 function escalate(errorData, options) {
-  return sendParent(function (context, event, meta) {
+  return sendParent(function (arg) {
     return {
       type: error,
-      data: isFunction(errorData) ? errorData(context, event, meta) : errorData
+      data: isFunction(errorData) ? errorData(arg) : errorData
     };
   }, _objectSpread2(_objectSpread2({}, options), {}, {
     to: exports.SpecialTargets.Parent
@@ -1721,7 +1731,10 @@ function stop$1(actorRef) {
     }
   }, function (_event, _ref) {
     var state = _ref.state;
-    var actorRefOrString = isFunction(actor) ? actor(state.context, _event.data) : actor;
+    var actorRefOrString = isFunction(actor) ? actor({
+      context: state.context,
+      event: _event.data
+    }) : actor;
     var actorRef = typeof actorRefOrString === 'string' ? state.children[actorRefOrString] : actorRefOrString;
     return [state, {
       type: 'xstate.stop',
@@ -1744,7 +1757,9 @@ function stop$1(actorRef) {
   });
 }
 
-var defaultLogExpr = function defaultLogExpr(context, event) {
+var defaultLogExpr = function defaultLogExpr(_ref) {
+  var context = _ref.context,
+    event = _ref.event;
   return {
     context: context,
     event: event
@@ -1769,11 +1784,13 @@ function log$1() {
       label: label,
       expr: expr
     }
-  }, function (_event, _ref) {
+  }, function (_event, _ref2) {
     var _actorContext$self;
-    var state = _ref.state,
-      actorContext = _ref.actorContext;
-    var resolvedValue = typeof expr === 'function' ? expr(state.context, _event.data, {
+    var state = _ref2.state,
+      actorContext = _ref2.actorContext;
+    var resolvedValue = typeof expr === 'function' ? expr({
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
       self: (_actorContext$self = actorContext === null || actorContext === void 0 ? void 0 : actorContext.self) !== null && _actorContext$self !== void 0 ? _actorContext$self : {},
@@ -1816,7 +1833,9 @@ function cancel$1(sendId) {
     var _actorContext$self;
     var state = _ref.state,
       actorContext = _ref.actorContext;
-    var resolvedSendId = isFunction(sendId) ? sendId(state.context, _event.data, {
+    var resolvedSendId = isFunction(sendId) ? sendId({
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
       // TODO: fix types,
@@ -1883,7 +1902,7 @@ function stateIn(stateValue) {
     params: {
       stateValue: stateValue
     },
-    predicate: function predicate(_, __, _ref) {
+    predicate: function predicate(_ref) {
       var state = _ref.state;
       if (isString(stateValue) && isStateId(stateValue)) {
         return state.configuration.some(function (sn) {
@@ -1901,8 +1920,13 @@ function not(guard) {
       op: 'not'
     },
     children: [toGuardDefinition(guard)],
-    predicate: function predicate(ctx, _, meta) {
-      return !meta.evaluate(meta.guard.children[0], ctx, meta._event, meta.state);
+    predicate: function predicate(_ref2) {
+      var evaluate = _ref2.evaluate,
+        guard = _ref2.guard,
+        context = _ref2.context,
+        _event = _ref2._event,
+        state = _ref2.state;
+      return !evaluate(guard.children[0], context, _event, state);
     }
   };
 }
@@ -1915,9 +1939,14 @@ function and(guards) {
     children: guards.map(function (guard) {
       return toGuardDefinition(guard);
     }),
-    predicate: function predicate(ctx, _, meta) {
-      return meta.guard.children.every(function (childGuard) {
-        return meta.evaluate(childGuard, ctx, meta._event, meta.state);
+    predicate: function predicate(_ref3) {
+      var evaluate = _ref3.evaluate,
+        guard = _ref3.guard,
+        context = _ref3.context,
+        _event = _ref3._event,
+        state = _ref3.state;
+      return guard.children.every(function (childGuard) {
+        return evaluate(childGuard, context, _event, state);
       });
     }
   };
@@ -1931,9 +1960,14 @@ function or(guards) {
     children: guards.map(function (guard) {
       return toGuardDefinition(guard);
     }),
-    predicate: function predicate(ctx, _, meta) {
-      return meta.guard.children.some(function (childGuard) {
-        return meta.evaluate(childGuard, ctx, meta._event, meta.state);
+    predicate: function predicate(_ref4) {
+      var evaluate = _ref4.evaluate,
+        guard = _ref4.guard,
+        context = _ref4.context,
+        _event = _ref4._event,
+        state = _ref4.state;
+      return guard.children.some(function (childGuard) {
+        return evaluate(childGuard, context, _event, state);
       });
     }
   };
@@ -1941,17 +1975,18 @@ function or(guards) {
 function evaluateGuard(guard, context, _event, state) {
   var _machine$options$guar, _machine$options, _machine$options$guar2;
   var machine = state.machine;
-  var guardMeta = {
-    state: state,
-    guard: guard,
-    _event: _event,
-    evaluate: evaluateGuard
-  };
   var predicate = (_machine$options$guar = machine === null || machine === void 0 ? void 0 : (_machine$options = machine.options) === null || _machine$options === void 0 ? void 0 : (_machine$options$guar2 = _machine$options.guards) === null || _machine$options$guar2 === void 0 ? void 0 : _machine$options$guar2[guard.type]) !== null && _machine$options$guar !== void 0 ? _machine$options$guar : guard.predicate;
   if (!predicate) {
     throw new Error("Guard '".concat(guard.type, "' is not implemented.'."));
   }
-  return predicate(context, _event.data, guardMeta);
+  return predicate({
+    context: context,
+    event: _event.data,
+    state: state,
+    guard: guard,
+    _event: _event,
+    evaluate: evaluateGuard
+  });
 }
 function toGuardDefinition(guardConfig, getPredicate) {
   var _guardConfig$children;
@@ -3794,8 +3829,10 @@ function invoke$1(invokeDef) {
           src: src,
           parent: actorContext === null || actorContext === void 0 ? void 0 : actorContext.self,
           systemId: invokeDef.systemId,
-          input: typeof input === 'function' ? input(state.context, _event.data, {
-            self: actorContext.self
+          input: typeof input === 'function' ? input({
+            context: state.context,
+            event: _event.data,
+            self: actorContext === null || actorContext === void 0 ? void 0 : actorContext.self
           }) : input
         });
         resolvedInvokeAction = {
@@ -3849,7 +3886,9 @@ function createSpawner(self, machine, context, _event, mutCapturedActions) {
         var actorRef = interpret(referenced.src, {
           id: resolvedName,
           parent: self,
-          input: typeof input === 'function' ? input(context, _event.data, {
+          input: typeof input === 'function' ? input({
+            context: context,
+            event: _event.data,
             self: self
           }) : input
         });
@@ -3907,7 +3946,9 @@ function assign$1(assignment) {
     if (!state.context) {
       throw new Error('Cannot assign to undefined `context`. Ensure that `context` is defined in the machine config.');
     }
-    var meta = {
+    var args = {
+      context: state.context,
+      event: _event.data,
       state: state,
       action: action,
       _event: _event,
@@ -3917,12 +3958,12 @@ function assign$1(assignment) {
     };
     var partialUpdate = {};
     if (isFunction(assignment)) {
-      partialUpdate = assignment(state.context, _event.data, meta);
+      partialUpdate = assignment(args);
     } else {
       for (var _i = 0, _Object$keys = Object.keys(assignment); _i < _Object$keys.length; _i++) {
         var key = _Object$keys[_i];
         var propAssignment = assignment[key];
-        partialUpdate[key] = isFunction(propAssignment) ? propAssignment(state.context, _event.data, meta) : propAssignment;
+        partialUpdate[key] = isFunction(propAssignment) ? propAssignment(args) : propAssignment;
       }
     }
     var updatedContext = Object.assign({}, state.context, partialUpdate);
@@ -3962,22 +4003,25 @@ function raise$1(eventOrExpr, options) {
       event: eventOrExpr,
       id: options && options.id !== undefined ? options.id : typeof eventOrExpr === 'function' ? eventOrExpr.name : eventOrExpr.type
     };
-    var meta = {
+    var args = {
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
+      // TODO: fix
       self: (_actorContext$self = actorContext === null || actorContext === void 0 ? void 0 : actorContext.self) !== null && _actorContext$self !== void 0 ? _actorContext$self : {},
       system: actorContext === null || actorContext === void 0 ? void 0 : actorContext.system
     };
     var delaysMap = state.machine.options.delays;
 
     // TODO: helper function for resolving Expr
-    var resolvedEvent = toSCXMLEvent(typeof eventOrExpr === 'function' ? eventOrExpr(state.context, _event.data, meta) : eventOrExpr);
+    var resolvedEvent = toSCXMLEvent(typeof eventOrExpr === 'function' ? eventOrExpr(args) : eventOrExpr);
     var resolvedDelay;
     if (typeof params.delay === 'string') {
       var configDelay = delaysMap && delaysMap[params.delay];
-      resolvedDelay = typeof configDelay === 'function' ? configDelay(state.context, _event.data, meta) : configDelay;
+      resolvedDelay = typeof configDelay === 'function' ? configDelay(args) : configDelay;
     } else {
-      resolvedDelay = typeof params.delay === 'function' ? params.delay(state.context, _event.data, meta) : params.delay;
+      resolvedDelay = typeof params.delay === 'function' ? params.delay(args) : params.delay;
     }
     var resolvedAction = {
       type: raise,
@@ -4040,7 +4084,9 @@ function resolveActionObject(actionObject, actionFunctionMap) {
         type: actionObject.type,
         params: actionObject.params,
         execute: function execute(actorCtx) {
-          return dereferencedAction(state.context, state.event, {
+          return dereferencedAction({
+            context: state.context,
+            event: state.event,
             action: a,
             _event: state._event,
             state: state,
@@ -4080,7 +4126,9 @@ function toActionObject(action) {
           "function": action
         },
         execute: function execute(actorCtx) {
-          return action(state.context, _event.data, {
+          return action({
+            context: state.context,
+            event: _event.data,
             action: actionObject,
             _event: _event,
             state: state,

package/dist/{actions-1e9778c2.cjs.dev.js → actions-3f0ba11b.cjs.dev.js}

@@ -346,14 +346,21 @@ function toArray(value) {
 }
 function mapContext(mapper, context, _event) {
   if (isFunction(mapper)) {
-    return mapper(context, _event.data);
+    return mapper({
+      context: context,
+      event: _event.data
+    });
   }
   var result = {};
+  var args = {
+    context: context,
+    event: _event.data
+  };
   for (var _i4 = 0, _Object$keys2 = Object.keys(mapper); _i4 < _Object$keys2.length; _i4++) {
     var _key3 = _Object$keys2[_i4];
     var subMapper = mapper[_key3];
     if (isFunction(subMapper)) {
-      result[_key3] = subMapper(context, _event.data);
+      result[_key3] = subMapper(args);
     } else {
       result[_key3] = subMapper;
     }
@@ -518,7 +525,9 @@ function send$1(eventOrExpr, options) {
       // there is too big chance of the ID collision
       id: options && options.id !== undefined ? options.id : isFunction(eventOrExpr) ? eventOrExpr.name : eventOrExpr.type
     };
-    var meta = {
+    var args = {
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
       self: (_actorContext$self = actorContext === null || actorContext === void 0 ? void 0 : actorContext.self) !== null && _actorContext$self !== void 0 ? _actorContext$self : null,
@@ -527,15 +536,15 @@ function send$1(eventOrExpr, options) {
     var delaysMap = state.machine.options.delays;
 
     // TODO: helper function for resolving Expr
-    var resolvedEvent = toSCXMLEvent(isFunction(eventOrExpr) ? eventOrExpr(state.context, _event.data, meta) : eventOrExpr);
+    var resolvedEvent = toSCXMLEvent(isFunction(eventOrExpr) ? eventOrExpr(args) : eventOrExpr);
     var resolvedDelay;
     if (isString(params.delay)) {
       var configDelay = delaysMap && delaysMap[params.delay];
-      resolvedDelay = isFunction(configDelay) ? configDelay(state.context, _event.data, meta) : configDelay;
+      resolvedDelay = isFunction(configDelay) ? configDelay(args) : configDelay;
     } else {
-      resolvedDelay = isFunction(params.delay) ? params.delay(state.context, _event.data, meta) : params.delay;
+      resolvedDelay = isFunction(params.delay) ? params.delay(args) : params.delay;
     }
-    var resolvedTarget = isFunction(params.to) ? params.to(state.context, _event.data, meta) : params.to;
+    var resolvedTarget = isFunction(params.to) ? params.to(args) : params.to;
     var targetActorRef;
     if (typeof resolvedTarget === 'string') {
       if (resolvedTarget === exports.SpecialTargets.Parent) {
@@ -607,7 +616,7 @@ function sendParent(event, options) {
  */
 function respond(event, options) {
   return send$1(event, _objectSpread2(_objectSpread2({}, options), {}, {
-    to: function to(_, __, _ref2) {
+    to: function to(_ref2) {
       var _event = _ref2._event;
       return _event.origin; // TODO: handle when _event.origin is undefined
     }
@@ -631,7 +640,8 @@ function forwardTo(target, options) {
       return resolvedTarget;
     };
   }
-  return send$1(function (_, event) {
+  return send$1(function (_ref3) {
+    var event = _ref3.event;
     return event;
   }, _objectSpread2(_objectSpread2({}, options), {}, {
     to: target
@@ -646,10 +656,10 @@ function forwardTo(target, options) {
  * @param options Options to pass into the send action creator.
  */
 function escalate(errorData, options) {
-  return sendParent(function (context, event, meta) {
+  return sendParent(function (arg) {
     return {
       type: error,
-      data: isFunction(errorData) ? errorData(context, event, meta) : errorData
+      data: isFunction(errorData) ? errorData(arg) : errorData
     };
   }, _objectSpread2(_objectSpread2({}, options), {}, {
     to: exports.SpecialTargets.Parent
@@ -1742,7 +1752,10 @@ function stop$1(actorRef) {
     }
   }, function (_event, _ref) {
     var state = _ref.state;
-    var actorRefOrString = isFunction(actor) ? actor(state.context, _event.data) : actor;
+    var actorRefOrString = isFunction(actor) ? actor({
+      context: state.context,
+      event: _event.data
+    }) : actor;
     var actorRef = typeof actorRefOrString === 'string' ? state.children[actorRefOrString] : actorRefOrString;
     return [state, {
       type: 'xstate.stop',
@@ -1765,7 +1778,9 @@ function stop$1(actorRef) {
   });
 }
 
-var defaultLogExpr = function defaultLogExpr(context, event) {
+var defaultLogExpr = function defaultLogExpr(_ref) {
+  var context = _ref.context,
+    event = _ref.event;
   return {
     context: context,
     event: event
@@ -1790,11 +1805,13 @@ function log$1() {
       label: label,
       expr: expr
     }
-  }, function (_event, _ref) {
+  }, function (_event, _ref2) {
     var _actorContext$self;
-    var state = _ref.state,
-      actorContext = _ref.actorContext;
-    var resolvedValue = typeof expr === 'function' ? expr(state.context, _event.data, {
+    var state = _ref2.state,
+      actorContext = _ref2.actorContext;
+    var resolvedValue = typeof expr === 'function' ? expr({
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
       self: (_actorContext$self = actorContext === null || actorContext === void 0 ? void 0 : actorContext.self) !== null && _actorContext$self !== void 0 ? _actorContext$self : {},
@@ -1837,7 +1854,9 @@ function cancel$1(sendId) {
     var _actorContext$self;
     var state = _ref.state,
       actorContext = _ref.actorContext;
-    var resolvedSendId = isFunction(sendId) ? sendId(state.context, _event.data, {
+    var resolvedSendId = isFunction(sendId) ? sendId({
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
       // TODO: fix types,
@@ -1904,7 +1923,7 @@ function stateIn(stateValue) {
     params: {
       stateValue: stateValue
     },
-    predicate: function predicate(_, __, _ref) {
+    predicate: function predicate(_ref) {
       var state = _ref.state;
       if (isString(stateValue) && isStateId(stateValue)) {
         return state.configuration.some(function (sn) {
@@ -1922,8 +1941,13 @@ function not(guard) {
       op: 'not'
     },
     children: [toGuardDefinition(guard)],
-    predicate: function predicate(ctx, _, meta) {
-      return !meta.evaluate(meta.guard.children[0], ctx, meta._event, meta.state);
+    predicate: function predicate(_ref2) {
+      var evaluate = _ref2.evaluate,
+        guard = _ref2.guard,
+        context = _ref2.context,
+        _event = _ref2._event,
+        state = _ref2.state;
+      return !evaluate(guard.children[0], context, _event, state);
     }
   };
 }
@@ -1936,9 +1960,14 @@ function and(guards) {
     children: guards.map(function (guard) {
       return toGuardDefinition(guard);
     }),
-    predicate: function predicate(ctx, _, meta) {
-      return meta.guard.children.every(function (childGuard) {
-        return meta.evaluate(childGuard, ctx, meta._event, meta.state);
+    predicate: function predicate(_ref3) {
+      var evaluate = _ref3.evaluate,
+        guard = _ref3.guard,
+        context = _ref3.context,
+        _event = _ref3._event,
+        state = _ref3.state;
+      return guard.children.every(function (childGuard) {
+        return evaluate(childGuard, context, _event, state);
       });
     }
   };
@@ -1952,9 +1981,14 @@ function or(guards) {
     children: guards.map(function (guard) {
       return toGuardDefinition(guard);
     }),
-    predicate: function predicate(ctx, _, meta) {
-      return meta.guard.children.some(function (childGuard) {
-        return meta.evaluate(childGuard, ctx, meta._event, meta.state);
+    predicate: function predicate(_ref4) {
+      var evaluate = _ref4.evaluate,
+        guard = _ref4.guard,
+        context = _ref4.context,
+        _event = _ref4._event,
+        state = _ref4.state;
+      return guard.children.some(function (childGuard) {
+        return evaluate(childGuard, context, _event, state);
       });
     }
   };
@@ -1962,17 +1996,18 @@ function or(guards) {
 function evaluateGuard(guard, context, _event, state) {
   var _machine$options$guar, _machine$options, _machine$options$guar2;
   var machine = state.machine;
-  var guardMeta = {
-    state: state,
-    guard: guard,
-    _event: _event,
-    evaluate: evaluateGuard
-  };
   var predicate = (_machine$options$guar = machine === null || machine === void 0 ? void 0 : (_machine$options = machine.options) === null || _machine$options === void 0 ? void 0 : (_machine$options$guar2 = _machine$options.guards) === null || _machine$options$guar2 === void 0 ? void 0 : _machine$options$guar2[guard.type]) !== null && _machine$options$guar !== void 0 ? _machine$options$guar : guard.predicate;
   if (!predicate) {
     throw new Error("Guard '".concat(guard.type, "' is not implemented.'."));
   }
-  return predicate(context, _event.data, guardMeta);
+  return predicate({
+    context: context,
+    event: _event.data,
+    state: state,
+    guard: guard,
+    _event: _event,
+    evaluate: evaluateGuard
+  });
 }
 function toGuardDefinition(guardConfig, getPredicate) {
   var _guardConfig$children;
@@ -3829,8 +3864,10 @@ function invoke$1(invokeDef) {
           src: src,
           parent: actorContext === null || actorContext === void 0 ? void 0 : actorContext.self,
           systemId: invokeDef.systemId,
-          input: typeof input === 'function' ? input(state.context, _event.data, {
-            self: actorContext.self
+          input: typeof input === 'function' ? input({
+            context: state.context,
+            event: _event.data,
+            self: actorContext === null || actorContext === void 0 ? void 0 : actorContext.self
           }) : input
         });
         resolvedInvokeAction = {
@@ -3887,7 +3924,9 @@ function createSpawner(self, machine, context, _event, mutCapturedActions) {
         var actorRef = interpret(referenced.src, {
           id: resolvedName,
           parent: self,
-          input: typeof input === 'function' ? input(context, _event.data, {
+          input: typeof input === 'function' ? input({
+            context: context,
+            event: _event.data,
             self: self
           }) : input
         });
@@ -3945,7 +3984,9 @@ function assign$1(assignment) {
     if (!state.context) {
       throw new Error('Cannot assign to undefined `context`. Ensure that `context` is defined in the machine config.');
     }
-    var meta = {
+    var args = {
+      context: state.context,
+      event: _event.data,
       state: state,
       action: action,
       _event: _event,
@@ -3955,12 +3996,12 @@ function assign$1(assignment) {
     };
     var partialUpdate = {};
     if (isFunction(assignment)) {
-      partialUpdate = assignment(state.context, _event.data, meta);
+      partialUpdate = assignment(args);
     } else {
       for (var _i = 0, _Object$keys = Object.keys(assignment); _i < _Object$keys.length; _i++) {
         var key = _Object$keys[_i];
         var propAssignment = assignment[key];
-        partialUpdate[key] = isFunction(propAssignment) ? propAssignment(state.context, _event.data, meta) : propAssignment;
+        partialUpdate[key] = isFunction(propAssignment) ? propAssignment(args) : propAssignment;
       }
     }
     var updatedContext = Object.assign({}, state.context, partialUpdate);
@@ -4000,22 +4041,25 @@ function raise$1(eventOrExpr, options) {
       event: eventOrExpr,
       id: options && options.id !== undefined ? options.id : typeof eventOrExpr === 'function' ? eventOrExpr.name : eventOrExpr.type
     };
-    var meta = {
+    var args = {
+      context: state.context,
+      event: _event.data,
       _event: _event,
       state: state,
+      // TODO: fix
       self: (_actorContext$self = actorContext === null || actorContext === void 0 ? void 0 : actorContext.self) !== null && _actorContext$self !== void 0 ? _actorContext$self : {},
       system: actorContext === null || actorContext === void 0 ? void 0 : actorContext.system
     };
     var delaysMap = state.machine.options.delays;
 
     // TODO: helper function for resolving Expr
-    var resolvedEvent = toSCXMLEvent(typeof eventOrExpr === 'function' ? eventOrExpr(state.context, _event.data, meta) : eventOrExpr);
+    var resolvedEvent = toSCXMLEvent(typeof eventOrExpr === 'function' ? eventOrExpr(args) : eventOrExpr);
     var resolvedDelay;
     if (typeof params.delay === 'string') {
       var configDelay = delaysMap && delaysMap[params.delay];
-      resolvedDelay = typeof configDelay === 'function' ? configDelay(state.context, _event.data, meta) : configDelay;
+      resolvedDelay = typeof configDelay === 'function' ? configDelay(args) : configDelay;
     } else {
-      resolvedDelay = typeof params.delay === 'function' ? params.delay(state.context, _event.data, meta) : params.delay;
+      resolvedDelay = typeof params.delay === 'function' ? params.delay(args) : params.delay;
     }
     var resolvedAction = {
       type: raise,
@@ -4078,7 +4122,9 @@ function resolveActionObject(actionObject, actionFunctionMap) {
         type: actionObject.type,
         params: actionObject.params,
         execute: function execute(actorCtx) {
-          return dereferencedAction(state.context, state.event, {
+          return dereferencedAction({
+            context: state.context,
+            event: state.event,
             action: a,
             _event: state._event,
             state: state,
@@ -4118,7 +4164,9 @@ function toActionObject(action) {
           "function": action
         },
         execute: function execute(actorCtx) {
-          return action(state.context, _event.data, {
+          return action({
+            context: state.context,
+            event: _event.data,
             action: actionObject,
             _event: _event,
             state: state,