refactor(overmind): pass parent state as first type to Derive

Author: christianalfoni

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

@@ -1,4 +1,4 @@
-import { Action, pipe, OnInitialize, Operator, map } from 'overmind'
+import { Action, pipe, OnInitialize, Operator } from 'overmind'
 import {
   Message,
   Tab,

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

@@ -20,15 +20,15 @@ type State = {
   expandedStatePaths: string[]
   expandAllActionDetails: boolean
   expandedComponents: string[]
-  currentAction: Derive<Action, State>
-  currentApp: Derive<App, State>
-  componentsMounted: Derive<Component[], State>
-  componentsUpdateCount: Derive<number, State>
-  componentsStatePathCount: Derive<number, State>
-  flushes: Derive<Flush[], State>
-  flushesMutationsCount: Derive<number, State>
-  flushesStatePathCount: Derive<number, State>
-  groupedComponents: Derive<GroupedComponents, State>
+  currentAction: Derive<State, Action>
+  currentApp: Derive<State, App>
+  componentsMounted: Derive<State, Component[]>
+  componentsUpdateCount: Derive<State, number>
+  componentsStatePathCount: Derive<State, number>
+  flushes: Derive<State, Flush[]>
+  flushesMutationsCount: Derive<State, number>
+  flushesStatePathCount: Derive<State, number>
+  groupedComponents: Derive<State, GroupedComponents>
 }
 
 const state: State = {

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

@@ -9,7 +9,7 @@ describe('Derived', () => {
   test('should instantiate app with derived state', () => {
     type State = {
       foo: string
-      upperFoo: Derive<string, State>
+      upperFoo: Derive<State, string>
     }
     const state: State = {
       foo: 'bar',
@@ -23,7 +23,7 @@ describe('Derived', () => {
       state: typeof state
     }>
 
-    type Derive<Value, Parent extends object> = TDerive<IApp, Value, Parent>
+    type Derive<Parent extends object, Value> = TDerive<IApp, Parent, Value>
 
     const app = new Overmind(config)
 
@@ -35,7 +35,7 @@ describe('Derived', () => {
     const changeFoo: Action = ({ state }) => (state.foo = 'bar2')
     type State = {
       foo: string
-      upperFoo: Derive<string, State>
+      upperFoo: Derive<State, string>
     }
     const state: State = {
       foo: 'bar',
@@ -56,7 +56,7 @@ describe('Derived', () => {
       actions: typeof config.actions
     }>
     type Action<Input = void> = TAction<IApp, Input>
-    type Derive<Value, Parent extends object> = TDerive<IApp, Value, Parent>
+    type Derive<Parent extends object, Value> = TDerive<IApp, Parent, Value>
 
     const app = new Overmind(config)
     function render() {
@@ -75,7 +75,7 @@ describe('Derived', () => {
     expect.assertions(1)
     type State = {
       foo: string
-      upperFoo: Derive<string, State>
+      upperFoo: Derive<State, string>
     }
     const state: State = {
       foo: 'bar',
@@ -100,7 +100,7 @@ describe('Derived', () => {
       actions: typeof config.actions
     }>
     type Action<Input = void> = TAction<IApp, Input>
-    type Derive<Value, Parent extends object> = TDerive<IApp, Value, Parent>
+    type Derive<Parent extends object, Value> = TDerive<IApp, Parent, Value>
 
     const app = new Overmind(config)
 
@@ -113,7 +113,7 @@ describe('Derived', () => {
       expect(state.upperFoo).toBe('BAR2')
     }
 
-    const derived: Derive<string, State> = (_, parent) =>
+    const derived: Derive<State, string> = (_, parent) =>
       parent.foo.toUpperCase()
 
     const config = {
@@ -133,7 +133,7 @@ describe('Derived', () => {
       actions: typeof config.actions
     }>
     type Action<Input = void> = TAction<IApp, Input>
-    type Derive<Value, Parent extends object> = TDerive<IApp, Value, Parent>
+    type Derive<Parent extends object, Value> = TDerive<IApp, Parent, Value>
 
     const app = new Overmind(config)
 

packages/node_modules/overmind/src/index.ts

@@ -37,7 +37,7 @@ export type Action<Value = void> = TAction<App, Value>
 
 export type Context = TContext<App>
 
-export type Derive<Value, Parent extends object> = TDerive<App, Value, Parent>
+export type Derive<Parent extends object, Value> = TDerive<App, Parent, Value>
 
 export type Reaction = TReaction<App>
 

packages/node_modules/overmind/src/internalTypes.ts

@@ -116,7 +116,7 @@ export type TBaseContext<App extends BaseApp> = App['effects'] & {
 }
 
 export type ResolveState<State extends object> = {
-  [P in keyof State]: State[P] extends TDerive<any, any>
+  [P in keyof State]: State[P] extends TDerive<any, any, any>
     ? ReturnType<State[P]>
     : State[P] extends Array<any>
     ? State[P]

packages/node_modules/overmind/src/types.ts

@@ -50,7 +50,7 @@ export type TOperator<Input, Output, OperatorContext extends TContext<any>> = (
   final?: (err, Error, val?: TValueContext<OperatorContext, Output>) => void
 ) => void
 
-export type TDerive<App extends BaseApp, Value, Parent extends object = {}> = (
+export type TDerive<App extends BaseApp, Parent extends object, Value> = (
   parent: ResolveState<Parent>,
   state: App['state']
 ) => Value

packages/overmind-website/examples/guide/managinglists/derivetolist.ts

@@ -15,7 +15,7 @@ export type Post {
 
 export type State = {
   posts: { [id: string] : Post }
-  postsList: Derive<Post[], State>
+  postsList: Derive<State, Post[]>
 }
 
 export const state: State = {

packages/overmind-website/examples/guide/managinglists/filtering.ts

@@ -16,7 +16,7 @@ export type Post {
 export type State = {
   posts: { [id: string] : Post }
   showCount: number
-  postsList: Derive<Post[], State>
+  postsList: Derive<State, Post[]>
 }
 
 export const state: State = {

packages/overmind-website/examples/guide/managinglists/sort.ts

@@ -15,7 +15,7 @@ export type Post {
 
 export type State = {
   posts: { [id: string] : Post }
-  postsList: Derive<Post[], State>
+  postsList: Derive<State, Post[]>
 }
 
 export const state: State = {