From d1cc6ed88d7b70dfba5654c9e3e11b2bc7728730 Mon Sep 17 00:00:00 2001
From: garronej <joseph.garrone@data.gouv.fr>
Date: Sun, 16 Apr 2023 03:00:03 +0200
Subject: [PATCH] Smarter getKcContext typing

---
 src/account/kcContext/createGetKcContext.ts |  4 ++--
 src/login/kcContext/createGetKcContext.ts   |  4 ++--
 test/lib/createGetKcContext.spec.ts         | 12 ++++++++++++
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/account/kcContext/createGetKcContext.ts b/src/account/kcContext/createGetKcContext.ts
index 1431d773..3df844cd 100644
--- a/src/account/kcContext/createGetKcContext.ts
+++ b/src/account/kcContext/createGetKcContext.ts
@@ -15,11 +15,11 @@ export function createGetKcContext<KcContextExtension extends { pageId: string }
 }) {
     const { mockData } = params ?? {};
 
-    function getKcContext<PageId extends ExtendKcContext<KcContextExtension>["pageId"]>(params?: {
+    function getKcContext<PageId extends ExtendKcContext<KcContextExtension>["pageId"] | undefined = undefined>(params?: {
         mockPageId?: PageId;
         storyParams?: DeepPartial<Extract<ExtendKcContext<KcContextExtension>, { pageId: PageId }>>;
     }): {
-        kcContext: ExtendKcContext<KcContextExtension>["pageId"] extends PageId
+        kcContext: PageId extends undefined
             ? ExtendKcContext<KcContextExtension> | undefined
             : Extract<ExtendKcContext<KcContextExtension>, { pageId: PageId }>;
     } {
diff --git a/src/login/kcContext/createGetKcContext.ts b/src/login/kcContext/createGetKcContext.ts
index a90d2463..c26d3f2a 100644
--- a/src/login/kcContext/createGetKcContext.ts
+++ b/src/login/kcContext/createGetKcContext.ts
@@ -18,11 +18,11 @@ export function createGetKcContext<KcContextExtension extends { pageId: string }
 }) {
     const { mockData } = params ?? {};
 
-    function getKcContext<PageId extends ExtendKcContext<KcContextExtension>["pageId"]>(params?: {
+    function getKcContext<PageId extends ExtendKcContext<KcContextExtension>["pageId"] | undefined = undefined>(params?: {
         mockPageId?: PageId;
         storyParams?: DeepPartial<Extract<ExtendKcContext<KcContextExtension>, { pageId: PageId }>>;
     }): {
-        kcContext: ExtendKcContext<KcContextExtension>["pageId"] extends PageId
+        kcContext: PageId extends undefined
             ? ExtendKcContext<KcContextExtension> | undefined
             : Extract<ExtendKcContext<KcContextExtension>, { pageId: PageId }>;
     } {
diff --git a/test/lib/createGetKcContext.spec.ts b/test/lib/createGetKcContext.spec.ts
index a31250ec..721dcad4 100644
--- a/test/lib/createGetKcContext.spec.ts
+++ b/test/lib/createGetKcContext.spec.ts
@@ -258,4 +258,16 @@ describe("createGetKcContext", () => {
 
         assert<Equals<typeof kcContext, KcContext.Login | KcContext.Register>>();
     });
+
+    it("no undefined as long as we provide a mock pageId", () => {
+        const { getKcContext } = createGetKcContext();
+
+        const mockPageId: KcContext["pageId"] = "login.ftl" as any;
+
+        const { kcContext } = getKcContext({
+            mockPageId
+        });
+
+        assert<Equals<typeof kcContext, KcContext>>();
+    });
 });