xstate 5.0.0-beta.14 → 5.0.0-beta.16

package/dist/xstate.development.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-73b8d456.development.cjs.js');
+var actors_dist_xstateActors = require('./actions-0f903c0d.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -95,7 +95,7 @@ class StateNode {
     this.key = options._key;
     this.machine = options._machine;
     this.path = this.parent ? this.parent.path.concat(this.key) : [];
-    this.id = this.config.id || [this.machine.id, ...this.path].join(this.machine.delimiter);
+    this.id = this.config.id || [this.machine.id, ...this.path].join(actors_dist_xstateActors.STATE_DELIMITER);
     this.type = this.config.type || (this.config.states && Object.keys(this.config.states).length ? 'compound' : this.config.history ? 'history' : 'atomic');
     this.description = this.config.description;
     this.order = this.machine.idMap.size;
@@ -185,9 +185,9 @@ class StateNode {
         systemId
       } = invokeConfig;
       const resolvedSrc = actors_dist_xstateActors.isString(src) ? src : !('type' in src) ? resolvedId : src;
-      if (!this.machine.options.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
-        this.machine.options.actors = {
-          ...this.machine.options.actors,
+      if (!this.machine.implementations.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
+        this.machine.implementations.actors = {
+          ...this.machine.implementations.actors,
           // TODO: this should accept `src` as-is
           [resolvedId]: src
         };
@@ -318,33 +318,7 @@ class StateNode {
 }
 
 const STATE_IDENTIFIER = '#';
-function createDefaultOptions() {
-  return {
-    actions: {},
-    actors: {},
-    delays: {},
-    guards: {},
-    context: {}
-  };
-}
 class StateMachine {
-  // TODO: this getter should be removed
-  getContext(input) {
-    return this.getContextAndActions(undefined, input)[0];
-  }
-  getContextAndActions(actorCtx, input) {
-    const actions = [];
-    const {
-      context
-    } = this.config;
-    const resolvedContext = typeof context === 'function' ? context({
-      spawn: actors_dist_xstateActors.createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      actors_dist_xstateActors.createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -353,11 +327,10 @@ class StateMachine {
   /**
    * The raw config used to create the machine.
    */
-  config, options) {
+  config, implementations) {
     this.config = config;
     this.version = void 0;
-    this.delimiter = void 0;
-    this.options = void 0;
+    this.implementations = void 0;
     this.types = void 0;
     this.__xstatenode = true;
     this.idMap = new Map();
@@ -371,8 +344,12 @@ class StateMachine {
     this.__TActorMap = void 0;
     this.__TResolvedTypesMeta = void 0;
     this.id = config.id || '(machine)';
-    this.options = Object.assign(createDefaultOptions(), options);
-    this.delimiter = this.config.delimiter || actors_dist_xstateActors.STATE_DELIMITER;
+    this.implementations = {
+      actors: implementations?.actors ?? {},
+      actions: implementations?.actions ?? {},
+      delays: implementations?.delays ?? {},
+      guards: implementations?.guards ?? {}
+    };
     this.version = this.config.version;
     this.types = this.config.types ?? {};
     this.transition = this.transition.bind(this);
@@ -400,7 +377,7 @@ class StateMachine {
       guards,
       actors,
       delays
-    } = this.options;
+    } = this.implementations;
     return new StateMachine(this.config, {
       actions: {
         ...actions,
@@ -438,10 +415,9 @@ class StateMachine {
       done: actors_dist_xstateActors.isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = actors_dist_xstateActors.resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(actors_dist_xstateActors.State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -480,22 +456,27 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, input) {
-    const [context, actions] = this.getContextAndActions(actorCtx, input);
-    const config = actors_dist_xstateActors.getInitialConfiguration(this.root);
+  getPreInitialState(actorCtx, initEvent) {
+    const {
+      context
+    } = this.config;
     const preInitial = this.resolveState(this.createState({
       value: {},
       // TODO: this is computed in state constructor
-      context,
+      context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: config,
-      transitions: [],
+      configuration: actors_dist_xstateActors.getInitialConfiguration(this.root),
       children: {}
     }));
-    preInitial._initial = true;
-    if (actorCtx) {
-      const [nextState] = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return actors_dist_xstateActors.resolveActionsAndContext([actors_dist_xstateActors.assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -506,8 +487,15 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = actors_dist_xstateActors.createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
-    const nextState = actors_dist_xstateActors.microstep([], preInitialState, actorCtx, initEvent);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
+    const nextState = actors_dist_xstateActors.microstep([{
+      target: [...preInitialState.configuration].filter(actors_dist_xstateActors.isAtomicStateNode),
+      source: this.root,
+      reenter: true,
+      actions: [],
+      eventType: null,
+      toJSON: null // TODO: fix
+    }], preInitialState, actorCtx, initEvent, true);
     const {
       state: macroState
     } = actors_dist_xstateActors.macrostep(nextState, initEvent, actorCtx);
@@ -526,7 +514,7 @@ class StateMachine {
     });
   }
   getStateNodeById(stateId) {
-    const fullPath = stateId.split(this.delimiter);
+    const fullPath = stateId.split(actors_dist_xstateActors.STATE_DELIMITER);
     const relativePath = fullPath.slice(1);
     const resolvedStateId = actors_dist_xstateActors.isStateId(fullPath[0]) ? fullPath[0].slice(STATE_IDENTIFIER.length) : fullPath[0];
     const stateNode = this.idMap.get(resolvedStateId);
@@ -536,10 +524,7 @@ class StateMachine {
     return actors_dist_xstateActors.getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;
@@ -564,7 +549,7 @@ class StateMachine {
       const actorData = state.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const logic = src ? actors_dist_xstateActors.resolveReferencedActor(this.options.actors[src])?.src : undefined;
+      const logic = src ? actors_dist_xstateActors.resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
       if (!logic) {
         return;
       }
@@ -591,7 +576,7 @@ class StateMachine {
           if (children[id]) {
             return;
           }
-          const referenced = actors_dist_xstateActors.resolveReferencedActor(this.options.actors[src]);
+          const referenced = actors_dist_xstateActors.resolveReferencedActor(this.implementations.actors[src]);
           if (referenced) {
             const actorRef = actors_dist_xstateActors.interpret(referenced.src, {
               id,

package/dist/xstate.development.esm.js

@@ -1,5 +1,5 @@
-import { m as mapValues, t as toActionObjects, a as toArray, f as formatTransitions, b as toTransitionConfigArray, N as NULL_EVENT, c as formatTransition, d as memo, e as evaluateGuard, g as flatten, h as createInvokeId, i as isString, j as invoke, k as getDelayedTransitions, l as formatInitialTransition, n as getCandidates, o as toInvokeConfig, p as createSpawner, S as STATE_DELIMITER, q as getConfiguration, r as getStateNodes, s as resolveStateValue, u as isInFinalState, v as State, w as isErrorEvent, x as macrostep, y as transitionNode, z as getInitialConfiguration, A as resolveActionsAndContext, B as microstep, C as error, D as isStateId, E as getStateNodeByPath, F as getPersistedState, G as resolveReferencedActor, H as interpret, I as createInitEvent, J as initEvent, K as matchesState } from './actions-60622c0c.development.esm.js';
-export { a9 as ActionTypes, P as Interpreter, Q as InterpreterStatus, aa as SpecialTargets, v as State, a7 as and, T as assign, U as cancel, V as choose, R as doneInvoke, O as forwardTo, a2 as fromCallback, a3 as fromEventObservable, a1 as fromObservable, a0 as fromPromise, a4 as fromTransition, r as getStateNodes, H as interpret, W as log, K as matchesState, a6 as not, a8 as or, _ as pathToStateValue, X as pure, Y as raise, M as sendParent, L as sendTo, a5 as stateIn, Z as stop, $ as toObserver } from './actions-60622c0c.development.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toActionObjects, a as toArray, f as formatTransitions, b as toTransitionConfigArray, N as NULL_EVENT, c as formatTransition, d as memo, e as evaluateGuard, g as flatten, h as createInvokeId, i as isString, j as invoke, k as getDelayedTransitions, l as formatInitialTransition, n as getCandidates, o as toInvokeConfig, p as getConfiguration, q as getStateNodes, r as resolveStateValue, s as isInFinalState, u as State, v as isErrorEvent, w as macrostep, x as transitionNode, y as getInitialConfiguration, z as resolveActionsAndContext, A as assign, B as microstep, C as isAtomicStateNode, D as error, E as isStateId, F as getStateNodeByPath, G as getPersistedState, H as resolveReferencedActor, I as interpret, J as createInitEvent, K as matchesState } from './actions-6f7fbc84.development.esm.js';
+export { a8 as ActionTypes, P as Interpreter, Q as InterpreterStatus, a9 as SpecialTargets, u as State, a6 as and, A as assign, T as cancel, U as choose, R as doneInvoke, O as forwardTo, a1 as fromCallback, a2 as fromEventObservable, a0 as fromObservable, $ as fromPromise, a3 as fromTransition, q as getStateNodes, I as interpret, V as log, K as matchesState, a5 as not, a7 as or, Z as pathToStateValue, W as pure, X as raise, M as sendParent, L as sendTo, a4 as stateIn, Y as stop, _ as toObserver } from './actions-6f7fbc84.development.esm.js';
 import '../dev/dist/xstate-dev.development.esm.js';
 
 const EMPTY_OBJECT = {};
@@ -92,7 +92,7 @@ class StateNode {
     this.key = options._key;
     this.machine = options._machine;
     this.path = this.parent ? this.parent.path.concat(this.key) : [];
-    this.id = this.config.id || [this.machine.id, ...this.path].join(this.machine.delimiter);
+    this.id = this.config.id || [this.machine.id, ...this.path].join(STATE_DELIMITER);
     this.type = this.config.type || (this.config.states && Object.keys(this.config.states).length ? 'compound' : this.config.history ? 'history' : 'atomic');
     this.description = this.config.description;
     this.order = this.machine.idMap.size;
@@ -182,9 +182,9 @@ class StateNode {
         systemId
       } = invokeConfig;
       const resolvedSrc = isString(src) ? src : !('type' in src) ? resolvedId : src;
-      if (!this.machine.options.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
-        this.machine.options.actors = {
-          ...this.machine.options.actors,
+      if (!this.machine.implementations.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
+        this.machine.implementations.actors = {
+          ...this.machine.implementations.actors,
           // TODO: this should accept `src` as-is
           [resolvedId]: src
         };
@@ -315,33 +315,7 @@ class StateNode {
 }
 
 const STATE_IDENTIFIER = '#';
-function createDefaultOptions() {
-  return {
-    actions: {},
-    actors: {},
-    delays: {},
-    guards: {},
-    context: {}
-  };
-}
 class StateMachine {
-  // TODO: this getter should be removed
-  getContext(input) {
-    return this.getContextAndActions(undefined, input)[0];
-  }
-  getContextAndActions(actorCtx, input) {
-    const actions = [];
-    const {
-      context
-    } = this.config;
-    const resolvedContext = typeof context === 'function' ? context({
-      spawn: createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -350,11 +324,10 @@ class StateMachine {
   /**
    * The raw config used to create the machine.
    */
-  config, options) {
+  config, implementations) {
     this.config = config;
     this.version = void 0;
-    this.delimiter = void 0;
-    this.options = void 0;
+    this.implementations = void 0;
     this.types = void 0;
     this.__xstatenode = true;
     this.idMap = new Map();
@@ -368,8 +341,12 @@ class StateMachine {
     this.__TActorMap = void 0;
     this.__TResolvedTypesMeta = void 0;
     this.id = config.id || '(machine)';
-    this.options = Object.assign(createDefaultOptions(), options);
-    this.delimiter = this.config.delimiter || STATE_DELIMITER;
+    this.implementations = {
+      actors: implementations?.actors ?? {},
+      actions: implementations?.actions ?? {},
+      delays: implementations?.delays ?? {},
+      guards: implementations?.guards ?? {}
+    };
     this.version = this.config.version;
     this.types = this.config.types ?? {};
     this.transition = this.transition.bind(this);
@@ -397,7 +374,7 @@ class StateMachine {
       guards,
       actors,
       delays
-    } = this.options;
+    } = this.implementations;
     return new StateMachine(this.config, {
       actions: {
         ...actions,
@@ -435,10 +412,9 @@ class StateMachine {
       done: isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -477,22 +453,27 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, input) {
-    const [context, actions] = this.getContextAndActions(actorCtx, input);
-    const config = getInitialConfiguration(this.root);
+  getPreInitialState(actorCtx, initEvent) {
+    const {
+      context
+    } = this.config;
     const preInitial = this.resolveState(this.createState({
       value: {},
       // TODO: this is computed in state constructor
-      context,
+      context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: config,
-      transitions: [],
+      configuration: getInitialConfiguration(this.root),
       children: {}
     }));
-    preInitial._initial = true;
-    if (actorCtx) {
-      const [nextState] = resolveActionsAndContext(actions, initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return resolveActionsAndContext([assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -503,8 +484,15 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
-    const nextState = microstep([], preInitialState, actorCtx, initEvent);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
+    const nextState = microstep([{
+      target: [...preInitialState.configuration].filter(isAtomicStateNode),
+      source: this.root,
+      reenter: true,
+      actions: [],
+      eventType: null,
+      toJSON: null // TODO: fix
+    }], preInitialState, actorCtx, initEvent, true);
     const {
       state: macroState
     } = macrostep(nextState, initEvent, actorCtx);
@@ -523,7 +511,7 @@ class StateMachine {
     });
   }
   getStateNodeById(stateId) {
-    const fullPath = stateId.split(this.delimiter);
+    const fullPath = stateId.split(STATE_DELIMITER);
     const relativePath = fullPath.slice(1);
     const resolvedStateId = isStateId(fullPath[0]) ? fullPath[0].slice(STATE_IDENTIFIER.length) : fullPath[0];
     const stateNode = this.idMap.get(resolvedStateId);
@@ -533,10 +521,7 @@ class StateMachine {
     return getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;
@@ -561,7 +546,7 @@ class StateMachine {
       const actorData = state.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const logic = src ? resolveReferencedActor(this.options.actors[src])?.src : undefined;
+      const logic = src ? resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
       if (!logic) {
         return;
       }
@@ -588,7 +573,7 @@ class StateMachine {
           if (children[id]) {
             return;
           }
-          const referenced = resolveReferencedActor(this.options.actors[src]);
+          const referenced = resolveReferencedActor(this.implementations.actors[src]);
           if (referenced) {
             const actorRef = interpret(referenced.src, {
               id,

package/dist/xstate.esm.js

@@ -1,5 +1,5 @@
-import { m as mapValues, t as toActionObjects, a as toArray, f as formatTransitions, b as toTransitionConfigArray, N as NULL_EVENT, c as formatTransition, d as memo, e as evaluateGuard, g as flatten, h as createInvokeId, i as isString, j as invoke, k as getDelayedTransitions, l as formatInitialTransition, n as getCandidates, o as toInvokeConfig, p as createSpawner, S as STATE_DELIMITER, q as getConfiguration, r as getStateNodes, s as resolveStateValue, u as isInFinalState, v as State, w as isErrorEvent, x as macrostep, y as transitionNode, z as getInitialConfiguration, A as resolveActionsAndContext, B as microstep, C as error, D as isStateId, E as getStateNodeByPath, F as getPersistedState, G as resolveReferencedActor, H as interpret, I as createInitEvent, J as initEvent, K as matchesState } from './actions-444a17c3.esm.js';
-export { a9 as ActionTypes, P as Interpreter, Q as InterpreterStatus, aa as SpecialTargets, v as State, a7 as and, T as assign, U as cancel, V as choose, R as doneInvoke, O as forwardTo, a2 as fromCallback, a3 as fromEventObservable, a1 as fromObservable, a0 as fromPromise, a4 as fromTransition, r as getStateNodes, H as interpret, W as log, K as matchesState, a6 as not, a8 as or, _ as pathToStateValue, X as pure, Y as raise, M as sendParent, L as sendTo, a5 as stateIn, Z as stop, $ as toObserver } from './actions-444a17c3.esm.js';
+import { S as STATE_DELIMITER, m as mapValues, t as toActionObjects, a as toArray, f as formatTransitions, b as toTransitionConfigArray, N as NULL_EVENT, c as formatTransition, d as memo, e as evaluateGuard, g as flatten, h as createInvokeId, i as isString, j as invoke, k as getDelayedTransitions, l as formatInitialTransition, n as getCandidates, o as toInvokeConfig, p as getConfiguration, q as getStateNodes, r as resolveStateValue, s as isInFinalState, u as State, v as isErrorEvent, w as macrostep, x as transitionNode, y as getInitialConfiguration, z as resolveActionsAndContext, A as assign, B as microstep, C as isAtomicStateNode, D as error, E as isStateId, F as getStateNodeByPath, G as getPersistedState, H as resolveReferencedActor, I as interpret, J as createInitEvent, K as matchesState } from './actions-0386b622.esm.js';
+export { a8 as ActionTypes, P as Interpreter, Q as InterpreterStatus, a9 as SpecialTargets, u as State, a6 as and, A as assign, T as cancel, U as choose, R as doneInvoke, O as forwardTo, a1 as fromCallback, a2 as fromEventObservable, a0 as fromObservable, $ as fromPromise, a3 as fromTransition, q as getStateNodes, I as interpret, V as log, K as matchesState, a5 as not, a7 as or, Z as pathToStateValue, W as pure, X as raise, M as sendParent, L as sendTo, a4 as stateIn, Y as stop, _ as toObserver } from './actions-0386b622.esm.js';
 import '../dev/dist/xstate-dev.esm.js';
 
 const EMPTY_OBJECT = {};
@@ -92,7 +92,7 @@ class StateNode {
     this.key = options._key;
     this.machine = options._machine;
     this.path = this.parent ? this.parent.path.concat(this.key) : [];
-    this.id = this.config.id || [this.machine.id, ...this.path].join(this.machine.delimiter);
+    this.id = this.config.id || [this.machine.id, ...this.path].join(STATE_DELIMITER);
     this.type = this.config.type || (this.config.states && Object.keys(this.config.states).length ? 'compound' : this.config.history ? 'history' : 'atomic');
     this.description = this.config.description;
     this.order = this.machine.idMap.size;
@@ -182,9 +182,9 @@ class StateNode {
         systemId
       } = invokeConfig;
       const resolvedSrc = isString(src) ? src : !('type' in src) ? resolvedId : src;
-      if (!this.machine.options.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
-        this.machine.options.actors = {
-          ...this.machine.options.actors,
+      if (!this.machine.implementations.actors[resolvedId] && typeof src !== 'string' && !('type' in src)) {
+        this.machine.implementations.actors = {
+          ...this.machine.implementations.actors,
           // TODO: this should accept `src` as-is
           [resolvedId]: src
         };
@@ -315,33 +315,7 @@ class StateNode {
 }
 
 const STATE_IDENTIFIER = '#';
-function createDefaultOptions() {
-  return {
-    actions: {},
-    actors: {},
-    delays: {},
-    guards: {},
-    context: {}
-  };
-}
 class StateMachine {
-  // TODO: this getter should be removed
-  getContext(input) {
-    return this.getContextAndActions(undefined, input)[0];
-  }
-  getContextAndActions(actorCtx, input) {
-    const actions = [];
-    const {
-      context
-    } = this.config;
-    const resolvedContext = typeof context === 'function' ? context({
-      spawn: createSpawner(actorCtx?.self, this, undefined,
-      // TODO: this requires `| undefined` for all referenced dynamic inputs that are spawnable in the context factory,
-      createInitEvent(input), actions),
-      input
-    }) : context;
-    return [resolvedContext || {}, actions];
-  }
   /**
    * The machine's own version.
    */
@@ -350,11 +324,10 @@ class StateMachine {
   /**
    * The raw config used to create the machine.
    */
-  config, options) {
+  config, implementations) {
     this.config = config;
     this.version = void 0;
-    this.delimiter = void 0;
-    this.options = void 0;
+    this.implementations = void 0;
     this.types = void 0;
     this.__xstatenode = true;
     this.idMap = new Map();
@@ -368,8 +341,12 @@ class StateMachine {
     this.__TActorMap = void 0;
     this.__TResolvedTypesMeta = void 0;
     this.id = config.id || '(machine)';
-    this.options = Object.assign(createDefaultOptions(), options);
-    this.delimiter = this.config.delimiter || STATE_DELIMITER;
+    this.implementations = {
+      actors: implementations?.actors ?? {},
+      actions: implementations?.actions ?? {},
+      delays: implementations?.delays ?? {},
+      guards: implementations?.guards ?? {}
+    };
     this.version = this.config.version;
     this.types = this.config.types ?? {};
     this.transition = this.transition.bind(this);
@@ -397,7 +374,7 @@ class StateMachine {
       guards,
       actors,
       delays
-    } = this.options;
+    } = this.implementations;
     return new StateMachine(this.config, {
       actions: {
         ...actions,
@@ -435,10 +412,9 @@ class StateMachine {
       done: isInFinalState(configuration)
     });
   }
-  resolveStateValue(stateValue) {
+  resolveStateValue(stateValue, ...[context]) {
     const resolvedStateValue = resolveStateValue(this.root, stateValue);
-    const resolvedContext = this.getContext();
-    return this.resolveState(State.from(resolvedStateValue, resolvedContext, this));
+    return this.resolveState(State.from(resolvedStateValue, context, this));
   }
 
   /**
@@ -477,22 +453,27 @@ class StateMachine {
    * The initial state _before_ evaluating any microsteps.
    * This "pre-initial" state is provided to initial actions executed in the initial state.
    */
-  getPreInitialState(actorCtx, input) {
-    const [context, actions] = this.getContextAndActions(actorCtx, input);
-    const config = getInitialConfiguration(this.root);
+  getPreInitialState(actorCtx, initEvent) {
+    const {
+      context
+    } = this.config;
     const preInitial = this.resolveState(this.createState({
       value: {},
       // TODO: this is computed in state constructor
-      context,
+      context: typeof context !== 'function' && context ? context : {},
       meta: undefined,
-      configuration: config,
-      transitions: [],
+      configuration: getInitialConfiguration(this.root),
       children: {}
     }));
-    preInitial._initial = true;
-    if (actorCtx) {
-      const [nextState] = resolveActionsAndContext(actions, initEvent, preInitial, actorCtx);
-      preInitial.children = nextState.children;
+    if (typeof context === 'function') {
+      const assignment = ({
+        spawn,
+        event
+      }) => context({
+        spawn,
+        input: event.input
+      });
+      return resolveActionsAndContext([assign(assignment)], initEvent, preInitial, actorCtx);
     }
     return preInitial;
   }
@@ -503,8 +484,15 @@ class StateMachine {
   getInitialState(actorCtx, input) {
     const initEvent = createInitEvent(input); // TODO: fix;
 
-    const preInitialState = this.getPreInitialState(actorCtx, input);
-    const nextState = microstep([], preInitialState, actorCtx, initEvent);
+    const preInitialState = this.getPreInitialState(actorCtx, initEvent);
+    const nextState = microstep([{
+      target: [...preInitialState.configuration].filter(isAtomicStateNode),
+      source: this.root,
+      reenter: true,
+      actions: [],
+      eventType: null,
+      toJSON: null // TODO: fix
+    }], preInitialState, actorCtx, initEvent, true);
     const {
       state: macroState
     } = macrostep(nextState, initEvent, actorCtx);
@@ -523,7 +511,7 @@ class StateMachine {
     });
   }
   getStateNodeById(stateId) {
-    const fullPath = stateId.split(this.delimiter);
+    const fullPath = stateId.split(STATE_DELIMITER);
     const relativePath = fullPath.slice(1);
     const resolvedStateId = isStateId(fullPath[0]) ? fullPath[0].slice(STATE_IDENTIFIER.length) : fullPath[0];
     const stateNode = this.idMap.get(resolvedStateId);
@@ -533,10 +521,7 @@ class StateMachine {
     return getStateNodeByPath(stateNode, relativePath);
   }
   get definition() {
-    return {
-      context: this.getContext(),
-      ...this.root.definition
-    };
+    return this.root.definition;
   }
   toJSON() {
     return this.definition;
@@ -561,7 +546,7 @@ class StateMachine {
       const actorData = state.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const logic = src ? resolveReferencedActor(this.options.actors[src])?.src : undefined;
+      const logic = src ? resolveReferencedActor(this.implementations.actors[src])?.src : undefined;
       if (!logic) {
         return;
       }
@@ -588,7 +573,7 @@ class StateMachine {
           if (children[id]) {
             return;
           }
-          const referenced = resolveReferencedActor(this.options.actors[src]);
+          const referenced = resolveReferencedActor(this.implementations.actors[src]);
           if (referenced) {
             const actorRef = interpret(referenced.src, {
               id,