fix(overmind): more type fixing

christianalfoni · christianalfoni · commit 604a20d8fccf · 2021-01-23T10:52:19.000+01:00
diff --git a/packages/node_modules/overmind/src/statemachine.ts b/packages/node_modules/overmind/src/statemachine.ts
@@ -32,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 TBaseState = never> = States & BaseState & MachineMethods<States, Events, BaseState>
+export type Statemachine<States extends TState, Events extends TEvents, BaseState extends TBaseState = never> = [BaseState] extends [never] ? States & MachineMethods<States, Events, BaseState> : States & BaseState & MachineMethods<States, Events, BaseState>
 
 const INITIAL_STATE = Symbol('INITIAL_STATE')
 const TRANSITIONS = Symbol('TRANSITIONS')

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export interface MachineMethods<States extends TState, Events extends TEvents, B`
`32`	`32`	`): Statemachine<States, Events, BaseState>`
`33`	`33`	`}`
`34`	`34`
`35`		`-export type Statemachine<States extends TState, Events extends TEvents, BaseState extends TBaseState = never> = States & BaseState & MachineMethods<States, Events, BaseState>`
	`35`	`+export type Statemachine<States extends TState, Events extends TEvents, BaseState extends TBaseState = never> = [BaseState] extends [never] ? States & MachineMethods<States, Events, BaseState> : States & BaseState & MachineMethods<States, Events, BaseState>`
`36`	`36`
`37`	`37`	`const INITIAL_STATE = Symbol('INITIAL_STATE')`
`38`	`38`	`const TRANSITIONS = Symbol('TRANSITIONS')`