Merge pull request cerebral#32 from cerebral/flipValueContext

refactor(overmind): flip the value and context arguments of operators

Author: christianalfoni

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

@@ -1,5 +1,5 @@
-export const getEventValue = (event: React.ChangeEvent<HTMLInputElement>) =>
+export const getEventValue = (_, event: React.ChangeEvent<HTMLInputElement>) =>
   event.currentTarget.value
 
-export const preventEventDefault = (event: React.FormEvent) =>
+export const preventEventDefault = (_, event: React.FormEvent) =>
   event.preventDefault()

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

@@ -2,17 +2,17 @@ import { State, Todo } from './state'
 
 let nextTodoId = 0
 
-export const setNewTodoTitle = (value: string, state: State) =>
+export const setNewTodoTitle = (state: State, value: string) =>
   (state.newTodoTitle = value)
 
-export const addTodo = (_, state: State) =>
+export const addTodo = (state: State) =>
   state.todos.unshift({
     id: String(nextTodoId++),
     title: state.newTodoTitle,
     completed: false,
   })
 
-export const clearNewTodoTitle = (_, state: State) => (state.newTodoTitle = '')
+export const clearNewTodoTitle = (state: State) => (state.newTodoTitle = '')
 
-export const toggleCompleted = (todo: Todo) =>
+export const toggleCompleted = (_, todo: Todo) =>
   (todo.completed = !todo.completed)

packages/node_modules/action-chain/src/ActionBase.ts

@@ -114,7 +114,7 @@ export class ActionBase<Context, InitialValue, Value = InitialValue> {
             ...context.__execution,
             operatorId,
           })
-          const result = cb(currentValue, context)
+          const result = cb(context, currentValue)
 
           if (result instanceof Promise) {
             this.actionChain.emit('operator:async', {

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

@@ -16,12 +16,12 @@ class Action<Context, InitialValue, Value = InitialValue> extends ActionBase<
   Value
 > {
   test: (
-    cb: (value: Value, context: Context) => void
+    cb: (context: Context, value: Value) => void
   ) => InitialValue extends void
     ? INoValueAction<Context, InitialValue, Value>
     : IAction<Context, InitialValue, Value> = (cb) => {
-    const operator = (value, context) => {
-      return cb(value, context)
+    const operator = (context, value) => {
+      return cb(context, value)
     }
 
     const [chain, initialActionId, runOperators] = this.createOperatorResult(
@@ -37,7 +37,7 @@ class Action<Context, InitialValue, Value = InitialValue> extends ActionBase<
   ) => InitialValue extends void
     ? INoValueAction<Context, InitialValue, Value>
     : IAction<Context, InitialValue, Value> = (action) => {
-    const operator = (value, context) => {
+    const operator = (context, value) => {
       return (action as any)(value, context, 'fork')
     }
 
@@ -93,7 +93,7 @@ describe('CONTEXT', () => {
     expect.assertions(2)
     const wut = action()
     console.log(wut.test)
-    const test = action().test((_, { __execution, __path }: any) => {
+    const test = action().test(({ __execution, __path }: any) => {
       expect(__execution).toBeTruthy()
       expect(__path).toBeTruthy()
     })
@@ -103,7 +103,7 @@ describe('CONTEXT', () => {
 
   test('should be able to extend context', () => {
     expect.assertions(1)
-    const fn = action().test((_, { foo }) => {
+    const fn = action().test(({ foo }) => {
       expect(foo.bar()).toBe('baz')
     })
 
@@ -114,7 +114,7 @@ describe('CONTEXT', () => {
 describe('PROVIDER', () => {
   test('should track execution of providers', () => {
     expect.assertions(2)
-    const fn = action().test((_, { foo }) => {
+    const fn = action().test(({ foo }) => {
       expect(foo.bar()).toBe('baz')
     })
 
@@ -132,7 +132,7 @@ describe('PROVIDER', () => {
   })
   test('should track execution of clas instance providers', () => {
     expect.assertions(2)
-    const fn = action().test((_, { test }) => {
+    const fn = action().test(({ test }) => {
       expect(test.foo()).toBe('bar')
     })
 

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

@@ -1,19 +1,18 @@
 import { Context } from './'
 
-export const getAppsFromStorage = (_, { storage }: Context) =>
-  storage.get('apps')
+export const getAppsFromStorage = ({ storage }: Context) => storage.get('apps')
 
-export const getCurrentPortFromStorage = (_, { storage }: Context) =>
+export const getCurrentPortFromStorage = ({ storage }: Context) =>
   storage.get('currentPort')
 
-export const getNewPortFromState = (_, { state }: Context) => state.newPortValue
+export const getNewPortFromState = ({ state }: Context) => state.newPortValue
 
-export const storeApps = (_, { storage, state }: Context) =>
+export const storeApps = ({ storage, state }: Context) =>
   storage.set('apps', state.apps)
 
-export const toNumber = (value: string) => String(Number(value))
+export const toNumber = (_, value: string) => String(Number(value))
 
-export const connectCurrentPort = (action: (message: any) => void) => (
-  _,
-  { state, connector }: Context
-) => connector.addPort(state.currentPort, action)
+export const connectCurrentPort = (action: (message: any) => void) => ({
+  state,
+  connector,
+}: Context) => connector.addPort(state.currentPort, action)

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

@@ -1,24 +1,24 @@
 import { Apps, State, Message, Tab } from './state'
 import { runMutation } from './utils'
 
-export const setApps = (apps: Apps, state: State) => (state.apps = apps || {})
+export const setApps = (state: State, apps: Apps) => (state.apps = apps || {})
 
-export const setCurrentPort = (currentPort: string, state: State) => {
+export const setCurrentPort = (state: State, currentPort: string) => {
   if (currentPort) {
     state.currentPort = currentPort
   } else if (Object.keys(state.apps).length) {
     state.currentPort = Object.keys(state.apps)[0]
   }
 }
 
-export const setError = (error: string, state: State) => (state.error = error)
+export const setError = (state: State, error: string) => (state.error = error)
 
-export const setAppLoaded = (_, state: State) => (state.isLoading = false)
+export const setAppLoaded = (state: State) => (state.isLoading = false)
 
-export const setNewPortValue = (value: string, state: State) =>
+export const setNewPortValue = (state: State, value: string) =>
   (state.newPortValue = value)
 
-export const addNewApp = (_, state: State) =>
+export const addNewApp = (state: State) =>
   (state.apps[state.newPortValue] = {
     name: null,
     port: state.newPortValue,
@@ -33,17 +33,17 @@ export const addNewApp = (_, state: State) =>
     ],
   })
 
-export const resetNewPortValue = (_, state: State) => (state.newPortValue = '')
+export const resetNewPortValue = (state: State) => (state.newPortValue = '')
 
-export const addMessagesFromClient = (message: Message, state: State) => {
+export const addMessagesFromClient = (state: State, message: Message) => {
   state.apps[message.port].messages = state.apps[message.port].messages.concat(
     message.message
   )
 }
 
-export const changeTab = (tab: Tab, state: State) => (state.currentTab = tab)
+export const changeTab = (state: State, tab: Tab) => (state.currentTab = tab)
 
-export const toggleExpandStatePath = (path: string[], state: State) => {
+export const toggleExpandStatePath = (state: State, path: string[]) => {
   const pathString = path.join('.')
 
   if (state.expandedStatePaths.indexOf(pathString) >= 0) {
@@ -57,13 +57,25 @@ export const toggleExpandStatePath = (path: string[], state: State) => {
 }
 
 export const performMutationsByMessageType = (
-  message: Message,
-  state: State
+  state: State,
+  message: Message
 ) => {
   message.message.forEach((clientMessage) => {
     switch (clientMessage.type) {
       case 'init': {
-        state.apps[message.port].state = clientMessage.data.state
+        state.apps[message.port] = {
+          name: '',
+          port: message.port,
+          state: clientMessage.data.state,
+          messages: [],
+          components: {},
+          flushes: [
+            {
+              mutations: [],
+              components: [],
+            },
+          ],
+        }
         break
       }
       case 'flush': {

packages/node_modules/overmind/src/Action.ts

@@ -2,8 +2,8 @@ import ProxyStateTree from 'proxy-state-tree'
 import { ActionBase, StopExecution } from 'action-chain'
 
 type OperatorCallback<Context, Value, NewValue = Value> = (
-  value: Value,
-  context: Context
+  context: Context,
+  value: Value
 ) => NewValue | Promise<NewValue>
 
 export interface IValueAction<
@@ -36,13 +36,13 @@ export default class Action<
     this.proxyStateTree = proxyStateTree
   }
   fork: <Paths>(
-    cb: (value: Value, context: Context) => keyof Paths,
+    cb: (context: Context, value: Value) => keyof Paths,
     paths: Paths
   ) => [InitialValue] extends [void]
     ? INoValueAction<State, Context, InitialValue, Value>
     : IValueAction<State, Context, InitialValue, Value> = (cb, paths) => {
-    const operator = (value, context) => {
-      const path = cb(value, context)
+    const operator = (context, value) => {
+      const path = cb(context, value)
 
       return (paths[path] as any).map(() => value)(value, context, path)
     }
@@ -60,13 +60,13 @@ export default class Action<
     ) as any
   }
   mutation: (
-    cb: (value: Value, state: State) => any
+    cb: (state: State, value: Value) => any
   ) => [InitialValue] extends [void]
     ? INoValueAction<State, Context, InitialValue, Value>
     : IValueAction<State, Context, InitialValue, Value> = (cb) => {
-    const operator = (value, context) => {
+    const operator = (context, value) => {
       this.proxyStateTree.startMutationTracking()
-      cb(value, context.state)
+      cb(context.state, value)
       const mutations = this.proxyStateTree.clearMutationTracking()
       this.getActionChain().emit('mutations', {
         mutations,
@@ -90,12 +90,12 @@ export default class Action<
     ) as any
   }
   do: (
-    cb: (value: Value, context: Context) => void
+    cb: (context: Context, value: Value) => void
   ) => [InitialValue] extends [void]
     ? INoValueAction<State, Context, InitialValue, Value>
     : IValueAction<State, Context, InitialValue, Value> = (cb) => {
-    const operator = (value, context) => {
-      cb(value, context)
+    const operator = (context, value) => {
+      cb(context, value)
       return value
     }
 
@@ -113,7 +113,7 @@ export default class Action<
     ) as any
   }
   map: <NewValue>(
-    cb: (value: Value, context: Context) => NewValue | Promise<NewValue>
+    cb: (context: Context, value: Value) => NewValue | Promise<NewValue>
   ) => [InitialValue] extends [void]
     ? INoValueAction<State, Context, InitialValue, NewValue>
     : IValueAction<State, Context, InitialValue, NewValue> = (cb) => {
@@ -156,8 +156,8 @@ export default class Action<
     cb,
     paths
   ) => {
-    const operator = (value, context) => {
-      return (cb(value, context) as any)
+    const operator = (context, value) => {
+      return (cb(context, value) as any)
         .then((promiseValue) => {
           return (paths.success as any)(promiseValue, context, 'success')
         })
@@ -179,7 +179,7 @@ export default class Action<
     ) as any
   }
   when: <TrueValue, FalseValue>(
-    cb: (value: Value, context: Context) => boolean,
+    cb: (context: Context, value: Value) => boolean,
     paths: {
       true: Action<State, Context, Value, TrueValue>
       false: Action<State, Context, Value, FalseValue>
@@ -190,8 +190,8 @@ export default class Action<
     cb,
     paths
   ) => {
-    const operator = (value, context) => {
-      const isTrue = cb(value, context)
+    const operator = (context, value) => {
+      const isTrue = cb(context, value)
       const path = isTrue ? paths.true : (paths.false as any)
 
       return path(value, context, isTrue ? 'true' : 'false')
@@ -210,12 +210,12 @@ export default class Action<
     ) as any
   }
   filter: (
-    cb: (value: Value, context: Context) => boolean
+    cb: (context: Context, value: Value) => boolean
   ) => [InitialValue] extends [void]
     ? INoValueAction<State, Context, InitialValue, Value>
     : IValueAction<State, Context, InitialValue, Value> = (cb) => {
-    const operator = (value, context) => {
-      const result = cb(value, context)
+    const operator = (context, value) => {
+      const result = cb(context, value)
 
       if (result === true) {
         return value
@@ -243,7 +243,7 @@ export default class Action<
     : IValueAction<State, Context, InitialValue, Value> = (timer) => {
     let currentTimeout = null
 
-    const operator = (value) => {
+    const operator = (_, value) => {
       return new Promise((resolve) => {
         if (currentTimeout) {
           currentTimeout()

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

@@ -71,7 +71,7 @@ describe('Computed', () => {
     const app = new App({
       state,
       actions: (action) => ({
-        changeFoo: action().mutation((_, state) => (state.foo = 'bar2')),
+        changeFoo: action().mutation((state) => (state.foo = 'bar2')),
       }),
     })
     app.state.test(123)

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

@@ -23,7 +23,7 @@ describe('Derived', () => {
         upperFoo: derived((state: State) => state.foo.toUpperCase()),
       },
       actions: (action) => ({
-        changeFoo: action().mutation((_, state) => (state.foo = 'bar2')),
+        changeFoo: action().mutation((state) => (state.foo = 'bar2')),
       }),
     })
     function render() {

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

@@ -63,7 +63,7 @@ describe('Overmind', () => {
         state,
         actions: (action: Action) => ({
           foo: action<string>().map(
-            (value, { state }) => value + state[namespace].foo
+            ({ state }, value) => value + state[namespace].foo
           ),
         }),
       }
@@ -104,7 +104,7 @@ describe('OPERATORS', () => {
         foo: 'bar',
       },
       actions: (action) => ({
-        doThis: action().mutation((_, state) => (state.foo = 'bar2')),
+        doThis: action().mutation((state) => (state.foo = 'bar2')),
       }),
     })
 
@@ -124,7 +124,7 @@ describe('OPERATORS', () => {
         },
       },
       actions: (action) => ({
-        doThis: action<string>().do((_, { foo }) => {
+        doThis: action<string>().do(({ foo }) => {
           expect(foo.bar()).toBe('baz')
         }),
       }),
@@ -136,7 +136,7 @@ describe('OPERATORS', () => {
     const app = new App({
       state: {},
       actions: (action) => ({
-        doThis: action<string>().map((value) => {
+        doThis: action<string>().map((_, value) => {
           return value.toUpperCase()
         }),
       }),