fix(overmind): correctly pass operatorId on last flush of operators

cerebral · Dec 28, 2018 · 2d8a845 · 2d8a845
1 parent 3602357
commit 2d8a845
Showing 1 changed file with 17 additions and 5 deletions.
diff --git a/packages/node_modules/overmind/src/index.ts b/packages/node_modules/overmind/src/index.ts
@@ -246,10 +246,10 @@ export class Overmind<Config extends Configuration> implements Configuration {
                   this.trackEffects(this.effects, execution)
                 ),
                 (err, finalContext) => {
-                  this.eventHub.emit(
-                    EventType.ACTION_END,
-                    finalContext.execution
-                  )
+                  this.eventHub.emit(EventType.ACTION_END, {
+                    ...finalContext.execution,
+                    operatorId: finalContext.execution.operatorId - 1,
+                  })
                   if (err) reject(err)
                   else resolve(finalContext.value)
                 }
@@ -767,9 +767,21 @@ export function action<Input, Config extends Configuration = TheConfig>(
         mutationTree.onMutation((mutation) => {
           context.execution.emit(EventType.MUTATIONS, {
             ...context.execution,
-            operatorId: context.execution.operatorId,
             mutations: makeStringifySafeMutations([mutation]),
           })
+          setTimeout(() => {
+            const flushData = context.proxyStateTree.flush(true)
+            if (flushData.mutations.length) {
+              context.execution.send({
+                type: 'flush',
+                data: {
+                  ...context.execution,
+                  ...flushData,
+                  mutations: makeStringifySafeMutations(flushData.mutations),
+                },
+              })
+            }
+          })
         })
       }
       const maybePromise: any = operation({