xstate 5.0.0-beta.25 → 5.0.0-beta.26

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

@@ -1,6 +1,6 @@
 import type { StateNode } from "./StateNode.js";
 import { TypegenDisabled, TypegenEnabled } from "./typegenTypes.js";
-import type { ProvidedActor, ActorRefFrom, AnyState, AnyStateMachine, EventObject, HistoryValue, MachineContext, PersistedMachineState, Prop, StateConfig, StateValue, TODO, AnyActorRef, Compute } from "./types.js";
+import type { ProvidedActor, ActorRefFrom, AnyState, AnyStateMachine, EventObject, HistoryValue, MachineContext, PersistedMachineState, Prop, StateConfig, StateValue, TODO, AnyActorRef, Compute, EventDescriptor } from "./types.js";
 type ComputeConcreteChildren<TActor extends ProvidedActor> = {
     [A in TActor as 'id' extends keyof A ? A['id'] & string : never]?: ActorRefFrom<A['logic']>;
 };
@@ -84,7 +84,7 @@ export declare class State<TContext extends MachineContext, TEvent extends Event
     /**
      * The next events that will cause a transition from the current state.
      */
-    get nextEvents(): Array<string>;
+    get nextEvents(): Array<EventDescriptor<TEvent>>;
     get meta(): Record<string, any>;
 }
 export declare function cloneState<TState extends AnyState>(state: TState, config?: Partial<StateConfig<any, any>>): TState;

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

@@ -162,8 +162,11 @@ export type StatesDefinition<TContext extends MachineContext, TEvent extends Eve
 export type TransitionConfigTarget = string | undefined;
 export type TransitionConfigOrTarget<TContext extends MachineContext, TExpressionEvent extends EventObject, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TDelay extends string> = SingleOrArray<TransitionConfigTarget | TransitionConfig<TContext, TExpressionEvent, TEvent, TAction, TGuard, TDelay>>;
 export type TransitionsConfig<TContext extends MachineContext, TEvent extends EventObject, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TDelay extends string> = {
-    [K in TEvent['type'] | '*']?: K extends '*' ? TransitionConfigOrTarget<TContext, TEvent, TEvent, TAction, TGuard, TDelay> : TransitionConfigOrTarget<TContext, ExtractEvent<TEvent, K>, TEvent, TAction, TGuard, TDelay>;
+    [K in EventDescriptor<TEvent>]?: TransitionConfigOrTarget<TContext, ExtractEvent<TEvent, K>, TEvent, TAction, TGuard, TDelay>;
 };
+type PartialEventDescriptor<TEventType extends string> = TEventType extends `${infer TLeading}.${infer TTail}` ? `${TLeading}.*` | `${TLeading}.${PartialEventDescriptor<TTail>}` : never;
+export type EventDescriptor<TEvent extends EventObject> = TEvent['type'] | PartialEventDescriptor<TEvent['type']> | '*';
+type NormalizeDescriptor<TDescriptor extends string> = TDescriptor extends '*' ? string : TDescriptor extends `${infer TLeading}.*` ? `${TLeading}.${string}` : TDescriptor;
 type IsLiteralString<T extends string> = string extends T ? false : true;
 type DistributeActors<TContext extends MachineContext, TEvent extends EventObject, TActor extends ProvidedActor, TAction extends ParameterizedObject, TGuard extends ParameterizedObject, TDelay extends string> = TActor extends {
     src: infer TSrc;
@@ -544,13 +547,13 @@ export interface TransitionDefinition<TContext extends MachineContext, TEvent ex
     actions: readonly UnknownAction[];
     reenter: boolean;
     guard?: UnknownGuard;
-    eventType: TEvent['type'] | '*';
+    eventType: EventDescriptor<TEvent>;
     toJSON: () => {
         target: string[] | undefined;
         source: string;
         actions: readonly UnknownAction[];
         guard?: UnknownGuard;
-        eventType: TEvent['type'] | '*';
+        eventType: EventDescriptor<TEvent>;
         meta?: Record<string, any>;
     };
 }
@@ -560,9 +563,7 @@ export interface InitialTransitionDefinition<TContext extends MachineContext, TE
     guard?: never;
 }
 export type TransitionDefinitionMap<TContext extends MachineContext, TEvent extends EventObject> = {
-    [K in TEvent['type'] | '*']: Array<TransitionDefinition<TContext, K extends TEvent['type'] ? Extract<TEvent, {
-        type: K;
-    }> : EventObject>>;
+    [K in EventDescriptor<TEvent>]: Array<TransitionDefinition<TContext, ExtractEvent<TEvent, K>>>;
 };
 export interface DelayedTransitionDefinition<TContext extends MachineContext, TEvent extends EventObject> extends TransitionDefinition<TContext, TEvent> {
     delay: number | string | DelayExpr<TContext, TEvent, undefined>;
@@ -650,7 +651,7 @@ export interface Subscribable<T> extends InteropSubscribable<T> {
     subscribe(observer: Observer<T>): Subscription;
     subscribe(next: (value: T) => void, error?: (error: any) => void, complete?: () => void): Subscription;
 }
-export type ExtractEvent<TEvent extends EventObject, TEventType extends TEvent['type']> = TEvent extends any ? TEventType extends TEvent['type'] ? TEvent : never : never;
+export type ExtractEvent<TEvent extends EventObject, TDescriptor extends EventDescriptor<TEvent>> = string extends TEvent['type'] ? TEvent : NormalizeDescriptor<TDescriptor> extends infer TNormalizedDescriptor ? TEvent extends any ? TEvent['type'] extends TNormalizedDescriptor ? TEvent : never : never : never;
 export interface BaseActorRef<TEvent extends EventObject> {
     send: (event: TEvent) => void;
 }