fix(overmind): reset proxy state tree on hot reload

Author: christianalfoni

packages/node_modules/overmind/src/index.ts

@@ -36,6 +36,7 @@ import {
   operatorStopped,
 } from './operator'
 import { proxifyEffects } from './proxyfyEffects'
+import { rehydrate } from './rehydrate'
 import {
   IAction,
   IConfiguration,
@@ -61,7 +62,7 @@ import {
   isPromise,
   processState,
 } from './utils'
-import { rehydrate } from './rehydrate'
+
 export * from './types'
 
 export { createOperator, createMutationOperator, ResolveState, ResolveActions }
@@ -944,9 +945,7 @@ export class Overmind<ThisConfig extends IConfiguration>
     return this.proxyStateTree.onFlush(cb)
   }
   reconfigure(configuration: IConfiguration) {
-    const proxyStateTree = this.proxyStateTree as any
-    this.proxyStateTree.sourceState = this.getState(configuration)
-    proxyStateTree.createTrackStateProxifier()
+    this.proxyStateTree.reset(configuration.state || {})
     this.state = this.proxyStateTree.state as any
     this.actions = this.getActions(configuration.actions)
     this.effects = configuration.effects || {}
@@ -968,7 +967,7 @@ export class Overmind<ThisConfig extends IConfiguration>
       this.devtools.send({
         type: 're_init',
         data: {
-          state: proxyStateTree.state,
+          state: this.state,
           actions: getActionPaths(configuration.actions),
         },
       })

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

@@ -9,6 +9,7 @@ import {
 
 export class MutationTree<T extends object> implements IMutationTree<T> {
   private mutationCallbacks: IMutationCallback[] = []
+  private disposeOnReset: Function
   master: IProxyStateTree<T>
   state: T
   proxifier: IProxifier<T>
@@ -22,6 +23,9 @@ export class MutationTree<T extends object> implements IMutationTree<T> {
     this.master = master
     this.proxifier = proxifier || new Proxifier(this)
     this.state = this.proxifier.proxify(master.sourceState, '')
+    this.disposeOnReset = master.onReset(() => {
+      this.state = this.proxifier.proxify(master.sourceState, '')
+    })
   }
   trackPaths() {
     const paths = new Set<string>()
@@ -101,6 +105,7 @@ export class MutationTree<T extends object> implements IMutationTree<T> {
     this.isBlocking = false
   }
   dispose() {
+    this.disposeOnReset()
     this.isTracking = false
     this.mutationCallbacks.length = 0
     this.proxifier = this.master.proxifier

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

@@ -1,12 +1,13 @@
 import {
+  IProxifier,
   IProxyStateTree,
-  ITrackStateTree,
   ITrackCallback,
-  IProxifier,
   ITrackScopedCallback,
+  ITrackStateTree,
 } from './types'
 
 export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
+  private disposeOnReset: Function
   master: IProxyStateTree<T>
   pathDependencies: Set<string> = new Set()
   callback: ITrackCallback
@@ -18,6 +19,9 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
     this.master = master
     this.proxifier = master.proxifier
     this.state = master.state
+    this.disposeOnReset = this.master.onReset(() => {
+      this.state = master.state
+    })
   }
   trackPaths() {
     const paths = new Set<string>()
@@ -93,6 +97,7 @@ export class TrackStateTree<T extends object> implements ITrackStateTree<T> {
     return result
   }
   dispose() {
+    this.disposeOnReset()
     if (!this.callback) {
       this.pathDependencies.clear()
 

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

@@ -36,6 +36,7 @@ export class ProxyStateTree<T extends object> implements IProxyStateTree<T> {
     mutationTree: [] as IMutationTree<T>[],
     trackStateTree: [] as ITrackStateTree<T>[],
   }
+  private onResetCallbacks: Function[] = []
   flushCallbacks: IFlushCallback[] = []
   mutationCallbacks: IMutationCallback[] = []
   currentFlushId: number = 0
@@ -85,6 +86,13 @@ export class ProxyStateTree<T extends object> implements IProxyStateTree<T> {
       ''
     )
   }
+  onReset(cb: Function) {
+    this.onResetCallbacks.push(cb)
+
+    return () => {
+      this.onResetCallbacks.splice(this.onResetCallbacks.indexOf(cb), 1)
+    }
+  }
   getMutationTree(): IMutationTree<T> {
     if (!this.options.devmode) {
       return (this.mutationTree =
@@ -241,6 +249,11 @@ export class ProxyStateTree<T extends object> implements IProxyStateTree<T> {
       delete this.pathDependencies[path]
     }
   }
+  reset(state: T) {
+    this.sourceState = state
+    this.createTrackStateProxifier()
+    this.onResetCallbacks.forEach((cb) => cb())
+  }
   toJSON() {
     return this.sourceState
   }

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

@@ -94,6 +94,7 @@ export interface IRemoveProxyCallback {
 }
 
 export interface IProxyStateTree<T extends object> {
+  onReset(cb: Function): () => void
   addPathDependency(path: string, callback: ITrackCallback): void
   removePathDependency(path: string, callback: ITrackCallback): void
   getTrackStateTree(): ITrackStateTree<T>