fix: get type from inner customMerge function

TehShrike · Nov 9, 2020 · 0c306df · 0c306df
1 parent 80ce4bc
commit 0c306df
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -46,24 +46,28 @@ type DeepMergeObjectProps<
 	T2,
 	Options extends deepmerge.Options
 > = {} extends {
-	[K in keyof (T1 & T2)]: Options["customMerge"] extends undefined
-		? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
-		: ReturnType<NonNullable<Options["customMerge"]>>;
+	[K in keyof (T1 & T2)]: any;
 }
 	? {
 			[K in keyof T1]: Options["customMerge"] extends undefined
 				? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
-				: ReturnType<NonNullable<Options["customMerge"]>>;
+				: ReturnType<NonNullable<Options["customMerge"]>> extends undefined
+					? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
+					: ReturnType<NonNullable<ReturnType<NonNullable<Options["customMerge"]>>>>;
 	  } &
 			{
 				[K in keyof T2]: Options["customMerge"] extends undefined
 					? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
-					: ReturnType<NonNullable<Options["customMerge"]>>;
+					: ReturnType<NonNullable<Options["customMerge"]>> extends undefined
+						? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
+						: ReturnType<NonNullable<ReturnType<NonNullable<Options["customMerge"]>>>>;
 			}
 	: {
 			[K in keyof (T1 & T2)]: Options["customMerge"] extends undefined
 				? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
-				: ReturnType<NonNullable<Options["customMerge"]>>;
+				: ReturnType<NonNullable<Options["customMerge"]>> extends undefined
+					? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
+					: ReturnType<NonNullable<ReturnType<NonNullable<Options["customMerge"]>>>>;
 	  };
 
 type DeepMergeArrays<