Fix cancel action

statelyai · Nov 2, 2024 · 6242d5d · 6242d5d
1 parent 94d44f0
commit 6242d5d
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 6 deletions.
diff --git a/packages/core/src/actions/cancel.ts b/packages/core/src/actions/cancel.ts
@@ -5,7 +5,8 @@ import {
   EventObject,
   MachineContext,
   ActionArgs,
-  ParameterizedObject
+  ParameterizedObject,
+  SpecialActionResolution
 } from '../types.ts';
 
 type ResolvableSendId<
@@ -26,18 +27,18 @@ function resolveCancel(
   actionArgs: ActionArgs<any, any, any>,
   actionParams: ParameterizedObject['params'] | undefined,
   { sendId }: { sendId: ResolvableSendId<any, any, any, any> }
-) {
+): SpecialActionResolution {
   const resolvedSendId =
     typeof sendId === 'function' ? sendId(actionArgs, actionParams) : sendId;
-  return [snapshot, resolvedSendId];
+  return [snapshot, { sendId: resolvedSendId }];
 }
 
 export function executeCancel(
   actorScope: AnyActorScope,
-  resolvedSendId: string
+  params: { sendId: string }
 ) {
   actorScope.defer(() => {
-    actorScope.system.scheduler.cancel(actorScope.self, resolvedSendId);
+    actorScope.system.scheduler.cancel(actorScope.self, params.sendId);
   });
 }
 

diff --git a/packages/core/src/types.ts b/packages/core/src/types.ts
@@ -2663,3 +2663,14 @@ export type ExecutableActionsFrom<T extends AnyActorLogic> =
     : never;
 
 export type ActionExecutor = (actionToExecute: ExecutableActionObject) => void;
+
+export type SpecialActionResolution =
+  | [
+      AnyMachineSnapshot,
+      NonReducibleUnknown // params
+    ]
+  | [
+      AnyMachineSnapshot,
+      NonReducibleUnknown, // params
+      UnknownAction[] | undefined
+    ];
diff --git a/packages/core/test/transition.test.ts b/packages/core/test/transition.test.ts
@@ -273,7 +273,14 @@ describe('transition function', () => {
     });
 
     // TODO: tweak the assertion
-    expect(actions.map((a) => a.type)).toEqual({});
+    expect(actions).toContainEqual(
+      expect.objectContaining({
+        type: 'xstate.cancel',
+        params: expect.objectContaining({
+          sendId: 'myRaise'
+        })
+      })
+    );
   });
 
   // Copied from getSnapshot.test.ts