Merge pull request cerebral#66 from cerebral/augmentModule

feat(overmind): declare module typing

Author: christianalfoni

packages/demos/todomvc/src/app/actions.ts

@@ -1,5 +1,5 @@
 import * as React from 'react'
-import { Action } from '../app'
+import { Action } from 'overmind'
 import { Todo } from './state'
 import * as operations from './operations'
 import * as mutations from './mutations'

packages/demos/todomvc/src/app/computed.ts

@@ -1,3 +1,4 @@
-import { Compute } from '../app'
+import { Compute } from 'overmind'
 
-export const testCount: Compute<number> = (foo) => (state) => state.count + foo
+export const testCount: Compute<number, number> = (foo) => (state) =>
+  state.count + foo

packages/demos/todomvc/src/app/derived.ts

@@ -1,3 +1,3 @@
-import { Derive } from '../app'
+import { Derive } from 'overmind'
 
-export const count: Derive = (state) => state.todos.length
+export const count: Derive<number> = (state) => state.todos.length

packages/demos/todomvc/src/app/index.ts

@@ -1,11 +1,4 @@
-import App, {
-  TConfig,
-  TConnect,
-  TAction,
-  TOperation,
-  TDerive,
-  TCompute,
-} from 'react-overmind'
+import App, { TConnect } from 'react-overmind'
 import * as effects from './effects'
 import * as actions from './actions'
 import * as state from './state'
@@ -16,18 +9,10 @@ const config = {
   state,
 }
 
-type Config = TConfig<typeof config>
-
-export type Action<Input = void, Output = any> = TAction<Input, Output, Config>
-export type Derive = TDerive<Config>
-export type Compute<Input> = TCompute<Input, Config>
-export type Mutation<Input = any> = TOperation.Mutation<Input, Config>
-export type Do<Input = any> = TOperation.Do<Input, Config>
-export type Filter<Input = any> = TOperation.Filter<Input, Config>
-export type When<Input = any> = TOperation.When<Input, Config>
-export type Fork<Input = any> = TOperation.Fork<Input, Config>
-export type Map<Input, Output> = TOperation.Map<Input, Output, Config>
-export type Try<Input, Output> = TOperation.Try<Input, Output, Config>
+declare module 'overmind' {
+  interface IState extends TState<typeof config> {}
+  interface IEffects extends TEffects<typeof config> {}
+}
 
 const app = new App(config, {
   devtools: 'localhost:1234',

packages/demos/todomvc/src/app/mutations.ts

@@ -1,4 +1,4 @@
-import { Mutation } from '../app'
+import { Mutation } from 'overmind'
 import { Todo } from './state'
 
 let nextTodoId = 0

packages/demos/todomvc/src/app/operations.ts

@@ -1,9 +1,9 @@
-import { Map, Do } from '../app'
+import { Operation } from 'overmind'
 
 type ChangeEvent = React.ChangeEvent<HTMLInputElement>
 
-export const getEventValue: Map<ChangeEvent, string> = (_, event) =>
+export const getEventValue: Operation.Map<ChangeEvent, string> = (_, event) =>
   event.currentTarget.value
 
-export const preventEventDefault: Do<React.FormEvent> = (_, event) =>
+export const preventEventDefault: Operation.Do<React.FormEvent> = (_, event) =>
   event.preventDefault()

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

@@ -1,4 +1,4 @@
-import { Action } from '../app'
+import { Action } from 'overmind'
 import * as mutations from './mutations'
 import * as operations from './operations'
 import { Message, Tab } from './state'

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

@@ -1,9 +1,9 @@
-import { Component } from './state'
-import { Derive } from '../app'
+import { Derive } from 'overmind'
+import { Component, App, Flush, Action } from './state'
 
-export const currentApp: Derive = (state) => state.apps[state.currentPort]
+export const currentApp: Derive<App> = (state) => state.apps[state.currentPort]
 
-export const componentsMounted: Derive = (state) =>
+export const componentsMounted: Derive<Component[]> = (state) =>
   Object.keys(state.currentApp.components).reduce(
     (aggr, key) => {
       if (state.currentApp.components[key].isMounted) {
@@ -15,19 +15,19 @@ export const componentsMounted: Derive = (state) =>
     [] as Component[]
   )
 
-export const componentsUpdateCount: Derive = (state) =>
+export const componentsUpdateCount: Derive<number> = (state) =>
   state.componentsMounted.reduce(
     (aggr, component) => aggr + component.updateCount,
     0
   )
 
-export const componentsStatePathCount: Derive = (state) =>
+export const componentsStatePathCount: Derive<number> = (state) =>
   state.componentsMounted.reduce(
     (aggr, component) => aggr + component.paths.length,
     0
   )
 
-export const flushes: Derive = (state) =>
+export const flushes: Derive<Flush[]> = (state) =>
   Object.keys(state.currentApp.flushes)
     .sort(
       (idA, idB) =>
@@ -36,10 +36,10 @@ export const flushes: Derive = (state) =>
     )
     .map((id) => state.currentApp.flushes[id])
 
-export const flushesMutationsCount: Derive = (state) =>
+export const flushesMutationsCount: Derive<number> = (state) =>
   state.flushes.reduce((aggr, flush) => aggr + flush.mutations.length, 0)
 
-export const flushesStatePathCount: Derive = (state) =>
+export const flushesStatePathCount: Derive<number> = (state) =>
   state.flushes.reduce((aggr, flush) => {
     return flush.mutations.reduce(
       (aggr, mutation) =>
@@ -48,5 +48,5 @@ export const flushesStatePathCount: Derive = (state) =>
     )
   }, []).length
 
-export const currentAction: Derive = (state) =>
+export const currentAction: Derive<Action> = (state) =>
   state.currentApp.actions[state.currentApp.currentActionId]

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

@@ -1,31 +1,18 @@
-import App, {
-  TConfig,
-  TDerive,
-  TOperation,
-  TConnect,
-  TAction,
-} from 'react-overmind'
+import App, { TConnect } from 'react-overmind'
 import * as effects from './effects'
 import * as actions from './actions'
-import state from './state'
+import * as state from './state'
 
 const config = {
   effects,
   actions,
   state,
 }
 
-type Config = TConfig<typeof config>
-
-export type Action<Input = void, Output = any> = TAction<Input, Output, Config>
-export type Derive = TDerive<Config>
-export type Mutation<Input = any> = TOperation.Mutation<Input, Config>
-export type Do<Input = any> = TOperation.Do<Input, Config>
-export type Filter<Input = any> = TOperation.Filter<Input, Config>
-export type When<Input = any> = TOperation.When<Input, Config>
-export type Fork<Input = any> = TOperation.Fork<Input, Config>
-export type Map<Input, Output> = TOperation.Map<Input, Output, Config>
-export type Try<Input, Output> = TOperation.Try<Input, Output, Config>
+declare module 'overmind' {
+  interface IState extends TState<typeof config> {}
+  interface IEffects extends TEffects<typeof config> {}
+}
 
 const app = new App(config)
 

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

@@ -1,4 +1,4 @@
-import { Mutation } from '../app'
+import { Mutation } from 'overmind'
 import {
   Apps,
   Message,