fix(types): correct type inference where merged types are same (#26)

danielroe · web-flow · commit f322607515a5 · 2020-11-09T12:11:52.000+01:00
diff --git a/src/types.ts b/src/types.ts
@@ -31,7 +31,7 @@ type MergeArrays<Destination, Source> = Destination extends Array<infer Destinat
 type MergeObjects<
   Destination extends Input,
   Defaults extends Input
-> = Omit<Destination, keyof Destination & keyof Defaults> & Omit<Defaults, keyof Destination & keyof Defaults> &
+> = Destination extends Defaults ? Destination : Omit<Destination, keyof Destination & keyof Defaults> & Omit<Defaults, keyof Destination & keyof Defaults> &
   {
     -readonly [Key in keyof Destination & keyof Defaults]:
       Destination[Key] extends null

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ type MergeArrays<Destination, Source> = Destination extends Array<infer Destinat`
`31`	`31`	`type MergeObjects<`
`32`	`32`	`Destination extends Input,`
`33`	`33`	`Defaults extends Input`
`34`		`-> = Omit<Destination, keyof Destination & keyof Defaults> & Omit<Defaults, keyof Destination & keyof Defaults> &`
	`34`	`+> = Destination extends Defaults ? Destination : Omit<Destination, keyof Destination & keyof Defaults> & Omit<Defaults, keyof Destination & keyof Defaults> &`
`35`	`35`	`{`
`36`	`36`	`-readonly [Key in keyof Destination & keyof Defaults]:`
`37`	`37`	`Destination[Key] extends null`