Fix the helper type that enable to extend the KcContext

src/account/kcContext/getKcContext.ts

@@ -1,4 +1,3 @@
-import { kcContextMocks, kcContextCommonMock } from "./kcContextMocks";
 import type { DeepPartial } from "keycloakify/tools/DeepPartial";
 import { deepAssign } from "keycloakify/tools/deepAssign";
 import type { ExtendKcContext } from "./getKcContextFromWindow";
@@ -7,6 +6,7 @@ import { pathJoin } from "keycloakify/bin/tools/pathJoin";
 import { pathBasename } from "keycloakify/tools/pathBasename";
 import { mockTestingResourcesCommonPath } from "keycloakify/bin/mockTestingResourcesPath";
 import { symToStr } from "tsafe/symToStr";
+import { kcContextMocks, kcContextCommonMock } from "keycloakify/account/kcContext/kcContextMocks";
 
 export function getKcContext<KcContextExtension extends { pageId: string } = never>(params?: {
     mockPageId?: ExtendKcContext<KcContextExtension>["pageId"];

src/account/kcContext/getKcContextFromWindow.ts

@@ -1,6 +1,6 @@
-import type { KcContext } from "./KcContext";
 import type { AndByDiscriminatingKey } from "keycloakify/tools/AndByDiscriminatingKey";
 import { ftlValuesGlobalName } from "keycloakify/bin/keycloakify/ftlValuesGlobalName";
+import type { KcContext } from "./KcContext";
 
 export type ExtendKcContext<KcContextExtension extends { pageId: string }> = [KcContextExtension] extends [never]
     ? KcContext

src/account/kcContext/kcContextMocks.ts

@@ -1,8 +1,8 @@
 import "minimal-polyfills/Object.fromEntries";
-import type { KcContext } from "./KcContext";
 import { mockTestingResourcesCommonPath, mockTestingResourcesPath } from "keycloakify/bin/mockTestingResourcesPath";
 import { pathJoin } from "keycloakify/bin/tools/pathJoin";
 import { id } from "tsafe/id";
+import type { KcContext } from "./KcContext";
 
 const PUBLIC_URL = process.env["PUBLIC_URL"] ?? "/";
 

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,