Merge pull request cerebral#19 from cerebral/unionTypesFix

fix(action-chain): fix setting union type as value type

Author: christianalfoni

packages/node_modules/action-chain/src/index.test.ts

@@ -10,12 +10,12 @@ import {
 interface Operators<Context, InitialValue, Value> {
   test(
     cb: (value: Value, context: Context) => void
-  ): InitialValue extends undefined
+  ): [InitialValue] extends [void]
     ? NoValueAction<Context, InitialValue, Value>
     : Action<Context, InitialValue, Value>
   testFork(
     action: Action<Context, Value>
-  ): InitialValue extends undefined
+  ): [InitialValue] extends [void]
     ? NoValueAction<Context, InitialValue, Value>
     : Action<Context, InitialValue, Value>
 }

packages/node_modules/overmind-devtools/src/app/actions.ts

@@ -1,7 +1,7 @@
 import { Action } from './'
 import * as mutations from './mutations'
 import * as helpers from './helpers'
-import { Message } from './state'
+import { Message, Tab } from './state'
 
 export default (action: Action) => {
   const onMessage = action<Message>()
@@ -30,13 +30,7 @@ export default (action: Action) => {
     .mutation(mutations.resetNewPortValue)
     .do(helpers.storeApps)
 
-  const openState = action().mutation(mutations.openState)
-
-  const openConsole = action().mutation(mutations.openConsole)
-
-  const openComponents = action().mutation(mutations.openComponents)
-
-  const openFlushes = action().mutation(mutations.openFlushes)
+  const changeTab = action<Tab>().mutation(mutations.changeTab)
 
   const openApp = action<string>()
 
@@ -49,10 +43,7 @@ export default (action: Action) => {
     setError,
     changeNewPortValue,
     addPort,
-    openState,
-    openConsole,
-    openComponents,
-    openFlushes,
+    changeTab,
     openApp,
     toggleExpandState,
   }

packages/node_modules/overmind-devtools/src/app/mutations.ts

@@ -41,14 +41,7 @@ export const addMessagesFromClient = (message: Message, state: State) => {
   )
 }
 
-export const openState = (_, state: State) => (state.currentTab = Tab.State)
-
-export const openConsole = (_, state: State) => (state.currentTab = Tab.Console)
-
-export const openComponents = (_, state: State) =>
-  (state.currentTab = Tab.Components)
-
-export const openFlushes = (_, state: State) => (state.currentTab = Tab.Flushes)
+export const changeTab = (tab: Tab, state: State) => (state.currentTab = tab)
 
 export const toggleExpandStatePath = (path: string[], state: State) => {
   const pathString = path.join('.')

packages/node_modules/overmind-devtools/src/components/Tabs/index.tsx

@@ -10,31 +10,31 @@ const Tabs: React.SFC<Connect> = ({ app }) => (
     <Tooltip text="State">
       <Button
         active={app.state.currentTab === Tab.State}
-        onClick={app.actions.openState}
+        onClick={() => app.actions.changeTab(Tab.State)}
       >
         <Icon>database</Icon>
       </Button>
     </Tooltip>
     <Tooltip text="Components">
       <Button
         active={app.state.currentTab === Tab.Components}
-        onClick={app.actions.openComponents}
+        onClick={() => app.actions.changeTab(Tab.Components)}
       >
         <Icon>code</Icon>
       </Button>
     </Tooltip>
     <Tooltip text="Flushes">
       <Button
         active={app.state.currentTab === Tab.Flushes}
-        onClick={app.actions.openFlushes}
+        onClick={() => app.actions.changeTab(Tab.Flushes)}
       >
         <Icon>save</Icon>
       </Button>
     </Tooltip>
     <Tooltip text="Console">
       <Button
         active={app.state.currentTab === Tab.Console}
-        onClick={app.actions.openConsole}
+        onClick={() => app.actions.changeTab(Tab.Console)}
       >
         <Icon>terminal</Icon>
       </Button>

packages/node_modules/overmind/src/createActionFactory.ts

@@ -16,22 +16,22 @@ interface Operators<State, Context, InitialValue, Value> {
   fork<Paths>(
     cb: (value: Value, context: Context) => keyof Paths,
     paths: Paths
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, Value>
     : Action<State, Context, InitialValue, Value>
   mutation(
     cb: (value: Value, state: State) => any
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, Value>
     : Action<State, Context, InitialValue, Value>
   do(
     cb: (value: Value, context: Context) => void
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, Value>
     : Action<State, Context, InitialValue, Value>
   map<NewValue>(
     cb: (value: Value, context: Context) => NewValue | Promise<NewValue>
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, NewValue>
     : Action<State, Context, InitialValue, NewValue>
   try<ResolveValue, RejectValue, NewValue>(
@@ -50,7 +50,7 @@ interface Operators<State, Context, InitialValue, Value> {
         RejectValue
       >
     }
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, ResolveValue | RejectValue>
     : Action<State, Context, InitialValue, ResolveValue | RejectValue>
   when<TrueValue, FalseValue>(
@@ -59,17 +59,17 @@ interface Operators<State, Context, InitialValue, Value> {
       true: Action<State, Context, Value, TrueValue>
       false: Action<State, Context, Value, FalseValue>
     }
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, TrueValue | FalseValue>
     : Action<State, Context, InitialValue, TrueValue | FalseValue>
   filter(
     cb: (value: Value, context: Context) => boolean
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, Value>
     : Action<State, Context, InitialValue, Value>
   debounce(
     timer: number
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, Value>
     : Action<State, Context, InitialValue, Value>
 }
@@ -95,7 +95,7 @@ export default function createActionFactory<State, Context>(proxyStateTree) {
       value: any,
       executionContext: ExecutionContext
     ) => any | Promise<any>
-  ): InitialValue extends void
+  ): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue, Value>
     : Action<State, Context, InitialValue, Value> {
     return Object.assign(

packages/node_modules/overmind/src/index.ts

@@ -27,7 +27,7 @@ export type TContext<State, Providers = {}> = Providers & {
 }
 
 export interface IAction<State, Context> {
-  <InitialValue = void>(): InitialValue extends void
+  <InitialValue = void>(): [InitialValue] extends [void]
     ? NoValueAction<State, Context, InitialValue>
     : Action<State, Context, InitialValue>
 }
@@ -71,7 +71,7 @@ export default class App<
       State,
       Providers & { state: State }
     >(proxyStateTree)
-    const action = function<InitialValue>(): InitialValue extends void
+    const action = function<InitialValue>(): [InitialValue] extends [void]
       ? NoValueAction<State, Providers & { state: State }, InitialValue>
       : Action<State, Providers & { state: State }, InitialValue> {
       return actionFactory<InitialValue>(actionChain)