Merge pull request cerebral#86 from cerebral/improvements

Improvements

Author: christianalfoni

packages/node_modules/overmind-vue/src/index.ts

@@ -96,10 +96,10 @@ export default class VueApp<
     // a callback that runs whenever a mutation
     // matches the paths tracked on this component
     componentOptions.mounted = function() {
-      const vueInstance = this
-      const paths = instance.clearTrackState(this.__trackId, () => {
-        mounted && mounted.call(vueInstance)
-      })
+      const paths = instance.clearTrackState(
+        this.__trackId,
+        mounted && mounted.bind(this)
+      )
       instance.eventHub.emitAsync(EventType.COMPONENT_ADD, {
         componentId,
         componentInstanceId: this.__componentInstanceId,

packages/node_modules/overmind/src/computed.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'betsy'
 import ProxyStateTree from 'proxy-state-tree'
-import { Events, EventType } from './'
+import { Events, EventType } from './internalTypes'
 
 type ComputedOptions = {
   cacheLimit?: number

packages/node_modules/overmind/src/derived.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'betsy'
 import ProxyStateTree from 'proxy-state-tree'
-import { Events, EventType } from './'
+import { Events, EventType } from './internalTypes'
 
 class Derived {
   private isDirty: boolean = true

packages/node_modules/overmind/src/index.ts

@@ -4,10 +4,17 @@ import ProxyStateTree from 'proxy-state-tree'
 import Devtools, { Message, safeValue } from './Devtools'
 import ActionClass, { IValueAction, INoValueAction, Compose } from './Action'
 import Reaction from './reaction'
+import {
+  DynamicModule,
+  SubType,
+  Events,
+  EventType,
+  Options,
+} from './internalTypes'
 export { default as derive } from './derived'
 export { default as compute } from './computed'
 
-export { IValueAction, Compose }
+export { IValueAction, Compose, EventType }
 
 export const log = (...objects: any[]) =>
   console.log(...objects.map((obj) => JSON.parse(JSON.stringify(obj))))
@@ -18,18 +25,6 @@ export const dynamicModule = ((cb) => (namespace) =>
 /*
   BASE TYPES
 */
-type DynamicModule = <
-  T extends {
-    onInitialize?: any
-    state?: any
-    effects?: any
-    actions?: any
-    reactions?: any
-  }
->(
-  cb: (namespace: string) => T
-) => ReturnType<typeof cb>
-
 export type Configuration = {
   onInitialize?: any
   state?: any
@@ -47,11 +42,6 @@ export type Configuration = {
   }
 }
 
-type SubType<Base, Condition> = Pick<
-  Base,
-  { [Key in keyof Base]: Base[Key] extends Condition ? Key : never }[keyof Base]
->
-
 /*
   DECLARE MODULE TYPES
 */
@@ -267,85 +257,6 @@ export type TCompute<Value, App> = (
   CLASS TYPES
 */
 
-type Options = {
-  devtools?: string
-}
-
-type CacheMessage = {
-  value: any
-  paths: string[]
-  updateCount: number
-}
-
-export enum EventType {
-  DERIVED = 'derived',
-  DERIVED_DIRTY = 'derived:dirty',
-  COMPUTED = 'computed',
-  COMPUTED_DIRTY = 'computed: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',
-}
-
-export interface Events {
-  [EventType.DERIVED]: {
-    path: string
-    paths: string[]
-    updateCount: number
-    value: any
-  }
-  [EventType.DERIVED_DIRTY]: {
-    path: string
-    flushId: number
-  }
-  [EventType.COMPUTED]: {
-    path: string
-    updateCount: number
-    cache: CacheMessage[]
-    limit: number
-  }
-  [EventType.COMPUTED_DIRTY]: {
-    path: string
-    flushId: number
-  }
-  [EventType.REACTION_ADD]: {
-    path: string
-    statePath: string
-    updateCount: number
-  }
-  [EventType.REACTION_UPDATE]: {
-    path: string
-    statePath: string
-    updateCount: number
-  }
-  [EventType.REACTION_REMOVE]: {
-    path: string
-    statePath: string
-    updateCount: number
-  }
-  [EventType.COMPONENT_ADD]: {
-    componentId: number
-    componentInstanceId: number
-    name: string
-    paths: string[]
-  }
-  [EventType.COMPONENT_UPDATE]: {
-    componentId: number
-    componentInstanceId: number
-    name: string
-    paths: string[]
-    flushId?: number
-  }
-  [EventType.COMPONENT_REMOVE]: {
-    componentId: number
-    componentInstanceId: number
-    name: string
-  }
-}
-
 export default class App<
   Config extends Configuration,
   EvalConfig extends TConfig<Config>

packages/node_modules/overmind/src/internalTypes.ts

@@ -0,0 +1,95 @@
+export type DynamicModule = <
+  T extends {
+    onInitialize?: any
+    state?: any
+    effects?: any
+    actions?: any
+    reactions?: any
+  }
+>(
+  cb: (namespace: string) => T
+) => ReturnType<typeof cb>
+
+export type SubType<Base, Condition> = Pick<
+  Base,
+  { [Key in keyof Base]: Base[Key] extends Condition ? Key : never }[keyof Base]
+>
+
+export type Options = {
+  devtools?: string
+}
+
+type CacheMessage = {
+  value: any
+  paths: string[]
+  updateCount: number
+}
+
+export enum EventType {
+  DERIVED = 'derived',
+  DERIVED_DIRTY = 'derived:dirty',
+  COMPUTED = 'computed',
+  COMPUTED_DIRTY = 'computed: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',
+}
+
+export interface Events {
+  [EventType.DERIVED]: {
+    path: string
+    paths: string[]
+    updateCount: number
+    value: any
+  }
+  [EventType.DERIVED_DIRTY]: {
+    path: string
+    flushId: number
+  }
+  [EventType.COMPUTED]: {
+    path: string
+    updateCount: number
+    cache: CacheMessage[]
+    limit: number
+  }
+  [EventType.COMPUTED_DIRTY]: {
+    path: string
+    flushId: number
+  }
+  [EventType.REACTION_ADD]: {
+    path: string
+    statePath: string
+    updateCount: number
+  }
+  [EventType.REACTION_UPDATE]: {
+    path: string
+    statePath: string
+    updateCount: number
+  }
+  [EventType.REACTION_REMOVE]: {
+    path: string
+    statePath: string
+    updateCount: number
+  }
+  [EventType.COMPONENT_ADD]: {
+    componentId: number
+    componentInstanceId: number
+    name: string
+    paths: string[]
+  }
+  [EventType.COMPONENT_UPDATE]: {
+    componentId: number
+    componentInstanceId: number
+    name: string
+    paths: string[]
+    flushId?: number
+  }
+  [EventType.COMPONENT_REMOVE]: {
+    componentId: number
+    componentInstanceId: number
+    name: string
+  }
+}

packages/node_modules/overmind/src/reaction.ts

@@ -1,6 +1,6 @@
 import { EventEmitter } from 'betsy'
 import ProxyStateTree from 'proxy-state-tree'
-import { Events, EventType } from './'
+import { Events, EventType } from './internalTypes'
 
 class Reaction {
   private proxyStateTreeListener: any = null