xstate 5.0.0-beta.29 → 5.0.0-beta.30

package/dist/declarations/src/actors/transition.d.ts

@@ -1,16 +1,19 @@
-import { ActorLogic, ActorContext, ActorSystem, EventObject, ActorRefFrom, AnyActorSystem } from "../types.js";
-export type TransitionActorLogic<TState, TEvent extends EventObject, TInput> = ActorLogic<TEvent, TState, TState, TState, AnyActorSystem, TInput>;
-export type TransitionActorRef<TState, TEvent extends EventObject> = ActorRefFrom<TransitionActorLogic<TState, TEvent, unknown>>;
+import { ActorLogic, ActorContext, ActorSystem, EventObject, ActorRefFrom, AnyActorSystem, Snapshot } from "../types.js";
+export type TransitionSnapshot<TContext> = Snapshot<undefined> & {
+    context: TContext;
+};
+export type TransitionActorLogic<TContext, TEvent extends EventObject, TInput> = ActorLogic<TransitionSnapshot<TContext>, TEvent, TInput, TransitionSnapshot<TContext>, AnyActorSystem>;
+export type TransitionActorRef<TContext, TEvent extends EventObject> = ActorRefFrom<TransitionActorLogic<TransitionSnapshot<TContext>, TEvent, unknown>>;
 /**
  * Returns actor logic from a transition function and its initial state.
  *
  * A transition function is a function that takes the current state and an event and returns the next state.
  *
  * @param transition The transition function that returns the next state given the current state and event.
- * @param initialState The initial state of the transition function.
+ * @param initialContext The initial state of the transition function.
  * @returns Actor logic
  */
-export declare function fromTransition<TState, TEvent extends EventObject, TSystem extends ActorSystem<any>, TInput>(transition: (state: TState, event: TEvent, actorContext: ActorContext<TEvent, TState, TSystem>) => TState, initialState: TState | (({ input, self }: {
+export declare function fromTransition<TContext, TEvent extends EventObject, TSystem extends ActorSystem<any>, TInput>(transition: (state: TContext, event: TEvent, actorContext: ActorContext<TransitionSnapshot<TContext>, TEvent, TSystem>) => TContext, initialContext: TContext | (({ input, self }: {
     input: TInput;
-    self: TransitionActorRef<TState, TEvent>;
-}) => TState)): TransitionActorLogic<TState, TEvent, TInput>;
+    self: TransitionActorRef<TContext, TEvent>;
+}) => TContext)): TransitionActorLogic<TContext, TEvent, TInput>;

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

@@ -2,7 +2,7 @@ export * from "./actions.js";
 export * from "./actors/index.js";
 export { SimulatedClock } from "./SimulatedClock.js";
 export { type Spawner } from "./spawn.js";
-export { StateMachine } from "./StateMachine.js";
+export { StateMachine, type MachineSnapshot } from "./StateMachine.js";
 export { getStateNodes } from "./stateUtils.js";
 export * from "./typegenTypes.js";
 export * from "./types.js";

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

@@ -19,7 +19,7 @@ export declare enum ActorStatus {
  * @deprecated Use `ActorStatus` instead.
  */
 export declare const InterpreterStatus: typeof ActorStatus;
-export declare class Actor<TLogic extends AnyActorLogic, TEvent extends EventObject = EventFromLogic<TLogic>> implements ActorRef<TEvent, SnapshotFrom<TLogic>> {
+export declare class Actor<TLogic extends AnyActorLogic> implements ActorRef<EventFromLogic<TLogic>, SnapshotFrom<TLogic>> {
     logic: TLogic;
     /**
      * The current internal state of the actor.
@@ -42,8 +42,8 @@ export declare class Actor<TLogic extends AnyActorLogic, TEvent extends EventObj
      * Whether the service is started.
      */
     status: ActorStatus;
-    _parent?: ActorRef<any>;
-    ref: ActorRef<TEvent>;
+    _parent?: ActorRef<any, any>;
+    ref: ActorRef<EventFromLogic<TLogic>, SnapshotFrom<TLogic>>;
     private _actorContext;
     private _systemId;
     /**
@@ -83,7 +83,7 @@ export declare class Actor<TLogic extends AnyActorLogic, TEvent extends EventObj
      *
      * @param event The event to send
      */
-    send(event: TEvent): void;
+    send(event: EventFromLogic<TLogic>): void;
     delaySend({ event, id, delay, to }: {
         event: EventObject;
         id: string | undefined;

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

@@ -35,12 +35,11 @@ export declare function getStateNodeByPath(stateNode: AnyStateNode, statePath: s
  *
  * @param state The state value or State instance
  */
-export declare function getStateNodes<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, state: StateValue | State<TContext, TEvent, TODO, TODO, TODO, TODO>): Array<AnyStateNode>;
-export declare function transitionAtomicNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: string, state: State<TContext, TEvent, TODO, TODO, TODO, TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
-export declare function transitionCompoundNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: StateValueMap, state: State<TContext, TEvent, TODO, TODO, TODO, TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
-export declare function transitionParallelNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: StateValueMap, state: State<TContext, TEvent, TODO, TODO, TODO, TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
-export declare function transitionNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: StateValue, state: State<TContext, TEvent, TODO, TODO, TODO, // output
-TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
+export declare function getStateNodes<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, state: StateValue | State<TContext, TEvent, TODO, TODO, TODO>): Array<AnyStateNode>;
+export declare function transitionAtomicNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: string, state: State<TContext, TEvent, TODO, TODO, TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
+export declare function transitionCompoundNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: StateValueMap, state: State<TContext, TEvent, TODO, TODO, TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
+export declare function transitionParallelNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: StateValueMap, state: State<TContext, TEvent, TODO, TODO, TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
+export declare function transitionNode<TContext extends MachineContext, TEvent extends EventObject>(stateNode: AnyStateNode, stateValue: StateValue, state: State<TContext, TEvent, TODO, TODO, TODO>, event: TEvent): Array<TransitionDefinition<TContext, TEvent>> | undefined;
 export declare function removeConflictingTransitions(enabledTransitions: Array<AnyTransitionDefinition>, configuration: Set<AnyStateNode>, historyValue: AnyHistoryValue): Array<AnyTransitionDefinition>;
 /**
  * https://www.w3.org/TR/scxml/#microstepProcedure

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

@@ -1,12 +1,18 @@
 import type { StateNode } from "./StateNode.js";
 import type { State } from "./State.js";
 import type { ActorStatus, Clock, Actor } from "./interpreter.js";
-import type { StateMachine } from "./StateMachine.js";
+import type { MachineSnapshot, StateMachine } from "./StateMachine.js";
 import { TypegenDisabled, ResolveTypegenMeta, TypegenConstraint, MarkAllImplementationsAsProvided, AreAllImplementationsAssumedToBeProvided } from "./typegenTypes.js";
 import { PromiseActorLogic } from "./actors/promise.js";
 import { Guard, GuardPredicate, UnknownGuard } from "./guards.js";
 import { Spawner } from "./spawn.js";
 import { AssignArgs } from "./actions/assign.js";
+export type HomomorphicPick<T, K extends keyof any> = {
+    [P in keyof T as P & K]: T[P];
+};
+export type HomomorphicOmit<T, K extends keyof any> = {
+    [P in keyof T as Exclude<P, K>]: T[P];
+};
 /**
  * `T | unknown` reduces to `unknown` and that can be problematic when it comes to contextual typing.
  * It especially is a problem when the union has a function member, like here:
@@ -61,15 +67,17 @@ export interface ParameterizedObject {
 export interface UnifiedArg<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject> {
     context: TContext;
     event: TExpressionEvent;
-    self: ActorRef<TEvent, TContext>;
+    self: ActorRef<TEvent, MachineSnapshot<TContext, TEvent, ProvidedActor, string, unknown>>;
     system: ActorSystem<any>;
 }
 export type MachineContext = Record<string, any>;
 export interface ActionArgs<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TEvent extends EventObject> extends UnifiedArg<TContext, TExpressionEvent, TEvent> {
     action: TExpressionAction;
 }
-export type InputFrom<T extends AnyActorLogic> = T extends StateMachine<infer _TContext, infer _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TDelay, infer _TTag, infer TInput, infer _TOutput, infer _TResolvedTypesMeta> ? TInput : T extends ActorLogic<infer _TEvent, infer _TSnapshot, infer _TInternalState, infer _TPersisted, infer _TSystem, infer TInput> ? TInput : never;
-export type OutputFrom<T extends AnyActorLogic> = T extends ActorLogic<infer _TEvent, infer _TSnapshot, infer _TInternalState, infer _TPersisted, infer _TSystem, infer _TInput, infer TOutput> ? TOutput : never;
+export type InputFrom<T extends AnyActorLogic> = T extends StateMachine<infer _TContext, infer _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TDelay, infer _TTag, infer TInput, infer _TOutput, infer _TResolvedTypesMeta> ? TInput : T extends ActorLogic<infer _TSnapshot, infer _TEvent, infer TInput, infer _TPersisted, infer _TSystem> ? TInput : never;
+export type OutputFrom<T extends AnyActorLogic> = T extends ActorLogic<infer TSnapshot, infer _TEvent, infer _TInput, infer _TPersisted, infer _TSystem> ? (TSnapshot & {
+    status: 'done';
+})['output'] : never;
 export type ActionFunction<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TActor extends ProvidedActor, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TDelay extends string> = {
     (args: ActionArgs<TContext, TExpressionEvent, TExpressionAction, TEvent>): void;
     _out_TEvent?: TEvent;
@@ -338,7 +346,10 @@ export interface StateMachineDefinition<TContext extends MachineContext, TEvent
 }
 export type AnyStateNode = StateNode<any, any>;
 export type AnyStateNodeDefinition = StateNodeDefinition<any, any>;
-export type AnyState = State<any, any, any, any, any, // delays
+export type AnyState = State<any, // context
+any, // event
+any, // actor
+any, // tags
 any>;
 export type AnyStateMachine = StateMachine<any, any, any, any, any, any, any, any, any, // delays
 any>;
@@ -509,7 +520,7 @@ export type PropertyAssigner<TContext extends MachineContext, TExpressionEvent e
 export type Mapper<TContext extends MachineContext, TEvent extends EventObject, TResult> = (args: {
     context: TContext;
     event: TEvent;
-    self: ActorRef<TEvent>;
+    self: ActorRef<TEvent, any>;
 }) => TResult;
 export type PropertyMapper<TContext extends MachineContext, TEvent extends EventObject, TParams extends {}> = {
     [K in keyof TParams]?: Mapper<TContext, TEvent, TParams[K]> | TParams[K];
@@ -552,8 +563,8 @@ export interface StateConfig<TContext extends MachineContext, TEvent extends Eve
     historyValue?: HistoryValue<TContext, TEvent>;
     meta?: any;
     configuration?: Array<StateNode<TContext, TEvent>>;
-    children: Record<string, ActorRef<any>>;
-    done?: boolean;
+    children: Record<string, ActorRef<any, any>>;
+    status: 'active' | 'done' | 'error' | 'stopped';
     output?: any;
     error?: unknown;
     tags?: Set<string>;
@@ -567,7 +578,7 @@ export interface ActorOptions<TLogic extends AnyActorLogic> {
     execute?: boolean;
     clock?: Clock;
     logger?: (...args: any[]) => void;
-    parent?: ActorRef<any>;
+    parent?: ActorRef<any, any>;
     /**
      * The custom `id` for referencing this service.
      */
@@ -593,14 +604,14 @@ export interface ActorOptions<TLogic extends AnyActorLogic> {
      */
     src?: string;
 }
-export type AnyActor = Actor<any, any>;
+export type AnyActor = Actor<any>;
 /**
  * @deprecated Use `AnyActor` instead.
  */
 export type AnyInterpreter = AnyActor;
 export type Observer<T> = {
     next?: (value: T) => void;
-    error?: (err: any) => void;
+    error?: (err: unknown) => void;
     complete?: () => void;
 };
 export interface Subscription {
@@ -623,7 +634,7 @@ export interface BaseActorRef<TEvent extends EventObject> {
 export interface ActorLike<TCurrent, TEvent extends EventObject> extends Subscribable<TCurrent> {
     send: (event: TEvent) => void;
 }
-export interface ActorRef<TEvent extends EventObject, TSnapshot = any> extends Subscribable<TSnapshot>, InteropObservable<TSnapshot> {
+export interface ActorRef<TEvent extends EventObject, TSnapshot extends Snapshot<unknown>> extends Subscribable<TSnapshot>, InteropObservable<TSnapshot> {
     /**
      * The unique identifier for this actor relative to its parent.
      */
@@ -642,12 +653,12 @@ export interface ActorRef<TEvent extends EventObject, TSnapshot = any> extends S
 }
 export type AnyActorRef = ActorRef<any, any>;
 export type ActorLogicFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<any, any, any, any, any, any, any, any, any> ? R : R extends Promise<infer U> ? PromiseActorLogic<U> : never : never;
-export type ActorRefFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer TEvent, infer TActor, infer _TAction, infer _TGuard, infer _TDelay, infer TTag, infer _TInput, infer TOutput, infer TResolvedTypesMeta> ? ActorRef<TEvent, State<TContext, TEvent, TActor, TTag, TOutput, AreAllImplementationsAssumedToBeProvided<TResolvedTypesMeta> extends false ? MarkAllImplementationsAsProvided<TResolvedTypesMeta> : TResolvedTypesMeta>> : R extends Promise<infer U> ? ActorRefFrom<PromiseActorLogic<U>> : R extends ActorLogic<infer TEvent, infer TSnapshot, infer _, infer __, infer ___, infer ____, infer _____> ? ActorRef<TEvent, TSnapshot> : never : never;
+export type ActorRefFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer TContext, infer TEvent, infer TActor, infer _TAction, infer _TGuard, infer _TDelay, infer TTag, infer _TInput, infer TOutput, infer TResolvedTypesMeta> ? ActorRef<TEvent, MachineSnapshot<TContext, TEvent, TActor, TTag, TOutput, AreAllImplementationsAssumedToBeProvided<TResolvedTypesMeta> extends false ? MarkAllImplementationsAsProvided<TResolvedTypesMeta> : TResolvedTypesMeta>> : R extends Promise<infer U> ? ActorRefFrom<PromiseActorLogic<U>> : R extends ActorLogic<infer TSnapshot, infer TEvent, infer _TInput, infer _TPersisted, infer _TSystem> ? ActorRef<TEvent, TSnapshot> : never : never;
 export type DevToolsAdapter = (service: AnyActor) => void;
 /**
  * @deprecated Use `Actor<T>` instead.
  */
-export type InterpreterFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine)> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, infer TActor, infer _TAction, infer _TGuard, infer _TDelay, infer TTag, infer TInput, infer TOutput, infer TResolvedTypesMeta> ? Actor<ActorLogic<TEvent, State<TContext, TEvent, TActor, TTag, TOutput, TResolvedTypesMeta>, State<TContext, TEvent, TActor, TTag, TOutput, TResolvedTypesMeta>, PersistedMachineState<State<TContext, TEvent, TActor, TTag, TOutput, TResolvedTypesMeta>>, ActorSystem<any>, TInput>> : never;
+export type InterpreterFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine)> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, infer TActor, infer _TAction, infer _TGuard, infer _TDelay, infer TTag, infer TInput, infer TOutput, infer TResolvedTypesMeta> ? Actor<ActorLogic<MachineSnapshot<TContext, TEvent, TActor, TTag, TOutput, TResolvedTypesMeta>, TEvent, TInput, PersistedMachineState<TContext, TEvent, TActor, TTag, TOutput, TResolvedTypesMeta>, ActorSystem<any>>> : never;
 export type MachineImplementationsFrom<T extends AnyStateMachine | ((...args: any[]) => AnyStateMachine), TRequireMissingImplementations extends boolean = false> = ReturnTypeOrValue<T> extends StateMachine<infer TContext, infer TEvent, infer TActor, infer TAction, infer _TGuard, infer TDelay, infer _TTag, infer _TInput, infer _TOutput, infer TResolvedTypesMeta> ? InternalMachineImplementations<TContext, TEvent, TActor, TAction, TDelay, TResolvedTypesMeta, TRequireMissingImplementations> : never;
 export type __ResolvedTypesMetaFrom<T> = T extends StateMachine<any, // context
 any, // event
@@ -659,7 +670,7 @@ any, // tag
 any, // input
 any, // output
 infer TResolvedTypesMeta> ? TResolvedTypesMeta : never;
-export interface ActorContext<TEvent extends EventObject, TSnapshot, TSystem extends ActorSystem<any> = ActorSystem<any>> {
+export interface ActorContext<TSnapshot extends Snapshot<unknown>, TEvent extends EventObject, TSystem extends ActorSystem<any> = ActorSystem<any>> {
     self: ActorRef<TEvent, TSnapshot>;
     id: string;
     sessionId: string;
@@ -669,38 +680,57 @@ export interface ActorContext<TEvent extends EventObject, TSnapshot, TSystem ext
     stopChild: (child: AnyActorRef) => void;
 }
 export type AnyActorContext = ActorContext<any, any, any>;
-export interface ActorLogic<TEvent extends EventObject, TSnapshot = any, TInternalState = TSnapshot, 
+export type ActorStatusObject<TOutput> = {
+    status: 'done';
+    output: TOutput;
+} | {
+    status: 'error';
+    error: unknown;
+} | {
+    status: 'stopped';
+} | {
+    status: 'active';
+};
+export type Snapshot<TOutput> = {
+    status: 'active';
+    output: undefined;
+    error: undefined;
+} | {
+    status: 'done';
+    output: TOutput;
+    error: undefined;
+} | {
+    status: 'error';
+    output: undefined;
+    error: unknown;
+} | {
+    status: 'stopped';
+    output: undefined;
+    error: undefined;
+};
+export interface ActorLogic<TSnapshot extends Snapshot<unknown>, TEvent extends EventObject, TInput = unknown, 
 /**
  * Serialized internal state used for persistence & restoration
  */
-TPersisted = TInternalState, TSystem extends ActorSystem<any> = ActorSystem<any>, TInput = any, TOutput = unknown> {
+TPersisted = TSnapshot, TSystem extends ActorSystem<any> = ActorSystem<any>> {
     config?: unknown;
-    transition: (state: TInternalState, message: TEvent, ctx: ActorContext<TEvent, TSnapshot, TSystem>) => TInternalState;
-    getInitialState: (actorCtx: ActorContext<TEvent, TSnapshot, TSystem>, input: TInput) => TInternalState;
-    restoreState?: (persistedState: TPersisted, actorCtx: ActorContext<TEvent, TSnapshot>) => TInternalState;
-    getSnapshot?: (state: TInternalState) => TSnapshot;
-    getStatus?: (state: TInternalState) => {
-        status: string;
-        data?: any;
-    };
-    start?: (state: TInternalState, actorCtx: ActorContext<TEvent, TSnapshot>) => void;
+    transition: (state: TSnapshot, message: TEvent, ctx: ActorContext<TSnapshot, TEvent, TSystem>) => TSnapshot;
+    getInitialState: (actorCtx: ActorContext<TSnapshot, TEvent, TSystem>, input: TInput) => TSnapshot;
+    restoreState?: (persistedState: TPersisted, actorCtx: ActorContext<TSnapshot, TEvent>) => TSnapshot;
+    start?: (state: TSnapshot, actorCtx: ActorContext<TSnapshot, TEvent>) => void;
     /**
      * @returns Persisted state
      */
-    getPersistedState?: (state: TInternalState) => TPersisted;
-    _out_TOutput?: TOutput;
+    getPersistedState?: (state: TSnapshot) => TPersisted;
 }
-export type AnyActorLogic = ActorLogic<any, // event
-any, // snapshot
-any, // internal state
-any, // persisted state
-any, // system
+export type AnyActorLogic = ActorLogic<any, // snapshot
+any, // event
 any, // input
+any, // persisted state
 any>;
-export type SnapshotFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TSnapshot> ? TSnapshot : R extends Actor<infer TLogic> ? SnapshotFrom<TLogic> : R extends StateMachine<infer _TContext, infer _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TDelay, infer _TTag, infer _TInput, infer _TOutput, infer _TResolvedTypesMeta> ? 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;
+export type SnapshotFrom<T> = ReturnTypeOrValue<T> extends infer R ? R extends ActorRef<infer _, infer TSnapshot> ? TSnapshot : R extends Actor<infer TLogic> ? SnapshotFrom<TLogic> : R extends StateMachine<infer _TContext, infer _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TDelay, infer _TTag, infer _TInput, infer _TOutput, infer _TResolvedTypesMeta> ? StateFrom<R> : R extends ActorLogic<any, any, any, any, any> ? ReturnType<R['transition']> : R extends ActorContext<infer TSnapshot, infer _, infer __> ? TSnapshot : never : never;
+export type EventFromLogic<TLogic extends ActorLogic<any, any, any, any, any>> = TLogic extends ActorLogic<infer _, infer TEvent, infer __, infer _____, infer ______> ? TEvent : never;
+export type PersistedStateFrom<TLogic extends ActorLogic<any, any, any, any, any>> = TLogic extends ActorLogic<infer _TSnapshot, infer _TEvent, infer _TInput, infer TPersisted, infer _TSystem> ? TPersisted : never;
 type ResolveEventType<T> = ReturnTypeOrValue<T> extends infer R ? R extends StateMachine<infer _TContext, infer TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TDelay, infer _TTag, infer _TInput, infer _TOutput, infer _TResolvedTypesMeta> ? TEvent : R extends State<infer _TContext, infer TEvent, infer _TActor, infer _TOutput, infer _TResolvedTypesMeta> ? 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 _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TDelay, infer _TTag, infer _TInput, infer _TOutput, infer _TTypesMeta> ? TContext : R extends State<infer TContext, infer _TEvent, infer _TActor, infer _TOutput, infer _TResolvedTypesMeta> ? TContext : R extends Actor<infer TActorLogic> ? TActorLogic extends StateMachine<infer TContext, infer _TEvent, infer _TActor, infer _TAction, infer _TGuard, infer _TDelay, infer _TTag, infer _TInput, infer _TOutput, infer _TTypesMeta> ? TContext : never : never : never;
@@ -725,9 +755,9 @@ export interface ActorSystem<T extends ActorSystemInfo> {
     get: <K extends keyof T['actors']>(key: K) => T['actors'][K] | undefined;
 }
 export type AnyActorSystem = ActorSystem<any>;
-export type PersistedMachineState<TState extends AnyState> = Pick<TState, 'value' | 'output' | 'error' | 'context' | 'done' | 'historyValue'> & {
+export type PersistedMachineState<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TTag extends string, TOutput, TResolvedTypesMeta = TypegenDisabled> = HomomorphicPick<MachineSnapshot<TContext, TEvent, TActor, TTag, TOutput, TResolvedTypesMeta>, 'value' | 'output' | 'error' | 'context' | 'status' | 'historyValue'> & {
     children: {
-        [K in keyof TState['children']]: {
+        [K in keyof MachineSnapshot<TContext, TEvent, TActor, TTag, TOutput, TResolvedTypesMeta>['children']]: {
             state: any;
             src?: string;
         };

package/dist/{interpreter-e2c6a579.development.cjs.js → interpreter-7f1dc557.development.cjs.js}

@@ -452,10 +452,9 @@ class Actor {
 
   // array of functions to defer
 
-  update(state) {
+  update(snapshot) {
     // Update state
-    this._state = state;
-    const snapshot = this.getSnapshot();
+    this._state = snapshot;
 
     // Execute deferred effects
     let deferredFn;
@@ -470,18 +469,17 @@ class Actor {
         reportUnhandledError(err);
       }
     }
-    const status = this.logic.getStatus?.(state);
-    switch (status?.status) {
+    switch (this._state.status) {
       case 'done':
         this._stopProcedure();
         this._complete();
-        this._doneEvent = createDoneActorEvent(this.id, status.data);
+        this._doneEvent = createDoneActorEvent(this.id, this._state.output);
         this._parent?.send(this._doneEvent);
         break;
       case 'error':
         this._stopProcedure();
-        this._error(status.data);
-        this._parent?.send(createErrorActorEvent(this.id, status.data));
+        this._error(this._state.error);
+        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
         break;
     }
   }
@@ -516,8 +514,8 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
-    const status = this.logic.getStatus?.(this._state);
-    switch (status?.status) {
+    const status = this._state.status;
+    switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
@@ -721,7 +719,7 @@ class Actor {
     return this;
   }
   getSnapshot() {
-    return this.logic.getSnapshot ? this.logic.getSnapshot(this._state) : this._state;
+    return this._state;
   }
 }
 

package/dist/{interpreter-6e7909c8.development.esm.js → interpreter-945c4b96.development.esm.js}

@@ -450,10 +450,9 @@ class Actor {
 
   // array of functions to defer
 
-  update(state) {
+  update(snapshot) {
     // Update state
-    this._state = state;
-    const snapshot = this.getSnapshot();
+    this._state = snapshot;
 
     // Execute deferred effects
     let deferredFn;
@@ -468,18 +467,17 @@ class Actor {
         reportUnhandledError(err);
       }
     }
-    const status = this.logic.getStatus?.(state);
-    switch (status?.status) {
+    switch (this._state.status) {
       case 'done':
         this._stopProcedure();
         this._complete();
-        this._doneEvent = createDoneActorEvent(this.id, status.data);
+        this._doneEvent = createDoneActorEvent(this.id, this._state.output);
         this._parent?.send(this._doneEvent);
         break;
       case 'error':
         this._stopProcedure();
-        this._error(status.data);
-        this._parent?.send(createErrorActorEvent(this.id, status.data));
+        this._error(this._state.error);
+        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
         break;
     }
   }
@@ -514,8 +512,8 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
-    const status = this.logic.getStatus?.(this._state);
-    switch (status?.status) {
+    const status = this._state.status;
+    switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
@@ -719,7 +717,7 @@ class Actor {
     return this;
   }
   getSnapshot() {
-    return this.logic.getSnapshot ? this.logic.getSnapshot(this._state) : this._state;
+    return this._state;
   }
 }
 

package/dist/{interpreter-c357bc50.cjs.js → interpreter-a2c1e529.cjs.js}

@@ -449,10 +449,9 @@ class Actor {
 
   // array of functions to defer
 
-  update(state) {
+  update(snapshot) {
     // Update state
-    this._state = state;
-    const snapshot = this.getSnapshot();
+    this._state = snapshot;
 
     // Execute deferred effects
     let deferredFn;
@@ -467,18 +466,17 @@ class Actor {
         reportUnhandledError(err);
       }
     }
-    const status = this.logic.getStatus?.(state);
-    switch (status?.status) {
+    switch (this._state.status) {
       case 'done':
         this._stopProcedure();
         this._complete();
-        this._doneEvent = createDoneActorEvent(this.id, status.data);
+        this._doneEvent = createDoneActorEvent(this.id, this._state.output);
         this._parent?.send(this._doneEvent);
         break;
       case 'error':
         this._stopProcedure();
-        this._error(status.data);
-        this._parent?.send(createErrorActorEvent(this.id, status.data));
+        this._error(this._state.error);
+        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
         break;
     }
   }
@@ -513,8 +511,8 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
-    const status = this.logic.getStatus?.(this._state);
-    switch (status?.status) {
+    const status = this._state.status;
+    switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
@@ -713,7 +711,7 @@ class Actor {
     return this;
   }
   getSnapshot() {
-    return this.logic.getSnapshot ? this.logic.getSnapshot(this._state) : this._state;
+    return this._state;
   }
 }
 

package/dist/{interpreter-498891b2.esm.js → interpreter-b8f53c4b.esm.js}

@@ -447,10 +447,9 @@ class Actor {
 
   // array of functions to defer
 
-  update(state) {
+  update(snapshot) {
     // Update state
-    this._state = state;
-    const snapshot = this.getSnapshot();
+    this._state = snapshot;
 
     // Execute deferred effects
     let deferredFn;
@@ -465,18 +464,17 @@ class Actor {
         reportUnhandledError(err);
       }
     }
-    const status = this.logic.getStatus?.(state);
-    switch (status?.status) {
+    switch (this._state.status) {
       case 'done':
         this._stopProcedure();
         this._complete();
-        this._doneEvent = createDoneActorEvent(this.id, status.data);
+        this._doneEvent = createDoneActorEvent(this.id, this._state.output);
         this._parent?.send(this._doneEvent);
         break;
       case 'error':
         this._stopProcedure();
-        this._error(status.data);
-        this._parent?.send(createErrorActorEvent(this.id, status.data));
+        this._error(this._state.error);
+        this._parent?.send(createErrorActorEvent(this.id, this._state.error));
         break;
     }
   }
@@ -511,8 +509,8 @@ class Actor {
       this.system._set(this._systemId, this);
     }
     this.status = ActorStatus.Running;
-    const status = this.logic.getStatus?.(this._state);
-    switch (status?.status) {
+    const status = this._state.status;
+    switch (status) {
       case 'done':
         // a state machine can be "done" upon intialization (it could reach a final state using initial microsteps)
         // we still need to complete observers, flush deferreds etc
@@ -711,7 +709,7 @@ class Actor {
     return this;
   }
   getSnapshot() {
-    return this.logic.getSnapshot ? this.logic.getSnapshot(this._state) : this._state;
+    return this._state;
   }
 }
 

package/dist/{raise-59f2c242.esm.js → raise-0b7dde8b.esm.js}

@@ -1,4 +1,4 @@
-import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as mapContext, j as XSTATE_STOP, X as XSTATE_INIT, W as WILDCARD, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-498891b2.esm.js';
+import { r as resolveReferencedActor, d as createActor, f as ActorStatus, k as createErrorActorEvent, l as toStateValue, n as STATE_IDENTIFIER, o as normalizeTarget, t as toArray, N as NULL_EVENT, a as toTransitionConfigArray, S as STATE_DELIMITER, q as toStatePath, s as createDoneStateEvent, u as mapContext, j as XSTATE_STOP, X as XSTATE_INIT, W as WILDCARD, v as isArray, w as createAfterEvent, x as flatten, e as matchesState } from './interpreter-b8f53c4b.esm.js';
 
 const cache = new WeakMap();
 function memo(object, key, fn) {
@@ -890,7 +890,7 @@ function microstepProcedure(transitions, currentState, mutConfiguration, event,
       historyValue,
       _internalQueue: internalQueue,
       context: nextState.context,
-      done,
+      status: done ? 'done' : currentState.status,
       output,
       children: nextState.children
     });
@@ -1119,7 +1119,7 @@ function macrostep(state, event, actorCtx) {
     nextState = microstep(transitions, state, actorCtx, nextEvent, false);
     states.push(nextState);
   }
-  while (!nextState.done) {
+  while (nextState.status === 'active') {
     let enabledTransitions = selectEventlessTransitions(nextState, nextEvent);
     if (!enabledTransitions.length) {
       if (!nextState._internalQueue.length) {
@@ -1136,7 +1136,7 @@ function macrostep(state, event, actorCtx) {
       states.push(nextState);
     }
   }
-  if (nextState.done) {
+  if (nextState.status !== 'active') {
     // Perform the stop step to ensure that child actors are stopped
     stopStep(nextEvent, nextState, actorCtx);
   }
@@ -1229,7 +1229,8 @@ class State {
           meta: {},
           configuration: [],
           // TODO: fix,
-          children: {}
+          children: {},
+          status: 'active'
         }, machine);
       }
       return stateValue;
@@ -1240,7 +1241,8 @@ class State {
       context,
       meta: undefined,
       configuration: Array.from(configuration),
-      children: {}
+      children: {},
+      status: 'active'
     }, machine);
   }
 
@@ -1253,8 +1255,7 @@ class State {
     this.machine = machine;
     this.tags = void 0;
     this.value = void 0;
-    this.done = void 0;
-    this.output = void 0;
+    this.status = void 0;
     this.error = void 0;
     this.context = void 0;
     this.historyValue = {};
@@ -1270,7 +1271,7 @@ class State {
     this.children = config.children;
     this.value = getStateValue(machine.root, this.configuration);
     this.tags = new Set(flatten(this.configuration.map(sn => sn.tags)));
-    this.done = config.done ?? false;
+    this.status = config.status;
     this.output = config.output;
     this.error = config.error;
   }
@@ -1365,9 +1366,10 @@ function getPersistedState(state) {
   } = state;
   const childrenJson = {};
   for (const id in children) {
+    const child = children[id];
     childrenJson[id] = {
-      state: children[id].getPersistedState?.(),
-      src: children[id].src
+      state: child.getPersistedState?.(),
+      src: child.src
     };
   }
   return {