fix(overmind): fix typing issue with rehydrate

Author: christianalfoni

packages/node_modules/overmind-devtools-client/DevtoolBackend.js

@@ -22,6 +22,9 @@ class DevtoolBackend {
 
       this.devtoolServer.on('connection', this.onConnection)
       this.devtoolServer.on('error', reject)
+      this.devtoolServer.on('close', (reason) => {
+        console.log("Devtools backend closed", reason)
+      })
       this.devtoolServer.on('listening', resolve)
     })
   }

packages/node_modules/overmind-devtools-client/src/BackendConnector.ts

@@ -38,6 +38,9 @@ class WebsocketConnector {
         })
         this.messagesBeforeConnected.length = 0
       }
+      this.socket.onclose = (reason) => {
+        console.log("Socket closed", reason)
+      }
     })
   }
   emit(event: string, data?: any) {

packages/node_modules/overmind/src/rehydrate.test.ts

@@ -1,4 +1,4 @@
-import { rehydrate } from './'
+import { SERIALIZE, rehydrate } from './'
 
 describe('REHYDRATE', () => {
   test('should allow rehydration', () => {
@@ -35,6 +35,12 @@ describe('REHYDRATE', () => {
     expect.assertions(1)
     class User {
       name = 'Bob'
+      toJSON() {
+        return {
+          [SERIALIZE]: true,
+          name: this.name
+        }
+      }
       static fromJSON(json) {
         return Object.assign(new User(), json)
       }
@@ -71,6 +77,7 @@ describe('REHYDRATE', () => {
   test('should allow rehydration of array', () => {
     expect.assertions(2)
     class User {
+      [SERIALIZE]
       name = 'Bob'
       static fromJSON(json) {
         return Object.assign(new User(), json)
@@ -98,6 +105,7 @@ describe('REHYDRATE', () => {
   test('should allow rehydration of dictionary', () => {
     expect.assertions(2)
     class User {
+      [SERIALIZE]
       name = 'Bob'
       static fromJSON(json) {
         return Object.assign(new User(), json)

packages/node_modules/overmind/src/rehydrate.ts

@@ -1,7 +1,5 @@
 import { IMutation } from 'proxy-state-tree'
 
-import { IState } from './types'
-
 export function rehydrateState(target: any, source: any, classes: any = {}) {
   if (!target || !source) {
     throw new Error(`You have to pass a "target" and "source" object to rehydrate`)
@@ -23,7 +21,7 @@ export function rehydrateState(target: any, source: any, classes: any = {}) {
       target[key] = classInstance(source[key])
     } else if (typeof value === 'object' && !Array.isArray(value) && value !== null) {
       if (!target[key]) target[key] = {}
-      rehydrateState(target[key] as IState, source[key] as IState, classes[key])
+      rehydrateState(target[key], source[key], classes[key])
     } else {
       target[key] = source[key]
     }
@@ -42,16 +40,18 @@ export type Serializable = Serialize | {
   }
 }
 
-export type RehydrateClasses<T extends IState> = Pick<{
+type StateNode = { [key: string]: any }
+
+export type RehydrateClasses<T extends StateNode> = Pick<{
   [P in keyof T]: T[P] extends Serializable ? (data: any) => T[P] :
       T[P] extends Array<Serializable> ? (data: any) => T[P][keyof T[P]] :
       T[P] extends { [key: string]: Serializable } ? (data: any) => T[P][keyof T[P]] :
-      T[P] extends IState ? RehydrateClasses<T[P]> :
+      T[P] extends StateNode ? RehydrateClasses<T[P]> :
       never
 },{ [Key in keyof T]: T[Key] extends Serializable | Array<Serializable> | { [key: string]: Serializable } ? Key : never }[keyof T]>
 
 
-export const rehydrate = <T extends IState>(state: T, source: IMutation[] | IState, classes: RehydrateClasses<T> = {} as any) => {
+export const rehydrate = <T extends { [key: string]: any }>(state: T, source: IMutation[] | StateNode, classes: RehydrateClasses<T> = {} as any) => {
   if (Array.isArray(source)) {
     const mutations = source as IMutation[]
     mutations.forEach((mutation) => {