xstate 5.0.0-beta.12 → 5.0.0-beta.14

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

@@ -1,9 +1,9 @@
-import type { StateNode } from './StateNode.ts';
-import type { State } from './State.ts';
-import type { ActorStatus, Clock, Interpreter } from './interpreter.ts';
-import type { StateMachine } from './StateMachine.ts';
-import type { LifecycleSignal } from './actors/index.ts';
-import { TypegenDisabled, ResolveTypegenMeta, TypegenConstraint, MarkAllImplementationsAsProvided, AreAllImplementationsAssumedToBeProvided } from './typegenTypes.ts';
+import type { StateNode } from "./StateNode.js";
+import type { State } from "./State.js";
+import type { ActorStatus, Clock, Interpreter } from "./interpreter.js";
+import type { StateMachine } from "./StateMachine.js";
+import type { LifecycleSignal } from "./actors/index.js";
+import { TypegenDisabled, ResolveTypegenMeta, TypegenConstraint, MarkAllImplementationsAsProvided, AreAllImplementationsAssumedToBeProvided } from "./typegenTypes.js";
 export type AnyFunction = (...args: any[]) => any;
 type ReturnTypeOrValue<T> = T extends AnyFunction ? ReturnType<T> : T;
 export type IsNever<T> = [T] extends [never] ? true : false;
@@ -76,12 +76,12 @@ export type MachineContext = Record<string, any>;
 export interface ActionMeta<TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> extends StateMeta<TEvent> {
     action: TAction;
 }
-export type Spawner = <T extends ActorBehavior<any, any> | string>(// TODO: read string from machine behavior keys
-behavior: T, options?: Partial<{
+export type Spawner = <T extends ActorLogic<any, any> | string>(// TODO: read string from machine logic keys
+logic: T, options?: Partial<{
     id: string;
     systemId?: string;
     input: any;
-}>) => T extends ActorBehavior<infer TActorEvent, infer TActorEmitted> ? ActorRef<TActorEvent, TActorEmitted> : ActorRef<any, any>;
+}>) => T extends ActorLogic<infer TActorEvent, infer TActorEmitted, infer _, infer __, infer ___> ? ActorRef<TActorEvent, TActorEmitted> : ActorRef<any, any>;
 export interface AssignMeta<TExpressionEvent extends EventObject, _TEvent extends EventObject> extends StateMeta<TExpressionEvent> {
     action: BaseActionObject;
     event: TExpressionEvent;
@@ -182,17 +182,10 @@ type ExtractWithSimpleSupport<T extends {
 export type Receiver<TEvent extends EventObject> = (listener: {
     bivarianceHack(event: TEvent): void;
 }['bivarianceHack']) => void;
-export type InvokeCallback<TEvent extends EventObject = AnyEventObject, TSentEvent extends EventObject = AnyEventObject> = (sendBack: (event: TSentEvent) => void, onReceive: Receiver<TEvent>, { input }: {
+export type InvokeCallback<TEvent extends EventObject = AnyEventObject, TSentEvent extends EventObject = AnyEventObject> = (sendBack: (event: TSentEvent) => void, onReceive: Receiver<TEvent>, { input, system }: {
     input: any;
+    system: AnyActorSystem;
 }) => (() => void) | Promise<any> | void;
-export type ActorBehaviorCreator<TContext extends MachineContext, TEvent extends EventObject, TActorBehavior extends AnyActorBehavior = AnyActorBehavior> = (context: TContext, event: TEvent, meta: {
-    id: string;
-    data?: any;
-    src: string;
-    event: TEvent;
-    meta: MetaObject | undefined;
-    input: any;
-}) => TActorBehavior;
 export interface InvokeMeta {
     src: string;
     meta: MetaObject | undefined;
@@ -201,7 +194,7 @@ export interface InvokeDefinition<TContext extends MachineContext, TEvent extend
     id: string;
     systemId: string | undefined;
     /**
-     * The source of the actor's behavior to be invoked
+     * The source of the actor logic to be invoked
      */
     src: string;
     input?: Mapper<TContext, TEvent, any> | any;
@@ -259,7 +252,7 @@ export interface InvokeConfig<TContext extends MachineContext, TEvent extends Ev
     /**
      * The source of the machine to be invoked, or the machine itself.
      */
-    src: string | ActorBehavior<any, any>;
+    src: string | ActorLogic<any, any>;
     input?: Mapper<TContext, TEvent, any> | any;
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
@@ -428,8 +421,8 @@ export type DelayConfig<TContext extends MachineContext, TEvent extends EventObj
 export interface MachineImplementationsSimplified<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject = ParameterizedObject> {
     guards: Record<string, GuardPredicate<TContext, TEvent>>;
     actions: ActionFunctionMap<TContext, TEvent, TAction>;
-    actors: Record<string, AnyActorBehavior | {
-        src: AnyActorBehavior;
+    actors: Record<string, AnyActorLogic | {
+        src: AnyActorLogic;
         input: Mapper<TContext, TEvent, any> | any;
     }>;
     delays: DelayFunctionMap<TContext, TEvent>;
@@ -446,8 +439,8 @@ type MachineImplementationsGuards<TContext extends MachineContext, TResolvedType
     [K in keyof TEventsCausingGuards]?: GuardPredicate<TContext, Cast<Prop<TIndexedEvents, TEventsCausingGuards[K]>, EventObject>>;
 };
 type MachineImplementationsActors<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingActors = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingActors'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>, _TInvokeSrcNameMap = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'invokeSrcNameMap'>> = {
-    [K in keyof TEventsCausingActors]?: AnyActorBehavior | {
-        src: AnyActorBehavior;
+    [K in keyof TEventsCausingActors]?: AnyActorLogic | {
+        src: AnyActorLogic;
         input: Mapper<TContext, Cast<Prop<TIndexedEvents, TEventsCausingActors[K]>, EventObject>, any> | any;
     };
 };
@@ -782,9 +775,7 @@ export interface StateLike<TContext extends MachineContext> {
 export interface StateConfig<TContext extends MachineContext, TEvent extends EventObject> {
     value: StateValue;
     context: TContext;
-    event: TEvent;
     historyValue?: HistoryValue<TContext, TEvent>;
-    actions?: BaseActionObject[];
     meta?: any;
     configuration?: Array<StateNode<TContext, TEvent>>;
     transitions?: Array<TransitionDefinition<TContext, TEvent>>;
@@ -795,7 +786,7 @@ export interface StateConfig<TContext extends MachineContext, TEvent extends Eve
     machine?: StateMachine<TContext, TEvent, any, any, any>;
     _internalQueue?: Array<TEvent>;
 }
-export interface InterpreterOptions<_TActorBehavior extends AnyActorBehavior> {
+export interface InterpreterOptions<_TActorLogic extends AnyActorLogic> {
     /**
      * Whether state actions should be executed immediately upon transition. Defaults to `true`.
      */
@@ -855,7 +846,6 @@ export interface Subscribable<T> extends InteropSubscribable<T> {
     subscribe(observer: Observer<T>): Subscription;
     subscribe(next: (value: T) => void, error?: (error: any) => void, complete?: () => void): Subscription;
 }
-export type Spawnable = AnyStateMachine | PromiseLike<any> | InvokeCallback | InteropObservable<any> | Subscribable<any> | ActorBehavior<any, any>;
 export type ExtractEvent<TEvent extends EventObject, TEventType extends TEvent['type']> = TEvent extends any ? TEventType extends TEvent['type'] ? TEvent : never : never;
 export interface BaseActorRef<TEvent extends EventObject> {
     send: (event: TEvent) => void;
@@ -883,9 +873,9 @@ export interface ActorRef<TEvent extends EventObject, TSnapshot = any> extends S
 export type AnyActorRef = ActorRef<any, any>;
 export type ActorRefFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer TEvent, any, any, infer TResolvedTypesMeta> ? ActorRef<TEvent, State<TContext, TEvent, AreAllImplementationsAssumedToBeProvided<TResolvedTypesMeta> extends false ? MarkAllImplementationsAsProvided<TResolvedTypesMeta> : TResolvedTypesMeta>> : R extends Promise<infer U> ? ActorRef<{
     type: string;
-}, U | undefined> : R extends ActorBehavior<infer TEvent, infer TSnapshot> ? ActorRef<TEvent, TSnapshot> : never : never;
+}, U | undefined> : R extends ActorLogic<infer TEvent, infer TSnapshot> ? ActorRef<TEvent, TSnapshot> : never : never;
 export type DevToolsAdapter = (service: AnyInterpreter) => void;
-export type InterpreterFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine)> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, any, any, infer TResolvedTypesMeta> ? Interpreter<ActorBehavior<TEvent, State<TContext, TEvent, TResolvedTypesMeta>, State<TContext, TEvent, TResolvedTypesMeta>, PersistedMachineState<State<TContext, TEvent, TResolvedTypesMeta>>>> : never;
+export type InterpreterFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine)> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, any, any, infer TResolvedTypesMeta> ? Interpreter<ActorLogic<TEvent, State<TContext, TEvent, TResolvedTypesMeta>, State<TContext, TEvent, TResolvedTypesMeta>, PersistedMachineState<State<TContext, TEvent, TResolvedTypesMeta>>>> : never;
 export type MachineImplementationsFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine), TRequireMissingImplementations extends boolean = false> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, any, any, infer TResolvedTypesMeta> ? InternalMachineImplementations<TContext, TEvent, TResolvedTypesMeta, TRequireMissingImplementations> : never;
 export type __ResolvedTypesMetaFrom<T> = T extends StateMachine<any, any, any, infer TResolvedTypesMeta> ? TResolvedTypesMeta : never;
 export type EventOfMachine<TMachine extends AnyStateMachine> = TMachine extends StateMachine<any, infer E, any, any, any> ? E : never;
@@ -899,7 +889,7 @@ export interface ActorContext<TEvent extends EventObject, TSnapshot, TSystem ext
     stopChild: (child: AnyActorRef) => void;
 }
 export type AnyActorContext = ActorContext<any, any, any>;
-export interface ActorBehavior<TEvent extends EventObject, TSnapshot = any, TInternalState = any, 
+export interface ActorLogic<TEvent extends EventObject, TSnapshot = any, TInternalState = TSnapshot, 
 /**
  * Serialized internal state used for persistence & restoration
  */
@@ -919,14 +909,14 @@ TPersisted = TInternalState, TSystem extends ActorSystem<any> = ActorSystem<any>
      */
     getPersistedState?: (state: TInternalState) => TPersisted;
 }
-export type AnyActorBehavior = ActorBehavior<any, any, any, any>;
-export type SnapshotFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TSnapshot> ? TSnapshot : R extends Interpreter<infer TBehavior> ? SnapshotFrom<TBehavior> : R extends StateMachine<infer _, infer __, infer ___, infer ____, infer _____> ? StateFrom<R> : R extends ActorBehavior<infer _, infer TSnapshot, infer __, infer ___, infer ____> ? TSnapshot : R extends ActorContext<infer _, infer TSnapshot, infer __> ? TSnapshot : never : never;
-export type EventFromBehavior<TBehavior extends ActorBehavior<any, any>> = TBehavior extends ActorBehavior<infer TEvent, infer _> ? TEvent : never;
-export type PersistedStateFrom<TBehavior extends ActorBehavior<any, any>> = TBehavior extends ActorBehavior<infer _TEvent, infer _TSnapshot, infer _TInternalState, infer TPersisted> ? TPersisted : never;
-export type InternalStateFrom<TBehavior extends ActorBehavior<any, any>> = TBehavior extends ActorBehavior<infer _TEvent, infer _TSnapshot, infer TInternalState, infer _TPersisted> ? TInternalState : never;
+export type AnyActorLogic = ActorLogic<any, any, any, any>;
+export type SnapshotFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TSnapshot> ? TSnapshot : R extends Interpreter<infer TLogic> ? SnapshotFrom<TLogic> : R extends StateMachine<infer _, infer __, infer ___, infer ____, infer _____> ? StateFrom<R> : R extends ActorLogic<infer _, infer TSnapshot, infer __, infer ___, infer ____> ? TSnapshot : R extends ActorContext<infer _, infer TSnapshot, infer __> ? TSnapshot : never : never;
+export type EventFromLogic<TLogic extends ActorLogic<any, any>> = TLogic extends ActorLogic<infer TEvent, infer _, infer __, infer ___, infer ____> ? TEvent : never;
+export type PersistedStateFrom<TLogic extends ActorLogic<any, any>> = TLogic extends ActorLogic<infer _TEvent, infer _TSnapshot, infer _TInternalState, infer TPersisted> ? TPersisted : never;
+export type InternalStateFrom<TLogic extends ActorLogic<any, any>> = TLogic extends ActorLogic<infer _TEvent, infer _TSnapshot, infer TInternalState, infer _TPersisted> ? TInternalState : never;
 type ResolveEventType<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer _, infer TEvent, infer __, infer ___, infer ____> ? TEvent : R extends State<infer _, infer TEvent, infer __> ? TEvent : R extends ActorRef<infer TEvent, infer _> ? TEvent : never : never;
 export type EventFrom<T, K extends Prop<TEvent, 'type'> = never, TEvent extends EventObject = ResolveEventType<T>> = IsNever<K> extends true ? TEvent : ExtractEvent<TEvent, K>;
-export type ContextFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer _, infer __, infer ___, infer ____> ? TContext : R extends State<infer TContext, infer _, infer __> ? TContext : R extends Interpreter<infer TBehavior> ? TBehavior extends StateMachine<infer TContext, infer _> ? TContext : never : never : never;
+export type ContextFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer _, infer __, infer ___, infer ____> ? TContext : R extends State<infer TContext, infer _, infer __> ? TContext : R extends Interpreter<infer TActorLogic> ? TActorLogic extends StateMachine<infer TContext, infer _> ? TContext : never : never : never;
 export type InferEvent<E extends EventObject> = {
     [T in E['type']]: {
         type: T;
@@ -937,7 +927,6 @@ export type InferEvent<E extends EventObject> = {
 export type TODO = any;
 export type StateValueFrom<TMachine extends AnyStateMachine> = Parameters<StateFrom<TMachine>['matches']>[0];
 export type TagsFrom<TMachine extends AnyStateMachine> = Parameters<StateFrom<TMachine>['hasTag']>[0];
-export type StateFromMachine<TMachine extends AnyStateMachine> = TMachine['initialState'];
 export interface ActorSystemInfo {
     actors: Record<string, AnyActorRef>;
 }
@@ -948,7 +937,8 @@ export interface ActorSystem<T extends ActorSystemInfo> {
     _set: <K extends keyof T['actors']>(key: K, actorRef: T['actors'][K]) => void;
     get: <K extends keyof T['actors']>(key: K) => T['actors'][K] | undefined;
 }
-export type PersistedMachineState<TState extends AnyState> = Pick<TState, 'value' | 'output' | 'context' | 'event' | 'done' | 'historyValue'> & {
+export type AnyActorSystem = ActorSystem<any>;
+export type PersistedMachineState<TState extends AnyState> = Pick<TState, 'value' | 'output' | 'context' | 'done' | 'historyValue'> & {
     children: {
         [K in keyof TState['children']]: {
             state: any;

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

@@ -1,7 +1,7 @@
-import { AnyActorBehavior, AnyState } from './index.ts';
-import { NULL_EVENT } from './constants.ts';
-import type { StateNode } from './StateNode.ts';
-import type { ActorBehavior, AnyEventObject, EventObject, EventType, InvokeConfig, MachineContext, Mapper, Observer, PropertyMapper, ErrorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfig, TransitionConfigTarget } from './types.ts';
+import { AnyActorLogic, AnyState } from "./index.js";
+import { NULL_EVENT } from "./constants.js";
+import type { StateNode } from "./StateNode.js";
+import type { ActorLogic, AnyEventObject, EventObject, EventType, InvokeConfig, MachineContext, Mapper, Observer, PropertyMapper, ErrorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfig, TransitionConfigTarget } from "./types.js";
 export declare function keys<T extends object>(value: T): Array<keyof T & string>;
 export declare function matchesState(parentStateId: StateValue, childStateId: StateValue, delimiter?: string): boolean;
 export declare function toStatePath(stateId: string | string[], delimiter: string): string[];
@@ -30,7 +30,7 @@ export declare function toArray<T>(value: T[] | T | undefined): T[];
 export declare function mapContext<TContext extends MachineContext, TEvent extends EventObject>(mapper: Mapper<TContext, TEvent, any> | PropertyMapper<TContext, TEvent, any>, context: TContext, event: TEvent): any;
 export declare function isBuiltInEvent(eventType: EventType): boolean;
 export declare function isPromiseLike(value: any): value is PromiseLike<any>;
-export declare function isBehavior(value: any): value is ActorBehavior<any, any>;
+export declare function isActorLogic(value: any): value is ActorLogic<any, any>;
 export declare function partition<T, A extends T, B extends T>(items: T[], predicate: (item: T) => item is A): [A[], B[]];
 export declare function isArray(value: any): value is any[];
 export declare function isFunction(value: any): value is Function;
@@ -43,13 +43,13 @@ export declare function toTransitionConfigArray<TContext extends MachineContext,
 }>;
 export declare function normalizeTarget<TContext extends MachineContext, TEvent extends EventObject>(target: SingleOrArray<string | StateNode<TContext, TEvent>> | undefined): Array<string | StateNode<TContext, TEvent>> | undefined;
 export declare function reportUnhandledExceptionOnInvocation(originalError: any, currentError: any, id: string): void;
-export declare function toInvokeConfig<TContext extends MachineContext, TEvent extends EventObject>(invocable: InvokeConfig<TContext, TEvent> | string | ActorBehavior<any, any>, id: string): InvokeConfig<TContext, TEvent>;
+export declare function toInvokeConfig<TContext extends MachineContext, TEvent extends EventObject>(invocable: InvokeConfig<TContext, TEvent> | string | ActorLogic<any, any>, id: string): InvokeConfig<TContext, TEvent>;
 export declare function toObserver<T>(nextHandler?: Observer<T> | ((value: T) => void), errorHandler?: (error: any) => void, completionHandler?: () => void): Observer<T>;
 export declare function createInvokeId(stateNodeId: string, index: number): string;
-export declare function resolveReferencedActor(referenced: AnyActorBehavior | {
-    src: AnyActorBehavior;
+export declare function resolveReferencedActor(referenced: AnyActorLogic | {
+    src: AnyActorLogic;
     input: Mapper<any, any, any> | any;
 } | undefined): {
-    src: AnyActorBehavior;
+    src: AnyActorLogic;
     input: Mapper<any, any, any> | any;
 } | undefined;

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

@@ -1,4 +1,4 @@
-import { ActorRef, SnapshotFrom } from './types.ts';
+import { ActorRef, SnapshotFrom } from "./types.js";
 interface WaitForOptions {
     /**
      * How long to wait before rejecting, if no emitted

package/dist/xstate.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-e4c704f3.cjs.js');
+var actors_dist_xstateActors = require('./actions-17c3bcfa.cjs.js');
 require('../dev/dist/xstate-dev.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -173,15 +173,15 @@ class StateNode {
   }
 
   /**
-   * The behaviors invoked as actors by this state node.
+   * The logic invoked as actors by this state node.
    */
   get invoke() {
     return actors_dist_xstateActors.memo(this, 'invoke', () => actors_dist_xstateActors.toArray(this.config.invoke).map((invocable, i) => {
       const generatedId = actors_dist_xstateActors.createInvokeId(this.id, i);
       const invokeConfig = actors_dist_xstateActors.toInvokeConfig(invocable, generatedId);
       const resolvedId = invokeConfig.id || generatedId;
+      const src = invokeConfig.src;
       const {
-        src,
         systemId
       } = invokeConfig;
       const resolvedSrc = actors_dist_xstateActors.isString(src) ? src : !('type' in src) ? resolvedId : src;
@@ -451,15 +451,14 @@ class StateMachine {
    * @param state The current State instance or state value
    * @param event The received event
    */
-  transition(state = this.initialState, event, actorCtx) {
-    const currentState = state instanceof actors_dist_xstateActors.State ? state : this.resolveStateValue(state);
+  transition(state, event, actorCtx) {
     // TODO: handle error events in a better way
-    if (actors_dist_xstateActors.isErrorEvent(event) && !currentState.nextEvents.some(nextEvent => nextEvent === event.type)) {
+    if (actors_dist_xstateActors.isErrorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       throw event.data;
     }
     const {
       state: nextState
-    } = actors_dist_xstateActors.macrostep(currentState, event, actorCtx);
+    } = actors_dist_xstateActors.macrostep(state, event, actorCtx);
     return nextState;
   }
 
@@ -470,7 +469,7 @@ class StateMachine {
    * @param state The current state
    * @param event The received event
    */
-  microstep(state = this.initialState, event, actorCtx) {
+  microstep(state, event, actorCtx) {
     return actors_dist_xstateActors.macrostep(state, event, actorCtx).microstates;
   }
   getTransitionData(state, event) {
@@ -488,33 +487,19 @@ class StateMachine {
       value: {},
       // TODO: this is computed in state constructor
       context,
-      event: actors_dist_xstateActors.createInitEvent({}),
-      actions: [],
       meta: undefined,
       configuration: config,
       transitions: [],
       children: {}
     }));
     preInitial._initial = true;
-    preInitial.actions.unshift(...actions);
     if (actorCtx) {
-      const {
-        nextState
-      } = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
+      const [nextState] = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
       preInitial.children = nextState.children;
-      preInitial.actions = nextState.actions;
     }
     return preInitial;
   }
 
-  /**
-   * The initial State instance, which includes all actions to be executed from
-   * entering the initial state.
-   */
-  get initialState() {
-    return this.getInitialState();
-  }
-
   /**
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
@@ -523,16 +508,12 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, input);
     const nextState = actors_dist_xstateActors.microstep([], preInitialState, actorCtx, initEvent);
-    nextState.actions.unshift(...preInitialState.actions);
     const {
       state: macroState
     } = actors_dist_xstateActors.macrostep(nextState, initEvent, actorCtx);
     return macroState;
   }
   start(state, actorCtx) {
-    state.actions.forEach(action => {
-      action.execute?.(actorCtx);
-    });
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
         try {
@@ -567,11 +548,7 @@ class StateMachine {
     return actors_dist_xstateActors.getPersistedState(state);
   }
   createState(stateConfig) {
-    const state = stateConfig instanceof actors_dist_xstateActors.State ? stateConfig : new actors_dist_xstateActors.State(stateConfig, this);
-    const {
-      nextState: resolvedState
-    } = actors_dist_xstateActors.resolveActionsAndContext(state.actions, state.event, state, undefined);
-    return resolvedState;
+    return stateConfig instanceof actors_dist_xstateActors.State ? stateConfig : new actors_dist_xstateActors.State(stateConfig, this);
   }
   getStatus(state) {
     return state.done ? {
@@ -587,12 +564,12 @@ class StateMachine {
       const actorData = state.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const behavior = src ? actors_dist_xstateActors.resolveReferencedActor(this.options.actors[src])?.src : undefined;
-      if (!behavior) {
+      const logic = src ? actors_dist_xstateActors.resolveReferencedActor(this.options.actors[src])?.src : undefined;
+      if (!logic) {
         return;
       }
-      const actorState = behavior.restoreState?.(childState, _actorCtx);
-      const actorRef = actors_dist_xstateActors.interpret(behavior, {
+      const actorState = logic.restoreState?.(childState, _actorCtx);
+      const actorRef = actors_dist_xstateActors.interpret(logic, {
         id: actorId,
         state: actorState
       });
@@ -626,7 +603,6 @@ class StateMachine {
         });
       }
     });
-    restoredState.actions = [];
     return restoredState;
   }
 

package/dist/xstate.development.cjs.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var actors_dist_xstateActors = require('./actions-d9c19f35.development.cjs.js');
+var actors_dist_xstateActors = require('./actions-73b8d456.development.cjs.js');
 require('../dev/dist/xstate-dev.development.cjs.js');
 
 const EMPTY_OBJECT = {};
@@ -173,15 +173,15 @@ class StateNode {
   }
 
   /**
-   * The behaviors invoked as actors by this state node.
+   * The logic invoked as actors by this state node.
    */
   get invoke() {
     return actors_dist_xstateActors.memo(this, 'invoke', () => actors_dist_xstateActors.toArray(this.config.invoke).map((invocable, i) => {
       const generatedId = actors_dist_xstateActors.createInvokeId(this.id, i);
       const invokeConfig = actors_dist_xstateActors.toInvokeConfig(invocable, generatedId);
       const resolvedId = invokeConfig.id || generatedId;
+      const src = invokeConfig.src;
       const {
-        src,
         systemId
       } = invokeConfig;
       const resolvedSrc = actors_dist_xstateActors.isString(src) ? src : !('type' in src) ? resolvedId : src;
@@ -451,15 +451,14 @@ class StateMachine {
    * @param state The current State instance or state value
    * @param event The received event
    */
-  transition(state = this.initialState, event, actorCtx) {
-    const currentState = state instanceof actors_dist_xstateActors.State ? state : this.resolveStateValue(state);
+  transition(state, event, actorCtx) {
     // TODO: handle error events in a better way
-    if (actors_dist_xstateActors.isErrorEvent(event) && !currentState.nextEvents.some(nextEvent => nextEvent === event.type)) {
+    if (actors_dist_xstateActors.isErrorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       throw event.data;
     }
     const {
       state: nextState
-    } = actors_dist_xstateActors.macrostep(currentState, event, actorCtx);
+    } = actors_dist_xstateActors.macrostep(state, event, actorCtx);
     return nextState;
   }
 
@@ -470,7 +469,7 @@ class StateMachine {
    * @param state The current state
    * @param event The received event
    */
-  microstep(state = this.initialState, event, actorCtx) {
+  microstep(state, event, actorCtx) {
     return actors_dist_xstateActors.macrostep(state, event, actorCtx).microstates;
   }
   getTransitionData(state, event) {
@@ -488,33 +487,19 @@ class StateMachine {
       value: {},
       // TODO: this is computed in state constructor
       context,
-      event: actors_dist_xstateActors.createInitEvent({}),
-      actions: [],
       meta: undefined,
       configuration: config,
       transitions: [],
       children: {}
     }));
     preInitial._initial = true;
-    preInitial.actions.unshift(...actions);
     if (actorCtx) {
-      const {
-        nextState
-      } = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
+      const [nextState] = actors_dist_xstateActors.resolveActionsAndContext(actions, actors_dist_xstateActors.initEvent, preInitial, actorCtx);
       preInitial.children = nextState.children;
-      preInitial.actions = nextState.actions;
     }
     return preInitial;
   }
 
-  /**
-   * The initial State instance, which includes all actions to be executed from
-   * entering the initial state.
-   */
-  get initialState() {
-    return this.getInitialState();
-  }
-
   /**
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
@@ -523,16 +508,12 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, input);
     const nextState = actors_dist_xstateActors.microstep([], preInitialState, actorCtx, initEvent);
-    nextState.actions.unshift(...preInitialState.actions);
     const {
       state: macroState
     } = actors_dist_xstateActors.macrostep(nextState, initEvent, actorCtx);
     return macroState;
   }
   start(state, actorCtx) {
-    state.actions.forEach(action => {
-      action.execute?.(actorCtx);
-    });
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
         try {
@@ -567,11 +548,7 @@ class StateMachine {
     return actors_dist_xstateActors.getPersistedState(state);
   }
   createState(stateConfig) {
-    const state = stateConfig instanceof actors_dist_xstateActors.State ? stateConfig : new actors_dist_xstateActors.State(stateConfig, this);
-    const {
-      nextState: resolvedState
-    } = actors_dist_xstateActors.resolveActionsAndContext(state.actions, state.event, state, undefined);
-    return resolvedState;
+    return stateConfig instanceof actors_dist_xstateActors.State ? stateConfig : new actors_dist_xstateActors.State(stateConfig, this);
   }
   getStatus(state) {
     return state.done ? {
@@ -587,12 +564,12 @@ class StateMachine {
       const actorData = state.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const behavior = src ? actors_dist_xstateActors.resolveReferencedActor(this.options.actors[src])?.src : undefined;
-      if (!behavior) {
+      const logic = src ? actors_dist_xstateActors.resolveReferencedActor(this.options.actors[src])?.src : undefined;
+      if (!logic) {
         return;
       }
-      const actorState = behavior.restoreState?.(childState, _actorCtx);
-      const actorRef = actors_dist_xstateActors.interpret(behavior, {
+      const actorState = logic.restoreState?.(childState, _actorCtx);
+      const actorRef = actors_dist_xstateActors.interpret(logic, {
         id: actorId,
         state: actorState
       });
@@ -626,7 +603,6 @@ class StateMachine {
         });
       }
     });
-    restoredState.actions = [];
     return restoredState;
   }
 

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 createInitEvent, B as resolveActionsAndContext, C as microstep, D as error, E as isStateId, F as getStateNodeByPath, G as getPersistedState, H as resolveReferencedActor, I as interpret, J as initEvent, K as matchesState } from './actions-c8b9504d.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, I 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-c8b9504d.development.esm.js';
+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 '../dev/dist/xstate-dev.development.esm.js';
 
 const EMPTY_OBJECT = {};
@@ -170,15 +170,15 @@ class StateNode {
   }
 
   /**
-   * The behaviors invoked as actors by this state node.
+   * The logic invoked as actors by this state node.
    */
   get invoke() {
     return memo(this, 'invoke', () => toArray(this.config.invoke).map((invocable, i) => {
       const generatedId = createInvokeId(this.id, i);
       const invokeConfig = toInvokeConfig(invocable, generatedId);
       const resolvedId = invokeConfig.id || generatedId;
+      const src = invokeConfig.src;
       const {
-        src,
         systemId
       } = invokeConfig;
       const resolvedSrc = isString(src) ? src : !('type' in src) ? resolvedId : src;
@@ -448,15 +448,14 @@ class StateMachine {
    * @param state The current State instance or state value
    * @param event The received event
    */
-  transition(state = this.initialState, event, actorCtx) {
-    const currentState = state instanceof State ? state : this.resolveStateValue(state);
+  transition(state, event, actorCtx) {
     // TODO: handle error events in a better way
-    if (isErrorEvent(event) && !currentState.nextEvents.some(nextEvent => nextEvent === event.type)) {
+    if (isErrorEvent(event) && !state.nextEvents.some(nextEvent => nextEvent === event.type)) {
       throw event.data;
     }
     const {
       state: nextState
-    } = macrostep(currentState, event, actorCtx);
+    } = macrostep(state, event, actorCtx);
     return nextState;
   }
 
@@ -467,7 +466,7 @@ class StateMachine {
    * @param state The current state
    * @param event The received event
    */
-  microstep(state = this.initialState, event, actorCtx) {
+  microstep(state, event, actorCtx) {
     return macrostep(state, event, actorCtx).microstates;
   }
   getTransitionData(state, event) {
@@ -485,33 +484,19 @@ class StateMachine {
       value: {},
       // TODO: this is computed in state constructor
       context,
-      event: createInitEvent({}),
-      actions: [],
       meta: undefined,
       configuration: config,
       transitions: [],
       children: {}
     }));
     preInitial._initial = true;
-    preInitial.actions.unshift(...actions);
     if (actorCtx) {
-      const {
-        nextState
-      } = resolveActionsAndContext(actions, initEvent, preInitial, actorCtx);
+      const [nextState] = resolveActionsAndContext(actions, initEvent, preInitial, actorCtx);
       preInitial.children = nextState.children;
-      preInitial.actions = nextState.actions;
     }
     return preInitial;
   }
 
-  /**
-   * The initial State instance, which includes all actions to be executed from
-   * entering the initial state.
-   */
-  get initialState() {
-    return this.getInitialState();
-  }
-
   /**
    * Returns the initial `State` instance, with reference to `self` as an `ActorRef`.
    */
@@ -520,16 +505,12 @@ class StateMachine {
 
     const preInitialState = this.getPreInitialState(actorCtx, input);
     const nextState = microstep([], preInitialState, actorCtx, initEvent);
-    nextState.actions.unshift(...preInitialState.actions);
     const {
       state: macroState
     } = macrostep(nextState, initEvent, actorCtx);
     return macroState;
   }
   start(state, actorCtx) {
-    state.actions.forEach(action => {
-      action.execute?.(actorCtx);
-    });
     Object.values(state.children).forEach(child => {
       if (child.status === 0) {
         try {
@@ -564,11 +545,7 @@ class StateMachine {
     return getPersistedState(state);
   }
   createState(stateConfig) {
-    const state = stateConfig instanceof State ? stateConfig : new State(stateConfig, this);
-    const {
-      nextState: resolvedState
-    } = resolveActionsAndContext(state.actions, state.event, state, undefined);
-    return resolvedState;
+    return stateConfig instanceof State ? stateConfig : new State(stateConfig, this);
   }
   getStatus(state) {
     return state.done ? {
@@ -584,12 +561,12 @@ class StateMachine {
       const actorData = state.children[actorId];
       const childState = actorData.state;
       const src = actorData.src;
-      const behavior = src ? resolveReferencedActor(this.options.actors[src])?.src : undefined;
-      if (!behavior) {
+      const logic = src ? resolveReferencedActor(this.options.actors[src])?.src : undefined;
+      if (!logic) {
         return;
       }
-      const actorState = behavior.restoreState?.(childState, _actorCtx);
-      const actorRef = interpret(behavior, {
+      const actorState = logic.restoreState?.(childState, _actorCtx);
+      const actorRef = interpret(logic, {
         id: actorId,
         state: actorState
       });
@@ -623,7 +600,6 @@ class StateMachine {
         });
       }
     });
-    restoredState.actions = [];
     return restoredState;
   }