refactor(overmind-devtools): refactor to correct typing approach

Author: christianalfoni

packages/node_modules/overmind-devtools/src/overmind/operators.ts

@@ -1,4 +1,4 @@
-import { action, forEach, fork, Operator, when, map } from 'overmind'
+import { Operator, action, forEach, fork, when, map } from 'overmind'
 import {
   Message,
   AppMessage,
@@ -29,31 +29,37 @@ import {
   runMutation,
 } from './utils'
 
-export const ensureCurrentApp = action<Message>(({ value: message, state }) => {
-  if (!state.currentAppName) {
-    state.currentAppName = message.appName
+export const ensureCurrentApp: Operator<Message> = action(
+  ({ value: message, state }) => {
+    if (!state.currentAppName) {
+      state.currentAppName = message.appName
+    }
   }
-})
+)
 
-export const setPortExists = action<any>(({ state }) => {
+export const setPortExists: Operator<any> = action(({ state }) => {
   state.error = 'PORT_EXISTS'
 })
 
-export const isPortExistsMessage = (paths: {
-  true: Operator<Message, any>
-  false: Operator<Message, any>
-}) =>
+export const isPortExistsMessage: (
+  paths: {
+    true: Operator<Message, any>
+    false: Operator<Message, any>
+  }
+) => Operator<Message> = (paths) =>
   when(
     ({ value: message }) => message.messages[0].type === 'PORT_EXISTS',
     paths
   )
 
-export const addState = action<InitMessage>(({ value: message, state }) => {
-  state.isConnecting = false
-  state.apps[message.appName].state = message.data.state
-})
+export const addState: Operator<InitMessage> = action(
+  ({ value: message, state }) => {
+    state.isConnecting = false
+    state.apps[message.appName].state = message.data.state
+  }
+)
 
-export const addFlushAndRunMutations = action<FlushMessage>(
+export const addFlushAndRunMutations: Operator<FlushMessage> = action(
   ({ value: message, state }) => {
     ensureFlushExists(state.apps[message.appName].flushes, message.data.flushId)
     state.apps[message.appName].flushes[message.data.flushId].mutations =
@@ -77,18 +83,20 @@ export const addFlushAndRunMutations = action<FlushMessage>(
   }
 )
 
-export const ensureApp = action<Message>(({ value: message, state }) => {
-  if (
-    !state.apps[message.appName] ||
-    message.messages[0].type === ExecutionType.INIT
-  ) {
-    state.apps[message.appName] = createApp({
-      name: message.appName,
-    })
+export const ensureApp: Operator<Message> = action(
+  ({ value: message, state }) => {
+    if (
+      !state.apps[message.appName] ||
+      message.messages[0].type === ExecutionType.INIT
+    ) {
+      state.apps[message.appName] = createApp({
+        name: message.appName,
+      })
+    }
   }
-})
+)
 
-export const addClientMessages = action<Message>(
+export const addClientMessages: Operator<Message> = action(
   ({ value: message, state }) => {
     state.apps[message.appName].messages = JSON.parse(
       JSON.stringify(message.messages)
@@ -98,7 +106,7 @@ export const addClientMessages = action<Message>(
   }
 )
 
-export const addComponent = action<AddComponentMessage>(
+export const addComponent: Operator<AddComponentMessage> = action(
   ({ value: message, state }) => {
     const id = `${message.data.componentId}_${message.data.componentInstanceId}`
 
@@ -112,7 +120,7 @@ export const addComponent = action<AddComponentMessage>(
   }
 )
 
-export const updateComponent = action<UpdateComponentMessage>(
+export const updateComponent: Operator<UpdateComponentMessage> = action(
   ({ value: message, state }) => {
     const id = `${message.data.componentId}_${message.data.componentInstanceId}`
 
@@ -133,15 +141,15 @@ export const updateComponent = action<UpdateComponentMessage>(
   }
 )
 
-export const removeComponent = action<RemoveComponentMessage>(
+export const removeComponent: Operator<RemoveComponentMessage> = action(
   ({ value: message, state }) => {
     const id = `${message.data.componentId}_${message.data.componentInstanceId}`
 
     state.apps[message.appName].components[id].isMounted = false
   }
 )
 
-export const updateDerived = action<DerivedMessage>(
+export const updateDerived: Operator<DerivedMessage> = action(
   ({ value: message, state }) => {
     const appState = state.apps[message.appName].state
     const path = message.data.path.split('.')
@@ -153,7 +161,7 @@ export const updateDerived = action<DerivedMessage>(
   }
 )
 
-export const updateFlushWithDerived = action<DirtyDerivedMessage>(
+export const updateFlushWithDerived: Operator<DirtyDerivedMessage> = action(
   ({ value: message, state }) => {
     ensureFlushExists(state.apps[message.appName].flushes, message.data.flushId)
     state.apps[message.appName].flushes[message.data.flushId].derived.push(
@@ -162,7 +170,7 @@ export const updateFlushWithDerived = action<DirtyDerivedMessage>(
   }
 )
 
-export const addAction = action<StartActionMessage>(
+export const addAction: Operator<StartActionMessage> = action(
   ({ value: message, state }) => {
     const app = state.apps[message.appName]
     const action = message.data
@@ -205,7 +213,7 @@ export const addAction = action<StartActionMessage>(
   }
 )
 
-export const addOperator = action<StartOperatorMessage>(
+export const addOperator: Operator<StartOperatorMessage> = action(
   ({ value: message, state }) => {
     const operatorData = message.data
     const actionId = getActionId(operatorData)
@@ -241,7 +249,7 @@ export const addOperator = action<StartOperatorMessage>(
   }
 )
 
-export const updateOperator = action<EndOperatorMessage>(
+export const updateOperator: Operator<EndOperatorMessage> = action(
   ({ value: message, state }) => {
     const operatorData = message.data
     const actionId = getActionId(operatorData)
@@ -256,7 +264,7 @@ export const updateOperator = action<EndOperatorMessage>(
   }
 )
 
-export const updateAction = action<EndActionMessage>(
+export const updateAction: Operator<EndActionMessage> = action(
   ({ value: message, state }) => {
     const app = state.apps[message.appName]
     const action = message.data
@@ -266,7 +274,7 @@ export const updateAction = action<EndActionMessage>(
   }
 )
 
-export const addMutations = action<MutationsMessage>(
+export const addMutations: Operator<MutationsMessage> = action(
   ({ value: message, state }) => {
     const mutations = message.data
     const id = `${mutations.actionId}_${mutations.executionId}`
@@ -277,21 +285,27 @@ export const addMutations = action<MutationsMessage>(
   }
 )
 
-export const addEffect = action<EffectMessage>(({ value: message, state }) => {
-  const effect = message.data
-  const id = getActionId(effect)
-  const operator =
-    state.apps[message.appName].actions[id].operators[effect.operatorId]
+export const addEffect: Operator<EffectMessage> = action(
+  ({ value: message, state }) => {
+    const effect = message.data
+    const id = getActionId(effect)
+    const operator =
+      state.apps[message.appName].actions[id].operators[effect.operatorId]
 
-  operator.effects.push(effect)
-})
+    operator.effects.push(effect)
+  }
+)
 
-export const getMessages = map<Message, AppMessage<any>[]>(({ value }) =>
-  value.messages.map((message) => ({ ...message, appName: value.appName }))
+export const getMessages: Operator<Message, AppMessage<any>[]> = map(
+  ({ value }) =>
+    value.messages.map((message) => ({ ...message, appName: value.appName }))
 )
 
-export const forkEachMessage = (paths: {
-  [key: string]: Operator<AppMessage<any>, AppMessage<any>>
-}) => forEach<AppMessage<any>[]>(fork(({ value }) => value.type, paths))
+export const forkEachMessage: (
+  paths: {
+    [key: string]: Operator<AppMessage<any>, any>
+  }
+) => Operator<AppMessage<any>[]> = (paths) =>
+  forEach(fork(({ value }) => value.type, paths) as Operator<AppMessage<any>>)
 
 export const updateOperatorAsync = action<AsyncOperatorMessage>(() => {})