Fix the helper type that enable to extend the KcContext

2023-03-21 14:21:09 +01:00
parent 77da00c2c5
commit 0fdd9e75a6
5 changed files with 80 additions and 58 deletions
--- a/src/tools/AndByDiscriminatingKey.ts
+++ b/src/tools/AndByDiscriminatingKey.ts
@ -10,7 +10,11 @@ export declare namespace AndByDiscriminatingKey {
        U1,
        U1Again extends Record<DiscriminatingKey, string>,
        U2 extends Record<DiscriminatingKey, string>
-    > = U1 extends Pick<U2, DiscriminatingKey> ? Tf2<DiscriminatingKey, U1, U2, U1Again> : U1;
+    > = U1 extends Pick<U2, DiscriminatingKey>
+        ? Tf2<DiscriminatingKey, U1, U2, U1Again>
+        : U1Again[DiscriminatingKey] & U2[DiscriminatingKey] extends never
+        ? U1 | U2
+        : U1;

    export type Tf2<
        DiscriminatingKey extends string,