xstate 6.0.0-alpha.6 → 6.0.0-alpha.7

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

@@ -126,6 +126,7 @@ export interface TransitionConfig<TContext extends MachineContext, TExpressionEv
     guard?: unknown;
     reenter?: boolean;
     target?: TransitionTarget | undefined;
+    context?: Partial<TContext>;
     to?: TransitionConfigFunction<TContext, TExpressionEvent, TEvent, TEmitted, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>;
     meta?: TMeta;
     description?: string;
@@ -144,7 +145,7 @@ any, // TGuardMap
 any>;
 export interface InvokeDefinition<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, TMeta extends MetaObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays']> {
     id: string;
-    systemId: string | undefined;
+    registryKey: string | undefined;
     logic: string | AnyActorLogic | (({ actors, context, event, self }: {
         actors: TActorMap;
         context: TContext;
@@ -201,7 +202,7 @@ export type TransitionConfigFunction<TContext extends MachineContext, TCurrentEv
     delays: TDelayMap;
 }, enq: EnqueueObject<TEvent, TEmitted>) => {
     target?: string | string[];
-    context?: _TCtx;
+    context?: Partial<_TCtx>;
     reenter?: boolean;
     meta?: TMeta;
 } | void;
@@ -222,7 +223,7 @@ type ActorImplementationsBySrc<TActor extends ProvidedActor> = {
 type DistributeActors<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, _TAction extends ParameterizedObject, _TGuard extends ParameterizedObject, _TDelay extends string, TEmitted extends EventObject, TMeta extends MetaObject, TSpecificActor extends ProvidedActor> = TSpecificActor extends {
     src: infer TSrc;
 } ? Compute<{
-    systemId?: string;
+    registryKey?: string;
     /** The source of the machine to be invoked, or the machine itself. */
     src: TSrc | (({ actors, context, event, self }: {
         actors: ActorImplementationsBySrc<TActor>;
@@ -256,7 +257,7 @@ type DistributeActors<TContext extends MachineContext, TEvent extends EventObjec
     [K in RequiredActorOptions<TSpecificActor>]: unknown;
 }> | {
     id?: never;
-    systemId?: string;
+    registryKey?: string;
     src: string | AnyActorLogic | (({ actors, context, event, self }: {
         actors: ActorImplementationsBySrc<TActor>;
         context: TContext;
@@ -279,7 +280,7 @@ export type InvokeConfig<TContext extends MachineContext, TEvent extends EventOb
      * will be the machine's own `id`, or the URL (from `src`).
      */
     id?: string;
-    systemId?: string;
+    registryKey?: string;
     /** The source of the machine to be invoked, or the machine itself. */
     src: string | AnyActorLogic | (({ actors, context, event, self }: {
         actors: ActorImplementationsBySrc<TActor>;
@@ -511,8 +512,8 @@ export interface ActorOptions<TLogic extends AnyActorLogic> {
     id?: string;
     /** @deprecated Use `inspect` instead. */
     devTools?: never;
-    /** The system ID to register this actor under. */
-    systemId?: string;
+    /** The registry key to register this actor under. */
+    registryKey?: string;
     /** The input data to pass to the actor. */
     input?: InputFrom<TLogic>;
     /**
@@ -861,6 +862,10 @@ export type TagsFrom<TMachine extends AnyStateMachine> = Parameters<StateFrom<TM
 export interface ActorSystemInfo {
     actors: Record<string, AnyActorRef>;
 }
+export type SystemRegistry = Record<string, AnyActorLogic>;
+export type RegistryKeyForLogic<TLogic extends AnyActorLogic, TSystemRegistry extends SystemRegistry> = string extends keyof TSystemRegistry ? string : Values<{
+    [K in keyof TSystemRegistry & string]: ActorRefFromLogic<TLogic> extends ActorRefFromLogic<TSystemRegistry[K]> ? K : never;
+}>;
 export type RequiredActorOptions<TActor extends ProvidedActor> = (undefined extends TActor['id'] ? never : 'id') | (undefined extends InputFrom<TActor['logic']> ? never : 'input');
 export type RequiredLogicInput<TLogic extends AnyActorLogic> = undefined extends InputFrom<TLogic> ? never : 'input';
 type ExtractLiteralString<T extends string | undefined> = T extends string ? string extends T ? never : T : never;
@@ -1028,7 +1033,7 @@ export interface SubscribeToMappers<TSnapshot extends Snapshot<unknown>, TOutput
     done?: (output: TOutput) => TMappedEvent;
     error?: (error: unknown) => TMappedEvent;
 }
-export type EnqueueObject<TEvent extends EventObject, TEmittedEvent extends EventObject> = {
+export type EnqueueObject<TEvent extends EventObject, TEmittedEvent extends EventObject, TSystemRegistry extends SystemRegistry = SystemRegistry> = {
     cancel: (id: string) => void;
     raise: (ev: TEvent, options?: {
         id?: string;
@@ -1038,7 +1043,7 @@ export type EnqueueObject<TEvent extends EventObject, TEmittedEvent extends Even
         input?: InputFrom<T>;
         id?: string;
         syncSnapshot?: boolean;
-        systemId?: string;
+        registryKey?: RegistryKeyForLogic<T, TSystemRegistry>;
     }) => ActorFromLogic<T>;
     emit: (emittedEvent: TEmittedEvent) => void;
     <T extends (...args: any[]) => any>(fn: T, ...args: Parameters<T>): void;
@@ -1085,7 +1090,7 @@ export type Action<TContext extends MachineContext, TEvent extends EventObject,
     system?: AnyActorSystem;
     params: TParams;
 }, enqueue: EnqueueObject<TEvent, TEmittedEvent>) => {
-    context?: _TCtx;
+    context?: Partial<_TCtx>;
     children?: Record<string, AnyActor | undefined>;
 } | void;
 export type AnyAction = Action<MachineContext, EventObject, EventObject, Implementations['actions'], Implementations['actors'], Implementations['guards'], Implementations['delays']> | {

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

@@ -1,6 +1,6 @@
 import { StandardSchemaV1 } from "./schema.types.js";
 import { MachineSnapshot } from "./State.js";
-import { Action, ActorLogic, ActorRef, ActorRefFromLogic, ActorSelf, AnyActorLogic, AnyActorRef, Compute, DoneActorEvent, DoNotInfer, EventDescriptor, EventObject, ExtractEvent, InitialContext, InputFrom, IsNever, MetaObject, NonReducibleUnknown, SingleOrArray, SnapshotEvent, StateValue, TODO, TransitionConfigFunction, Values, AnyStateNode } from "./types.js";
+import { Action, ActorLogic, ActorRef, ActorRefFromLogic, ActorSelf, AnyActorLogic, AnyActorRef, Compute, DoneActorEvent, DoNotInfer, EventDescriptor, EventObject, ExtractEvent, InitialContext, InputFrom, IsNever, MetaObject, NonReducibleUnknown, SingleOrArray, SnapshotEvent, StateValue, TODO, TransitionConfigFunction, Values, AnyStateNode, SystemRegistry } from "./types.js";
 import { MachineContext, Mapper } from "./types.js";
 import { LowInfer } from "./types.js";
 import { DoneStateEvent } from "./types.js";
@@ -61,7 +61,7 @@ type MachineSchemas<TContextSchema extends StandardSchemaV1, TEventSchemaMap ext
     children?: TChildrenSchemaMap;
 };
 export type AnyMachineSchemas = MachineSchemas<StandardSchemaV1, Record<string, StandardSchemaV1>, Record<string, StandardSchemaV1>, StandardSchemaV1, StandardSchemaV1, StandardSchemaV1, StandardSchemaV1, Record<string, StandardSchemaV1>>;
-export type Next_MachineConfig<TContextSchema extends StandardSchemaV1, TEventSchemaMap extends Record<string, StandardSchemaV1>, TEmittedSchemaMap extends Record<string, StandardSchemaV1>, TInputSchema extends StandardSchemaV1, TOutputSchema extends StandardSchemaV1, TMetaSchema extends StandardSchemaV1, TTagSchema extends StandardSchemaV1, TChildrenSchemaMap extends Record<string, StandardSchemaV1>, TContext extends MachineContext = InferOutput<TContextSchema, MachineContext>, TEvent extends EventObject = InferEvents<TEventSchemaMap>, TChildren extends Record<string, AnyActorRef | undefined> = InferChildren<TChildrenSchemaMap>, TDelays extends string = string, _TTag extends string = string, TActionMap extends Implementations['actions'] = Implementations['actions'], TActorMap extends Implementations['actors'] = Implementations['actors'], TGuardMap extends Implementations['guards'] = Implementations['guards'], TDelayMap extends Implementations['delays'] = Implementations['delays'], TContextRequired extends boolean = IsNever<TContext> extends true ? false : true> = (DistributiveOmit<Next_StateNodeConfig<TContext, DoNotInfer<InferEvents<TEventSchemaMap>>, DoNotInfer<TDelays>, DoNotInfer<StandardSchemaV1.InferOutput<TTagSchema> & string>, DoNotInfer<StandardSchemaV1.InferOutput<TOutputSchema>>, DoNotInfer<InferEvents<TEmittedSchemaMap>>, DoNotInfer<InferOutput<TMetaSchema, MetaObject>>, DoNotInfer<TChildren>, DoNotInfer<TActionMap>, DoNotInfer<TActorMap>, DoNotInfer<TGuardMap>, DoNotInfer<TDelayMap>>, 'output'> & {
+export type Next_MachineConfig<TContextSchema extends StandardSchemaV1, TEventSchemaMap extends Record<string, StandardSchemaV1>, TEmittedSchemaMap extends Record<string, StandardSchemaV1>, TInputSchema extends StandardSchemaV1, TOutputSchema extends StandardSchemaV1, TMetaSchema extends StandardSchemaV1, TTagSchema extends StandardSchemaV1, TChildrenSchemaMap extends Record<string, StandardSchemaV1>, TContext extends MachineContext = InferOutput<TContextSchema, MachineContext>, TEvent extends EventObject = InferEvents<TEventSchemaMap>, TChildren extends Record<string, AnyActorRef | undefined> = InferChildren<TChildrenSchemaMap>, TDelays extends string = string, _TTag extends string = string, TActionMap extends Implementations['actions'] = Implementations['actions'], TActorMap extends Implementations['actors'] = Implementations['actors'], TGuardMap extends Implementations['guards'] = Implementations['guards'], TDelayMap extends Implementations['delays'] = Implementations['delays'], TContextRequired extends boolean = IsNever<TContext> extends true ? false : true, TSystemRegistry extends SystemRegistry = SystemRegistry> = (DistributiveOmit<Next_StateNodeConfig<TContext, DoNotInfer<InferEvents<TEventSchemaMap>>, DoNotInfer<TDelays>, DoNotInfer<StandardSchemaV1.InferOutput<TTagSchema> & string>, DoNotInfer<StandardSchemaV1.InferOutput<TOutputSchema>>, DoNotInfer<InferEvents<TEmittedSchemaMap>>, DoNotInfer<InferOutput<TMetaSchema, MetaObject>>, DoNotInfer<TChildren>, DoNotInfer<TActionMap>, DoNotInfer<TActorMap>, DoNotInfer<TGuardMap>, DoNotInfer<TDelayMap>, Record<string, unknown> | undefined, Record<string, unknown>, DoNotInfer<TSystemRegistry>>, 'output'> & {
     internalEvents?: readonly InternalEventDescriptorFor<InferEvents<TEventSchemaMap>>[];
     schemas?: MachineSchemas<TContextSchema, TEventSchemaMap, TEmittedSchemaMap, TInputSchema, TOutputSchema, TMetaSchema, TTagSchema, TChildrenSchemaMap>;
     actions?: TActionMap;
@@ -117,14 +117,14 @@ type ChildIdForLogic<TLogic extends AnyActorLogic, TChildren extends Record<stri
     [K in keyof TChildren & string]: ActorRefFromLogic<TLogic> extends NonNullable<TChildren[K]> ? K : never;
 }> : string;
 type LogicForChildRef<TActorRef> = NonNullable<TActorRef> extends ActorRef<infer TSnapshot, infer TEvent, infer TEmitted, any> ? ActorLogic<TSnapshot, TEvent, any, any, TEmitted> : never;
-type InlineChildInvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject> = Values<{
-    [K in keyof TChildren & string]: Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta> & {
+type InlineChildInvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject, TSystemRegistry extends SystemRegistry> = Values<{
+    [K in keyof TChildren & string]: Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry> & {
         id: K;
         src: LogicForChildRef<TChildren[K]>;
         input?: ((args: InvokeInputArgs<TContext, TEvent, TEmitted, TChildren>) => unknown) | NonReducibleUnknown;
     };
 }>;
-type InlineInvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject> = HasExplicitChildren<TChildren> extends true ? InlineChildInvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta> : Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta> & {
+type InlineInvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject, TSystemRegistry extends SystemRegistry> = HasExplicitChildren<TChildren> extends true ? InlineChildInvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry> : Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry> & {
     src: AnyActorLogic;
     input?: ((args: InvokeInputArgs<TContext, TEvent, TEmitted, TChildren>) => unknown) | NonReducibleUnknown;
 };
@@ -138,19 +138,19 @@ type InlineInvokeConfig<TContext extends MachineContext, TEvent extends EventObj
  * - A branch for inline (unregistered) actor logic values, whose `input` cannot
  *   be correlated (the config is not generic over inline logic).
  */
-export type Next_InvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject> = string extends keyof TActorMap ? HasExplicitChildren<TChildren> extends true ? InlineInvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta> : Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta> & {
+export type Next_InvokeConfig<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject, TSystemRegistry extends SystemRegistry = SystemRegistry> = string extends keyof TActorMap ? HasExplicitChildren<TChildren> extends true ? InlineInvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry> : Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry> & {
     src: string | AnyActorLogic | ((args: InvokeSrcArgs<TContext, TEvent, TActorMap>) => string | AnyActorLogic);
     input?: ((args: InvokeInputArgs<TContext, TEvent, TEmitted, TChildren>) => unknown) | NonReducibleUnknown;
 } : {
-    [K in keyof TActorMap & string]: Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta> & {
+    [K in keyof TActorMap & string]: Next_InvokeConfigBase<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry> & {
         src: K | TActorMap[K] | ((args: InvokeSrcArgs<TContext, TEvent, TActorMap>) => K | TActorMap[K]);
         id?: ChildIdForLogic<TActorMap[K], TChildren>;
         input?: ((args: InvokeInputArgs<TContext, TEvent, TEmitted, TChildren>) => InputFrom<TActorMap[K]>) | InputFrom<TActorMap[K]>;
     };
-}[keyof TActorMap & string] | InlineInvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>;
-interface Next_InvokeConfigBase<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, _TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject> {
+}[keyof TActorMap & string] | InlineInvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry>;
+interface Next_InvokeConfigBase<TContext extends MachineContext, TEvent extends EventObject, TEmitted extends EventObject, _TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject, TSystemRegistry extends SystemRegistry> {
     id?: string;
-    systemId?: string;
+    registryKey?: keyof TSystemRegistry & string;
     onDone?: Next_TransitionConfigOrTarget<TContext, DoneActorEvent<any>, TEvent, TEmitted, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>;
     onError?: Next_TransitionConfigOrTarget<TContext, ErrorEvent, TEvent, TEmitted, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>;
     onSnapshot?: Next_TransitionConfigOrTarget<TContext, SnapshotEvent<any>, TEvent, TEmitted, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>;
@@ -214,7 +214,7 @@ type Next_RouteConfig<TContext extends MachineContext, TEvent extends EventObjec
     }) => Record<string, unknown>);
 });
 type Next_ChoiceConfigFunction<TContext extends MachineContext, TCurrentEvent extends EventObject, TEvent extends EventObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject, _TCtx = [TContext] extends [never] ? any : TContext> = (args: Next_ChoiceArgs<TContext, TCurrentEvent, TEvent, TActionMap, TActorMap, TGuardMap, TDelayMap, _TCtx>) => Next_ChoiceTarget<TMeta>;
-export type Next_StateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TDelays extends string, TTag extends string, _TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TInput = Record<string, unknown> | undefined, TInputMap extends Record<string, unknown> = Record<string, unknown>> = Next_RegularStateNodeConfig<TContext, TEvent, TDelays, TTag, _TOutput, TEmitted, TMeta, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TInput, TInputMap> | Next_ChoiceStateNodeConfig<TContext, TEvent, TTag, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap>;
+export type Next_StateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TDelays extends string, TTag extends string, _TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TInput = Record<string, unknown> | undefined, TInputMap extends Record<string, unknown> = Record<string, unknown>, TSystemRegistry extends SystemRegistry = SystemRegistry> = Next_RegularStateNodeConfig<TContext, TEvent, TDelays, TTag, _TOutput, TEmitted, TMeta, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TInput, TInputMap, TSystemRegistry> | Next_ChoiceStateNodeConfig<TContext, TEvent, TTag, TMeta, TActionMap, TActorMap, TGuardMap, TDelayMap>;
 interface Next_ChoiceStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TTag extends string, TMeta extends MetaObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays']> {
     contextSchema?: StandardSchemaV1;
     type: 'choice';
@@ -241,7 +241,7 @@ interface Next_ChoiceStateNodeConfig<TContext extends MachineContext, TEvent ext
     output?: never;
     target?: never;
 }
-interface Next_RegularStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TDelays extends string, TTag extends string, _TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TInput = Record<string, unknown> | undefined, TInputMap extends Record<string, unknown> = Record<string, unknown>> {
+interface Next_RegularStateNodeConfig<TContext extends MachineContext, TEvent extends EventObject, TDelays extends string, TTag extends string, _TOutput, TEmitted extends EventObject, TMeta extends MetaObject, TChildren extends Record<string, AnyActorRef | undefined>, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TInput = Record<string, unknown> | undefined, TInputMap extends Record<string, unknown> = Record<string, unknown>, TSystemRegistry extends SystemRegistry = SystemRegistry> {
     contextSchema?: StandardSchemaV1;
     /** The initial state transition. */
     initial?: string | {
@@ -272,13 +272,13 @@ interface Next_RegularStateNodeConfig<TContext extends MachineContext, TEvent ex
      */
     states?: {
         [K in string]: Next_StateNodeConfig<TContext, TEvent, TDelays, TTag, any, // TOutput,
-        TEmitted, TMeta, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, LookupInput<TInputMap, K>, TInputMap>;
+        TEmitted, TMeta, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, LookupInput<TInputMap, K>, TInputMap, TSystemRegistry>;
     };
     /**
      * The services to invoke upon entering this state node. These services will
      * be stopped upon exiting this state node.
      */
-    invoke?: SingleOrArray<Next_InvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>>;
+    invoke?: SingleOrArray<Next_InvokeConfig<TContext, TEvent, TEmitted, TChildren, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta, TSystemRegistry>>;
     /** The mapping of event types to their potential transition(s). */
     on?: {
         [K in EventDescriptor<TEvent>]?: Next_TransitionConfigOrTarget<TContext, ExtractEvent<TEvent, K>, TEvent, TEmitted, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>;
@@ -366,6 +366,7 @@ interface Next_RegularStateNodeConfig<TContext extends MachineContext, TEvent ex
 }
 export type Next_TransitionConfigOrTarget<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TEmitted extends EventObject, TActionMap extends Implementations['actions'], TActorMap extends Implementations['actors'], TGuardMap extends Implementations['guards'], TDelayMap extends Implementations['delays'], TMeta extends MetaObject> = undefined | {
     target?: string | string[];
+    context?: Partial<TContext>;
     description?: string;
     reenter?: boolean;
     meta?: TMeta;
@@ -375,6 +376,7 @@ export type Next_TransitionConfigOrTarget<TContext extends MachineContext, TExpr
     }) => Record<string, unknown>);
 } | {
     to?: TransitionConfigFunction<TContext, TExpressionEvent, TEvent, TEmitted, TActionMap, TActorMap, TGuardMap, TDelayMap, TMeta>;
+    context?: Partial<TContext>;
     description?: string;
     reenter?: boolean;
     meta?: TMeta;

package/dist/{index-918ab496.cjs.js → index-87499be0.cjs.js}

@@ -339,6 +339,12 @@ function createSubscriptionLogic() {
 // Singleton logic instance
 const subscriptionLogic = /* #__PURE__ */createSubscriptionLogic();
 
+function mergeContextPatch$1(context, patch) {
+  return {
+    ...context,
+    ...patch
+  };
+}
 function pushBuiltInAction(actions, action, ...args) {
   actions.push({
     action,
@@ -543,8 +549,8 @@ function resolveActionsWithContext(currentSnapshot, event, actorScope, actions)
       const res = specialAction(actionArgs, emptyEnqueueObject);
       if (res && ('context' in res || 'children' in res)) {
         intermediateSnapshot = cloneMachineSnapshot(intermediateSnapshot, {
-          ...('context' in res ? {
-            context: res.context
+          ...(res.context !== undefined ? {
+            context: mergeContextPatch$1(intermediateSnapshot.context, res.context)
           } : {}),
           ...('children' in res ? {
             children: res.children
@@ -1250,6 +1256,12 @@ function initialMicrostep(root, preInitialState, actorScope, initEvent, internal
     toJSON: null
   }], preInitialState, actorScope, initEvent, true, internalQueue);
 }
+function mergeContextPatch(context, patch) {
+  return {
+    ...context,
+    ...patch
+  };
+}
 
 /** https://www.w3.org/TR/scxml/#microstepProcedure */
 function microstep(transitions, currentSnapshot, actorScope, event, isInitial, internalQueue) {
@@ -1283,8 +1295,8 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
           delays: currentSnapshot.machine.implementations.delays,
           input
         }, enqueue);
-        if (res?.context) {
-          updatedContext = res.context;
+        if (res?.context !== undefined) {
+          updatedContext = mergeContextPatch(context, res.context);
         }
         return [actions, updatedContext, internalEvents];
       }
@@ -1357,8 +1369,8 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         transitionActions.push(...toArray(t.actions));
       }
       const res = getCurrentTransitionResult(t);
-      if (res.context) {
-        context = res.context;
+      if (res.context !== undefined) {
+        context = mergeContextPatch(context, res.context);
       }
       if (res.actions) {
         transitionActions.push(...res.actions);
@@ -1541,18 +1553,23 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
             children
           });
         }
-        let context;
+        let context = nextState.context;
+        let contextChangedByEntry = false;
         const stateInput = stateInputMap[stateNodeToEnter.id];
         if (stateNodeToEnter.entry) {
-          const [resultActions, nextContext, nextInternalEvents] = getStateActionsAndContext(stateNodeToEnter.entry, nextState.context, children, stateInput);
+          const [resultActions, nextContext, nextInternalEvents] = getStateActionsAndContext(stateNodeToEnter.entry, context, children, stateInput);
           actions.push(...resultActions);
           if (nextInternalEvents?.length) {
             internalQueue.push(...nextInternalEvents);
           }
           if (nextContext) {
             context = nextContext;
+            contextChangedByEntry = true;
           }
         }
+        if (contextChangedByEntry) {
+          nextState.context = context;
+        }
         if (statesForDefaultEntry.has(stateNodeToEnter)) {
           const {
             actions: initialActions,
@@ -1571,9 +1588,6 @@ function microstep(transitions, currentSnapshot, actorScope, event, isInitial, i
         nextState = resolvedState;
         actions.length = 0;
         executableActions.push(...resolvedActions);
-        if (context) {
-          nextState.context = context;
-        }
         if (stateNodeToEnter.type !== 'final') {
           continue;
         }
@@ -1709,7 +1723,7 @@ function getTransitionResult(transition, snapshot, event, actorScope) {
   }) : transition.input;
   return {
     targets: transition.target,
-    context: undefined,
+    context: transition.context,
     reenter: transition.reenter,
     actions: undefined,
     internalEvents: undefined,
@@ -2110,7 +2124,7 @@ function getPersistedSnapshot(snapshot, options) {
     childrenJson[id] = {
       snapshot: child.getPersistedSnapshot(options),
       src: child.src,
-      systemId: child.systemId,
+      registryKey: child.registryKey,
       syncSnapshot: child._syncSnapshot
     };
   }
@@ -2361,7 +2375,7 @@ function matchesEventDescriptor(eventType, descriptor) {
 function createScheduledEventId(actor, id) {
   return `${actor.sessionId}.${id}`;
 }
-function createSystem(rootActor, options) {
+function createRuntimeSystem(rootActor, options) {
   let idCounter = 0;
   const children = new Map();
   const keyedActors = new Map();
@@ -2467,25 +2481,25 @@ function createSystem(rootActor, options) {
     },
     _unregister: actor => {
       children.delete(actor.sessionId);
-      const systemId = reverseKeyedActors.get(actor);
-      if (systemId !== undefined) {
-        keyedActors.delete(systemId);
+      const registryKey = reverseKeyedActors.get(actor);
+      if (registryKey !== undefined) {
+        keyedActors.delete(registryKey);
         reverseKeyedActors.delete(actor);
       }
     },
-    get: systemId => {
-      return keyedActors.get(systemId);
+    get: registryKey => {
+      return keyedActors.get(registryKey);
     },
     getAll: () => {
       return Object.fromEntries(keyedActors.entries());
     },
-    _set: (systemId, actor) => {
-      const existing = keyedActors.get(systemId);
+    _set: (registryKey, actor) => {
+      const existing = keyedActors.get(registryKey);
       if (existing && existing !== actor) {
-        throw new Error(`Actor with system ID '${systemId}' already exists.`);
+        throw new Error(`Actor with registry key '${registryKey}' already exists.`);
       }
-      keyedActors.set(systemId, actor);
-      reverseKeyedActors.set(actor, systemId);
+      keyedActors.set(registryKey, actor);
+      reverseKeyedActors.set(actor, registryKey);
     },
     inspect: observerOrFn => {
       const observer = toObserver(observerOrFn);
@@ -2849,7 +2863,7 @@ class Actor {
     /** @internal Events relayed to other actors during the in-flight transition. */
     this._collectedSent = [];
     this._initialEffects = void 0;
-    this.systemId = void 0;
+    this.registryKey = void 0;
     /** The globally unique process ID for this invocation. */
     this.sessionId = void 0;
     /** The system to which this actor belongs. */
@@ -2870,14 +2884,17 @@ class Actor {
       parent,
       syncSnapshot,
       id,
-      systemId,
+      registryKey,
       inspect
     } = resolvedOptions;
-    this.system = parent ? parent.system : createSystem(this, {
+    this.system = parent ? parent.system : resolvedOptions._systemRef?.current ?? createRuntimeSystem(this, {
       clock,
       logger,
       timers: resolvedOptions.timers
     });
+    if (!parent && resolvedOptions._systemRef && !resolvedOptions._systemRef.current) {
+      resolvedOptions._systemRef.current = this.system;
+    }
     if (inspect && !parent) {
       // Always inspect at the system-level
       this.system.inspect(toObserver(inspect));
@@ -2975,9 +2992,10 @@ class Actor {
 
     // unified '@xstate.transition' event replaces '@xstate.actor'
 
-    if (systemId) {
-      this.systemId = systemId;
-      this.system._set(systemId, this);
+    const resolvedRegistryKey = registryKey;
+    if (resolvedRegistryKey) {
+      this.registryKey = resolvedRegistryKey;
+      this.system._set(resolvedRegistryKey, this);
     }
 
     // prepare to collect initial microsteps during initialTransition
@@ -3014,7 +3032,7 @@ class Actor {
       // computation so they can't run against an inconsistent actor
       this._deferred.length = 0;
     }
-    if (systemId && this._snapshot.status !== 'active') {
+    if (resolvedRegistryKey && this._snapshot.status !== 'active') {
       this.system._unregister(this);
     }
 
@@ -3279,8 +3297,8 @@ class Actor {
       });
     }
     this.system._register(this.sessionId, this);
-    if (this.systemId) {
-      this.system._set(this.systemId, this);
+    if (this.registryKey) {
+      this.system._set(this.registryKey, this);
     }
     this._processingStatus = ProcessingStatus.Running;