From c9fb0ca6ae261a7c9113700bd20e3f6a55ce82e2 Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Sat, 8 Jun 2024 14:20:56 +0200 Subject: [PATCH] Rename extention types --- src/account/KcContext/KcContext.ts | 14 ++++----- src/account/KcContext/getKcContextMock.ts | 37 ++++++++--------------- src/bin/shared/generateKcGenTs.ts | 2 +- src/login/KcContext/KcContext.ts | 14 ++++----- src/login/KcContext/getKcContextMock.ts | 37 ++++++++--------------- 5 files changed, 41 insertions(+), 63 deletions(-) diff --git a/src/account/KcContext/KcContext.ts b/src/account/KcContext/KcContext.ts index 2ab09cff..0bb7c20b 100644 --- a/src/account/KcContext/KcContext.ts +++ b/src/account/KcContext/KcContext.ts @@ -4,20 +4,20 @@ import { assert } from "tsafe/assert"; import type { Equals } from "tsafe"; export type ExtendKcContext< - KcContextExtraProperties extends { properties?: Record }, - KcContextExtraPropertiesPerPage extends Record> + KcContextExtension extends { properties?: Record }, + KcContextExtensionPerPage extends Record> > = ValueOf<{ - [PageId in keyof KcContextExtraPropertiesPerPage | KcContext["pageId"]]: Extract< + [PageId in keyof KcContextExtensionPerPage | KcContext["pageId"]]: Extract< KcContext, { pageId: PageId } > extends never ? KcContext.Common & - KcContextExtraProperties & { + KcContextExtension & { pageId: PageId; - } & KcContextExtraPropertiesPerPage[PageId] + } & KcContextExtensionPerPage[PageId] : Extract & - KcContextExtraProperties & - KcContextExtraPropertiesPerPage[PageId]; + KcContextExtension & + KcContextExtensionPerPage[PageId]; }>; export type KcContext = diff --git a/src/account/KcContext/getKcContextMock.ts b/src/account/KcContext/getKcContextMock.ts index 0735bb81..8bf94bb2 100644 --- a/src/account/KcContext/getKcContextMock.ts +++ b/src/account/KcContext/getKcContextMock.ts @@ -7,43 +7,32 @@ import { kcContextMocks, kcContextCommonMock } from "./kcContextMocks"; import { exclude } from "tsafe/exclude"; export function createGetKcContextMock< - KcContextExtraProperties extends { properties?: Record }, - KcContextExtraPropertiesPerPage extends Record< - `${string}.ftl`, - Record - > + KcContextExtension extends { properties?: Record }, + KcContextExtensionPerPage extends Record<`${string}.ftl`, Record> >(params: { - kcContextExtraProperties: KcContextExtraProperties; - kcContextExtraPropertiesPerPage: KcContextExtraPropertiesPerPage; - overrides?: DeepPartial; + kcContextExtension: KcContextExtension; + kcContextExtensionPerPage: KcContextExtensionPerPage; + overrides?: DeepPartial; overridesPerPage?: { - [PageId in - | AccountThemePageId - | keyof KcContextExtraPropertiesPerPage]?: DeepPartial< + [PageId in AccountThemePageId | keyof KcContextExtensionPerPage]?: DeepPartial< Extract< - ExtendKcContext< - KcContextExtraProperties, - KcContextExtraPropertiesPerPage - >, + ExtendKcContext, { pageId: PageId } > >; }; }) { const { - kcContextExtraProperties, - kcContextExtraPropertiesPerPage, + kcContextExtension, + kcContextExtensionPerPage, overrides: overrides_global, overridesPerPage: overridesPerPage_global } = params; - type KcContext = ExtendKcContext< - KcContextExtraProperties, - KcContextExtraPropertiesPerPage - >; + type KcContext = ExtendKcContext; function getKcContextMock< - PageId extends AccountThemePageId | keyof KcContextExtraPropertiesPerPage + PageId extends AccountThemePageId | keyof KcContextExtensionPerPage >(params: { pageId: PageId; overrides?: DeepPartial>; @@ -58,8 +47,8 @@ export function createGetKcContextMock< ); [ - kcContextExtraProperties, - kcContextExtraPropertiesPerPage[pageId], + kcContextExtension, + kcContextExtensionPerPage[pageId], overrides_global, overridesPerPage_global?.[pageId], overrides diff --git a/src/bin/shared/generateKcGenTs.ts b/src/bin/shared/generateKcGenTs.ts index 9edf9e30..8b9a4c68 100644 --- a/src/bin/shared/generateKcGenTs.ts +++ b/src/bin/shared/generateKcGenTs.ts @@ -51,7 +51,7 @@ export async function generateKcGenTs(params: { ), null, 2 - )}`, + )};`, ``, `/* prettier-ignore-end */` ].join("\n"), diff --git a/src/login/KcContext/KcContext.ts b/src/login/KcContext/KcContext.ts index c633b271..9e5277ed 100644 --- a/src/login/KcContext/KcContext.ts +++ b/src/login/KcContext/KcContext.ts @@ -10,20 +10,20 @@ import type { Equals } from "tsafe"; import type { MessageKey } from "../i18n/i18n"; export type ExtendKcContext< - KcContextExtraProperties extends { properties?: Record }, - KcContextExtraPropertiesPerPage extends Record> + KcContextExtension extends { properties?: Record }, + KcContextExtensionPerPage extends Record> > = ValueOf<{ - [PageId in keyof KcContextExtraPropertiesPerPage | KcContext["pageId"]]: Extract< + [PageId in keyof KcContextExtensionPerPage | KcContext["pageId"]]: Extract< KcContext, { pageId: PageId } > extends never ? KcContext.Common & - KcContextExtraProperties & { + KcContextExtension & { pageId: PageId; - } & KcContextExtraPropertiesPerPage[PageId] + } & KcContextExtensionPerPage[PageId] : Extract & - KcContextExtraProperties & - KcContextExtraPropertiesPerPage[PageId]; + KcContextExtension & + KcContextExtensionPerPage[PageId]; }>; /** Take theses type definition with a grain of salt. diff --git a/src/login/KcContext/getKcContextMock.ts b/src/login/KcContext/getKcContextMock.ts index 23b32d03..53d7d3b0 100644 --- a/src/login/KcContext/getKcContextMock.ts +++ b/src/login/KcContext/getKcContextMock.ts @@ -7,43 +7,32 @@ import { kcContextMocks, kcContextCommonMock } from "./kcContextMocks"; import { exclude } from "tsafe/exclude"; export function createGetKcContextMock< - KcContextExtraProperties extends { properties?: Record }, - KcContextExtraPropertiesPerPage extends Record< - `${string}.ftl`, - Record - > + KcContextExtension extends { properties?: Record }, + KcContextExtensionPerPage extends Record<`${string}.ftl`, Record> >(params: { - kcContextExtraProperties: KcContextExtraProperties; - kcContextExtraPropertiesPerPage: KcContextExtraPropertiesPerPage; - overrides?: DeepPartial; + kcContextExtension: KcContextExtension; + kcContextExtensionPerPage: KcContextExtensionPerPage; + overrides?: DeepPartial; overridesPerPage?: { - [PageId in - | LoginThemePageId - | keyof KcContextExtraPropertiesPerPage]?: DeepPartial< + [PageId in LoginThemePageId | keyof KcContextExtensionPerPage]?: DeepPartial< Extract< - ExtendKcContext< - KcContextExtraProperties, - KcContextExtraPropertiesPerPage - >, + ExtendKcContext, { pageId: PageId } > >; }; }) { const { - kcContextExtraProperties, - kcContextExtraPropertiesPerPage, + kcContextExtension, + kcContextExtensionPerPage, overrides: overrides_global, overridesPerPage: overridesPerPage_global } = params; - type KcContext = ExtendKcContext< - KcContextExtraProperties, - KcContextExtraPropertiesPerPage - >; + type KcContext = ExtendKcContext; function getKcContextMock< - PageId extends LoginThemePageId | keyof KcContextExtraPropertiesPerPage + PageId extends LoginThemePageId | keyof KcContextExtensionPerPage >(params: { pageId: PageId; overrides?: DeepPartial>; @@ -58,8 +47,8 @@ export function createGetKcContextMock< ); [ - kcContextExtraProperties, - kcContextExtraPropertiesPerPage[pageId], + kcContextExtension, + kcContextExtensionPerPage[pageId], overrides_global, overridesPerPage_global?.[pageId], overrides