fix(overmind): make operators also handle inline execution

Author: christianalfoni

packages/node_modules/overmind/src/index.ts

@@ -49,7 +49,7 @@ import {
   EXECUTION,
   processState,
   isPromise,
-} from './utils'
+ MODE_DEFAULT, MODE_TEST, MODE_SSR } from './utils'
 import {
   operatorStarted,
   operatorStopped,
@@ -59,10 +59,13 @@ import {
   createOperator,
 } from './operator'
 
+
 export * from './types'
 
 export { createOperator, createMutationOperator }
 
+export { MODE_DEFAULT, MODE_TEST, MODE_SSR } from './utils'
+
 /** This type can be overwriten by app developers if they want to avoid
  * typing and then they can import `Action`,  `Operation` etc. directly from
  * overmind.
@@ -82,10 +85,6 @@ export interface Derive<Parent extends IState, Value>
 
 export interface OnInitialize extends IOnInitialize<Config> {}
 
-export const MODE_DEFAULT = Symbol('MODE_DEFAULT')
-export const MODE_TEST = Symbol('MODE_TEST')
-export const MODE_SSR = Symbol('MODE_SSR')
-
 export const json = (obj: any) =>
   deepCopy(obj && obj[IS_PROXY] ? obj[VALUE] : obj)
 
@@ -516,11 +515,8 @@ export class Overmind<ThisConfig extends IConfiguration>
             action(
               null,
               {
+                ...this.createContext(execution, this.proxyStateTree),
                 value,
-                state: this.proxyStateTree.state,
-                actions: this.actions,
-                execution,
-                effects: this.trackEffects(this.effects, execution),
               },
               (err, finalContext) => {
                 execution.isRunning = false

packages/node_modules/overmind/src/operator.ts

@@ -3,11 +3,12 @@ import {
   makeStringifySafeMutations,
   createActionsProxy,
   ORIGINAL_ACTIONS,
-} from './utils'
+ MODE_TEST } from './utils'
 import { EventType, Execution } from './internalTypes'
 import { safeValue } from './Devtools'
 import { IContext, IConfiguration, IOperator } from './types'
 
+
 export function operatorStarted(type, arg, context) {
   if (process.env.NODE_ENV === 'production') {
     return
@@ -86,6 +87,7 @@ export function createContext(context, value, path?) {
     path: path || context.execution.path,
   }
 
+  const mutationTrees: any[] = []
   return {
     ...context,
     actions: createActionsProxy(
@@ -98,6 +100,25 @@ export function createContext(context, value, path?) {
     value,
     execution: newExecution,
     effects: context.execution.trackEffects(newExecution),
+    flush: context.parentExecution
+      ? context.parentExecution.flush
+      : (isAsync?: boolean) => {
+          return this.proxyStateTree.flush(mutationTrees, isAsync)
+        },
+    getMutationTree: context.parentExecution
+      ? context.parentExecution.getMutationTree
+      : () => {
+          const mutationTree = this.proxyStateTree.getMutationTree()
+
+          mutationTrees.push(mutationTree)
+
+          if (this.mode.mode === MODE_TEST) {
+            mutationTree.onMutation((mutation) => {
+              this.addExecutionMutation(mutation)
+            })
+          }
+          return mutationTree
+        },
   }
 }
 

packages/node_modules/overmind/src/utils.ts

@@ -8,6 +8,10 @@ export const IS_OPERATOR = Symbol('operator')
 export const ORIGINAL_ACTIONS = Symbol('origina_actions')
 export const EXECUTION = Symbol('execution')
 
+export const MODE_DEFAULT = Symbol('MODE_DEFAULT')
+export const MODE_TEST = Symbol('MODE_TEST')
+export const MODE_SSR = Symbol('MODE_SSR')
+
 export class MockedEventEmitter {
   emit() {}
   emitAsync() {}