(WIP) v6

README.md

@@ -53,7 +53,6 @@ Special thanks to the sponsors who support this open-source project:
   </picture>
 </a>
 
-
 ## Templates
 
 Get started by forking one of these templates on CodeSandbox:
@@ -565,7 +564,6 @@ actor.send({ type: 'PREVIOUS' });
 </tbody>
 </table>
 
-
 ## SemVer Policy
 
 We understand the importance of the public contract and do not intend to release any breaking changes to the **runtime** API in a minor or patch release. We consider this with any changes we make to the XState libraries and aim to minimize their effects on existing users.

package.json

@@ -26,6 +26,7 @@
     "preinstall": "node ./scripts/ensure-pnpm.js",
     "postinstall": "manypkg check && preconstruct dev",
     "build": "preconstruct build",
+    "watch": "preconstruct watch",
     "fix": "manypkg fix",
     "lint": "eslint --cache --quiet",
     "typecheck": "tsc",
@@ -55,7 +56,7 @@
     "@changesets/cli": "^2.29.5",
     "@eslint/js": "^9.26.0",
     "@manypkg/cli": "^0.21.4",
-    "@preconstruct/cli": "^2.8.1",
+    "@preconstruct/cli": "^2.8.12",
     "@types/node": "^20.14.13",
     "babel-preset-solid": "^1.8.4",
     "eslint": "^9.26.0",

packages/core/package.json

@@ -20,34 +20,6 @@
       "import": "./dist/xstate.cjs.mjs",
       "default": "./dist/xstate.cjs.js"
     },
-    "./guards": {
-      "types": {
-        "import": "./guards/dist/xstate-guards.cjs.mjs",
-        "default": "./guards/dist/xstate-guards.cjs.js"
-      },
-      "development": {
-        "module": "./guards/dist/xstate-guards.development.esm.js",
-        "import": "./guards/dist/xstate-guards.development.cjs.mjs",
-        "default": "./guards/dist/xstate-guards.development.cjs.js"
-      },
-      "module": "./guards/dist/xstate-guards.esm.js",
-      "import": "./guards/dist/xstate-guards.cjs.mjs",
-      "default": "./guards/dist/xstate-guards.cjs.js"
-    },
-    "./actions": {
-      "types": {
-        "import": "./actions/dist/xstate-actions.cjs.mjs",
-        "default": "./actions/dist/xstate-actions.cjs.js"
-      },
-      "development": {
-        "module": "./actions/dist/xstate-actions.development.esm.js",
-        "import": "./actions/dist/xstate-actions.development.cjs.mjs",
-        "default": "./actions/dist/xstate-actions.development.cjs.js"
-      },
-      "module": "./actions/dist/xstate-actions.esm.js",
-      "import": "./actions/dist/xstate-actions.cjs.mjs",
-      "default": "./actions/dist/xstate-actions.cjs.js"
-    },
     "./dev": {
       "types": {
         "import": "./dev/dist/xstate-dev.cjs.mjs",
@@ -138,15 +110,14 @@
     "ajv": "^8.12.0",
     "pkg-up": "^3.1.0",
     "rxjs": "^7.8.1",
-    "xml-js": "^1.6.11"
+    "xml-js": "^1.6.11",
+    "zod": "^3.25.51"
   },
   "preconstruct": {
     "umdName": "XState",
     "entrypoints": [
       "./index.ts",
-      "./actions.ts",
       "./actors/index.ts",
-      "./guards.ts",
       "./dev/index.ts",
       "./graph/index.ts"
     ]

packages/core/src/State.ts

@@ -2,7 +2,7 @@ import isDevelopment from '#is-development';
 import { $$ACTOR_TYPE } from './createActor.ts';
 import type { StateNode } from './StateNode.ts';
 import type { StateMachine } from './StateMachine.ts';
-import { getStateValue } from './stateUtils.ts';
+import { getStateValue, getTransitionResult, hasEffect } from './stateUtils.ts';
 import type {
   ProvidedActor,
   AnyMachineSnapshot,
@@ -20,9 +20,12 @@ import type {
   StateSchema,
   StateId,
   SnapshotStatus,
-  PersistedHistoryValue
+  PersistedHistoryValue,
+  TODO
 } from './types.ts';
 import { matchesState } from './utils.ts';
+import { createSystem } from './system.ts';
+import { createEmptyActor } from './actors/index.ts';
 
 type ToTestStateValue<TStateValue extends StateValue> =
   TStateValue extends string
@@ -71,7 +74,10 @@ interface MachineSnapshotBase<
     TOutput,
     EventObject, // TEmitted
     any, // TMeta
-    TStateSchema
+    TStateSchema,
+    TODO, // TActionMap
+    TODO, // TActorMap
+    TODO // TGuardMap
   >;
   /** The tags of the active state nodes that represent the current state value. */
   tags: Set<string>;
@@ -312,12 +318,22 @@ const machineSnapshotCan = function can(
     );
   }
 
-  const transitionData = this.machine.getTransitionData(this, event);
+  const transitionData = this.machine.getTransitionData(this, event, {} as any);
 
   return (
     !!transitionData?.length &&
     // Check that at least one transition is not forbidden
-    transitionData.some((t) => t.target !== undefined || t.actions.length)
+    transitionData.some((t) => {
+      const res = getTransitionResult(t, this, event, createEmptyActor(), {
+        system: createSystem(createEmptyActor(), {})
+      } as any);
+      return (
+        t.target !== undefined ||
+        res.targets?.length ||
+        res.context ||
+        hasEffect(t, this.context, event, this, {} as any)
+      );
+    })
   );
 };
 

packages/core/src/StateMachine.ts

@@ -1,7 +1,7 @@
 import isDevelopment from '#is-development';
-import { assign } from './actions.ts';
 import { $$ACTOR_TYPE, createActor } from './createActor.ts';
 import { createInitEvent } from './eventUtils.ts';
+import { createSpawner } from './spawn.ts';
 import {
   createMachineSnapshot,
   getPersistedSnapshot,
@@ -17,7 +17,7 @@
   isStateId,
   macrostep,
   microstep,
-  resolveActionsAndContext,
+  resolveAndExecuteActionsWithContext,
   resolveStateValue,
   transitionNode
 } from './stateUtils.ts';
@@ -29,15 +29,11 @@
   AnyActorRef,
   AnyActorScope,
   AnyEventObject,
-  DoNotInfer,
   Equals,
   EventDescriptor,
   EventObject,
   HistoryValue,
-  InternalMachineImplementations,
-  MachineConfig,
   MachineContext,
-  MachineImplementationsSimplified,
   MetaObject,
   ParameterizedObject,
   ProvidedActor,
@@ -46,10 +42,10 @@
   StateMachineDefinition,
   StateValue,
   TransitionDefinition,
-  ResolvedStateMachineTypes,
   StateSchema,
   SnapshotStatus
 } from './types.ts';
+import { Implementations, Next_MachineConfig } from './types.v6.ts';
 import { resolveReferencedActor, toStatePath } from './utils.ts';
 
 const STATE_IDENTIFIER = '#';
@@ -68,7 +64,8 @@
   TOutput,
   TEmitted extends EventObject,
   TMeta extends MetaObject,
-  TConfig extends StateSchema
+  TConfig extends StateSchema,
+  TImplementations extends Implementations
 > implements
     ActorLogic<
       MachineSnapshot<
@@ -92,7 +89,7 @@
 
   public schemas: unknown;
 
-  public implementations: MachineImplementationsSimplified<TContext, TEvent>;
+  public implementations: Implementations;
 
   /** @internal */
   public __xstatenode = true as const;
@@ -109,29 +106,28 @@
 
   constructor(
     /** The raw config used to create the machine. */
-    public config: MachineConfig<
-      TContext,
-      TEvent,
+    public config: Next_MachineConfig<
       any,
       any,
       any,
       any,
       any,
       any,
-      TOutput,
-      any, // TEmitted
-      any // TMeta
+      any,
+      any,
+      any
     > & {
       schemas?: unknown;
     },
-    implementations?: MachineImplementationsSimplified<TContext, TEvent>
+    implementations?: Implementations
   ) {
     this.id = config.id || '(machine)';
     this.implementations = {
-      actors: implementations?.actors ?? {},
-      actions: implementations?.actions ?? {},
-      delays: implementations?.delays ?? {},
-      guards: implementations?.guards ?? {}
+      actors: config.actors ?? {},
+      actions: config.actions ?? {},
+      delays: config.delays ?? {},
+      guards: config.guards ?? {},
+      ...implementations
     };
     this.version = this.config.version;
     this.schemas = this.config.schemas;
@@ -172,20 +168,11 @@
    *   recursively merge with the existing options.
    * @returns A new `StateMachine` instance with the provided implementations.
    */
-  public provide(
-    implementations: InternalMachineImplementations<
-      ResolvedStateMachineTypes<
-        TContext,
-        DoNotInfer<TEvent>,
-        TActor,
-        TAction,
-        TGuard,
-        TDelay,
-        TTag,
-        TEmitted
-      >
-    >
-  ): StateMachine<
+  public provide(implementations: {
+    actions?: Partial<TActionMap>;
+    actors?: Partial<TActorMap>;
+    guards?: Partial<TGuardMap>;
+  }): StateMachine<
     TContext,
     TEvent,
     TChildren,
@@ -199,7 +186,10 @@
     TOutput,
     TEmitted,
     TMeta,
-    TConfig
+    TConfig,
+    TActionMap,
+    TActorMap,
+    TGuardMap
   > {
     const { actions, guards, actors, delays } = this.implementations;
 
@@ -342,9 +332,12 @@
       TMeta,
       TConfig
     >,
-    event: TEvent
+    event: TEvent,
+    self: AnyActorRef
   ): Array<TransitionDefinition<TContext, TEvent>> {
-    return transitionNode(this.root, snapshot.value, snapshot, event) || [];
+    return (
+      transitionNode(this.root, snapshot.value, snapshot, event, self) || []
+    );
   }
 
   /**
@@ -354,7 +347,7 @@
   private getPreInitialState(
     actorScope: AnyActorScope,
     initEvent: any,
     internalQueue: AnyEventObject[]
   ): MachineSnapshot<
     TContext,
     TEvent,
@@ -379,16 +372,30 @@
     );
 
     if (typeof context === 'function') {
-      const assignment = ({ spawn, event, self }: any) =>
-        context({ spawn, input: event.input, self });
-      return resolveActionsAndContext(
+      const children = {};
+      const spawn = createSpawner(actorScope, preInitial, initEvent, children);
+      const resolvedContext = context({
+        spawn,
+        input: initEvent.input,
+        self: actorScope.self,
+        actors: this.implementations.actors
+      });
+      const nextState = resolveAndExecuteActionsWithContext(
         preInitial,
         initEvent,
         actorScope,
-        [assign(assignment)],
-        internalQueue,
-        undefined
+        []
       ) as SnapshotFrom<this>;
+      if (resolvedContext) {
+        nextState.context = resolvedContext;
+      }
+      if (Object.keys(children).length > 0) {
+        nextState.children = {
+          ...nextState.children,
+          ...children
+        };
+      }
+      return nextState;
     }
 
     return preInitial as SnapshotFrom<this>;
@@ -439,8 +446,7 @@
           source: this.root,
           reenter: true,
           actions: [],
-          eventType: null as any,
-          toJSON: null as any // TODO: fix
+          eventType: null as any
         }
       ],
       preInitialState,
@@ -461,7 +467,7 @@
   }
 
   public start(
     snapshot: MachineSnapshot<
       TContext,
       TEvent,
       TChildren,
@@ -472,13 +478,14 @@
       TConfig
     >
   ): void {
-    Object.values(snapshot.children as Record<string, AnyActorRef>).forEach(
-      (child: any) => {
-        if (child.getSnapshot().status === 'active') {
-          child.start();
-        }
-      }
-    );
+    // if (snapshot.children)
+    //   Object.values(snapshot.children as Record<string, AnyActorRef>).forEach(
+    //     (child: any) => {
+    //       if (child.getSnapshot().status === 'active') {
+    //         child.start();
+    //       }
+    //     }
+    //   );
   }
 
   public getStateNodeById(stateId: string): StateNode<TContext, TEvent> {