xstate 6.0.0-alpha.46 → 6.0.0-alpha.47

package/dist/{StateMachine-756e1335.cjs.js → StateMachine-7046f677.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var createActor = require('./createActor-0816a84b.cjs.js');
-var dist_xstateActors = require('./index-7b9c4f77.cjs.js');
+var createActor = require('./createActor-bfe8b6bd.cjs.js');
+var dist_xstateActors = require('./index-b3fe59bc.cjs.js');
 
 function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
@@ -1020,7 +1020,11 @@ class StateMachine {
   restoreSnapshot(snapshot, actorScope) {
     const usesInertScope = !actorScope;
     const resolvedActorScope = actorScope ?? createActor.createInertActorScope(this);
-    const persistedMachine = snapshot.machine;
+    const snapshotMachine = snapshot.machine;
+    // A live machine snapshot carries its producing machine so helpers such as
+    // `matches()` can resolve state nodes. That runtime association is not the
+    // persisted `{ id, version }` identity written by getPersistedSnapshot().
+    const persistedMachine = snapshotMachine && typeof snapshotMachine === 'object' && typeof snapshotMachine.transition === 'function' && 'root' in snapshotMachine ? undefined : snapshotMachine;
     const legacyPersistedVersion = snapshot.version;
     const persistedVersion = typeof persistedMachine?.version === 'string' ? persistedMachine.version : legacyPersistedVersion;
     if (legacyPersistedVersion !== undefined && persistedMachine?.version !== undefined && persistedMachine.version !== legacyPersistedVersion) {

package/dist/{StateMachine-fa133051.development.cjs.js → StateMachine-70c06bdd.development.cjs.js}

@@ -1,7 +1,7 @@
 'use strict';
 
-var createActor = require('./createActor-f6e6146f.development.cjs.js');
-var dist_xstateActors = require('./index-1e1e1cba.development.cjs.js');
+var createActor = require('./createActor-6736cbbe.development.cjs.js');
+var dist_xstateActors = require('./index-0f498ef2.development.cjs.js');
 
 function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
@@ -1049,7 +1049,11 @@ class StateMachine {
   restoreSnapshot(snapshot, actorScope) {
     const usesInertScope = !actorScope;
     const resolvedActorScope = actorScope ?? createActor.createInertActorScope(this);
-    const persistedMachine = snapshot.machine;
+    const snapshotMachine = snapshot.machine;
+    // A live machine snapshot carries its producing machine so helpers such as
+    // `matches()` can resolve state nodes. That runtime association is not the
+    // persisted `{ id, version }` identity written by getPersistedSnapshot().
+    const persistedMachine = snapshotMachine && typeof snapshotMachine === 'object' && typeof snapshotMachine.transition === 'function' && 'root' in snapshotMachine ? undefined : snapshotMachine;
     const legacyPersistedVersion = snapshot.version;
     const persistedVersion = typeof persistedMachine?.version === 'string' ? persistedMachine.version : legacyPersistedVersion;
     if (legacyPersistedVersion !== undefined && persistedMachine?.version !== undefined && persistedMachine.version !== legacyPersistedVersion) {

package/dist/{StateMachine-9509c0bd.esm.js → StateMachine-74929087.esm.js}

@@ -1,5 +1,5 @@
-import { Q as resolveRegisteredActorSource, R as allocateChildId, S as assertChildIdFree, T as reserveChildId, U as STATE_DELIMITER, V as mapValues, t as toArray, W as createInvokeId, Y as getDelayedTransitions, Z as getEventDescriptorKey, _ as getCandidates, $ as evaluateCandidate, a0 as formatTransition, a1 as NULL_EVENT, a2 as toTransitionConfigArray, a3 as createInvokeTimeoutEventId, a4 as matchesActorSession, a5 as formatRouteTransitions, a6 as resolveStateValue, a7 as getAllStateNodes, x as getStateNodes, a8 as createMachineSnapshot, a9 as isInFinalState, aa as createInertActorScope, ab as setInertActorScopeSnapshot, a as beginSpawnAllocation, ac as attachSnapshotActorRef, ad as macrostep, ae as isInertActorScope, af as setSnapshotActorRef, ag as cloneMachineSnapshot, ah as transitionNode, g as XSTATE_TIMER, m as matchesEventDescriptor, ai as getTransitionResult, aj as hasEffect, ak as createErrorPlatformEvent, al as withActorSelf, r as resolveActionsWithContext, am as takeSpawnAllocationCounters, an as mergeActorIdCounters, K as createInitEvent, ao as createSpawnEffect, ap as initialMicrostep, aq as toStatePath, ar as isStateId, as as getStateNodeByPath, at as getPersistedSnapshot, au as createRemoteActorRef, av as resolveReferencedActor, aw as createInvokeTimeoutEvent, ax as parseGeneratedActorId, ay as ACTOR_REF_TYPE, k as createActor } from './createActor-9523f716.esm.js';
-import { g as assertValid } from './index-c7431a16.esm.js';
+import { Q as resolveRegisteredActorSource, R as allocateChildId, S as assertChildIdFree, T as reserveChildId, U as STATE_DELIMITER, V as mapValues, t as toArray, W as createInvokeId, Y as getDelayedTransitions, Z as getEventDescriptorKey, _ as getCandidates, $ as evaluateCandidate, a0 as formatTransition, a1 as NULL_EVENT, a2 as toTransitionConfigArray, a3 as createInvokeTimeoutEventId, a4 as matchesActorSession, a5 as formatRouteTransitions, a6 as resolveStateValue, a7 as getAllStateNodes, x as getStateNodes, a8 as createMachineSnapshot, a9 as isInFinalState, aa as createInertActorScope, ab as setInertActorScopeSnapshot, a as beginSpawnAllocation, ac as attachSnapshotActorRef, ad as macrostep, ae as isInertActorScope, af as setSnapshotActorRef, ag as cloneMachineSnapshot, ah as transitionNode, g as XSTATE_TIMER, m as matchesEventDescriptor, ai as getTransitionResult, aj as hasEffect, ak as createErrorPlatformEvent, al as withActorSelf, r as resolveActionsWithContext, am as takeSpawnAllocationCounters, an as mergeActorIdCounters, K as createInitEvent, ao as createSpawnEffect, ap as initialMicrostep, aq as toStatePath, ar as isStateId, as as getStateNodeByPath, at as getPersistedSnapshot, au as createRemoteActorRef, av as resolveReferencedActor, aw as createInvokeTimeoutEvent, ax as parseGeneratedActorId, ay as ACTOR_REF_TYPE, k as createActor } from './createActor-915ea40c.esm.js';
+import { g as assertValid } from './index-b051c924.esm.js';
 
 function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
@@ -1018,7 +1018,11 @@ class StateMachine {
   restoreSnapshot(snapshot, actorScope) {
     const usesInertScope = !actorScope;
     const resolvedActorScope = actorScope ?? createInertActorScope(this);
-    const persistedMachine = snapshot.machine;
+    const snapshotMachine = snapshot.machine;
+    // A live machine snapshot carries its producing machine so helpers such as
+    // `matches()` can resolve state nodes. That runtime association is not the
+    // persisted `{ id, version }` identity written by getPersistedSnapshot().
+    const persistedMachine = snapshotMachine && typeof snapshotMachine === 'object' && typeof snapshotMachine.transition === 'function' && 'root' in snapshotMachine ? undefined : snapshotMachine;
     const legacyPersistedVersion = snapshot.version;
     const persistedVersion = typeof persistedMachine?.version === 'string' ? persistedMachine.version : legacyPersistedVersion;
     if (legacyPersistedVersion !== undefined && persistedMachine?.version !== undefined && persistedMachine.version !== legacyPersistedVersion) {

package/dist/{StateMachine-a5ede014.development.esm.js → StateMachine-ee10f67e.development.esm.js}

@@ -1,5 +1,5 @@
-import { Q as resolveRegisteredActorSource, R as allocateChildId, S as assertChildIdFree, T as reserveChildId, U as STATE_DELIMITER, V as mapValues, t as toArray, W as createInvokeId, Y as getDelayedTransitions, Z as getEventDescriptorKey, _ as getCandidates, $ as evaluateCandidate, a0 as formatTransition, a1 as NULL_EVENT, a2 as toTransitionConfigArray, a3 as createInvokeTimeoutEventId, a4 as matchesActorSession, a5 as formatRouteTransitions, a6 as resolveStateValue, a7 as getAllStateNodes, x as getStateNodes, a8 as createMachineSnapshot, a9 as isInFinalState, aa as createInertActorScope, ab as setInertActorScopeSnapshot, a as beginSpawnAllocation, ac as attachSnapshotActorRef, ad as macrostep, ae as isInertActorScope, af as setSnapshotActorRef, ag as cloneMachineSnapshot, ah as transitionNode, g as XSTATE_TIMER, m as matchesEventDescriptor, ai as getTransitionResult, aj as hasEffect, ak as createErrorPlatformEvent, al as withActorSelf, r as resolveActionsWithContext, am as takeSpawnAllocationCounters, an as mergeActorIdCounters, K as createInitEvent, ao as createSpawnEffect, ap as initialMicrostep, aq as toStatePath, ar as isStateId, as as getStateNodeByPath, at as getPersistedSnapshot, au as createRemoteActorRef, av as resolveReferencedActor, aw as createInvokeTimeoutEvent, ax as parseGeneratedActorId, ay as ACTOR_REF_TYPE, k as createActor } from './createActor-f5277b31.development.esm.js';
-import { g as assertValid } from './index-3907b7aa.development.esm.js';
+import { Q as resolveRegisteredActorSource, R as allocateChildId, S as assertChildIdFree, T as reserveChildId, U as STATE_DELIMITER, V as mapValues, t as toArray, W as createInvokeId, Y as getDelayedTransitions, Z as getEventDescriptorKey, _ as getCandidates, $ as evaluateCandidate, a0 as formatTransition, a1 as NULL_EVENT, a2 as toTransitionConfigArray, a3 as createInvokeTimeoutEventId, a4 as matchesActorSession, a5 as formatRouteTransitions, a6 as resolveStateValue, a7 as getAllStateNodes, x as getStateNodes, a8 as createMachineSnapshot, a9 as isInFinalState, aa as createInertActorScope, ab as setInertActorScopeSnapshot, a as beginSpawnAllocation, ac as attachSnapshotActorRef, ad as macrostep, ae as isInertActorScope, af as setSnapshotActorRef, ag as cloneMachineSnapshot, ah as transitionNode, g as XSTATE_TIMER, m as matchesEventDescriptor, ai as getTransitionResult, aj as hasEffect, ak as createErrorPlatformEvent, al as withActorSelf, r as resolveActionsWithContext, am as takeSpawnAllocationCounters, an as mergeActorIdCounters, K as createInitEvent, ao as createSpawnEffect, ap as initialMicrostep, aq as toStatePath, ar as isStateId, as as getStateNodeByPath, at as getPersistedSnapshot, au as createRemoteActorRef, av as resolveReferencedActor, aw as createInvokeTimeoutEvent, ax as parseGeneratedActorId, ay as ACTOR_REF_TYPE, k as createActor } from './createActor-ff132afa.development.esm.js';
+import { g as assertValid } from './index-70d56425.development.esm.js';
 
 function createSpawner(actorScope, actors, spawnedChildren) {
   return (src, options) => {
@@ -1047,7 +1047,11 @@ class StateMachine {
   restoreSnapshot(snapshot, actorScope) {
     const usesInertScope = !actorScope;
     const resolvedActorScope = actorScope ?? createInertActorScope(this);
-    const persistedMachine = snapshot.machine;
+    const snapshotMachine = snapshot.machine;
+    // A live machine snapshot carries its producing machine so helpers such as
+    // `matches()` can resolve state nodes. That runtime association is not the
+    // persisted `{ id, version }` identity written by getPersistedSnapshot().
+    const persistedMachine = snapshotMachine && typeof snapshotMachine === 'object' && typeof snapshotMachine.transition === 'function' && 'root' in snapshotMachine ? undefined : snapshotMachine;
     const legacyPersistedVersion = snapshot.version;
     const persistedVersion = typeof persistedMachine?.version === 'string' ? persistedMachine.version : legacyPersistedVersion;
     if (legacyPersistedVersion !== undefined && persistedMachine?.version !== undefined && persistedMachine.version !== legacyPersistedVersion) {

package/dist/{createActor-f6e6146f.development.cjs.js → createActor-6736cbbe.development.cjs.js}

@@ -908,12 +908,15 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
     },
     stop: actor => {
       if (actor) {
-        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actor);
+        // enq.stop accepts the consumer ActorRef contract; refs handed to
+        // machine code are always full actor instances at runtime.
+        const actorInstance = actor;
+        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actorInstance);
         action.childUpdate = {
           type: 'remove',
-          actor
+          actor: actorInstance
         };
-        recordStoppedChild(actorScope, actor);
+        recordStoppedChild(actorScope, actorInstance);
       }
     }
   };

package/dist/{createActor-9523f716.esm.js → createActor-915ea40c.esm.js}

@@ -898,12 +898,15 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
     },
     stop: actor => {
       if (actor) {
-        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actor);
+        // enq.stop accepts the consumer ActorRef contract; refs handed to
+        // machine code are always full actor instances at runtime.
+        const actorInstance = actor;
+        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actorInstance);
         action.childUpdate = {
           type: 'remove',
-          actor
+          actor: actorInstance
         };
-        recordStoppedChild(actorScope, actor);
+        recordStoppedChild(actorScope, actorInstance);
       }
     }
   };

package/dist/{createActor-0816a84b.cjs.js → createActor-bfe8b6bd.cjs.js}

@@ -900,12 +900,15 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
     },
     stop: actor => {
       if (actor) {
-        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actor);
+        // enq.stop accepts the consumer ActorRef contract; refs handed to
+        // machine code are always full actor instances at runtime.
+        const actorInstance = actor;
+        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actorInstance);
         action.childUpdate = {
           type: 'remove',
-          actor
+          actor: actorInstance
         };
-        recordStoppedChild(actorScope, actor);
+        recordStoppedChild(actorScope, actorInstance);
       }
     }
   };

package/dist/{createActor-f5277b31.development.esm.js → createActor-ff132afa.development.esm.js}

@@ -906,12 +906,15 @@ function createTransitionEnqueue(actorScope, actions, internalEvents, actorSubsc
     },
     stop: actor => {
       if (actor) {
-        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actor);
+        // enq.stop accepts the consumer ActorRef contract; refs handed to
+        // machine code are always full actor instances at runtime.
+        const actorInstance = actor;
+        const action = pushBuiltInAction(actions, builtInActions['@xstate.stop'], actorScope, actorInstance);
         action.childUpdate = {
           type: 'remove',
-          actor
+          actor: actorInstance
         };
-        recordStoppedChild(actorScope, actor);
+        recordStoppedChild(actorScope, actorInstance);
       }
     }
   };

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

@@ -3,7 +3,7 @@ import { StateNode } from "./StateNode.js";
 import { type TransitionSelectionResults } from "./stateUtils.js";
 import { AnyActorSystem } from "./system.js";
 import type { ActorLogic, ActorLogicTransitionResult, ActorScope, AnyActorLogic, AnyActorRef, AnyActorScope, AnyTransitionDefinition, Equals, EventDescriptor, EmittedFrom, EventObject, EventFromLogic, ExecutableActionObjectFromLogic, HistoryValue, InputFrom, IsAny, MachineContext, MetaObject, OutputFrom, Snapshot, SnapshotFrom, StateValue, StateSchema, SnapshotStatus } from "./types.js";
-import { AnyMachineSchemas, Sources, Next_MachineConfig, MachineOptions } from "./types.v6.js";
+import { AnyMachineSchemas, DelaySourceMap, GuardSourceMap, Sources, Next_MachineConfig, MachineOptions } from "./types.v6.js";
 import type { ActorLogicValidator } from "./validation.types.js";
 import type { StandardSchemaV1 } from "./schema.types.js";
 import type { PersistedMachineSnapshot } from "./machineVersion.types.js";
@@ -53,8 +53,12 @@ export declare class StateMachine<TContext extends MachineContext, TEvent extend
     provide<const TProvidedActorMap extends Partial<Record<keyof TActorMap & string, AnyActorLogic>> = {}>(sources: {
         actions?: Partial<TActionMap>;
         actors?: TProvidedActorMap & ProvidedActors<TActorMap, TProvidedActorMap>;
-        guards?: Partial<TGuardMap>;
-        delays?: Partial<TDelayMap>;
+        guards?: Partial<TGuardMap> & {
+            [K in keyof TGuardMap]?: GuardSourceMap<TContext, TEvent>[string];
+        };
+        delays?: {
+            [K in keyof TDelayMap]?: DelaySourceMap<TContext, TEvent>[string];
+        };
     }): this;
     resolveState(config: {
         value: StateValue;

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

@@ -46,10 +46,17 @@ export interface DurableEffect<TEffect> extends DurableEffectMetadata {
  * during `executeEffects`: the execution captures and retains them, and the
  * execution's `waitForEvent()` hands them out before deferring to this
  * adapter. While the loop is parked, a root-addressed event reaches
- * `sendEvent` like any other target, so the host enqueues it in its own
- * mailbox.
+ * `enqueueRootEvent`, or the broader `sendEvent` override when implemented,
+ * so the host can place it in its own mailbox.
  */
 export interface DurableExecutionAdapter<TLogic extends AnyActorLogic> extends Partial<ActorSystemRuntime> {
+    /**
+     * Enqueues an event addressed to this execution's root while the durable
+     * loop is parked in `waitForEvent()`. Use this when the host only owns the
+     * root mailbox; implementing `sendEvent` instead takes ownership of delivery
+     * for every target and must use `deliverEvent` for co-located actors.
+     */
+    enqueueRootEvent?(source: AnyActor | undefined, event: AnyEventObject): void | PromiseLike<void>;
     /**
      * Executes a custom action as a durable host step or activity. The host
      * should identify the action by `type` and memoize or deduplicate it using

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

@@ -5,15 +5,41 @@ import { type Actor, type RequiredActorOptionsKeys } from "./createActor.js";
 import { AnyActorRef, AnyActorLogic, ActorRefFromLogic, AnyStateNode, EventObject, AnyEventObject, EventDescriptor, ExtractEvent, MachineContext, ProvidedActor, RoutableStateId, StateSchema, StateValue, StateValueFromStateSchema, ToChildren, MetaObject, Cast, Compute, EnqueueObject, DoneActorEvent, DoneStateEvent, ErrorActorEvent, SystemRegistry, RegistryKeyForLogic, ActorOptions, Observer, Subscription, OutputArg, SnapshotEvent, SingleOrArray, AfterEvent, TimeoutEvent, ErrorEvent } from "./types.js";
 import { AnyActorSystem } from "./system.js";
 import { InspectionEvent } from "./inspection.js";
-import { ActionSchemas, DelayMapFromNames, GuardSchemas, InferChildren, InferActions, InferGuards, Sources, InferOutput, InferEvents, InferInternalEvents, Next_MachineConfig, Next_InvokeConfig, Next_StateNodeConfig, Next_TransitionConfigOrTarget, OutputFromConfig, ValidateHistoryDefaults, ValidateStateTargets, WithDefault } from "./types.v6.js";
+import { ActionSchemas, DelayMapFromNames, DelaySourceMap, GuardSourceMap, GuardSchemas, InferChildren, InferActions, InferGuards, Sources, InferOutput, InferEvents, InferInternalEvents, Next_MachineConfig, Next_InvokeConfig, Next_StateNodeConfig, Next_TransitionConfigOrTarget, OutputFromConfig, ValidateHistoryDefaults, ValidateStateTargets, WithDefault } from "./types.v6.js";
 export type SetupConfig<TSchemas extends SetupSchemas, TStates extends Record<string, SetupStateSchema>, TActionMap extends Sources['actions'], TActorMap extends Sources['actors'], TGuardMap extends Sources['guards'], TDelayMap extends Sources['delays'], TValidator extends ActorLogicValidator | undefined = ActorLogicValidator | undefined> = {
     validator?: TValidator;
-    schemas?: TSchemas & SetupSchemas;
+    schemas?: TSchemas;
     states?: TStates;
     actions?: TActionMap;
     actors?: TActorMap;
-    guards?: TGuardMap;
-    delays?: TDelayMap;
+    guards?: TGuardMap & SetupGuardSources<NoInfer<TSchemas>>;
+    delays?: TDelayMap & SetupDelaySources<NoInfer<TSchemas>>;
+};
+/**
+ * Contextual types for guard/delay source maps passed to `setup()`, derived
+ * from the same call's `schemas` (context/events). These intersect the
+ * inferred source-map type parameters so inline functions get typed args
+ * without hand-annotating.
+ */
+type SetupGuardSources<TSchemas> = GuardSourceMap<SetupContext<TSchemas, StandardSchemaV1>, SetupEvents<TSchemas, Record<string, StandardSchemaV1>>>;
+type SetupDelaySources<TSchemas> = DelaySourceMap<SetupContext<TSchemas, StandardSchemaV1>, SetupEvents<TSchemas, Record<string, StandardSchemaV1>>>;
+/**
+ * Contextual companion for the whole-config `setup()` overload: gives inline
+ * `guards`/`delays` functions typed args from the config's own `schemas`.
+ */
+type SetupSourceCompanions<TSchemas> = {
+    guards?: SetupGuardSources<TSchemas>;
+    delays?: SetupDelaySources<TSchemas>;
+};
+type MergeRecord<TBase, TExtend> = Omit<TBase, keyof TExtend> & TExtend;
+/**
+ * Mirrors the runtime `mergeSchemas`: scalar schema keys (`context`, `input`,
+ * ...) are overridden whole, while map-valued keys (`events`, `emitted`,
+ * `children`, `actions`, `guards`) are merged entry-by-entry with extension
+ * entries winning, so base-declared entries stay visible to extension sources.
+ */
+type MergedSetupSchemas<TBaseSchemas, TExtendSchemas> = {
+    [K in keyof TBaseSchemas | keyof TExtendSchemas]: K extends 'events' | 'emitted' | 'children' | 'actions' | 'guards' ? MergeRecord<K extends keyof TBaseSchemas ? NonNullable<TBaseSchemas[K]> : {}, K extends keyof TExtendSchemas ? NonNullable<TExtendSchemas[K]> : {}> : K extends keyof TExtendSchemas ? TExtendSchemas[K] : K extends keyof TBaseSchemas ? TBaseSchemas[K] : never;
 };
 export type AnySetupConfig = SetupConfig<SetupSchemas, Record<string, SetupStateSchema>, Sources['actions'], Sources['actors'], Sources['guards'], Sources['delays'], ActorLogicValidator | undefined>;
 interface RuntimeValidationDoesNotSupportTransformingSchemas {
@@ -62,7 +88,10 @@ type ExtendValidatorConfig<TExtension> = [TExtension] extends [
 } : {
     validator: TExtension;
 };
-type SetupExtensionConfig<TBaseSchemas, TBaseStates, TBaseValidator, TExtendSchemas extends SetupSchemas, TExtendStates extends Record<string, SetupStateSchema>, TExtendActionMap extends Sources['actions'], TExtendActorMap extends Sources['actors'], TExtendGuardMap extends Sources['guards'], TExtendDelayMap extends Sources['delays'], TExtendValidator extends ActorLogicValidator | undefined | InheritedValidator> = Omit<SetupConfig<TExtendSchemas, TExtendStates, TExtendActionMap, TExtendActorMap, TExtendGuardMap, TExtendDelayMap>, 'validator'> & ExtendValidatorConfig<TExtendValidator> & RuntimeValidationCompatibility<NoInfer<TBaseSchemas>, NoInfer<TBaseStates>, ResolveExtendedValidator<TBaseValidator, TExtendValidator>> & RuntimeValidationConstraint<NoInfer<TExtendSchemas>, NoInfer<TExtendStates>, ResolveExtendedValidator<TBaseValidator, TExtendValidator>>;
+type SetupExtensionConfig<TBaseSchemas, TBaseStates, TBaseValidator, TExtendSchemas extends SetupSchemas, TExtendStates extends Record<string, SetupStateSchema>, TExtendActionMap extends Sources['actions'], TExtendActorMap extends Sources['actors'], TExtendGuardMap extends Sources['guards'], TExtendDelayMap extends Sources['delays'], TExtendValidator extends ActorLogicValidator | undefined | InheritedValidator> = Omit<SetupConfig<TExtendSchemas, TExtendStates, TExtendActionMap, TExtendActorMap, TExtendGuardMap, TExtendDelayMap>, 'validator' | 'guards' | 'delays'> & {
+    guards?: TExtendGuardMap & SetupGuardSources<NoInfer<MergedSetupSchemas<TBaseSchemas, TExtendSchemas>>>;
+    delays?: TExtendDelayMap & SetupDelaySources<NoInfer<MergedSetupSchemas<TBaseSchemas, TExtendSchemas>>>;
+} & ExtendValidatorConfig<TExtendValidator> & RuntimeValidationCompatibility<NoInfer<TBaseSchemas>, NoInfer<TBaseStates>, ResolveExtendedValidator<TBaseValidator, TExtendValidator>> & RuntimeValidationConstraint<NoInfer<TExtendSchemas>, NoInfer<TExtendStates>, ResolveExtendedValidator<TBaseValidator, TExtendValidator>>;
 type InlineMachineSchemas<TContextSchema, TEventSchemaMap, TInternalEventSchemaMap, TEmittedSchemaMap, TActionSchemaMap, TGuardSchemaMap, TInputSchema, TOutputSchema, TMetaSchema, TTagSchema, TChildrenSchemaMap> = {
     context?: TContextSchema;
     events?: TEventSchemaMap;
@@ -330,7 +359,7 @@ type MergeStateSchema<TConfig extends StateSchema, TSetup extends StateSchema> =
 type SetupMachineConfig<TStateSchemas extends Record<string, SetupStateSchema>, TStateKeys extends string, TSchemas extends SetupSchemas, TContextSchema extends StandardSchemaV1, TEventSchemaMap extends Record<string, StandardSchemaV1>, TInternalEventSchemaMap 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, TEvent extends EventObject, TChildren extends Record<string, AnyActorRef | undefined>, TDelays extends string, TTag extends string, TEmitted extends EventObject, TMeta extends MetaObject, TActionMap extends Sources['actions'], TActorMap extends Sources['actors'], TGuardMap extends Sources['guards'], TDelayMap extends Sources['delays'], TSystemRegistry extends SystemRegistry, TContextRequired extends boolean, TRootDelays extends string = TDelays, TRootActionMap extends Sources['actions'] = TActionMap, TRootActorMap extends Sources['actors'] = TActorMap, TRootGuardMap extends Sources['guards'] = TGuardMap> = Omit<Next_MachineConfig<SetupOrConfigSchema<TSchemas, 'context', TContextSchema>, SetupOrConfigSchemaMap<TSchemas, 'events', TEventSchemaMap>, SetupOrConfigSchemaMap<TSchemas, 'internalEvents', TInternalEventSchemaMap>, SetupOrConfigSchemaMap<TSchemas, 'emitted', TEmittedSchemaMap>, SetupOrConfigSchema<TSchemas, 'input', TInputSchema>, SetupOrConfigSchema<TSchemas, 'output', TOutputSchema>, SetupOrConfigSchema<TSchemas, 'meta', TMetaSchema>, SetupOrConfigSchema<TSchemas, 'tags', TTagSchema>, SetupOrConfigSchemaMap<TSchemas, 'children', TChildrenSchemaMap>, TContext, TEvent, TChildren, TDelays, TTag, TActionMap, TActorMap, TGuardMap, TDelayMap, TContextRequired, TSystemRegistry>, 'states' | 'initial' | 'on' | 'always' | 'invoke' | 'actions' | 'actors' | 'guards' | 'delays'> & {
     actions?: TRootActionMap;
     actors?: TRootActorMap;
-    guards?: TRootGuardMap;
+    guards?: TRootGuardMap & GuardSourceMap<TContext, TEvent>;
     delays?: {
         [K in TRootDelays | number]?: number | (({ context, event, stateNode }: {
             context: TContext;
@@ -537,7 +566,7 @@ export type SetupReturnFromConfig<TConfig extends AnySetupConfig, TSystemRegistr
 type SetupFunction<TSystemRegistry extends SystemRegistry = SystemRegistry> = {
     (): SetupReturn<Record<string, SetupStateSchema>, {}, {}, {}, {}, {}, never, TSystemRegistry>;
     <const TSchemas extends SetupSchemas = {}, const TStates extends Record<string, SetupStateSchema> = Record<string, SetupStateSchema>, TActionMap extends Sources['actions'] = {}, TActorMap extends Sources['actors'] = {}, TGuardMap extends Sources['guards'] = {}, TDelayMap extends Sources['delays'] = {}, const TValidator extends ActorLogicValidator | undefined = undefined>(config: SetupConfig<TSchemas, TStates, TActionMap, TActorMap, TGuardMap, TDelayMap, TValidator> & RuntimeValidationConstraint<NoInfer<TSchemas>, NoInfer<TStates>, TValidator>): SetupReturn<TStates, TSchemas, TActionMap, TActorMap, TGuardMap, TDelayMap, Extract<keyof TDelayMap, string>, TSystemRegistry, TValidator>;
-    <const TConfig extends AnySetupConfig>(config: TConfig & RuntimeValidationConstraint<NoInfer<SetupConfigSchemas<TConfig>>, NoInfer<SetupConfigStates<TConfig>>, TConfig extends {
+    <const TConfig extends AnySetupConfig>(config: TConfig & SetupSourceCompanions<SetupConfigSchemas<TConfig>> & RuntimeValidationConstraint<NoInfer<SetupConfigSchemas<TConfig>>, NoInfer<SetupConfigStates<TConfig>>, TConfig extends {
         validator: infer TValidator;
     } ? TValidator : undefined>): SetupReturnFromConfig<TConfig, TSystemRegistry>;
 };

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

@@ -101,7 +101,7 @@ export type OutputArg<TEvent extends EventObject> = TEvent extends {
 export type ActionArgs<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject> = UnifiedArg<TContext, TExpressionEvent, TEvent> & {
     children: Record<string, AnyActor>;
 };
-export type InputFrom<T> = T extends StateMachine<infer _TContext, infer _TEvent, infer _TChildren, infer _TStateValue, infer _TTag, infer TInput, infer _TOutput, infer _TEmitted, infer _TMeta, infer _TStateSchema, infer _TActionMap, infer _TActorMap, infer _TGuardMap, infer _TDelayMap> ? TInput : T extends ActorLogic<infer _TSnapshot, infer _TEvent, infer TInput, infer _TSystem, infer _TEmitted> ? TInput : never;
+export type InputFrom<T> = T extends ActorLogic<infer _TSnapshot, infer _TEvent, infer TInput, infer _TSystem, infer _TEmitted> ? TInput : T extends StateMachine<infer _TContext, infer _TEvent, infer _TChildren, infer _TStateValue, infer _TTag, infer TInput, infer _TOutput, infer _TEmitted, infer _TMeta, infer _TStateSchema, infer _TActionMap, infer _TActorMap, infer _TGuardMap, infer _TDelayMap> ? TInput : never;
 export type OutputFrom<T> = T extends ActorLogic<infer TSnapshot, infer _TEvent, infer _TInput, infer _TSystem, infer _TEmitted> ? (TSnapshot & {
     status: 'done';
 })['output'] : T extends ActorRef<infer TSnapshot, infer _TEvent, infer _TEmitted> ? (TSnapshot & {
@@ -1247,7 +1247,7 @@ export type EnqueueObject<TEvent extends EventObject, TEmittedEvent extends Even
         id?: string;
         delay?: number;
     }) => void;
-    stop: (actor?: AnyActor) => void;
+    stop: (actor?: AnyActorRef) => void;
     /**
      * Listen to emitted events from an actor. Returns a listener actor that can
      * be stopped via `enq.stop()`.
@@ -1257,7 +1257,7 @@ export type EnqueueObject<TEvent extends EventObject, TEmittedEvent extends Even
      *   wildcards: 'event._', '_')
      * @param mapper - Function to transform emitted events into machine events
      */
-    listen: <TEmitted extends EventObject, TMappedEvent extends TEvent>(actor: AnyActor, eventType: string, mapper: (event: TEmitted) => TMappedEvent) => AnyActor;
+    listen: <TEmitted extends EventObject, TMappedEvent extends TEvent>(actor: AnyActorRef, eventType: string, mapper: (event: TEmitted) => TMappedEvent) => AnyActor;
     /**
      * Subscribe to lifecycle events (done/error/snapshot) from an actor. Returns
      * a subscription actor that can be stopped via `enq.stop()`.
@@ -1266,7 +1266,7 @@ export type EnqueueObject<TEvent extends EventObject, TEmittedEvent extends Even
      * @param mappers - Object with done/error/snapshot mappers, or a single
      *   snapshot mapper function
      */
-    subscribeTo: <TActor extends AnyActor, TMappedEvent extends TEvent>(actor: TActor, mappers: SubscribeToMappers<SnapshotFrom<TActor>, OutputFrom<TActor>, TMappedEvent> | ((snapshot: SnapshotFrom<TActor>) => TMappedEvent)) => AnyActor;
+    subscribeTo: <TActor extends AnyActorRef, TMappedEvent extends TEvent>(actor: TActor, mappers: SubscribeToMappers<SnapshotFrom<TActor>, OutputFrom<TActor>, TMappedEvent> | ((snapshot: SnapshotFrom<TActor>) => TMappedEvent)) => AnyActor;
 };
 export type Action<TContext extends MachineContext, TEvent extends EventObject, TEmittedEvent extends EventObject, TActionMap extends Sources['actions'], TActorMap extends Sources['actors'], TGuardMap extends Sources['guards'], TDelayMap extends Sources['delays'], TParams = Record<string, unknown> | undefined, _TCtx = [TContext] extends [never] ? any : TContext> = (_: {
     context: _TCtx;

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

@@ -132,7 +132,7 @@ export type Next_MachineConfig<TContextSchema extends StandardSchemaV1, TEventSc
     internalEvents?: readonly InternalEventDescriptorFor<TEvent>[];
     schemas?: MachineSchemas<TContextSchema, TEventSchemaMap, TInternalEventSchemaMap, TEmittedSchemaMap, TInputSchema, TOutputSchema, TMetaSchema, TTagSchema, TChildrenSchemaMap>;
     actions?: TActionMap;
-    guards?: TGuardMap;
+    guards?: TGuardMap & GuardSourceMap<TContext, TEvent>;
     actors?: TActorMap;
     /** The machine's own version. */
     version?: string;
@@ -504,12 +504,34 @@ export interface Sources {
         context?: any;
         children?: any;
     }>;
-    guards: Record<string, (...args: any[]) => boolean>;
-    delays: Record<string, number | ((...args: any[]) => number)>;
+    guards: Record<string, Function>;
+    delays: Record<string, number | Function>;
     actors: Record<string, AnyActorLogic>;
 }
-export type DelayMapFromNames<TDelays extends string, _TDelayMap extends Sources['delays']> = string extends TDelays ? Sources['delays'] : {
-    [K in TDelays]: Sources['delays'][string];
+/**
+ * Contextually types the entries of a `guards: { ... }` source map. Guard
+ * sources receive the transition args object first and optional caller-supplied
+ * params after it.
+ */
+export type GuardSourceMap<TContext extends MachineContext, TEvent extends EventObject, _TCtx = [TContext] extends [never] ? any : TContext> = Record<string, (args: {
+    context: _TCtx;
+    event: TEvent;
+    self: AnyActorRef;
+    parent: AnyActorRef | undefined;
+    value: StateValue;
+    children: Record<string, AnyActorRef | undefined>;
+}, ...params: any[]) => boolean>;
+/**
+ * Contextually types the entries of a `delays: { ... }` source map. Delay
+ * functions receive `{ context, event, stateNode }` at runtime.
+ */
+export type DelaySourceMap<TContext extends MachineContext, TEvent extends EventObject, _TCtx = [TContext] extends [never] ? any : TContext> = Record<string, number | ((args: {
+    context: _TCtx;
+    event: TEvent;
+    stateNode: AnyStateNode;
+}) => number)>;
+export type DelayMapFromNames<TDelays extends string, TDelayMap extends Sources['delays']> = string extends TDelays ? Sources['delays'] : {
+    [K in TDelays]: K extends keyof TDelayMap ? TDelayMap[K] : number | ((...args: any[]) => number);
 };
 type DelayNamesFromConfig<TConfig> = TConfig extends {
     delays: infer TDelays;

package/dist/{effectDescriptor-8a5d62e0.development.cjs.js → effectDescriptor-3c699328.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-f6e6146f.development.cjs.js');
+var createActor = require('./createActor-6736cbbe.development.cjs.js');
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   if (!microsteps.length) {
@@ -130,6 +130,9 @@ function getInitialMicrosteps(machine, ...[input]) {
  *   deterministic order
  */
 function getNextTransitions(state) {
+  if (state.status !== 'active') {
+    return [];
+  }
   const potentialTransitions = [];
   const atomicStates = state.nodes.filter(createActor.isAtomicStateNode);
   const visited = new Set();

package/dist/{effectDescriptor-87826c41.esm.js → effectDescriptor-8be60443.esm.js}

@@ -1,4 +1,4 @@
-import { aa as createInertActorScope, ab as setInertActorScopeSnapshot, f as finalizeTransitionResult, ac as attachSnapshotActorRef, K as createInitEvent, az as hasAmbientInspector, a as beginSpawnAllocation, ad as macrostep, ao as createSpawnEffect, ap as initialMicrostep, j as isAtomicStateNode, aA as getProperAncestors, aB as isRemoteActorRef, aC as getActorIdPrefix } from './createActor-9523f716.esm.js';
+import { aa as createInertActorScope, ab as setInertActorScopeSnapshot, f as finalizeTransitionResult, ac as attachSnapshotActorRef, K as createInitEvent, az as hasAmbientInspector, a as beginSpawnAllocation, ad as macrostep, ao as createSpawnEffect, ap as initialMicrostep, j as isAtomicStateNode, aA as getProperAncestors, aB as isRemoteActorRef, aC as getActorIdPrefix } from './createActor-915ea40c.esm.js';
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   if (!microsteps.length) {
@@ -128,6 +128,9 @@ function getInitialMicrosteps(machine, ...[input]) {
  *   deterministic order
  */
 function getNextTransitions(state) {
+  if (state.status !== 'active') {
+    return [];
+  }
   const potentialTransitions = [];
   const atomicStates = state.nodes.filter(isAtomicStateNode);
   const visited = new Set();

package/dist/{effectDescriptor-3a016bbe.cjs.js → effectDescriptor-a7e2d4d1.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-0816a84b.cjs.js');
+var createActor = require('./createActor-bfe8b6bd.cjs.js');
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   if (!microsteps.length) {
@@ -130,6 +130,9 @@ function getInitialMicrosteps(machine, ...[input]) {
  *   deterministic order
  */
 function getNextTransitions(state) {
+  if (state.status !== 'active') {
+    return [];
+  }
   const potentialTransitions = [];
   const atomicStates = state.nodes.filter(createActor.isAtomicStateNode);
   const visited = new Set();

package/dist/{effectDescriptor-9a14147f.development.esm.js → effectDescriptor-fbe67d5a.development.esm.js}

@@ -1,4 +1,4 @@
-import { aa as createInertActorScope, ab as setInertActorScopeSnapshot, f as finalizeTransitionResult, ac as attachSnapshotActorRef, K as createInitEvent, az as hasAmbientInspector, a as beginSpawnAllocation, ad as macrostep, ao as createSpawnEffect, ap as initialMicrostep, j as isAtomicStateNode, aA as getProperAncestors, aB as isRemoteActorRef, aC as getActorIdPrefix } from './createActor-f5277b31.development.esm.js';
+import { aa as createInertActorScope, ab as setInertActorScopeSnapshot, f as finalizeTransitionResult, ac as attachSnapshotActorRef, K as createInitEvent, az as hasAmbientInspector, a as beginSpawnAllocation, ad as macrostep, ao as createSpawnEffect, ap as initialMicrostep, j as isAtomicStateNode, aA as getProperAncestors, aB as isRemoteActorRef, aC as getActorIdPrefix } from './createActor-ff132afa.development.esm.js';
 
 function attachMicrostepActorRefs(microsteps, actorScope, inputSnapshot) {
   if (!microsteps.length) {
@@ -128,6 +128,9 @@ function getInitialMicrosteps(machine, ...[input]) {
  *   deterministic order
  */
 function getNextTransitions(state) {
+  if (state.status !== 'active') {
+    return [];
+  }
   const potentialTransitions = [];
   const atomicStates = state.nodes.filter(isAtomicStateNode);
   const visited = new Set();

package/dist/{index-1e1e1cba.development.cjs.js → index-0f498ef2.development.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-f6e6146f.development.cjs.js');
+var createActor = require('./createActor-6736cbbe.development.cjs.js');
 
 function assertValid(validator, request) {
   const error = validator.check(request);

package/dist/{index-3907b7aa.development.esm.js → index-70d56425.development.esm.js}

@@ -1,4 +1,4 @@
-import { K as createInitEvent, e as XSTATE_STOP, L as createCustomEffect, M as XSTATE_LOGIC_EFFECT_START, N as XSTATE_LOGIC_EFFECT_RESOLVE, O as XSTATE_LOGIC_EFFECT_REJECT, f as finalizeTransitionResult, P as createEmitEffect, h as createSendToEffect, X as XSTATE_INIT, p as parseDelayToMilliseconds, H as runStep, k as createActor } from './createActor-f5277b31.development.esm.js';
+import { K as createInitEvent, e as XSTATE_STOP, L as createCustomEffect, M as XSTATE_LOGIC_EFFECT_START, N as XSTATE_LOGIC_EFFECT_RESOLVE, O as XSTATE_LOGIC_EFFECT_REJECT, f as finalizeTransitionResult, P as createEmitEffect, h as createSendToEffect, X as XSTATE_INIT, p as parseDelayToMilliseconds, H as runStep, k as createActor } from './createActor-ff132afa.development.esm.js';
 
 function assertValid(validator, request) {
   const error = validator.check(request);

package/dist/{index-c7431a16.esm.js → index-b051c924.esm.js}

@@ -1,4 +1,4 @@
-import { K as createInitEvent, e as XSTATE_STOP, L as createCustomEffect, M as XSTATE_LOGIC_EFFECT_START, N as XSTATE_LOGIC_EFFECT_RESOLVE, O as XSTATE_LOGIC_EFFECT_REJECT, f as finalizeTransitionResult, P as createEmitEffect, h as createSendToEffect, X as XSTATE_INIT, p as parseDelayToMilliseconds, H as runStep, k as createActor } from './createActor-9523f716.esm.js';
+import { K as createInitEvent, e as XSTATE_STOP, L as createCustomEffect, M as XSTATE_LOGIC_EFFECT_START, N as XSTATE_LOGIC_EFFECT_RESOLVE, O as XSTATE_LOGIC_EFFECT_REJECT, f as finalizeTransitionResult, P as createEmitEffect, h as createSendToEffect, X as XSTATE_INIT, p as parseDelayToMilliseconds, H as runStep, k as createActor } from './createActor-915ea40c.esm.js';
 
 function assertValid(validator, request) {
   const error = validator.check(request);

package/dist/{index-7b9c4f77.cjs.js → index-b3fe59bc.cjs.js}

@@ -1,6 +1,6 @@
 'use strict';
 
-var createActor = require('./createActor-0816a84b.cjs.js');
+var createActor = require('./createActor-bfe8b6bd.cjs.js');
 
 function assertValid(validator, request) {
   const error = validator.check(request);

package/dist/xstate-actors.cjs.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createActor = require('./createActor-0816a84b.cjs.js');
-var dist_xstateActors = require('./index-7b9c4f77.cjs.js');
+var createActor = require('./createActor-bfe8b6bd.cjs.js');
+var dist_xstateActors = require('./index-b3fe59bc.cjs.js');
 
 
 

package/dist/xstate-actors.development.cjs.js

@@ -2,8 +2,8 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var createActor = require('./createActor-f6e6146f.development.cjs.js');
-var dist_xstateActors = require('./index-1e1e1cba.development.cjs.js');
+var createActor = require('./createActor-6736cbbe.development.cjs.js');
+var dist_xstateActors = require('./index-0f498ef2.development.cjs.js');
 
 
 

package/dist/xstate-actors.development.esm.js

@@ -1,2 +1,2 @@
-export { l as createListenerLogic, n as createSubscriptionLogic, o as listenerLogic, s as subscriptionLogic } from './createActor-f5277b31.development.esm.js';
-export { T as TimeoutError, c as createAsyncLogic, a as createCallbackLogic, b as createEmptyActor, d as createEventObservableLogic, e as createLogic, f as createObservableLogic } from './index-3907b7aa.development.esm.js';
+export { l as createListenerLogic, n as createSubscriptionLogic, o as listenerLogic, s as subscriptionLogic } from './createActor-ff132afa.development.esm.js';
+export { T as TimeoutError, c as createAsyncLogic, a as createCallbackLogic, b as createEmptyActor, d as createEventObservableLogic, e as createLogic, f as createObservableLogic } from './index-70d56425.development.esm.js';

package/dist/xstate-actors.esm.js

@@ -1,2 +1,2 @@
-export { l as createListenerLogic, n as createSubscriptionLogic, o as listenerLogic, s as subscriptionLogic } from './createActor-9523f716.esm.js';
-export { T as TimeoutError, c as createAsyncLogic, a as createCallbackLogic, b as createEmptyActor, d as createEventObservableLogic, e as createLogic, f as createObservableLogic } from './index-c7431a16.esm.js';
+export { l as createListenerLogic, n as createSubscriptionLogic, o as listenerLogic, s as subscriptionLogic } from './createActor-915ea40c.esm.js';
+export { T as TimeoutError, c as createAsyncLogic, a as createCallbackLogic, b as createEmptyActor, d as createEventObservableLogic, e as createLogic, f as createObservableLogic } from './index-b051c924.esm.js';