Merge pull request cerebral#169 from cerebral/fixes5

christianalfoni · web-flow · commit c96e3deef06b · 2018-12-21T23:24:15.000+01:00
Fixes5
diff --git a/packages/node_modules/overmind-angular/package.json b/packages/node_modules/overmind-angular/package.json
@@ -29,11 +29,6 @@
     "es",
     "react"
   ],
-  "engines": {
-    "browsers": [
-      "last 1 Chrome versions"
-    ]
-  },
   "dependencies": {
     "@types/node": "^10.5.1",
     "overmind": "next",
diff --git a/packages/node_modules/overmind-devtools/src/components/ActionOperator/index.tsx b/packages/node_modules/overmind-devtools/src/components/ActionOperator/index.tsx
@@ -25,6 +25,7 @@ const ActionOperator: SFC<Props> = ({
   const { state, actions } = useOvermind()
   const isExpanded = state.expandAllActionDetails || !operator.isCollapsed
 
+  console.log(operator.mutations)
   return (
     <div>
       {value === undefined ? null : (
diff --git a/packages/node_modules/overmind-react/package.json b/packages/node_modules/overmind-react/package.json
@@ -31,11 +31,6 @@
     "es",
     "react"
   ],
-  "engines": {
-    "browsers": [
-      "last 1 Chrome versions"
-    ]
-  },
   "dependencies": {
     "@types/node": "^10.5.1",
     "overmind": "next",
@@ -45,7 +40,7 @@
     "@types/jest": "^23.1.4",
     "@types/react": "^16.7.13",
     "jest": "^23.5.0",
-    "react": "^16.7.0-alpha.1",
+    "react": "^16.7.0-alpha.2",
     "react-test-renderer": "^16.4.1",
     "rimraf": "^2.6.2",
     "ts-jest": "^23.10.4",
diff --git a/packages/node_modules/overmind-react/src/index.ts b/packages/node_modules/overmind-react/src/index.ts
@@ -145,6 +145,7 @@ export const createConnect = <A extends Overmind<Configuration>>(
       componentInstanceId = componentInstanceId++
       currentFlushId = 0
       componentDidMount() {
+        console.log(this.tree)
         overmind.eventHub.emitAsync(EventType.COMPONENT_ADD, {
           componentId: populatedComponent.__componentId,
           componentInstanceId: this.componentInstanceId,
diff --git a/packages/node_modules/overmind-vue/package.json b/packages/node_modules/overmind-vue/package.json
@@ -31,11 +31,6 @@
     "es",
     "react"
   ],
-  "engines": {
-    "browsers": [
-      "last 1 Chrome versions"
-    ]
-  },
   "dependencies": {
     "@types/node": "^10.5.1",
     "overmind": "next",
diff --git a/packages/node_modules/overmind/package.json b/packages/node_modules/overmind/package.json
@@ -31,11 +31,6 @@
     "es",
     "config"
   ],
-  "engines": {
-    "browsers": [
-      "last 1 Chrome versions"
-    ]
-  },
   "dependencies": {
     "@types/node": "^10.5.1",
     "is-plain-object": "^2.0.4",
diff --git a/packages/node_modules/overmind/src/derived.test.ts b/packages/node_modules/overmind/src/derived.test.ts
@@ -1,4 +1,4 @@
-import { Overmind, TAction, TDerive, StateObject } from './'
+import { Overmind, TAction, TDerive, TStateObject } from './'
 
 type State = {
   foo: string
@@ -23,7 +23,7 @@ describe.only('Derived', () => {
       state: typeof state
     }
 
-    type Derive<Parent extends StateObject, Value> = TDerive<
+    type Derive<Parent extends TStateObject, Value> = TDerive<
       Config,
       Parent,
       Value
@@ -60,7 +60,7 @@ describe.only('Derived', () => {
       actions: typeof config.actions
     }
     type Action<Input = void> = TAction<Config, Input>
-    type Derive<Parent extends StateObject, Value> = TDerive<
+    type Derive<Parent extends TStateObject, Value> = TDerive<
       Config,
       Parent,
       Value
@@ -110,7 +110,7 @@ describe.only('Derived', () => {
       actions: typeof config.actions
     }
     type Action<Input = void> = TAction<Config, Input>
-    type Derive<Parent extends StateObject, Value> = TDerive<
+    type Derive<Parent extends TStateObject, Value> = TDerive<
       Config,
       Parent,
       Value
@@ -147,7 +147,7 @@ describe.only('Derived', () => {
       actions: typeof config.actions
     }
     type Action<Input = void> = TAction<Config, Input>
-    type Derive<Parent extends StateObject, Value> = TDerive<
+    type Derive<Parent extends TStateObject, Value> = TDerive<
       Config,
       Parent,
       Value
diff --git a/packages/node_modules/overmind/src/index.ts b/packages/node_modules/overmind/src/index.ts
@@ -16,10 +16,9 @@ import {
   TConfig,
   TDerive,
   TOperator,
-  TReaction,
   TValueContext,
   TOnInitialize,
-  StateObject,
+  TStateObject,
 } from './types'
 
 export * from './types'
@@ -34,14 +33,12 @@ type TheConfig = IConfig & TConfig<{ actions: {} }>
 
 export type Action<Value = void> = TAction<TheConfig, Value>
 
-export type Derive<Parent extends StateObject, Value> = TDerive<
+export type Derive<Parent extends TStateObject, Value> = TDerive<
   TheConfig,
   Parent,
   Value
 >
 
-export type Reaction = TReaction<TheConfig>
-
 export type OnInitialize = TOnInitialize<TheConfig>
 
 const isPlainObject = require('is-plain-object')
@@ -179,6 +176,7 @@ export class Overmind<Config extends Configuration> implements Configuration {
       operatorId: -1,
       path: [],
       emit: this.eventHub.emit.bind(this.eventHub),
+      send: this.devtools ? this.devtools.send.bind(this.devtools) : () => {},
     }
   }
   private createContext(value, execution, tree) {
@@ -745,13 +743,27 @@ export function mutate<Input, Config extends Configuration = TheConfig>(
     if (err) next(err)
     else {
       startDebugOperator('mutate', operation, context)
-      const mutationsTree = context.proxyStateTree.getMutationTree()
-      operation({ ...context, state: mutationsTree.state })
-      const newContext = createContext(context, context.value)
-      context.execution.emit(EventType.MUTATIONS, {
-        ...newContext.execution,
-        mutations: mutationsTree.mutations,
+      const mutationTree = context.proxyStateTree.getMutationTree()
+      if (!IS_PRODUCTION) {
+        mutationTree.onMutation((mutation) => {
+          context.execution.emit(EventType.MUTATIONS, {
+            ...context.execution,
+            operatorId: context.execution.operatorId + 1,
+            mutations: [mutation],
+          })
+        })
+      }
+      const maybePromise: any = operation({
+        ...context,
+        state: mutationTree.state,
       })
+      const newContext = createContext(
+        context,
+        maybePromise instanceof Promise
+          ? maybePromise.then(() => context.value)
+          : context.value
+      )
+
       stopDebugOperator(newContext)
       next(null, newContext)
     }
diff --git a/packages/node_modules/overmind/src/internalTypes.ts b/packages/node_modules/overmind/src/internalTypes.ts
@@ -1,5 +1,5 @@
 import { IMutation, ProxyStateTree } from 'proxy-state-tree'
-import { Configuration, TAction, TOperator, StateObject } from './types'
+import { Configuration, TAction, TOperator, TStateObject } from './types'
 
 export type SubType<Base, Condition> = Pick<
   Base,
@@ -115,14 +115,14 @@ export type TBaseContext<Config extends Configuration> = Config['effects'] & {
 
 type Derived = (parent: any, config: any) => any
 
-export type ResolveState<State extends StateObject> = State extends undefined
+export type ResolveState<State extends TStateObject> = State extends undefined
   ? {}
   : {
       [P in keyof State]: State[P] extends Derived
         ? ReturnType<State[P]>
         : State[P] extends Array<any>
         ? State[P]
-        : State[P] extends StateObject
+        : State[P] extends TStateObject
         ? ResolveState<State[P]>
         : State[P]
     }
diff --git a/packages/node_modules/overmind/src/types.ts b/packages/node_modules/overmind/src/types.ts
@@ -18,10 +18,10 @@ export type BaseApp = {
   actions: {}
 }
 
-export type StateObject =
+export type TStateObject =
   | {
       [key: string]:
-        | StateObject
+        | TStateObject
         | string
         | TDerive<any, any, any>
         | number
@@ -68,20 +68,13 @@ export type TOperator<Config extends Configuration, Input, Output> = (
 
 export type TDerive<
   Config extends Configuration,
-  Parent extends StateObject,
+  Parent extends TStateObject,
   Value
 > = (
   parent: ResolveState<Parent>,
   state: ResolveState<Config['state'] & {}>
 ) => Value
 
-export type TReaction<Config extends Configuration> = (
-  reaction: (
-    getState: (state: ResolveState<Config['state']>) => any,
-    action: TAction<Config, void> | TOperator<Config, void, any>
-  ) => any
-) => any
-
 export type TOnInitialize<Config extends Configuration> = (
   context: TValueContext<Config, Overmind<Config>>
 ) => void
diff --git a/packages/node_modules/proxy-state-tree/src/TrackStateTree.ts b/packages/node_modules/proxy-state-tree/src/TrackStateTree.ts
@@ -10,6 +10,7 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
   master: IProxyStateTree<T>
   pathDependencies: Set<string> = new Set()
   callback: ITrackCallback
+  shouldTrack: boolean = false
   state: T
   proxifier: IProxifier<T>
   constructor(master: IProxyStateTree<T>) {
@@ -24,6 +25,10 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
     return true
   }
   addTrackingPath(path: string) {
+    if (!this.shouldTrack) {
+      return
+    }
+
     this.pathDependencies.add(path)
 
     if (this.callback) {
@@ -32,7 +37,8 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
   }
   track(cb?: ITrackCallback) {
     this.master.changeTrackStateTree(this)
-
+    this.shouldTrack = true
+    setTimeout(() => (this.shouldTrack = false))
     if (this.callback) {
       for (let path of this.pathDependencies) {
         this.master.removePathDependency(path, this.callback)
diff --git a/packages/overmind-website/examples/guide/typescript/explicit.ts b/packages/overmind-website/examples/guide/typescript/explicit.ts
@@ -7,22 +7,24 @@ import {
   TAction,
   TOperator,
   TDerive,
-  TReaction
+  TStateObject
 } from 'overmind'
 
 const config = {}
 
-export type Config = TConfig<typeof config>
+export type Config = TConfig<{
+  state: typeof config["state"]
+  actions: typeof config["actions"]
+  effects: typeof config["effects"]
+}>
 
 export type OnInitialize = TOnInitialize<Config>
 
-export type Action<Input> = TAction<Config, Input>
+export type Action<Input = void> = TAction<Config, Input>
 
 export type Operator<Input, Output> = TOperator<Config, Input, Output>
 
-export type Derive<Parent extends object, Output> = TDerive<Config, Parent, Output>
-
-export type Reaction = TReaction<Config>
+export type Derive<Parent extends TStateObject, Output> = TDerive<Config, Parent, Output>
         `,
   },
 ]
diff --git a/packages/overmind-website/src/app/actions.ts b/packages/overmind-website/src/app/actions.ts
@@ -1,5 +1,5 @@
 import { Action, Operator, debounce, pipe } from 'overmind'
-import { Page, RouteContext, GuideParams, VideoParams, Guide } from './types'
+import { Page, RouteContext, GuideParams, VideoParams } from './types'
 import * as o from './operators'
 
 export const openHome: Action<RouteContext> = async ({ state, request }) => {
diff --git a/packages/overmind-website/src/app/index.ts b/packages/overmind-website/src/app/index.ts
@@ -3,7 +3,7 @@ import state from './state'
 import onInitialize from './onInitialize'
 import * as actions from './actions'
 import * as effects from './effects'
-import { createHook, createConnect, TConnect } from 'overmind-react'
+import { createHook } from 'overmind-react'
 
 const config = {
   onInitialize,
@@ -16,8 +16,6 @@ declare module 'overmind' {
   interface IConfig extends TConfig<typeof config> {}
 }
 
-export type Connect = TConnect<typeof config>
-
 const app = new Overmind(
   config,
   process.env.NODE_ENV === 'production'
@@ -28,5 +26,3 @@ const app = new Overmind(
 )
 
 export const useOvermind = createHook(app)
-
-export const connect = createConnect(app)
diff --git a/packages/overmind-website/src/app/state.ts b/packages/overmind-website/src/app/state.ts
@@ -25,7 +25,7 @@ type State = {
   isLoadingSearchResult: boolean
   searchResult: SearchResult[]
   showSearchResult: boolean
-  test: Derive<State, Guide[]>
+  test: string
 }
 
 const state: State = {
@@ -44,7 +44,7 @@ const state: State = {
   isLoadingSearchResult: false,
   searchResult: [],
   showSearchResult: false,
-  test: (state) => state.guides.filter((guide) => guide.type === 'beginner'),
+  test: '',
 }
 
 export default state
diff --git a/packages/overmind-website/src/components/App/index.tsx b/packages/overmind-website/src/components/App/index.tsx
@@ -1,5 +1,5 @@
 import { createElement, SFC, useRef, useEffect } from 'react'
-import { useOvermind, connect, Connect } from '../../app'
+import { useOvermind } from '../../app'
 import * as styles from './styles'
 import TopBar from '../TopBar'
 import FrontPage from '../FrontPage'
@@ -30,7 +30,8 @@ const fadeInPage = () => {
   logo.style.opacity = '0'
 }
 
-const App: SFC<Connect> = ({ overmind: { state } }) => {
+const App: SFC = () => {
+  const { state } = useOvermind()
   const mainRef = useRef(null)
   const isMobile = useIsMobile()
   useScrollToTop(state.page)
@@ -53,4 +54,4 @@ const App: SFC<Connect> = ({ overmind: { state } }) => {
   )
 }
 
-export default connect(App)
+export default App
