Merge pull request cerebral#191 from cerebral/getterUpdates

feat(overmind-devtools): update getter values as well

Author: christianalfoni

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

@@ -28,6 +28,7 @@ import {
   ensureApp,
   addClientMessages,
   updateOperatorAsync,
+  runGetterMutation,
 } from './operators'
 
 export const onInitialize: OnInitialize = async ({
@@ -64,6 +65,7 @@ const handleClientMessage: Operator<Message, any> = pipe(
     [ExecutionType.OPERATOR_END]: updateOperator,
     [ExecutionType.ACTION_END]: updateAction,
     [ExecutionType.OPERATOR_ASYNC]: updateOperatorAsync,
+    [ExecutionType.GETTER]: runGetterMutation,
   })
 )
 

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

@@ -22,6 +22,7 @@ import {
   AsyncOperatorMessage,
   EventType,
   Effect,
+  GetterMessage,
 } from './types'
 import {
   createApp,
@@ -39,6 +40,16 @@ export const ensureCurrentApp: Operator<Message> = action(
   }
 )
 
+export const runGetterMutation: Operator<GetterMessage> = action(
+  ({ value: message, state }) => {
+    runMutation(state.apps[message.appName].state)({
+      method: 'set',
+      path: message.data.path,
+      args: [message.data.value],
+    })
+  }
+)
+
 export const setPortExists: Operator<any> = action(({ state }) => {
   state.error = 'PORT_EXISTS'
 })

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

@@ -160,6 +160,7 @@ export enum ExecutionType {
   OPERATOR_END = 'operator:end',
   OPERATOR_ASYNC = 'operator:async',
   ACTION_END = 'action:end',
+  GETTER = 'getter',
 }
 
 export enum AppMessageType {
@@ -177,6 +178,11 @@ export type InitMessage = AppMessage<{
   state: object
 }>
 
+export type GetterMessage = AppMessage<{
+  path: string
+  value: any
+}>
+
 export type FlushMessage = AppMessage<
   Execution & {
     flushId: number

packages/node_modules/overmind/src/index.ts

@@ -157,6 +157,11 @@ export class Overmind<Config extends Configuration> implements Configuration {
       {
         devmode: !IS_PRODUCTION,
         dynamicWrapper: (_, path, func) => func(eventHub, proxyStateTree, path),
+        onGetter: (path, value) =>
+          this.eventHub.emit(EventType.GETTER, {
+            path,
+            value: safeValue(value),
+          }),
       }
     )
 

packages/node_modules/overmind/src/internalTypes.ts

@@ -37,12 +37,10 @@ export enum EventType {
   EFFECT = 'effect',
   DERIVED = 'derived',
   DERIVED_DIRTY = 'derived:dirty',
-  REACTION_ADD = 'reaction:add',
-  REACTION_UPDATE = 'reaction:update',
-  REACTION_REMOVE = 'reaction:remove',
   COMPONENT_ADD = 'component:add',
   COMPONENT_UPDATE = 'component:update',
   COMPONENT_REMOVE = 'component:remove',
+  GETTER = 'getter',
 }
 
 export type Execution = {
@@ -99,21 +97,9 @@ export interface Events {
     error: string
     effectId: number
   }
-  [EventType.REACTION_ADD]: {
+  [EventType.GETTER]: {
     path: string
-    statePath: string
-    updateCount: number
-  }
-  [EventType.REACTION_UPDATE]: {
-    path: string
-    statePath: string
-    updateCount: number
-    flushId: number
-  }
-  [EventType.REACTION_REMOVE]: {
-    path: string
-    statePath: string
-    updateCount: number
+    value: any
   }
   [EventType.COMPONENT_ADD]: {
     componentId: number | string

packages/node_modules/proxy-state-tree/src/Proxyfier.ts

@@ -258,7 +258,21 @@ export class Proxifier {
             const descriptor = Object.getOwnPropertyDescriptor(target, prop)
 
             if (descriptor && 'get' in descriptor) {
-              return descriptor.get.call(proxifier.getProxyFromCache(path))
+              const value = descriptor.get.call(
+                proxifier.getProxyFromCache(path)
+              )
+
+              if (
+                proxifier.tree.master.options.devmode &&
+                proxifier.tree.master.options.onGetter
+              ) {
+                proxifier.tree.master.options.onGetter(
+                  proxifier.concat(path, prop),
+                  value
+                )
+              }
+
+              return value
             }
 
             const trackingTree = proxifier.getTrackingTree()

packages/node_modules/proxy-state-tree/src/types.ts

@@ -64,6 +64,7 @@ export interface ITrackStateTree<T extends object> {
 export interface IOptions {
   devmode?: boolean
   dynamicWrapper?: Function
+  onGetter?: Function
 }
 
 export interface IFlushCallback {