From 20cdbb6185730b15a77ee7b8de2056f1995bb33b Mon Sep 17 00:00:00 2001 From: Joseph Garrone Date: Sat, 21 Sep 2024 23:21:15 +0200 Subject: [PATCH] Rename .create() by .build() for i18nBuilder --- src/login/i18n/noJsx/i18nBuilder.ts | 26 +++++++++++++------------- src/login/i18n/noJsx/index.ts | 2 +- src/login/i18n/withJsx/i18nBuilder.ts | 26 +++++++++++++------------- stories/account/i18n.ts | 10 ++++------ stories/intro/intro.stories.tsx | 1 - stories/login/i18n.ts | 10 ++++------ test/login/i18n.typelevel-spec.ts | 2 +- 7 files changed, 36 insertions(+), 41 deletions(-) diff --git a/src/login/i18n/noJsx/i18nBuilder.ts b/src/login/i18n/noJsx/i18nBuilder.ts index ad66e656..7bf9ed7d 100644 --- a/src/login/i18n/noJsx/i18nBuilder.ts +++ b/src/login/i18n/noJsx/i18nBuilder.ts @@ -4,7 +4,7 @@ import type { } from "../messages_defaultSet/types"; import { type ReturnTypeOfCreateGetI18n, createGetI18n } from "./getI18n"; -export type i18nBuilder< +export type I18nBuilder< ThemeName extends string = never, MessageKey_themeDefined extends string = never, LanguageTag_notInDefaultSet extends string = never, @@ -14,7 +14,7 @@ export type i18nBuilder< | "withCustomTranslations" = never > = Omit< { - withThemeName: () => i18nBuilder< + withThemeName: () => I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, @@ -29,7 +29,7 @@ export type i18nBuilder< default: Record; }>; }; - }) => i18nBuilder< + }) => I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, @@ -44,13 +44,13 @@ export type i18nBuilder< string | Record >; }> - ) => i18nBuilder< + ) => I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withCustomTranslations" >; - create: () => ReturnTypeOfCreateGetI18n< + build: () => ReturnTypeOfCreateGetI18n< MessageKey_themeDefined, LanguageTag_notInDefaultSet >; @@ -58,7 +58,7 @@ export type i18nBuilder< ExcludedMethod >; -function createi18nBuilder< +function createI18nBuilder< ThemeName extends string = never, MessageKey_themeDefined extends string = never, LanguageTag_notInDefaultSet extends string = never @@ -77,30 +77,30 @@ function createi18nBuilder< string | Record >; }>; -}): i18nBuilder { - const i18nBuilder: i18nBuilder< +}): I18nBuilder { + const i18nBuilder: I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet > = { withThemeName: () => - createi18nBuilder({ + createI18nBuilder({ extraLanguageTranslations: params.extraLanguageTranslations, messagesByLanguageTag_themeDefined: params.messagesByLanguageTag_themeDefined as any }), withExtraLanguages: extraLanguageTranslations => - createi18nBuilder({ + createI18nBuilder({ extraLanguageTranslations, messagesByLanguageTag_themeDefined: params.messagesByLanguageTag_themeDefined as any }), withCustomTranslations: messagesByLanguageTag_themeDefined => - createi18nBuilder({ + createI18nBuilder({ extraLanguageTranslations: params.extraLanguageTranslations, messagesByLanguageTag_themeDefined }), - create: () => + build: () => createGetI18n({ extraLanguageTranslations: params.extraLanguageTranslations, messagesByLanguageTag_themeDefined: @@ -111,7 +111,7 @@ function createi18nBuilder< return i18nBuilder; } -export const i18nBuilder = createi18nBuilder({ +export const i18nBuilder = createI18nBuilder({ extraLanguageTranslations: {}, messagesByLanguageTag_themeDefined: {} }); diff --git a/src/login/i18n/noJsx/index.ts b/src/login/i18n/noJsx/index.ts index 8d408443..948edc99 100644 --- a/src/login/i18n/noJsx/index.ts +++ b/src/login/i18n/noJsx/index.ts @@ -1,3 +1,3 @@ -export type { KcContextLike } from "./getI18n"; export { i18nBuilder } from "./i18nBuilder"; +export type { KcContextLike } from "./getI18n"; export type { MessageKey as MessageKey_defaultSet } from "../messages_defaultSet/types"; diff --git a/src/login/i18n/withJsx/i18nBuilder.ts b/src/login/i18n/withJsx/i18nBuilder.ts index fcf33511..9ec3c873 100644 --- a/src/login/i18n/withJsx/i18nBuilder.ts +++ b/src/login/i18n/withJsx/i18nBuilder.ts @@ -4,7 +4,7 @@ import type { } from "../messages_defaultSet/types"; import { type ReturnTypeOfCreateUseI18n, createUseI18n } from "../withJsx/useI18n"; -export type i18nBuilder< +export type I18nBuilder< ThemeName extends string = never, MessageKey_themeDefined extends string = never, LanguageTag_notInDefaultSet extends string = never, @@ -14,7 +14,7 @@ export type i18nBuilder< | "withCustomTranslations" = never > = Omit< { - withThemeName: () => i18nBuilder< + withThemeName: () => I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, @@ -29,7 +29,7 @@ export type i18nBuilder< default: Record; }>; }; - }) => i18nBuilder< + }) => I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, @@ -44,13 +44,13 @@ export type i18nBuilder< string | Record >; }> - ) => i18nBuilder< + ) => I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withCustomTranslations" >; - create: () => ReturnTypeOfCreateUseI18n< + build: () => ReturnTypeOfCreateUseI18n< MessageKey_themeDefined, LanguageTag_notInDefaultSet >; @@ -58,7 +58,7 @@ export type i18nBuilder< ExcludedMethod >; -function createi18nBuilder< +function createI18nBuilder< ThemeName extends string = never, MessageKey_themeDefined extends string = never, LanguageTag_notInDefaultSet extends string = never @@ -77,30 +77,30 @@ function createi18nBuilder< string | Record >; }>; -}): i18nBuilder { - const i18nBuilder: i18nBuilder< +}): I18nBuilder { + const i18nBuilder: I18nBuilder< ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet > = { withThemeName: () => - createi18nBuilder({ + createI18nBuilder({ extraLanguageTranslations: params.extraLanguageTranslations, messagesByLanguageTag_themeDefined: params.messagesByLanguageTag_themeDefined as any }), withExtraLanguages: extraLanguageTranslations => - createi18nBuilder({ + createI18nBuilder({ extraLanguageTranslations, messagesByLanguageTag_themeDefined: params.messagesByLanguageTag_themeDefined as any }), withCustomTranslations: messagesByLanguageTag_themeDefined => - createi18nBuilder({ + createI18nBuilder({ extraLanguageTranslations: params.extraLanguageTranslations, messagesByLanguageTag_themeDefined }), - create: () => + build: () => createUseI18n({ extraLanguageTranslations: params.extraLanguageTranslations, messagesByLanguageTag_themeDefined: @@ -111,7 +111,7 @@ function createi18nBuilder< return i18nBuilder; } -export const i18nBuilder = createi18nBuilder({ +export const i18nBuilder = createI18nBuilder({ extraLanguageTranslations: {}, messagesByLanguageTag_themeDefined: {} }); diff --git a/stories/account/i18n.ts b/stories/account/i18n.ts index 241c0b75..213e0f93 100644 --- a/stories/account/i18n.ts +++ b/stories/account/i18n.ts @@ -1,9 +1,7 @@ import { i18nBuilder } from "../../dist/account"; -import type { ThemeName } from "../kc.gen"; -export const { useI18n, ofTypeI18n } = i18nBuilder - .withThemeName() - .withCustomTranslations({}) - .create(); +const { useI18n, ofTypeI18n } = i18nBuilder.build(); -export type I18n = typeof ofTypeI18n; +type I18n = typeof ofTypeI18n; + +export { useI18n, I18n }; diff --git a/stories/intro/intro.stories.tsx b/stories/intro/intro.stories.tsx index 256884b6..6ff187d0 100644 --- a/stories/intro/intro.stories.tsx +++ b/stories/intro/intro.stories.tsx @@ -2,7 +2,6 @@ import React from "react"; import type { Meta, StoryObj } from "@storybook/react"; import { KeycloakifyRotatingLogo } from "./KeycloakifyRotatingLogo"; import { useInsertLinkTags } from "../../dist/tools/useInsertLinkTags"; -import { useOnFistMount } from "../../dist/tools/useOnFirstMount"; import { tss } from "../tss"; const meta = { diff --git a/stories/login/i18n.ts b/stories/login/i18n.ts index 667ebcd2..7a479c99 100644 --- a/stories/login/i18n.ts +++ b/stories/login/i18n.ts @@ -1,9 +1,7 @@ import { i18nBuilder } from "../../dist/login"; -import type { ThemeName } from "../kc.gen"; -export const { useI18n, ofTypeI18n } = i18nBuilder - .withThemeName() - .withCustomTranslations({}) - .create(); +const { useI18n, ofTypeI18n } = i18nBuilder.build(); -export type I18n = typeof ofTypeI18n; +type I18n = typeof ofTypeI18n; + +export { useI18n, I18n }; diff --git a/test/login/i18n.typelevel-spec.ts b/test/login/i18n.typelevel-spec.ts index 57dbf6be..d1338030 100644 --- a/test/login/i18n.typelevel-spec.ts +++ b/test/login/i18n.typelevel-spec.ts @@ -26,7 +26,7 @@ const { useI18n, ofTypeI18n } = i18nBuilder } } }) - .create(); + .build(); type I18n = typeof ofTypeI18n;