Fixed an issue with events received from callback actors not having t…

…he appropriate `_event.origin` set
statelyai · Dec 22, 2020 · 497c543 · 497c543
1 parent 7348614
commit 497c543
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 4 deletions.
diff --git a/.changeset/short-poets-sort.md b/.changeset/short-poets-sort.md
@@ -0,0 +1,5 @@
+---
+'xstate': patch
+---
+
+Fixed an issue with events received from callback actors not having the appropriate `_event.origin` set.
diff --git a/packages/core/src/interpreter.ts b/packages/core/src/interpreter.ts
@@ -1095,7 +1095,7 @@ export class Interpreter<
       if (canceled) {
         return;
       }
-      this.send(e);
+      this.send(toSCXMLEvent(e, { origin: id }));
     };
 
     let callbackStop;

diff --git a/packages/core/test/event.test.ts b/packages/core/test/event.test.ts
@@ -2,7 +2,7 @@ import { Machine, sendParent, interpret, assign } from '../src';
 import { respond, send } from '../src/actions';
 
 describe('SCXML events', () => {
-  it('should have the origin (id) from the sending service', (done) => {
+  it('should have the origin (id) from the sending machine service', (done) => {
     const childMachine = Machine({
       initial: 'active',
       states: {
@@ -40,14 +40,46 @@ describe('SCXML events', () => {
       .start();
   });
 
+  it('should have the origin (id) from the sending callback service', () => {
+    const machine = Machine<{ childOrigin?: string }>({
+      initial: 'active',
+      context: {},
+      states: {
+        active: {
+          invoke: {
+            id: 'callback_child',
+            src: () => (send) => send({ type: 'EVENT' })
+          },
+          on: {
+            EVENT: {
+              target: 'success',
+              actions: assign({
+                childOrigin: (_, __, { _event }) => _event.origin
+              })
+            }
+          }
+        },
+        success: {
+          type: 'final'
+        }
+      }
+    });
+
+    const service = interpret(machine).start();
+
+    expect(service.state.context.childOrigin).toBe('callback_child');
+  });
+
   it('respond() should be able to respond to sender', (done) => {
     const authServerMachine = Machine({
       initial: 'waitingForCode',
       states: {
         waitingForCode: {
           on: {
             CODE: {
-              actions: respond('TOKEN', { delay: 10 })
+              actions: respond('TOKEN', {
+                delay: 10
+              })
             }
           }
         }
@@ -65,7 +97,9 @@ describe('SCXML events', () => {
             id: 'auth-server',
             src: authServerMachine
           },
-          entry: send('CODE', { to: 'auth-server' }),
+          entry: send('CODE', {
+            to: 'auth-server'
+          }),
           on: {
             TOKEN: 'authorized'
           }