fix(overmind): base state typing fix

Author: christianalfoni

packages/node_modules/overmind/src/statemachine.ts

@@ -5,7 +5,9 @@ import { IState } from '.'
 
 type TState = {
   current: string
-} & {
+} & TBaseState
+
+type TBaseState = {
   [key: string]: IState | Statemachine<any, any, any>
 }
 
@@ -15,13 +17,13 @@ type TEvents = {
 }
 
 
-export type StatemachineTransitions<States extends TState, Events extends TEvents, BaseState extends IState> = {
+export type StatemachineTransitions<States extends TState, Events extends TEvents, BaseState extends TBaseState> = {
   [Type in Events["type"]]: [BaseState] extends [never] ?
     ((state: States, payload: Events extends { type: Type } ? Events["data"] : never) =>  States | void) :
     ((state: States & BaseState, payload: Events extends { type: Type } ? Events["data"] : never) =>  States | void)
 }
 
-export interface MachineMethods<States extends TState, Events extends TEvents, BaseState extends IState> {
+export interface MachineMethods<States extends TState, Events extends TEvents, BaseState extends TBaseState> {
   matches<T extends States["current"]>(
     current: T,
   ): Statemachine<States extends { current: T} ? States : never, Events, BaseState> | undefined
@@ -30,7 +32,7 @@ export interface MachineMethods<States extends TState, Events extends TEvents, B
   ): Statemachine<States, Events, BaseState>
 }
 
-export type Statemachine<States extends TState, Events extends TEvents, BaseState extends IState = never> = States & BaseState & MachineMethods<States, Events, BaseState>
+export type Statemachine<States extends TState, Events extends TEvents, BaseState extends TBaseState = never> = States & BaseState & MachineMethods<States, Events, BaseState>
 
 const INITIAL_STATE = Symbol('INITIAL_STATE')
 const TRANSITIONS = Symbol('TRANSITIONS')
@@ -39,7 +41,7 @@ const IS_DISPOSED = Symbol('IS_DISPOSED')
 const CURRENT_KEYS = Symbol('CURRENT_KEYS')
 const BASE_STATE = Symbol('BASE_STATE')
 
-export class StateMachine<State extends TState, Events extends TEvents, BaseState extends IState>  {
+export class StateMachine<State extends TState, Events extends TEvents, BaseState extends TBaseState>  {
   current: State["current"]
   private [INITIAL_STATE]: State["current"]
   private [TRANSITIONS]: StatemachineTransitions<State, Events, BaseState>
@@ -101,13 +103,13 @@ export class StateMachine<State extends TState, Events extends TEvents, BaseStat
   }
 }
 
-export type StatemachineFactory<States extends TState, Events extends TEvents, BaseState extends IState> = [BaseState] extends [never] ? {
+export type StatemachineFactory<States extends TState, Events extends TEvents, BaseState extends TBaseState> = [BaseState] extends [never] ? {
   create(state: States): Statemachine<States, Events, {}> 
 } : {
   create(state: States, baseState: BaseState): Statemachine<States, Events, BaseState> 
 }
 
-export function statemachine<States extends TState, Events extends TEvents, BaseState extends IState = never>(transitions: StatemachineTransitions<States, Events, BaseState>): StatemachineFactory<States, Events, BaseState> {
+export function statemachine<States extends TState, Events extends TEvents, BaseState extends TBaseState = never>(transitions: StatemachineTransitions<States, Events, BaseState>): StatemachineFactory<States, Events, BaseState> {
    return {
      create(state, baseState) {
       return new StateMachine(transitions, state as any, baseState as any)