fix: use alternative DeepMergeAll approach to get around bad circular…

… reference
TehShrike · Nov 10, 2020 · 67a71ed · 67a71ed
1 parent adc2941
commit 67a71ed
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/types/index.d.ts b/types/index.d.ts
@@ -3,14 +3,12 @@
 type DeepMergeAll<
 	Ts extends readonly any[],
 	Options extends deepmerge.Options
-> = Ts extends readonly [infer T1, ...any[]]
-	? Ts extends readonly [any, infer T2, ...infer TRest]
-		? TRest extends readonly never[]
-			? DeepMerge<T1, T2, Options>
-			: unknown // DeepMerge<T1, DeepMergeAll<[T2, ...TRest], Options>, Options>
-		: T1
-	: never;
-
+> = {
+	0: Ts[0];
+	1: Ts extends [infer T1, ...infer TRest]
+		? DeepMerge<T1, DeepMergeAll<TRest, Options>, Options>
+		: Ts;
+}[Ts extends readonly [any, any, ...any[]] ? 1 : 0];
 
 type DeepMerge<T1, T2, Options extends deepmerge.Options> = IsSame<
 	T1,
@@ -51,22 +49,28 @@ type DeepMergeObjectProps<
 			[K in keyof T1]: Options["customMerge"] extends undefined
 				? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
 				: ReturnType<NonNullable<Options["customMerge"]>> extends undefined
-					? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
-					: ReturnType<NonNullable<ReturnType<NonNullable<Options["customMerge"]>>>>;
+				? 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"]>> extends undefined
-						? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
-						: ReturnType<NonNullable<ReturnType<NonNullable<Options["customMerge"]>>>>;
+					? 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"]>> extends undefined
-					? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
-					: ReturnType<NonNullable<ReturnType<NonNullable<Options["customMerge"]>>>>;
+				? DeepMerge<ValueOfKey<T1, K>, ValueOfKey<T2, K>, Options>
+				: ReturnType<
+						NonNullable<ReturnType<NonNullable<Options["customMerge"]>>>
+				  >;
 	  };
 
 type DeepMergeArrays<
@@ -112,7 +116,9 @@ type ArrayMerge = (
 type ObjectMerge = (
 	key: string,
 	options: Required<deepmerge.Options>
-) => ((target: any, source: any, options?: deepmerge.Options) => any) | undefined;
+) =>
+	| ((target: any, source: any, options?: deepmerge.Options) => any)
+	| undefined;
 
 type IsMergeable = (value: any) => boolean;