fix(overmind): remove Derive and ResolveState

BREAKING CHANGE:
Derive type no longer exists

Author: christianalfoni

packages/node_modules/overmind/src/config/statechart.ts

@@ -1,11 +1,11 @@
 import {
   IConfig,
   IConfiguration,
-  IDerive,
   filter,
   map,
   mutate,
   pipe,
+  derived
 } from '../'
 
 const ACTIONS = 'ACTIONS'
@@ -235,7 +235,7 @@ export function statechart<C extends IConfiguration, Charts extends Statecharts
   state: C['state'] & {
     states: Array<(string | number)[]>
     actions: { [N in keyof C['actions']]: boolean }
-    matches: IDerive<any, any, (match: Match<Charts>) => boolean>
+    matches: (match: Match<Charts>) => boolean
   }
   actions: C['actions']
   effects: C['effects']
@@ -309,7 +309,7 @@ export function statechart<C extends IConfiguration, Charts extends Statecharts
     state: Object.assign(state, {
       states: getInitialStates(charts),
       actions: ((state) => getCanTransitionActions(actions, charts, state)) as any,
-      matches: (state) => (match) => {
+      matches: derived((state: any) => (match) => {
         const matchPaths = getMatchPaths(match)
         const statesWithoutRootChartIndicator = state.states.map((statePath) => statePath.filter((path) => path !== CHART))
 
@@ -336,7 +336,7 @@ export function statechart<C extends IConfiguration, Charts extends Statecharts
         }
 
         return true
-      },
+      }),
     }),
     actions: Object.keys(actions).reduce((aggr, key) => {
       aggr[key] = pipe(

packages/node_modules/overmind/src/derived.test.ts

@@ -1,6 +1,6 @@
 import { PROXY_TREE } from 'proxy-state-tree'
 
-import { EventType, IAction, IDerive, IState, Overmind, derived } from './'
+import { EventType, IAction, IState, Overmind, derived } from './'
 
 type State = {
   foo: string
@@ -21,11 +21,6 @@ describe('Derived', () => {
       state,
     }
 
-    type Config = typeof config
-
-    interface Derive<Parent extends IState, Value>
-      extends IDerive<Config, Parent, Value> {}
-
     const app = new Overmind(config)
 
     expect(app.state.upperFoo).toEqual('BAR')
@@ -118,8 +113,6 @@ describe('Derived', () => {
       actions: typeof config.actions
     }
     interface Action<Input = void> extends IAction<Config, Input> {}
-    interface Derive<Parent extends IState, Value>
-      extends IDerive<Config, Parent, Value> {}
 
     const app = new Overmind(config)
     const trackStateTree = app.getTrackStateTree()
@@ -253,8 +246,7 @@ describe('Derived', () => {
     }
     type Config = typeof config
     interface Action<Input = void> extends IAction<Config, Input> {}
-    interface Derive<Parent extends IState, Value>
-      extends IDerive<Config, Parent, Value> {}
+
 
     const app = new Overmind(config)
 
@@ -267,22 +259,26 @@ describe('Derived', () => {
       expect(state.upperFoo).toBe('BAR2')
     }
 
-    const derived: Derive<State, string> = (_, parent) =>
-      parent.foo.toUpperCase()
+    type State = {
+      foo: string
+      upperFoo: string
+    }
+
+    const state: State = {
+      foo: 'bar',
+      upperFoo: derived((_, parent: State) => parent.foo.toUpperCase()),
+    }
+
 
     const config = {
-      state: {
-        foo: 'bar',
-        upperFoo: derived,
-      },
+      state,
       actions: {
         changeFoo,
       },
     }
     type Config = typeof config
     interface Action<Input = void> extends IAction<Config, Input> {}
-    interface Derive<Parent extends IState, Value>
-      extends IDerive<Config, Parent, Value> {}
+
 
     const app = new Overmind(config)
 
@@ -292,29 +288,33 @@ describe('Derived', () => {
     expect.assertions(4)
     let runCount = 0
     const changeFoo: Action = ({ state }) => {
-      state.foo = 'bar2'
-      expect(state.upperFoo).toBe('BAR2')
+      state.nestedDerived.foo = 'bar2'
+      expect(state.nestedDerived.upperFoo).toBe('BAR2')
     }
 
-    const derived: Derive<State, string> = (parent) => parent.foo.toUpperCase()
+    type State = {
+      nestedDerived: {
+        foo: string
+        upperFoo: string
+      }
+    }
 
-    const nestedDerived: Derive<State, string> = (parent) =>
-      parent.upperFoo + '!!!'
+    const state: State = {
+      nestedDerived: {
+        foo: 'bar',
+        upperFoo: derived((parent: State["nestedDerived"]) => parent.foo.toUpperCase())
+      }
+    }
 
     const config = {
-      state: {
-        foo: 'bar',
-        nestedDerived,
-        upperFoo: derived,
-      },
+      state,
       actions: {
         changeFoo,
       },
     }
     type Config = typeof config
     interface Action<Input = void> extends IAction<Config, Input> {}
-    interface Derive<Parent extends IState, Value>
-      extends IDerive<Config, Parent, Value> {}
+
 
     const app = new Overmind(config)
 
@@ -323,9 +323,9 @@ describe('Derived', () => {
     function render() {
       runCount++
       if (runCount === 1) {
-        expect(trackStateTree.state.nestedDerived).toBe('BAR!!!')
+        expect(trackStateTree.state.nestedDerived.upperFoo).toBe('BAR')
       } else {
-        expect(trackStateTree.state.nestedDerived).toBe('BAR2!!!')
+        expect(trackStateTree.state.nestedDerived.upperFoo).toBe('BAR2')
       }
       trackStateTree.stopTracking()
     }

packages/node_modules/overmind/src/index.ts

@@ -23,7 +23,6 @@ import {
   NestedPartial,
   Options,
   ResolveActions,
-  ResolveState,
   SSRMode,
   TestMode
 } from './internalTypes'
@@ -41,7 +40,6 @@ import {
   IAction,
   IConfiguration,
   IContext,
-  IDerive,
   IOnInitialize,
   IOperator,
   IReaction,
@@ -66,15 +64,15 @@ import {
 
 export * from './types'
 
-export { createOperator, createMutationOperator, ResolveState, ResolveActions }
+export { createOperator, createMutationOperator, ResolveActions }
 
 export { MODE_DEFAULT, MODE_TEST, MODE_SSR } from './utils'
 
 export { SERIALIZE, rehydrate } from './rehydrate'
 
 export { Statemachine, statemachine } from './statemachine'
 
-export const derived = <D extends IDerive<any, any, any>>(cb: D): D extends IDerive<any, any, infer O> ? O : never => cb as any
+export const derived = <D extends (state: IState, rootState: IState) => any>(cb: D): D extends (state: IState, rootState: IState) => infer O ? O : never => cb as any
 
 /** This type can be overwriten by app developers if they want to avoid
  * typing and then they can import `Action`,  `Operation` etc. directly from
@@ -92,9 +90,6 @@ export interface Action<Value = void, ReturnValue = void>
 export interface AsyncAction<Value = void, ReturnValue = void>
   extends IAction<Config, Value, Promise<ReturnValue>> {}
 
-export interface Derive<Parent extends IState, Value>
-  extends IDerive<Config, Parent, Value> {}
-
 export interface OnInitialize extends IOnInitialize<Config> {}
 
 export interface Reaction extends IReaction<Config> {}
@@ -198,7 +193,7 @@ export class Overmind<ThisConfig extends IConfiguration>
   eventHub: EventEmitter<Events>
   devtools: Devtools
   actions: ResolveActions<ThisConfig['actions']>
-  state: ResolveState<ThisConfig['state']>
+  state: ThisConfig['state']
   effects: ThisConfig['effects'] & {}
   delimiter: string
   constructor(

packages/node_modules/overmind/src/internalTypes.ts

@@ -152,18 +152,6 @@ export interface Events {
 
 // ============= PRIVATE TYPES FOR APP
 
-export type ResolveState<State extends IState | null | undefined> = State extends undefined
-  ? State
-  : {
-      [P in keyof State]: State[P] extends (parent: ResolveState<IState>, root: any) => any
-        ? State[P] extends () => any ? State[P] : ReturnType<State[P]>
-        : State[P] extends Array<any>
-        ? State[P]
-        : State[P] extends IState | null
-        ? ResolveState<State[P]>
-        : State[P]
-    }
-
 type NestedActions =
   | {
       [key: string]:

packages/node_modules/overmind/src/types.ts

@@ -1,5 +1,5 @@
 import { Overmind } from './'
-import { ResolveActions, ResolveState } from './internalTypes'
+import { ResolveActions } from './internalTypes'
 import { IS_OPERATOR } from './utils'
 
 /** ===== PUBLIC API
@@ -17,7 +17,6 @@ export type IState = {
   [key: string]:
     | IState
     | string
-    | IDerive<any, any, any>
     | number
     | boolean
     | object
@@ -33,15 +32,15 @@ export interface IConfig<ThisConfig extends IConfiguration> {
 }
 
 export type IContext<ThisConfig extends IConfiguration> = {
-  state: ResolveState<ThisConfig['state']>
+  state: ThisConfig['state']
   actions: ResolveActions<ThisConfig['actions']>
   effects: ThisConfig['effects']
   revertable: (mutationsCallback: () => any) => () => void
 }
 
 export interface IReaction<ThisConfig extends IConfiguration> {
   <O>(
-    stateCallback: (state: ResolveState<ThisConfig['state']>) => O,
+    stateCallback: (state: ThisConfig['state']) => O,
     updateCallback: (value: O) => void,
     options?: {
       nested?: boolean
@@ -74,15 +73,6 @@ export interface IOperator<
   [IS_OPERATOR]: true
 }
 
-export type IDerive<
-  ThisConfig extends IConfiguration,
-  Parent extends IState,
-  Value
-> = (
-  parent: ResolveState<Parent>,
-  state: ResolveState<ThisConfig['state']>
-) => Value
-
 export interface IOnInitialize<ThisConfig extends IConfiguration> {
   (context: IContext<ThisConfig>, value: Overmind<ThisConfig>): void
 }