fix(overmind): move all event signaling to start and stop operator functions

Author: christianalfoni

packages/node_modules/overmind/src/index.ts

@@ -988,10 +988,6 @@ export function pipe(...operators) {
         const operator = operators[operatorIndex++]
 
         if (!operatorErr && operatorContext.value instanceof Promise) {
-          context.execution.emit(EventType.OPERATOR_ASYNC, {
-            ...operatorContext.execution,
-            isAsync: true,
-          })
           operatorContext.value
             .then((promiseValue) =>
               (operator || next)(

packages/node_modules/overmind/src/operator.ts

@@ -3,7 +3,7 @@ import { EventType } from './internalTypes'
 import { safeValue } from './Devtools'
 import { IContext, IConfiguration } from './types'
 
-export function startDebugOperator(type, arg, context) {
+export function operatorStarted(type, arg, context) {
   if (IS_PRODUCTION) {
     return
   }
@@ -17,7 +17,7 @@ export function startDebugOperator(type, arg, context) {
   })
 }
 
-export function stopDebugOperator(
+export function operatorStopped(
   context,
   value,
   details: {
@@ -27,6 +27,12 @@ export function stopDebugOperator(
   } = {}
 ) {
   if (IS_PRODUCTION) {
+    if (value instanceof Promise) {
+      context.execution.emit(EventType.OPERATOR_ASYNC, {
+        ...context.execution,
+        isAsync: true,
+      })
+    }
     return
   }
 
@@ -121,7 +127,7 @@ export function createOperator<ThisConfig extends IConfiguration>(
   ) => any
 ): any {
   const operator = (err, context, next, final) => {
-    startDebugOperator(type, name, context)
+    operatorStarted(type, name, context)
     let asyncTimeout = setTimeout(() => {
       context.execution.emit(EventType.OPERATOR_ASYNC, {
         ...context.execution,
@@ -148,19 +154,19 @@ export function createOperator<ThisConfig extends IConfiguration>(
             )
             const nextWithPath = createNextPath(next)
             options.path.operator(err, newContext, (...args) => {
-              stopDebugOperator(context, args[1].value)
+              operatorStopped(context, args[1].value)
               nextWithPath(...args)
             })
           } else {
-            stopDebugOperator(context, err || value, {
+            operatorStopped(context, err || value, {
               isSkipped: err ? true : options.isSkipped,
             })
             next(err, createContext(context, value))
           }
         },
         (err, value) => {
           clearTimeout(asyncTimeout)
-          stopDebugOperator(context, err || value, {
+          operatorStopped(context, err || value, {
             isSkipped: Boolean(err),
             isIntercepted: !err,
           })
@@ -169,7 +175,7 @@ export function createOperator<ThisConfig extends IConfiguration>(
       )
     } catch (error) {
       clearTimeout(asyncTimeout)
-      stopDebugOperator(context, context.value, {
+      operatorStopped(context, context.value, {
         error,
       })
       next(error, createContext(context, context.value))
@@ -200,7 +206,7 @@ export function createMutationOperator<ThisConfig extends IConfiguration>(
   ) => any
 ): any {
   const operator = (err, context, next, final) => {
-    startDebugOperator(type, name, context)
+    operatorStarted(type, name, context)
     const mutationTree = context.execution.getMutationTree()
     if (!IS_PRODUCTION) {
       mutationTree.onMutation((mutation) => {
@@ -229,14 +235,14 @@ export function createMutationOperator<ThisConfig extends IConfiguration>(
           : context.execution.scopeValue(context.value, mutationTree),
         (err, value, options = {}) => {
           clearTimeout(asyncTimeout)
-          stopDebugOperator(context, err || value, {
+          operatorStopped(context, err || value, {
             isSkipped: err ? true : options.isSkipped,
           })
           next(err, createContext(context, value))
         },
         (err, value) => {
           clearTimeout(asyncTimeout)
-          stopDebugOperator(context, err || value, {
+          operatorStopped(context, err || value, {
             isSkipped: Boolean(err),
             isIntercepted: !err,
           })
@@ -268,7 +274,7 @@ export function createMutationOperator<ThisConfig extends IConfiguration>(
       }
     } catch (error) {
       clearTimeout(asyncTimeout)
-      stopDebugOperator(context, context.value, {
+      operatorStopped(context, context.value, {
         error,
       })
       next(error, createContext(context, context.value))