Merge branch 'next' of https://github.com/cerebral/overmind into next

Author: christianalfoni

packages/node_modules/overmind/src/index.ts

@@ -307,8 +307,13 @@ export class Overmind<ThisConfig extends IConfiguration>
     }
 
     if (process.env.NODE_ENV === 'production' && mode.mode === MODE_DEFAULT) {
-      eventHub.on(EventType.OPERATOR_ASYNC, () => {
-        proxyStateTree.getMutationTree().flush(true)
+      eventHub.on(EventType.OPERATOR_ASYNC, (execution) => {
+        if (
+          !execution.parentExecution ||
+          !execution.parentExecution.isRunning
+        ) {
+          proxyStateTree.getMutationTree().flush(true)
+        }
       })
       eventHub.on(EventType.ACTION_END, (execution) => {
         if (!execution.parentExecution || !execution.parentExecution.isRunning)
@@ -331,15 +336,20 @@ export class Overmind<ThisConfig extends IConfiguration>
         })
       }
       eventHub.on(EventType.OPERATOR_ASYNC, (execution) => {
-        const flushData = execution.flush(true)
-        if (this.devtools && flushData.mutations.length) {
-          this.devtools.send({
-            type: 'flush',
-            data: {
-              ...execution,
-              ...flushData,
-            },
-          })
+        if (
+          !execution.parentExecution ||
+          !execution.parentExecution.isRunning
+        ) {
+          const flushData = execution.flush(true)
+          if (this.devtools && flushData.mutations.length) {
+            this.devtools.send({
+              type: 'flush',
+              data: {
+                ...execution,
+                ...flushData,
+              },
+            })
+          }
         }
       })
       eventHub.on(EventType.ACTION_END, (execution) => {

packages/node_modules/overmind/src/proxyfyEffects.ts

@@ -22,7 +22,7 @@ export function proxifyEffects<Effects>(
       const name = path.split('.')
       const method = name.pop()
       return cb({
-        func: target.bind(thisArg[ORIGIN_TARGET]),
+        func: target.bind(thisArg ? thisArg[ORIGIN_TARGET] : undefined),
         effectId,
         name: name.join('.'),
         method,

packages/node_modules/overmind/src/statemachine.ts

@@ -12,22 +12,9 @@ export type StatemachineTransitions<States extends TStates> = {
 
 export interface MachineMethods<States extends TStates> {
   reset: () => void
-  matches<T0 extends States["state"]>(arg0: T0): this is Statemachine<States> & (States extends { state: T0 } ? States : never);
-  matches<
-    T0 extends States["state"],
-    T1 extends States["state"],
-  >(state0: T0, state1: T1): this is Statemachine<States> & (States extends { state: T0 } ? States : never) & (States extends { state: T1 } ? States : never);
-  matches<
-    T0 extends States["state"],
-    T1 extends States["state"],
-    T2 extends States["state"],
-  >(state0: T0, state1: T1, state2: T2): this is Statemachine<States> & (States extends { state: T0 } ? States : never) & (States extends { state: T1 } ? States : never) & (States extends { state: T2 } ? States : never);
-  matches<
-    T0 extends States["state"],
-    T1 extends States["state"],
-    T2 extends States["state"],
-    T3 extends States["state"],
-  >(state0: T0, state1: T1, state2: T2, state3: T3): this is Statemachine<States> & (States extends { state: T0 } ? States : never) & (States extends { state: T1 } ? States : never) & (States extends { state: T2 } ? States : never) & (States extends { state: T3 } ? States : never);
+  matches<T extends States["state"][]>(...states: T): this is Statemachine<States> & (States extends {
+    state: T extends Array<infer S> ? S : never;
+} ? States : never);
   whenTransitioned: (state: States["state"]) => Promise<void>
 }