fix(overmind): nested rehydrate typing fix

Author: christianalfoni

packages/node_modules/overmind/src/rehydrate.ts

@@ -44,24 +44,26 @@ type SerializableValue = Serializable | Array<Serializable> | { [key: string]: S
 
 type FilteredKeys<T, U> = { [P in keyof T]: T[P] extends U ? P : never }[keyof T];
 
-type ExcludeNever<T extends StateNode> = { [P in keyof T]: T[P] extends never ? never : P }[keyof T]
+type ExcludeNever<T extends {}> = { [P in keyof T]: T[P] extends never ? never : P }[keyof T]
 
-type StateNode = { [key: string]: any }
-
-type NeverStateNode = { [key: string]: never }
-
-export type Classes<
-    T extends StateNode,
+type ExtracType<
+    T extends {},
+    K
 > = {
-    [P in FilteredKeys<T, SerializableValue | StateNode>]:
+    [P in FilteredKeys<T, K | {}>]:
         T[P] extends SerializableValue ? (data: any) => Serializable :
-            T[P] extends StateNode ? Classes<T[P]> extends NeverStateNode ? never : Classes<T[P]>  : never
+        T[P] extends {} ? ExtracType<T[P], K> extends { [key: string]: never } ? never : ExtractDeepType<T[P], K>  : never
+    }
+
+type ExtractDeepType<T extends {}, K, U = ExtracType<T, K>> = {
+    [P in ExcludeNever<U>]: U[P]
 }
 
+type StateNode = {
+  [key: string]: any
+}
 
-export const rehydrate = <T extends StateNode, U = Classes<T>>(state: T, source: IMutation[] | StateNode, classes: {
-  [P in ExcludeNever<U>]: U[P]
-} = {} as any) => {
+export const rehydrate = <T extends StateNode>(state: T, source: IMutation[] | StateNode, classes: ExtractDeepType<T, SerializableValue> = {} as any) => {
   if (Array.isArray(source)) {
     const mutations = source as IMutation[]
     mutations.forEach((mutation) => {