fix(overmind): try to fix typing issue with rehydrate classes

Author: christianalfoni

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

@@ -58,7 +58,7 @@ function createDefaultOvermind() {
   }
   const rehydrateAction: Action<any> = ({ state }, newState) => {
     rehydrate(state, newState, {
-      value: StateValue.fromJSON
+      value: StateValue.fromJSON,
     })
   }
   const actions = {

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

@@ -31,7 +31,7 @@ describe('REHYDRATE', () => {
       foo: 'bar2'
     })
   })
-  test('should allow rehydration of single class value', () => {
+  test.only('should allow rehydration of single class value', () => {
     expect.assertions(1)
     class User {
       name = 'Bob'
@@ -51,7 +51,7 @@ describe('REHYDRATE', () => {
     }
     const state: State = {
       user: null,
-      user2: new User()
+      user2: new User(),
     }
     rehydrate(state, {
       user: {
@@ -62,7 +62,7 @@ describe('REHYDRATE', () => {
       }
     }, {
       user: User.fromJSON,
-      user2: User.fromJSON
+      user2: User.fromJSON,
     })
 
     expect(state).toEqual({

packages/node_modules/overmind/src/rehydrate.ts

@@ -1,5 +1,7 @@
 import { IMutation } from 'proxy-state-tree'
 
+import { SubType } from './internalTypes'
+
 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`)
@@ -40,18 +42,24 @@ export type Serializable = Serialize | {
   }
 }
 
-type StateNode = { [key: string]: any }
+export type StateNode = { [key: string]: any }
+
+export type SerializableValue = Serializable | Array<Serializable> | { [key: string]: Serializable }
+
+export type Classes<T extends StateNode, U = SubType<T, SerializableValue | null>> = {
+  [P in keyof U]?: (data: any) => U[P]
+}
+
+export type RehydrateClasses<T extends StateNode, N = SubType<Omit<T, keyof Classes<T>>, StateNode>> = Classes<T> & SubType<{
+  [P in keyof N]?: Classes<N[P]>
+}, { [key: string]: (data: any) => 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 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 { [key: string]: any }>(state: T, source: IMutation[] | StateNode, classes: RehydrateClasses<T> = {} as any) => {
+export const rehydrate = <T extends StateNode>(state: T, source: IMutation[] | StateNode, classes: RehydrateClasses<T> = {} as any) => {
   if (Array.isArray(source)) {
     const mutations = source as IMutation[]
     mutations.forEach((mutation) => {