Minor tweak to typescript state mapper

ctrlplusb · Oct 1, 2019 · c4efa4f · c4efa4f
1 parent 65a2fd8
commit c4efa4f
Showing 1 changed file with 7 additions and 12 deletions.
diff --git a/index.d.ts b/index.d.ts
@@ -210,23 +210,18 @@ type StateMapper<StateModel extends object, Depth extends string> = {
     : StateModel[P];
 };
 
+type IntermediateStateMapper<Model extends object, Depth extends string> = {
+  [K in keyof Model]: K extends IndexSignatureKeysOfType<Model>
+    ? Model[K]
+    : StateMapper<{ 0: Model[K] }, Depth>[0];
+};
+
 type RecursiveState<
   Model extends object,
   Depth extends string
 > = Depth extends '6'
   ? Model
-  : {
-    [K in keyof O.Filter<Model, ActionTypes>]: K extends IndexSignatureKeysOfType<Model>
-      ? Model[K]
-      : StateMapper<{ 0: Model[K] }, Depth>[0]
-  }
-  // : O.Merge<
-  //     StateMapper<
-  //       O.Omit<O.Filter<Model, ActionTypes>, IndexSignatureKeysOfType<Model>>,
-  //       Depth
-  //     >,
-  //     O.Pick<Model, IndexSignatureKeysOfType<Model>>
-  //   >;
+  : IntermediateStateMapper<O.Filter<Model, ActionTypes>, Depth>;
 
 /**
  * Filters a model into a type that represents the state only (i.e. no actions)