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

Author: christianalfoni

.github/ISSUE_TEMPLATE/issue-template.md

@@ -0,0 +1,8 @@
+---
+name: Report BUG
+about: If you want support we recommend rather joining the Discord chat at https://discord.gg/CdpmRhQ.
+title: "[BUG]"
+labels: bug
+assignees: 'christianalfoni'
+
+---

packages/node_modules/overmind/src/index.ts

@@ -318,7 +318,7 @@ export class Overmind<ThisConfig extends IConfiguration>
         nextTick && clearTimeout(nextTick)
         nextTick = setTimeout(flushTree, 0)
       })
-    } else if (mode.mode === MODE_DEFAULT) {
+    } else if (mode.mode === MODE_DEFAULT || mode.mode === MODE_TEST) {
       eventHub.on(EventType.OPERATOR_ASYNC, (execution) => {
         const flushData = execution.flush(true)
         if (this.devtools && flushData.mutations.length) {
@@ -396,6 +396,7 @@ export class Overmind<ThisConfig extends IConfiguration>
         [EXECUTION]: true,
         parentExecution,
         namespacePath,
+        actionName: name,
         getMutationTree: () => {
           return this.proxyStateTree.getMutationTree()
         },

packages/node_modules/overmind/src/internalTypes.ts

@@ -151,8 +151,8 @@ export interface Events {
 
 // ============= PRIVATE TYPES FOR APP
 
-export type ResolveState<State extends IState | null> = State extends undefined
-  ? {}
+export type ResolveState<State extends IState | null | undefined> = State extends undefined
+  ? State
   : {
       [P in keyof State]: State[P] extends (parent: ResolveState<IState>, root: any) => any
         ? ReturnType<State[P]>

packages/node_modules/overmind/src/statemachine.ts

@@ -11,7 +11,7 @@ export type Statemachine<States extends string> = {
   current: States
   reset: () => void
 } & {
-  [State in States]: <T>(entry?: () => T, exit?: () => void) => T
+  [State in States]: <T extends () => any>(entry?: T, exit?: () => void) => T extends () => infer U ? U : void
 }
 
 const CURRENT_EXIT = Symbol('CURRENT_EXIT')
@@ -27,9 +27,9 @@ class StateMachine<States extends string>  {
         if (definition.states[this.current].includes(key as any)) {
           if (this[CURRENT_EXIT]) this[CURRENT_EXIT]()
           this[VALUE][CURRENT_EXIT] = exit
-          this.current = key as any
           const tree = (this[PROXY_TREE].master.mutationTree || this[PROXY_TREE])
           tree.enableMutations()
+          this.current = key as any
           const result = entry && entry()
           tree.blockMutations()
 

packages/node_modules/overmind/src/types.ts

@@ -13,19 +13,18 @@ export type IConfiguration = {
   actions?: {}
 }
 
-export type IState =
-  | {
-      [key: string]:
-        | IState
-        | string
-        | IDerive<any, any, any>
-        | number
-        | boolean
-        | object
-        | null
-        | undefined
-    }
-  | undefined
+export type IState = {
+  [key: string]:
+    | IState
+    | string
+    | IDerive<any, any, any>
+    | number
+    | boolean
+    | object
+    | null
+    | undefined
+}
+
 
 export interface IConfig<ThisConfig extends IConfiguration> {
   state: ThisConfig['state'] & {}