Call exit handlers when service gets stopped

.changeset/sour-carrots-drum.md

@@ -0,0 +1,5 @@
+---
+'xstate': patch
+---
+
+Exit actions will now be properly called when a service gets canceled by calling its `stop` method.

packages/core/src/interpreter.ts

@@ -235,6 +235,7 @@ export class Interpreter<
       this.exec(action, state, actionsConfig);
     }
   }
+
   private update(
     state: State<TContext, TEvent, TStateSchema, TTypestate>,
     _event: SCXML.Event<TEvent>
@@ -281,13 +282,6 @@ export class Interpreter<
     const isDone = isInFinalState(state.configuration || [], this.machine);
 
     if (this.state.configuration && isDone) {
-      // exit interpreter procedure: https://www.w3.org/TR/scxml/#exitInterpreter
-      this.state.configuration.forEach((stateNode) => {
-        for (const action of stateNode.definition.exit) {
-          this.exec(action, state);
-        }
-      });
-
       // get final child state node
       const finalChildStateNode = state.configuration.find(
         (sn) => sn.type === 'final' && sn.parent === this.machine
@@ -502,6 +496,12 @@ export class Interpreter<
       this.doneListeners.delete(listener);
     }
 
+    this.state.configuration.forEach((stateNode) => {
+      for (const action of stateNode.definition.exit) {
+        this.exec(action, this.state);
+      }
+    });
+
     // Stop all children
     this.children.forEach((child) => {
       if (isFunction(child.stop)) {

packages/core/test/actions.test.ts

@@ -1396,6 +1396,31 @@ describe('choose', () => {
       })
       .start();
   });
+
+  it('exit actions should be called when stopping a machine', () => {
+    let exitCalled = false;
+    let childExitCalled = false;
+
+    const machine = Machine({
+      exit: () => {
+        exitCalled = true;
+      },
+      initial: 'a',
+      states: {
+        a: {
+          exit: () => {
+            childExitCalled = true;
+          }
+        }
+      }
+    });
+
+    const service = interpret(machine).start();
+    service.stop();
+
+    expect(exitCalled).toBeTruthy();
+    expect(childExitCalled).toBeTruthy();
+  });
 });
 
 describe('sendParent', () => {