xstate 5.0.0-alpha.5 → 5.0.0-beta.7

package/dist/{actions-96f799fc.cjs.dev.js → actions-0fcf4fd9.cjs.dev.js}

@@ -2041,8 +2041,7 @@ function getOutput(configuration, context, _event) {
   var finalChildStateNode = configuration.find(function (stateNode) {
     return stateNode.type === 'final' && stateNode.parent === machine.root;
   });
-  var doneData = finalChildStateNode && finalChildStateNode.doneData ? mapContext(finalChildStateNode.doneData, context, _event) : undefined;
-  return doneData;
+  return finalChildStateNode && finalChildStateNode.output ? mapContext(finalChildStateNode.output, context, _event) : undefined;
 }
 var isAtomicStateNode = function isAtomicStateNode(stateNode) {
   return stateNode.type === 'atomic' || stateNode.type === 'final';
@@ -2292,9 +2291,9 @@ function getDelayedTransitions(stateNode) {
   });
 }
 function formatTransition(stateNode, transitionConfig) {
-  var _transitionConfig$ext;
+  var _transitionConfig$ree;
   var normalizedTarget = normalizeTarget(transitionConfig.target);
-  var external = (_transitionConfig$ext = transitionConfig.external) !== null && _transitionConfig$ext !== void 0 ? _transitionConfig$ext : false;
+  var reenter = (_transitionConfig$ree = transitionConfig.reenter) !== null && _transitionConfig$ree !== void 0 ? _transitionConfig$ree : false;
   var guards = stateNode.machine.options.guards;
   var target = resolveTarget(stateNode, normalizedTarget);
 
@@ -2309,7 +2308,7 @@ function formatTransition(stateNode, transitionConfig) {
     }) : undefined,
     target: target,
     source: stateNode,
-    external: external,
+    reenter: reenter,
     eventType: transitionConfig.event,
     toJSON: function toJSON() {
       return _objectSpread2(_objectSpread2({}, transition), {}, {
@@ -2396,7 +2395,7 @@ function formatInitialTransition(stateNode, _target) {
       source: stateNode,
       actions: [],
       eventType: null,
-      external: false,
+      reenter: false,
       target: resolvedTarget,
       toJSON: function toJSON() {
         return _objectSpread2(_objectSpread2({}, transition), {}, {
@@ -2429,6 +2428,9 @@ function resolveTarget(stateNode, targets) {
     if (!isString(target)) {
       return target;
     }
+    if (isStateId(target)) {
+      return stateNode.machine.getStateNodeById(target);
+    }
     var isInternalTarget = target[0] === stateNode.machine.delimiter;
     // If internal target is defined on machine,
     // do not include machine key on target
@@ -2444,7 +2446,7 @@ function resolveTarget(stateNode, targets) {
         throw new Error("Invalid transition definition for state node '".concat(stateNode.id, "':\n").concat(err.message));
       }
     } else {
-      return getStateNodeByPath(stateNode, resolvedTarget);
+      throw new Error("Invalid target: \"".concat(target, "\" is not a valid target from the root node. Did you mean \".").concat(target, "\"?"));
     }
   });
 }
@@ -2816,7 +2818,7 @@ function getTransitionDomain(transition, historyValue) {
   if (!targetStates) {
     return null;
   }
-  if (!transition.external && transition.source.type === 'compound' && targetStates.every(function (targetStateNode) {
+  if (!transition.reenter && transition.source.type !== 'parallel' && targetStates.every(function (targetStateNode) {
     return isDescendant(targetStateNode, transition.source);
   })) {
     return transition.source;
@@ -2886,7 +2888,7 @@ function microstep(transitions, currentState, actorCtx, scxmlEvent) {
   var microstate = microstepProcedure(currentState._initial ? [{
     target: _toConsumableArray(currentState.configuration).filter(isAtomicStateNode),
     source: machine.root,
-    external: true,
+    reenter: true,
     actions: [],
     eventType: null,
     toJSON: null // TODO: fix
@@ -3044,7 +3046,7 @@ function enterStates(filteredTransitions, mutConfiguration, actions, internalQue
         if (!parent.parent) {
           continue;
         }
-        internalQueue.push(toSCXMLEvent(done(parent.id, stateNodeToEnter.doneData ? mapContext(stateNodeToEnter.doneData, currentState.context, currentState._event) : undefined)));
+        internalQueue.push(toSCXMLEvent(done(parent.id, stateNodeToEnter.output ? mapContext(stateNodeToEnter.output, currentState.context, currentState._event) : undefined)));
         if (parent.parent) {
           var grandparent = parent.parent;
           if (grandparent.type === 'parallel') {
@@ -4198,13 +4200,13 @@ function after$1(delayRef, id) {
  * has been reached in the parent state node.
  *
  * @param id The final state node's parent state node `id`
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-function done(id, data) {
+function done(id, output) {
   var type = "".concat(exports.ActionTypes.DoneState, ".").concat(id);
   var eventObject = {
     type: type,
-    data: data
+    output: output
   };
   eventObject.toString = function () {
     return type;
@@ -4219,13 +4221,13 @@ function done(id, data) {
  * but not when it is canceled.
  *
  * @param invokeId The invoked service ID
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-function doneInvoke(invokeId, data) {
+function doneInvoke(invokeId, output) {
   var type = "".concat(exports.ActionTypes.DoneInvoke, ".").concat(invokeId);
   var eventObject = {
     type: type,
-    data: data
+    output: output
   };
   eventObject.toString = function () {
     return type;
@@ -4292,6 +4294,7 @@ exports.getConfiguration = getConfiguration;
 exports.getDelayedTransitions = getDelayedTransitions;
 exports.getInitialConfiguration = getInitialConfiguration;
 exports.getPersistedState = getPersistedState;
+exports.getStateNodeByPath = getStateNodeByPath;
 exports.getStateNodes = getStateNodes;
 exports.initEvent = initEvent;
 exports.interpret = interpret;

package/dist/{actions-2479953d.cjs.prod.js → actions-a1a641d3.cjs.prod.js}

@@ -2020,8 +2020,7 @@ function getOutput(configuration, context, _event) {
   var finalChildStateNode = configuration.find(function (stateNode) {
     return stateNode.type === 'final' && stateNode.parent === machine.root;
   });
-  var doneData = finalChildStateNode && finalChildStateNode.doneData ? mapContext(finalChildStateNode.doneData, context, _event) : undefined;
-  return doneData;
+  return finalChildStateNode && finalChildStateNode.output ? mapContext(finalChildStateNode.output, context, _event) : undefined;
 }
 var isAtomicStateNode = function isAtomicStateNode(stateNode) {
   return stateNode.type === 'atomic' || stateNode.type === 'final';
@@ -2265,9 +2264,9 @@ function getDelayedTransitions(stateNode) {
   });
 }
 function formatTransition(stateNode, transitionConfig) {
-  var _transitionConfig$ext;
+  var _transitionConfig$ree;
   var normalizedTarget = normalizeTarget(transitionConfig.target);
-  var external = (_transitionConfig$ext = transitionConfig.external) !== null && _transitionConfig$ext !== void 0 ? _transitionConfig$ext : false;
+  var reenter = (_transitionConfig$ree = transitionConfig.reenter) !== null && _transitionConfig$ree !== void 0 ? _transitionConfig$ree : false;
   var guards = stateNode.machine.options.guards;
   var target = resolveTarget(stateNode, normalizedTarget);
   var transition = _objectSpread2(_objectSpread2({}, transitionConfig), {}, {
@@ -2277,7 +2276,7 @@ function formatTransition(stateNode, transitionConfig) {
     }) : undefined,
     target: target,
     source: stateNode,
-    external: external,
+    reenter: reenter,
     eventType: transitionConfig.event,
     toJSON: function toJSON() {
       return _objectSpread2(_objectSpread2({}, transition), {}, {
@@ -2364,7 +2363,7 @@ function formatInitialTransition(stateNode, _target) {
       source: stateNode,
       actions: [],
       eventType: null,
-      external: false,
+      reenter: false,
       target: resolvedTarget,
       toJSON: function toJSON() {
         return _objectSpread2(_objectSpread2({}, transition), {}, {
@@ -2397,6 +2396,9 @@ function resolveTarget(stateNode, targets) {
     if (!isString(target)) {
       return target;
     }
+    if (isStateId(target)) {
+      return stateNode.machine.getStateNodeById(target);
+    }
     var isInternalTarget = target[0] === stateNode.machine.delimiter;
     // If internal target is defined on machine,
     // do not include machine key on target
@@ -2412,7 +2414,7 @@ function resolveTarget(stateNode, targets) {
         throw new Error("Invalid transition definition for state node '".concat(stateNode.id, "':\n").concat(err.message));
       }
     } else {
-      return getStateNodeByPath(stateNode, resolvedTarget);
+      throw new Error("Invalid target: \"".concat(target, "\" is not a valid target from the root node. Did you mean \".").concat(target, "\"?"));
     }
   });
 }
@@ -2784,7 +2786,7 @@ function getTransitionDomain(transition, historyValue) {
   if (!targetStates) {
     return null;
   }
-  if (!transition.external && transition.source.type === 'compound' && targetStates.every(function (targetStateNode) {
+  if (!transition.reenter && transition.source.type !== 'parallel' && targetStates.every(function (targetStateNode) {
     return isDescendant(targetStateNode, transition.source);
   })) {
     return transition.source;
@@ -2854,7 +2856,7 @@ function microstep(transitions, currentState, actorCtx, scxmlEvent) {
   var microstate = microstepProcedure(currentState._initial ? [{
     target: _toConsumableArray(currentState.configuration).filter(isAtomicStateNode),
     source: machine.root,
-    external: true,
+    reenter: true,
     actions: [],
     eventType: null,
     toJSON: null // TODO: fix
@@ -3012,7 +3014,7 @@ function enterStates(filteredTransitions, mutConfiguration, actions, internalQue
         if (!parent.parent) {
           continue;
         }
-        internalQueue.push(toSCXMLEvent(done(parent.id, stateNodeToEnter.doneData ? mapContext(stateNodeToEnter.doneData, currentState.context, currentState._event) : undefined)));
+        internalQueue.push(toSCXMLEvent(done(parent.id, stateNodeToEnter.output ? mapContext(stateNodeToEnter.output, currentState.context, currentState._event) : undefined)));
         if (parent.parent) {
           var grandparent = parent.parent;
           if (grandparent.type === 'parallel') {
@@ -4160,13 +4162,13 @@ function after$1(delayRef, id) {
  * has been reached in the parent state node.
  *
  * @param id The final state node's parent state node `id`
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-function done(id, data) {
+function done(id, output) {
   var type = "".concat(exports.ActionTypes.DoneState, ".").concat(id);
   var eventObject = {
     type: type,
-    data: data
+    output: output
   };
   eventObject.toString = function () {
     return type;
@@ -4181,13 +4183,13 @@ function done(id, data) {
  * but not when it is canceled.
  *
  * @param invokeId The invoked service ID
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-function doneInvoke(invokeId, data) {
+function doneInvoke(invokeId, output) {
   var type = "".concat(exports.ActionTypes.DoneInvoke, ".").concat(invokeId);
   var eventObject = {
     type: type,
-    data: data
+    output: output
   };
   eventObject.toString = function () {
     return type;
@@ -4254,6 +4256,7 @@ exports.getConfiguration = getConfiguration;
 exports.getDelayedTransitions = getDelayedTransitions;
 exports.getInitialConfiguration = getInitialConfiguration;
 exports.getPersistedState = getPersistedState;
+exports.getStateNodeByPath = getStateNodeByPath;
 exports.getStateNodes = getStateNodes;
 exports.initEvent = initEvent;
 exports.interpret = interpret;

package/dist/{actions-7678b87b.esm.js → actions-b334e916.esm.js}

@@ -2073,8 +2073,7 @@ function getOutput(configuration, context, _event) {
   var finalChildStateNode = configuration.find(function (stateNode) {
     return stateNode.type === 'final' && stateNode.parent === machine.root;
   });
-  var doneData = finalChildStateNode && finalChildStateNode.doneData ? mapContext(finalChildStateNode.doneData, context, _event) : undefined;
-  return doneData;
+  return finalChildStateNode && finalChildStateNode.output ? mapContext(finalChildStateNode.output, context, _event) : undefined;
 }
 var isAtomicStateNode = function isAtomicStateNode(stateNode) {
   return stateNode.type === 'atomic' || stateNode.type === 'final';
@@ -2324,9 +2323,9 @@ function getDelayedTransitions(stateNode) {
   });
 }
 function formatTransition(stateNode, transitionConfig) {
-  var _transitionConfig$ext;
+  var _transitionConfig$ree;
   var normalizedTarget = normalizeTarget(transitionConfig.target);
-  var external = (_transitionConfig$ext = transitionConfig.external) !== null && _transitionConfig$ext !== void 0 ? _transitionConfig$ext : false;
+  var reenter = (_transitionConfig$ree = transitionConfig.reenter) !== null && _transitionConfig$ree !== void 0 ? _transitionConfig$ree : false;
   var guards = stateNode.machine.options.guards;
   var target = resolveTarget(stateNode, normalizedTarget);
 
@@ -2341,7 +2340,7 @@ function formatTransition(stateNode, transitionConfig) {
     }) : undefined,
     target: target,
     source: stateNode,
-    external: external,
+    reenter: reenter,
     eventType: transitionConfig.event,
     toJSON: function toJSON() {
       return _objectSpread2(_objectSpread2({}, transition), {}, {
@@ -2428,7 +2427,7 @@ function formatInitialTransition(stateNode, _target) {
       source: stateNode,
       actions: [],
       eventType: null,
-      external: false,
+      reenter: false,
       target: resolvedTarget,
       toJSON: function toJSON() {
         return _objectSpread2(_objectSpread2({}, transition), {}, {
@@ -2461,6 +2460,9 @@ function resolveTarget(stateNode, targets) {
     if (!isString(target)) {
       return target;
     }
+    if (isStateId(target)) {
+      return stateNode.machine.getStateNodeById(target);
+    }
     var isInternalTarget = target[0] === stateNode.machine.delimiter;
     // If internal target is defined on machine,
     // do not include machine key on target
@@ -2476,7 +2478,7 @@ function resolveTarget(stateNode, targets) {
         throw new Error("Invalid transition definition for state node '".concat(stateNode.id, "':\n").concat(err.message));
       }
     } else {
-      return getStateNodeByPath(stateNode, resolvedTarget);
+      throw new Error("Invalid target: \"".concat(target, "\" is not a valid target from the root node. Did you mean \".").concat(target, "\"?"));
     }
   });
 }
@@ -2848,7 +2850,7 @@ function getTransitionDomain(transition, historyValue) {
   if (!targetStates) {
     return null;
   }
-  if (!transition.external && transition.source.type === 'compound' && targetStates.every(function (targetStateNode) {
+  if (!transition.reenter && transition.source.type !== 'parallel' && targetStates.every(function (targetStateNode) {
     return isDescendant(targetStateNode, transition.source);
   })) {
     return transition.source;
@@ -2918,7 +2920,7 @@ function microstep(transitions, currentState, actorCtx, scxmlEvent) {
   var microstate = microstepProcedure(currentState._initial ? [{
     target: _toConsumableArray(currentState.configuration).filter(isAtomicStateNode),
     source: machine.root,
-    external: true,
+    reenter: true,
     actions: [],
     eventType: null,
     toJSON: null // TODO: fix
@@ -3076,7 +3078,7 @@ function enterStates(filteredTransitions, mutConfiguration, actions, internalQue
         if (!parent.parent) {
           continue;
         }
-        internalQueue.push(toSCXMLEvent(done(parent.id, stateNodeToEnter.doneData ? mapContext(stateNodeToEnter.doneData, currentState.context, currentState._event) : undefined)));
+        internalQueue.push(toSCXMLEvent(done(parent.id, stateNodeToEnter.output ? mapContext(stateNodeToEnter.output, currentState.context, currentState._event) : undefined)));
         if (parent.parent) {
           var grandparent = parent.parent;
           if (grandparent.type === 'parallel') {
@@ -4230,13 +4232,13 @@ function after$1(delayRef, id) {
  * has been reached in the parent state node.
  *
  * @param id The final state node's parent state node `id`
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-function done(id, data) {
+function done(id, output) {
   var type = "".concat(ActionTypes.DoneState, ".").concat(id);
   var eventObject = {
     type: type,
-    data: data
+    output: output
   };
   eventObject.toString = function () {
     return type;
@@ -4251,13 +4253,13 @@ function done(id, data) {
  * but not when it is canceled.
  *
  * @param invokeId The invoked service ID
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-function doneInvoke(invokeId, data) {
+function doneInvoke(invokeId, output) {
   var type = "".concat(ActionTypes.DoneInvoke, ".").concat(invokeId);
   var eventObject = {
     type: type,
-    data: data
+    output: output
   };
   eventObject.toString = function () {
     return type;
@@ -4282,4 +4284,4 @@ function createInitEvent(input) {
   });
 }
 
-export { log$1 as $, getConfiguration as A, getStateNodes as B, resolveStateValue as C, isInFinalState as D, toSCXMLEvent as E, isSCXMLErrorEvent as F, macrostep as G, transitionNode as H, _slicedToArray as I, getInitialConfiguration as J, resolveActionsAndContext as K, microstep as L, error$1 as M, NULL_EVENT as N, isStateId as O, getPersistedState as P, resolveReferencedActor as Q, interpret as R, State as S, STATE_DELIMITER as T, initEvent as U, matchesState as V, raise$1 as W, send$1 as X, sendParent as Y, sendTo as Z, _createClass as _, toActionObjects as a, cancel$1 as a0, stop$1 as a1, assign$1 as a2, after$1 as a3, done as a4, respond as a5, forwardTo as a6, escalate as a7, choose$1 as a8, Interpreter as a9, ActorStatus as aa, doneInvoke as ab, pathToStateValue as ac, toObserver as ad, ActionTypes as ae, SpecialTargets as af, startSignalType as ag, stopSignalType as ah, startSignal as ai, stopSignal as aj, isSignal as ak, isActorRef as al, toActorRef as am, fromTransition as an, fromPromise as ao, fromObservable as ap, fromEventObservable as aq, fromCallback as ar, stateIn as as, not as at, and as au, or as av, toGuardDefinition as aw, actionTypes as ax, resolveActionObject as ay, toActionObject as az, toTransitionConfigArray as b, createDynamicAction as c, formatTransition as d, memo as e, formatTransitions as f, _createForOfIteratorHelper as g, evaluateGuard as h, _toConsumableArray as i, flatten as j, _classCallCheck as k, _defineProperty as l, mapValues as m, createInvokeId as n, toInvokeConfig as o, pure as p, _objectSpread2 as q, invoke as r, _objectWithoutProperties as s, toArray as t, getDelayedTransitions as u, formatInitialTransition as v, getCandidates as w, isString as x, createSpawner as y, createInitEvent as z };
+export { sendTo as $, getConfiguration as A, getStateNodes as B, resolveStateValue as C, isInFinalState as D, toSCXMLEvent as E, isSCXMLErrorEvent as F, macrostep as G, transitionNode as H, _slicedToArray as I, getInitialConfiguration as J, resolveActionsAndContext as K, microstep as L, error$1 as M, NULL_EVENT as N, isStateId as O, getStateNodeByPath as P, getPersistedState as Q, resolveReferencedActor as R, State as S, interpret as T, STATE_DELIMITER as U, initEvent as V, matchesState as W, raise$1 as X, send$1 as Y, sendParent as Z, _createClass as _, toActionObjects as a, log$1 as a0, cancel$1 as a1, stop$1 as a2, assign$1 as a3, after$1 as a4, done as a5, respond as a6, forwardTo as a7, escalate as a8, choose$1 as a9, toActionObject as aA, Interpreter as aa, ActorStatus as ab, doneInvoke as ac, pathToStateValue as ad, toObserver as ae, ActionTypes as af, SpecialTargets as ag, startSignalType as ah, stopSignalType as ai, startSignal as aj, stopSignal as ak, isSignal as al, isActorRef as am, toActorRef as an, fromTransition as ao, fromPromise as ap, fromObservable as aq, fromEventObservable as ar, fromCallback as as, stateIn as at, not as au, and as av, or as aw, toGuardDefinition as ax, actionTypes as ay, resolveActionObject as az, toTransitionConfigArray as b, createDynamicAction as c, formatTransition as d, memo as e, formatTransitions as f, _createForOfIteratorHelper as g, evaluateGuard as h, _toConsumableArray as i, flatten as j, _classCallCheck as k, _defineProperty as l, mapValues as m, createInvokeId as n, toInvokeConfig as o, pure as p, _objectSpread2 as q, invoke as r, _objectWithoutProperties as s, toArray as t, getDelayedTransitions as u, formatInitialTransition as v, getCandidates as w, isString as x, createSpawner as y, createInitEvent as z };

package/dist/declarations/src/StateNode.d.ts

@@ -65,9 +65,9 @@ export declare class StateNode<TContext extends MachineContext = MachineContext,
      */
     meta?: any;
     /**
-     * The data sent with the "done.state._id_" event if this is a final state node.
+     * The output data sent with the "done.state._id_" event if this is a final state node.
      */
-    doneData?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
+    output?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
     /**
      * The order this state node appears. Corresponds to the implicit SCXML document order.
      */

package/dist/declarations/src/actions.d.ts

@@ -27,9 +27,9 @@ export declare function after(delayRef: number | string, id?: string): string;
  * has been reached in the parent state node.
  *
  * @param id The final state node's parent state node `id`
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-export declare function done(id: string, data?: any): DoneEventObject;
+export declare function done(id: string, output?: any): DoneEventObject;
 /**
  * Returns an event that represents that an invoked service has terminated.
  *
@@ -37,9 +37,9 @@ export declare function done(id: string, data?: any): DoneEventObject;
  * but not when it is canceled.
  *
  * @param invokeId The invoked service ID
- * @param data The data to pass into the event
+ * @param output The data to pass into the event
  */
-export declare function doneInvoke(invokeId: string, data?: any): DoneEvent;
+export declare function doneInvoke(invokeId: string, output?: any): DoneEvent;
 export declare function error(id: string, data?: any): ErrorPlatformEvent & string;
 export declare function createInitEvent(input: any): SCXML.Event<{
     type: ActionTypes.Init;

package/dist/declarations/src/stateUtils.d.ts

@@ -32,6 +32,12 @@ export declare function getInitialStateNodes(stateNode: AnyStateNode): Array<Any
  * Returns the child state node from its relative `stateKey`, or throws.
  */
 export declare function getStateNode(stateNode: AnyStateNode, stateKey: string): AnyStateNode;
+/**
+ * Returns the relative state node from the given `statePath`, or throws.
+ *
+ * @param statePath The string or string array relative path to the state node.
+ */
+export declare function getStateNodeByPath(stateNode: AnyStateNode, statePath: string | string[]): AnyStateNode;
 /**
  * Returns the state nodes represented by the current state value.
  *

package/dist/declarations/src/typegenTypes.d.ts

@@ -121,11 +121,11 @@ export interface ResolveTypegenMeta<TTypesMeta extends TypegenConstraint, TEvent
         disabled: TypegenDisabled & AllImplementationsProvided & AllowAllEvents & {
             indexedActions: IndexByType<TAction>;
             indexedEvents: Record<string, TEvent> & {
-                __XSTATE_ALLOW_ANY_INVOKE_DATA_HACK__: {
-                    data: any;
+                __XSTATE_ALLOW_ANY_INVOKE_OUTPUT_HACK__: {
+                    output: any;
                 };
             };
-            invokeSrcNameMap: Record<string, '__XSTATE_ALLOW_ANY_INVOKE_DATA_HACK__'>;
+            invokeSrcNameMap: Record<string, '__XSTATE_ALLOW_ANY_INVOKE_OUTPUT_HACK__'>;
         };
     }[IsNever<TTypesMeta> extends true ? 'disabled' : TTypesMeta extends TypegenEnabled ? 'enabled' : 'disabled'];
 }

package/dist/declarations/src/types.d.ts

@@ -161,7 +161,7 @@ export type TransitionTarget = SingleOrArray<string>;
 export interface TransitionConfig<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject = TExpressionEvent, TAction extends ParameterizedObject = ParameterizedObject> {
     guard?: GuardConfig<TContext, TExpressionEvent>;
     actions?: BaseActions<TContext, TExpressionEvent, TEvent, TAction>;
-    external?: boolean;
+    reenter?: boolean;
     target?: TransitionTarget | undefined;
     meta?: Record<string, any>;
     description?: string;
@@ -269,7 +269,7 @@ export interface InvokeConfig<TContext extends MachineContext, TEvent extends Ev
     /**
      * The transition to take upon the invoked child machine sending an error event.
      */
-    onError?: string | SingleOrArray<TransitionConfigOrTarget<TContext, DoneInvokeEvent<any>, TEvent>>;
+    onError?: string | SingleOrArray<TransitionConfigOrTarget<TContext, ErrorEvent<any>, TEvent>>;
     onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent<any>, TEvent>>;
     /**
      * Meta data related to this invocation
@@ -341,12 +341,12 @@ export interface StateNodeConfig<TContext extends MachineContext, TEvent extends
      */
     meta?: any;
     /**
-     * The data sent with the "done.state._id_" event if this is a final state node.
+     * The output data sent with the "done.state._id_" event if this is a final state node.
      *
-     * The data will be evaluated with the current `context` and placed on the `.data` property
+     * The output data will be evaluated with the current `context` and placed on the `.data` property
      * of the event.
      */
-    data?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
+    output?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
     /**
      * The unique ID of the state node, which can be referenced as a transition target via the
      * `#id` syntax.
@@ -387,7 +387,7 @@ export interface StateNodeDefinition<TContext extends MachineContext, TEvent ext
     exit: BaseActionObject[];
     meta: any;
     order: number;
-    data?: FinalStateNodeConfig<TContext, TEvent>['data'];
+    output?: FinalStateNodeConfig<TContext, TEvent>['output'];
     invoke: Array<InvokeDefinition<TContext, TEvent>>;
     description?: string;
     tags: string[];
@@ -416,7 +416,7 @@ export interface FinalStateNodeConfig<TContext extends MachineContext, TEvent ex
      * The data to be sent with the "done.state.<id>" event. The data can be
      * static or dynamic (based on assigners).
      */
-    data?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
+    output?: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>;
 }
 export type SimpleOrStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> = AtomicStateNodeConfig<TContext, TEvent> | StateNodeConfig<TContext, TEvent>;
 export type ActionFunctionMap<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> = {
@@ -494,7 +494,7 @@ export interface MachineConfig<TContext extends MachineContext, TEvent extends E
     tsTypes?: TTypesMeta;
 }
 export type ActorMap = Record<string, {
-    data: any;
+    output: any;
 }>;
 export interface MachineSchema<TContext extends MachineContext, TEvent extends EventObject, TActorMap extends ActorMap = ActorMap> {
     context?: TContext;
@@ -547,7 +547,7 @@ export interface RaiseActionObject<TContext extends MachineContext, TExpressionE
 }
 export interface DoneInvokeEvent<TData> extends EventObject {
     type: `done.invoke.${string}`;
-    data: TData;
+    output: TData;
 }
 export interface ErrorEvent<TErrorData> {
     type: `error.${string}`;
@@ -570,7 +570,7 @@ export interface SCXMLErrorEvent extends SCXML.Event<any> {
     data: any;
 }
 export interface DoneEventObject extends EventObject {
-    data?: any;
+    output?: any;
     toString(): string;
 }
 export type DoneEvent = DoneEventObject & string;
@@ -731,7 +731,7 @@ export interface TransitionDefinition<TContext extends MachineContext, TEvent ex
     target: Array<StateNode<TContext, TEvent>> | undefined;
     source: StateNode<TContext, TEvent>;
     actions: BaseActionObject[];
-    external: boolean;
+    reenter: boolean;
     guard?: GuardDefinition<TContext, TEvent>;
     eventType: TEvent['type'] | '*';
     toJSON: () => {

package/dist/xstate.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-96f799fc.cjs.dev.js');
+var actors_dist_xstateActors = require('./actions-0fcf4fd9.cjs.dev.js');
 require('./index-ebaab3c9.cjs.dev.js');
 
 function pure(getActions) {
@@ -83,7 +83,7 @@ var StateNode = /*#__PURE__*/function () {
    */
 
   /**
-   * The data sent with the "done.state._id_" event if this is a final state node.
+   * The output data sent with the "done.state._id_" event if this is a final state node.
    */
 
   /**
@@ -109,7 +109,7 @@ var StateNode = /*#__PURE__*/function () {
     actors_dist_xstateActors._defineProperty(this, "parent", void 0);
     actors_dist_xstateActors._defineProperty(this, "machine", void 0);
     actors_dist_xstateActors._defineProperty(this, "meta", void 0);
-    actors_dist_xstateActors._defineProperty(this, "doneData", void 0);
+    actors_dist_xstateActors._defineProperty(this, "output", void 0);
     actors_dist_xstateActors._defineProperty(this, "order", -1);
     actors_dist_xstateActors._defineProperty(this, "description", void 0);
     actors_dist_xstateActors._defineProperty(this, "tags", []);
@@ -141,7 +141,7 @@ var StateNode = /*#__PURE__*/function () {
     this.entry = actors_dist_xstateActors.toActionObjects(this.config.entry);
     this.exit = actors_dist_xstateActors.toActionObjects(this.config.exit);
     this.meta = this.config.meta;
-    this.doneData = this.type === 'final' ? this.config.data : undefined;
+    this.output = this.type === 'final' ? this.config.output : undefined;
     this.tags = actors_dist_xstateActors.toArray(config.tags);
   }
   actors_dist_xstateActors._createClass(StateNode, [{
@@ -176,7 +176,7 @@ var StateNode = /*#__PURE__*/function () {
           source: this,
           actions: this.initial.actions,
           eventType: null,
-          external: false,
+          reenter: false,
           toJSON: function toJSON() {
             return {
               target: _this3.initial.target.map(function (t) {
@@ -198,7 +198,7 @@ var StateNode = /*#__PURE__*/function () {
         exit: this.exit,
         meta: this.meta,
         order: this.order || -1,
-        data: this.doneData,
+        output: this.output,
         invoke: this.invoke,
         description: this.description,
         tags: this.tags
@@ -400,7 +400,7 @@ var StateNode = /*#__PURE__*/function () {
     key: "ownEvents",
     get: function get() {
       var events = new Set(this.transitions.filter(function (transition) {
-        return !(!transition.target && !transition.actions.length && !transition.external);
+        return !(!transition.target && !transition.actions.length && !transition.reenter);
       }).map(function (transition) {
         return transition.eventType;
       }));
@@ -666,12 +666,14 @@ var StateMachine = /*#__PURE__*/function () {
   }, {
     key: "getStateNodeById",
     value: function getStateNodeById(stateId) {
-      var resolvedStateId = actors_dist_xstateActors.isStateId(stateId) ? stateId.slice(STATE_IDENTIFIER.length) : stateId;
+      var fullPath = stateId.split(this.delimiter);
+      var relativePath = fullPath.slice(1);
+      var resolvedStateId = actors_dist_xstateActors.isStateId(fullPath[0]) ? fullPath[0].slice(STATE_IDENTIFIER.length) : fullPath[0];
       var stateNode = this.idMap.get(resolvedStateId);
       if (!stateNode) {
         throw new Error("Child state node '#".concat(resolvedStateId, "' does not exist on machine '").concat(this.id, "'"));
       }
-      return stateNode;
+      return actors_dist_xstateActors.getStateNodeByPath(stateNode, relativePath);
     }
   }, {
     key: "definition",