feat(overmind): adjust to using right hand typing of actions

cerebral · Oct 22, 2020 · 38baf14 · 38baf14
1 parent 3ba4638
commit 38baf14
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/packages/node_modules/overmind/src/config/config.test.ts b/packages/node_modules/overmind/src/config/config.test.ts
@@ -67,7 +67,7 @@ describe('Config', () => {
 
     return Promise.all([
       app.actions.lazy.loadConfig('configA'),
-      app.actions.loadConfigB({}),
+      app.actions.loadConfigB(),
     ]).then(() => {
       // @ts-ignore
       expect(app.state.configA.foo).toEqual('bar')

diff --git a/packages/node_modules/overmind/src/index.test.ts b/packages/node_modules/overmind/src/index.test.ts
@@ -193,7 +193,7 @@ describe('Overmind', () => {
         type: 'action',
       })
     })
-    app.actions.doThis({})
+    app.actions.doThis()
   })
   test('should track operator start and end', () => {
     expect.assertions(2)
@@ -227,7 +227,7 @@ describe('Overmind', () => {
         type: 'action',
       })
     })
-    app.actions.doThis({})
+    app.actions.doThis()
   })
   test('should track mutations', () => {
     expect.assertions(1)

diff --git a/packages/node_modules/overmind/src/internalTypes.ts b/packages/node_modules/overmind/src/internalTypes.ts
@@ -5,7 +5,7 @@ import {
   ITrackStateTree,
 } from 'proxy-state-tree'
 
-import { IAction, IOperator } from './types'
+import { IAction, IOperator, IContext } from './types'
 
 export type SubType<Base, Condition> = Pick<
   Base,
@@ -173,11 +173,11 @@ export type ResolveActions<
   ? {}
   : {
       [T in keyof Actions]: Actions[T] extends IOperator<any, any, any>
-        ? TActionValue<Actions[T]> extends void
+        ? Actions[T] extends (context: IContext<any>, value: void) => any
           ? () => Promise<void>
           : (value: TActionValue<Actions[T]>) => Promise<void>
         : Actions[T] extends IAction<any, any, any>
-        ? TActionValue<Actions[T]> extends void
+        ? Actions[T] extends (context: IContext<any>, value: void) => any
           ? () => ReturnType<Actions[T]>
           : (value: TActionValue<Actions[T]>) => ReturnType<Actions[T]>
         : Actions[T] extends NestedActions
@@ -202,11 +202,11 @@ export type ResolveMockActions<
   ? {}
   : {
       [T in keyof Actions]: Actions[T] extends IOperator<any, any, any>
-        ? TActionValue<Actions[T]> extends void
+        ? Actions[T] extends (context: IContext<any>, value: void) => any
           ? () => Promise<MockResult>
           : (value: TActionValue<Actions[T]>) => Promise<MockResult>
         : Actions[T] extends IAction<any, any, any>
-        ? TActionValue<Actions[T]> extends void
+        ? Actions[T] extends (context: IContext<any>, value: void) => any
           ? () => Promise<MockResult>
           : (value: TActionValue<Actions[T]>) => Promise<MockResult>
         : Actions[T] extends NestedMockActions