fix(overmind): changed statemachines to class and fixed derived typing

Author: christianalfoni

packages/node_modules/overmind/src/internalTypes.ts

@@ -5,7 +5,7 @@ import {
   ITrackStateTree,
 } from 'proxy-state-tree'
 
-import { IAction, IOperator, IState } from './types'
+import { IAction, IConfiguration, IDerive, IOperator, IState } from './types'
 
 export type SubType<Base, Condition> = Pick<
   Base,
@@ -150,13 +150,10 @@ export interface Events {
 }
 
 // ============= PRIVATE TYPES FOR APP
-
-type Derived = (parent: any, config: any) => any
-
 export type ResolveState<State extends IState> = State extends undefined
   ? {}
   : {
-      [P in keyof State]: State[P] extends Derived
+      [P in keyof State]: State[P] extends IDerive<IConfiguration, IState, any>
         ? ReturnType<State[P]>
         : State[P] extends Array<any>
         ? State[P]

packages/node_modules/overmind/src/statemachine.test.ts

@@ -1,5 +1,4 @@
-import { IAction , createOvermind, createOvermindMock } from './'
-
+import { IAction, createOvermind, createOvermindMock } from './'
 import { Statemachine, statemachine } from './statemachine'
 
 describe('Statemachine', () => {
@@ -25,8 +24,7 @@ describe('Statemachine', () => {
 
     expect(overmind.state.machine.current).toBe('FOO')
   })
-  test('should transition state', () => {
-
+  test.only('should transition state', () => {
     type State = {
       machine: Statemachine<'FOO' | 'BAR'>
     }

packages/node_modules/overmind/src/statemachine.ts

@@ -11,37 +11,36 @@ export type Statemachine<States extends string> = {
   current: States
   reset: () => void
 } & {
-  [State in States]: Derive<any, <T>(entry?: () => T, exit?: () => void) => T>
+  [State in States]: <T>(entry?: () => T, exit?: () => void) => T
 }
 
-export function statemachine<States extends string>(chart: StatemachineDefinition<States>): Statemachine<States> {
-  let currentExit
+class Machine<States extends string>  {
+  current: States
+  private _currentExit: (() => void) | undefined
+  constructor(definition: StatemachineDefinition<States>) {
+    this.current = definition.initial
 
-  return {
-    current: chart.initial,
-    ...Object.keys(chart.states).reduce((aggr, key) => {
-      aggr[key] = () => { 
-        return function (entry, exit) {
-          if (chart.states[this.current].includes(key as any)) {
-            if (currentExit) currentExit()
-            currentExit = exit
-            this.current = key
-            return entry && entry()
-          }
+    Object.keys(definition.states).reduce((aggr, key) => {
+      aggr[key] = (entry, exit) => {
+        if (definition.states[this.current].includes(key as any)) {
+          if (this._currentExit) this._currentExit()
+          this._currentExit = exit
+          this.current = key as any
+          return entry && entry()
         }
       }
 
       return aggr
-    }, {}),
-    reset: () => {
-      return function() {
-        const caller = this
-        caller.current = chart.initial
-        if (currentExit) {
-          currentExit()
-          currentExit = null
-        }
-      }
+    }, this)
+  }
+  reset() {
+    if (this._currentExit) {
+      this._currentExit()
+      this._currentExit = undefined
     }
-  } as any
+  }
+}
+
+export function statemachine<States extends string>(definition: StatemachineDefinition<States>): Statemachine<States> {
+  return new Machine(definition) as any
 }