xstate 5.0.0-beta.29 → 5.0.0-beta.31

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

@@ -1,10 +1,8 @@
-import { ActorLogic, ActorRefFrom, ActorSystem, AnyActorSystem } from "../types.js";
+import { ActorLogic, ActorRefFrom, ActorSystem, AnyActorSystem, Snapshot } from "../types.js";
 import { XSTATE_STOP } from "../constants.js";
-export interface PromiseInternalState<T, TInput = unknown> {
-    status: 'active' | 'error' | 'done' | 'canceled';
-    data: T | undefined;
+export type PromiseSnapshot<TOutput, TInput> = Snapshot<TOutput> & {
     input: TInput | undefined;
-}
+};
 declare const resolveEventType = "$$xstate.resolve";
 declare const rejectEventType = "$$xstate.reject";
 export type PromiseActorEvents<T> = {
@@ -16,17 +14,16 @@ export type PromiseActorEvents<T> = {
 } | {
     type: typeof XSTATE_STOP;
 };
-export type PromiseActorLogic<T, TInput = unknown> = ActorLogic<{
+export type PromiseActorLogic<TOutput, TInput = unknown> = ActorLogic<PromiseSnapshot<TOutput, TInput>, {
     type: string;
     [k: string]: unknown;
-}, T | undefined, PromiseInternalState<T, TInput>, // internal state
-PromiseInternalState<T, TInput>, // persisted state
-ActorSystem<any>, TInput, // input
-T>;
-export type PromiseActorRef<T> = ActorRefFrom<PromiseActorLogic<T>>;
-export declare function fromPromise<T, TInput>(promiseCreator: ({ input, system }: {
+}, TInput, // input
+PromiseSnapshot<TOutput, TInput>, // persisted state
+ActorSystem<any>>;
+export type PromiseActorRef<TOutput> = ActorRefFrom<PromiseActorLogic<TOutput, unknown>>;
+export declare function fromPromise<TOutput, TInput = unknown>(promiseCreator: ({ input, system }: {
     input: TInput;
     system: AnyActorSystem;
-    self: PromiseActorRef<T>;
-}) => PromiseLike<T>): PromiseActorLogic<T, TInput>;
+    self: PromiseActorRef<TOutput>;
+}) => PromiseLike<TOutput>): PromiseActorLogic<TOutput, TInput>;
 export {};

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/spawn.d.ts

@@ -6,12 +6,14 @@ type SpawnOptions<TActor extends ProvidedActor, TSrc extends TActor['src']> = TA
         id: TActor['id'];
         systemId?: string;
         input?: InputFrom<TActor['logic']>;
+        syncSnapshot?: boolean;
     }
 ] : [
     options?: {
         id?: string;
         systemId?: string;
         input?: InputFrom<TActor['logic']>;
+        syncSnapshot?: boolean;
     }
 ] : never;
 export type Spawner<TActor extends ProvidedActor> = IsLiteralString<TActor['src']> extends true ? <TSrc extends TActor['src']>(logic: TSrc, ...[options]: SpawnOptions<TActor, TSrc>) => ActorRefFrom<(TActor & {
@@ -20,6 +22,7 @@ export type Spawner<TActor extends ProvidedActor> = IsLiteralString<TActor['src'
     id?: string;
     systemId?: string;
     input?: unknown;
+    syncSnapshot?: boolean;
 }) => TLogic extends string ? AnyActorRef : ActorRefFrom<TLogic>;
 export declare function createSpawner(actorContext: AnyActorContext, { machine, context }: AnyState, event: AnyEventObject, spawnedChildren: Record<string, AnyActorRef>): Spawner<any>;
 export {};

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;
@@ -127,7 +135,7 @@ export interface InvokeDefinition<TContext extends MachineContext, TEvent extend
      * The source of the actor logic to be invoked
      */
     src: string;
-    input?: Mapper<TContext, TEvent, NonReducibleUnknown> | NonReducibleUnknown;
+    input?: Mapper<TContext, TEvent, NonReducibleUnknown, TEvent> | NonReducibleUnknown;
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
      */
@@ -136,7 +144,7 @@ export interface InvokeDefinition<TContext extends MachineContext, TEvent extend
      * The transition to take upon the invoked child machine sending an error event.
      */
     onError?: string | SingleOrArray<TransitionConfig<TContext, ErrorActorEvent, TEvent, TActor, TAction, TGuard, TDelay>>;
-    onSnapshot?: string | SingleOrArray<TransitionConfig<TContext, SnapshotEvent<unknown>, TEvent, TActor, TAction, TGuard, TDelay>>;
+    onSnapshot?: string | SingleOrArray<TransitionConfig<TContext, SnapshotEvent, TEvent, TActor, TAction, TGuard, TDelay>>;
     toJSON: () => Omit<InvokeDefinition<TContext, TEvent, TActor, TAction, TGuard, TDelay>, 'onDone' | 'onError' | 'toJSON'>;
 }
 type Delay<TDelay extends string> = TDelay | number;
@@ -173,7 +181,7 @@ type DistributeActors<TContext extends MachineContext, TEvent extends EventObjec
      * The source of the machine to be invoked, or the machine itself.
      */
     src: TSrc;
-    input?: Mapper<TContext, TEvent, InputFrom<TSpecificActor['logic']>> | InputFrom<TSpecificActor['logic']>;
+    input?: Mapper<TContext, TEvent, InputFrom<TSpecificActor['logic']>, TEvent> | InputFrom<TSpecificActor['logic']>;
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
      */
@@ -207,7 +215,7 @@ export type InvokeConfig<TContext extends MachineContext, TEvent extends EventOb
      * The source of the machine to be invoked, or the machine itself.
      */
     src: AnyActorLogic | string;
-    input?: Mapper<TContext, TEvent, NonReducibleUnknown> | NonReducibleUnknown;
+    input?: Mapper<TContext, TEvent, NonReducibleUnknown, TEvent> | NonReducibleUnknown;
     /**
      * The transition to take upon the invoked child machine reaching its final top-level state.
      */
@@ -217,8 +225,7 @@ export type InvokeConfig<TContext extends MachineContext, TEvent extends EventOb
      * The transition to take upon the invoked child machine sending an error event.
      */
     onError?: string | SingleOrArray<TransitionConfigOrTarget<TContext, ErrorActorEvent, TEvent, TActor, TAction, TGuard, TDelay>>;
-    onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent<any>, // TODO: consider replacing with `unknown`
-    TEvent, TActor, TAction, TGuard, TDelay>>;
+    onSnapshot?: string | SingleOrArray<TransitionConfigOrTarget<TContext, SnapshotEvent, TEvent, TActor, TAction, TGuard, TDelay>>;
 };
 export type AnyInvokeConfig = InvokeConfig<any, any, any, any, any, any>;
 export interface StateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TDelay extends string, TTag extends string, TOutput> {
@@ -291,7 +298,7 @@ export interface StateNodeConfig<TContext extends MachineContext, TEvent extends
      * The output data will be evaluated with the current `context` and placed on the `.data` property
      * of the event.
      */
-    output?: Mapper<TContext, TEvent, TOutput> | TOutput;
+    output?: Mapper<TContext, TEvent, unknown, TEvent> | NonReducibleUnknown;
     /**
      * The unique ID of the state node, which can be referenced as a transition target via the
      * `#id` syntax.
@@ -329,7 +336,7 @@ export interface StateNodeDefinition<TContext extends MachineContext, TEvent ext
     exit: UnknownAction[];
     meta: any;
     order: number;
-    output?: FinalStateNodeConfig<TContext, TEvent>['output'];
+    output?: StateNodeConfig<TContext, TEvent, ProvidedActor, ParameterizedObject, ParameterizedObject, string, string, unknown>['output'];
     invoke: Array<InvokeDefinition<TContext, TEvent, TODO, TODO, TODO, TODO>>;
     description?: string;
     tags: string[];
@@ -338,7 +345,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>;
@@ -353,14 +363,6 @@ export interface HistoryStateNodeConfig<TContext extends MachineContext, TEvent
     history: 'shallow' | 'deep' | true;
     target: string | undefined;
 }
-export interface FinalStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> extends AtomicStateNodeConfig<TContext, TEvent> {
-    type: 'final';
-    /**
-     * The data to be sent with the "xstate.done.state.<id>" event. The data can be
-     * static or dynamic (based on assigners).
-     */
-    output?: Mapper<TContext, TEvent, any>;
-}
 export type SimpleOrStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject> = AtomicStateNodeConfig<TContext, TEvent> | StateNodeConfig<TContext, TEvent, TODO, TODO, TODO, TODO, TODO, TODO>;
 export type ActionFunctionMap<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TAction extends ParameterizedObject = ParameterizedObject, TGuard extends ParameterizedObject = ParameterizedObject, TDelay extends string = string> = {
     [K in TAction['type']]?: ActionFunction<TContext, TEvent, TEvent, TAction extends {
@@ -379,7 +381,7 @@ export interface MachineImplementationsSimplified<TContext extends MachineContex
     actions: ActionFunctionMap<TContext, TEvent, TActor, TAction>;
     actors: Record<string, AnyActorLogic | {
         src: AnyActorLogic;
-        input: Mapper<TContext, TEvent, any> | any;
+        input: Mapper<TContext, TEvent, unknown, TEvent> | NonReducibleUnknown;
     }>;
     delays: DelayFunctionMap<TContext, TEvent, TAction>;
 }
@@ -390,7 +392,7 @@ type MachineImplementationsActions<TContext extends MachineContext, TResolvedTyp
 type MachineImplementationsActors<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingActors = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingActors'>, TIndexedActors = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedActors'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>, _TInvokeSrcNameMap = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'invokeSrcNameMap'>> = {
     [K in keyof TIndexedActors]?: Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic> | {
         src: Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>;
-        input: Mapper<TContext, MaybeNarrowedEvent<TIndexedEvents, TEventsCausingActors, K>, InputFrom<Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>>> | InputFrom<Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>>;
+        input: Mapper<TContext, MaybeNarrowedEvent<TIndexedEvents, TEventsCausingActors, K>, InputFrom<Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>>, Cast<Prop<TIndexedEvents, keyof TIndexedEvents>, EventObject>> | InputFrom<Cast<Prop<TIndexedActors[K], 'logic'>, AnyActorLogic>>;
     };
 };
 type MachineImplementationsDelays<TContext extends MachineContext, TResolvedTypesMeta, TEventsCausingDelays = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'eventsCausingDelays'>, TIndexedEvents = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedEvents'>, TIndexedActions = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedActions'>, TIndexedDelays = Prop<Prop<TResolvedTypesMeta, 'resolved'>, 'indexedDelays'>> = {
@@ -424,10 +426,7 @@ export type ContextFactory<TContext extends MachineContext, TActor extends Provi
     spawn: Spawner<TActor>;
     input: TInput;
 }) => TContext;
-type RootStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TDelay extends string, TTag extends string, TOutput> = Omit<StateNodeConfig<TContext, TEvent, TActor, TAction, TGuard, TDelay, TTag, TOutput>, 'states'> & {
-    states?: StatesConfig<TContext, TEvent, TActor, TAction, TGuard, TDelay, TTag, TOutput> | undefined;
-};
-export type MachineConfig<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor = ProvidedActor, TAction extends ParameterizedObject = ParameterizedObject, TGuard extends ParameterizedObject = ParameterizedObject, TDelay extends string = string, TTag extends string = string, TInput = any, TOutput = unknown, TTypesMeta = TypegenDisabled> = (RootStateNodeConfig<NoInfer<TContext>, NoInfer<TEvent>, NoInfer<TActor>, NoInfer<TAction>, NoInfer<TGuard>, NoInfer<TDelay>, NoInfer<TTag>, NoInfer<TOutput>> & {
+export type MachineConfig<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor = ProvidedActor, TAction extends ParameterizedObject = ParameterizedObject, TGuard extends ParameterizedObject = ParameterizedObject, TDelay extends string = string, TTag extends string = string, TInput = any, TOutput = unknown, TTypesMeta = TypegenDisabled> = (Omit<StateNodeConfig<NoInfer<TContext>, NoInfer<TEvent>, NoInfer<TActor>, NoInfer<TAction>, NoInfer<TGuard>, NoInfer<TDelay>, NoInfer<TTag>, NoInfer<TOutput>>, 'output'> & {
     /**
      * The initial context (extended state)
      */
@@ -436,7 +435,8 @@ export type MachineConfig<TContext extends MachineContext, TEvent extends EventO
      */
     version?: string;
     types?: MachineTypes<TContext, TEvent, TActor, TAction, TGuard, TDelay, TTag, TInput, TOutput, TTypesMeta>;
-}) & (Equals<TContext, MachineContext> extends true ? {
+    output?: Mapper<TContext, DoneStateEvent, TOutput, TEvent> | TOutput;
+}) & (MachineContext extends TContext ? {
     context?: InitialContext<LowInfer<TContext>, TActor, TInput>;
 } : {
     context: InitialContext<LowInfer<TContext>, TActor, TInput>;
@@ -474,9 +474,9 @@ export interface ErrorActorEvent<TErrorData = unknown> extends EventObject {
     type: `xstate.error.actor.${string}`;
     data: TErrorData;
 }
-export interface SnapshotEvent<TData = unknown> extends EventObject {
+export interface SnapshotEvent<TSnapshot extends Snapshot<unknown> = Snapshot<unknown>> extends EventObject {
     type: `xstate.snapshot.${string}`;
-    data: TData;
+    snapshot: TSnapshot;
 }
 export interface DoneStateEvent<TOutput = unknown> extends EventObject {
     type: `xstate.done.state.${string}`;
@@ -506,14 +506,11 @@ export type PartialAssigner<TContext extends MachineContext, TExpressionEvent ex
 export type PropertyAssigner<TContext extends MachineContext, TExpressionEvent extends EventObject, TExpressionAction extends ParameterizedObject | undefined, TEvent extends EventObject, TActor extends ProvidedActor> = {
     [K in keyof TContext]?: PartialAssigner<TContext, TExpressionEvent, TExpressionAction, TEvent, TActor, K> | TContext[K];
 };
-export type Mapper<TContext extends MachineContext, TEvent extends EventObject, TResult> = (args: {
+export type Mapper<TContext extends MachineContext, TExpressionEvent extends EventObject, TResult, TEvent extends EventObject> = (args: {
     context: TContext;
-    event: TEvent;
-    self: ActorRef<TEvent>;
+    event: TExpressionEvent;
+    self: ActorRef<TEvent, MachineSnapshot<TContext, TEvent, ProvidedActor, string, unknown>>;
 }) => TResult;
-export type PropertyMapper<TContext extends MachineContext, TEvent extends EventObject, TParams extends {}> = {
-    [K in keyof TParams]?: Mapper<TContext, TEvent, TParams[K]> | TParams[K];
-};
 export interface TransitionDefinition<TContext extends MachineContext, TEvent extends EventObject> extends Omit<TransitionConfig<TContext, TEvent, TEvent, TODO, TODO, TODO, TODO>, 'target' | 'guard'> {
     target: ReadonlyArray<StateNode<TContext, TEvent>> | undefined;
     source: StateNode<TContext, TEvent>;
@@ -552,8 +549,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 +564,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 +590,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 +620,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 +639,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 +656,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 +666,46 @@ 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 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 +730,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/declarations/src/utils.d.ts

@@ -1,6 +1,6 @@
 import { AnyActorLogic, AnyState } from "./index.js";
 import type { StateNode } from "./StateNode.js";
-import type { ActorLogic, AnyEventObject, EventObject, MachineContext, Mapper, Observer, ErrorActorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfigTarget, AnyActorRef, AnyTransitionConfig } from "./types.js";
+import type { ActorLogic, AnyEventObject, EventObject, MachineContext, Mapper, Observer, ErrorActorEvent, SingleOrArray, StateLike, StateValue, Subscribable, TransitionConfigTarget, AnyActorRef, AnyTransitionConfig, NonReducibleUnknown } from "./types.js";
 export declare function keys<T extends object>(value: T): Array<keyof T & string>;
 export declare function matchesState(parentStateId: StateValue, childStateId: StateValue): boolean;
 export declare function toStatePath(stateId: string | string[]): string[];
@@ -26,7 +26,7 @@ export declare function toStatePaths(stateValue: StateValue | undefined): string
 export declare function flatten<T>(array: Array<T | T[]>): T[];
 export declare function toArrayStrict<T>(value: readonly T[] | T): readonly T[];
 export declare function toArray<T>(value: readonly T[] | T | undefined): readonly T[];
-export declare function mapContext<TContext extends MachineContext, TEvent extends EventObject>(mapper: Mapper<TContext, TEvent, any>, context: TContext, event: TEvent, self: AnyActorRef): any;
+export declare function resolveOutput<TContext extends MachineContext, TExpressionEvent extends EventObject>(mapper: Mapper<TContext, TExpressionEvent, unknown, EventObject> | NonReducibleUnknown, context: TContext, event: TExpressionEvent, self: AnyActorRef): unknown;
 export declare function isBuiltInEvent(eventType: string): boolean;
 export declare function isPromiseLike(value: any): value is PromiseLike<any>;
 export declare function isActorLogic(value: any): value is ActorLogic<any, any>;
@@ -42,8 +42,8 @@ export declare function toObserver<T>(nextHandler?: Observer<T> | ((value: T) =>
 export declare function createInvokeId(stateNodeId: string, index: number): string;
 export declare function resolveReferencedActor(referenced: AnyActorLogic | {
     src: AnyActorLogic;
-    input: Mapper<any, any, any> | any;
+    input: Mapper<MachineContext, EventObject, unknown, EventObject> | NonReducibleUnknown;
 } | undefined): {
     src: AnyActorLogic;
-    input: Mapper<any, any, any> | any;
+    input: Mapper<MachineContext, EventObject, unknown, EventObject> | NonReducibleUnknown;
 } | undefined;

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

@@ -271,7 +271,7 @@ function toArray(value) {
   }
   return toArrayStrict(value);
 }
-function mapContext(mapper, context, event, self) {
+function resolveOutput(mapper, context, event, self) {
   if (typeof mapper === 'function') {
     return mapper({
       context,
@@ -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;
   }
 }
 
@@ -760,11 +758,11 @@ exports.flatten = flatten;
 exports.interpret = interpret;
 exports.isArray = isArray;
 exports.isErrorActorEvent = isErrorActorEvent;
-exports.mapContext = mapContext;
 exports.mapValues = mapValues;
 exports.matchesState = matchesState;
 exports.normalizeTarget = normalizeTarget;
 exports.pathToStateValue = pathToStateValue;
+exports.resolveOutput = resolveOutput;
 exports.resolveReferencedActor = resolveReferencedActor;
 exports.toArray = toArray;
 exports.toObserver = toObserver;