wip

package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.3.0",
+    "version": "11.2.10",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",
@@ -38,14 +38,12 @@
         "dist/",
         "!dist/tsconfig.tsbuildinfo",
         "!dist/bin/",
-        "dist/bin/**/*.d.ts",
         "dist/bin/main.js",
         "dist/bin/*.index.js",
         "dist/bin/*.node",
         "dist/bin/shared/constants.js",
-        "dist/bin/shared/constants.js.map",
+        "dist/bin/shared/*.d.ts",
-        "dist/bin/shared/customHandler.js",
+        "dist/bin/shared/*.js.map",
-        "dist/bin/shared/customHandler.js.map",
         "!dist/vite-plugin/",
         "dist/vite-plugin/index.js",
         "dist/vite-plugin/index.d.ts",
@@ -73,6 +71,7 @@
         "@babel/preset-env": "7.24.8",
         "@babel/types": "^7.24.5",
         "@emotion/react": "^11.11.4",
+        "@keycloakify/angular": "^0.0.1-rc.19",
         "@octokit/rest": "^20.1.1",
         "@storybook/addon-a11y": "^6.5.16",
         "@storybook/builder-webpack5": "^6.5.13",

src/bin/add-story.ts

@@ -13,11 +13,16 @@ import * as fs from "fs";
 import { join as pathJoin, relative as pathRelative, dirname as pathDirname } from "path";
 import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase";
 import { assert, Equals } from "tsafe/assert";
-import type { BuildContext } from "./shared/buildContext";
+import type { CliCommandOptions } from "./main";
+import { getBuildContext } from "./shared/buildContext";
 import chalk from "chalk";
 
-export async function command(params: { buildContext: BuildContext }) {
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { buildContext } = params;
+    const { cliCommandOptions } = params;
+
+    const buildContext = getBuildContext({
+        cliCommandOptions
+    });
 
     console.log(chalk.cyan("Theme type:"));
 

src/bin/copy-keycloak-resources-to-public.ts

@@ -1,14 +1,11 @@
 import { copyKeycloakResourcesToPublic } from "./shared/copyKeycloakResourcesToPublic";
-import type { BuildContext } from "./shared/buildContext";
+import { getBuildContext } from "./shared/buildContext";
-import { maybeDelegateCommandToCustomHandler } from "./shared/customHandler_delegate";
+import type { CliCommandOptions } from "./main";
 
-export async function command(params: { buildContext: BuildContext }) {
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { buildContext } = params;
+    const { cliCommandOptions } = params;
 
-    maybeDelegateCommandToCustomHandler({
+    const buildContext = getBuildContext({ cliCommandOptions });
-        commandName: "copy-keycloak-resources-to-public",
-        buildContext
-    });
 
     copyKeycloakResourcesToPublic({
         buildContext

src/bin/eject-page/eject-page.ts

@@ -20,11 +20,16 @@ import {
 } from "path";
 import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase";
 import { assert, Equals } from "tsafe/assert";
-import type { BuildContext } from "./shared/buildContext";
+import type { CliCommandOptions } from "./main";
+import { getBuildContext } from "./shared/buildContext";
 import chalk from "chalk";
 
-export async function command(params: { buildContext: BuildContext }) {
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { buildContext } = params;
+    const { cliCommandOptions } = params;
+
+    const buildContext = getBuildContext({
+        cliCommandOptions
+    });
 
     console.log(chalk.cyan("Theme type:"));
 

src/bin/initialize-account-theme/initialize-account-theme.ts

@@ -1,20 +1,17 @@
-import type { BuildContext } from "../shared/buildContext";
+import { getBuildContext } from "../shared/buildContext";
+import type { CliCommandOptions } from "../main";
 import cliSelect from "cli-select";
 import child_process from "child_process";
 import chalk from "chalk";
 import { join as pathJoin, relative as pathRelative } from "path";
 import * as fs from "fs";
 import { updateAccountThemeImplementationInConfig } from "./updateAccountThemeImplementationInConfig";
-import { command as updateKcGenCommand } from "../update-kc-gen";
+import { generateKcGenTs } from "../shared/generateKcGenTs";
-import { maybeDelegateCommandToCustomHandler } from "../shared/customHandler_delegate";
 
-export async function command(params: { buildContext: BuildContext }) {
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { buildContext } = params;
+    const { cliCommandOptions } = params;
 
-    maybeDelegateCommandToCustomHandler({
+    const buildContext = getBuildContext({ cliCommandOptions });
-        commandName: "initialize-account-theme",
-        buildContext
-    });
 
     const accountThemeSrcDirPath = pathJoin(buildContext.themeSrcDirPath, "account");
 
@@ -100,7 +97,7 @@ export async function command(params: { buildContext: BuildContext }) {
 
     updateAccountThemeImplementationInConfig({ buildContext, accountThemeType });
 
-    await updateKcGenCommand({
+    await generateKcGenTs({
         buildContext: {
             ...buildContext,
             implementedThemeTypes: {

src/bin/initialize-account-theme/updateAccountThemeImplementationInConfig.ts

@@ -8,14 +8,12 @@ import { id } from "tsafe/id";
 
 export type BuildContextLike = {
     bundler: BuildContext["bundler"];
-    projectDirPath: string;
-    packageJsonFilePath: string;
 };
 
 assert<BuildContext extends BuildContextLike ? true : false>();
 
 export function updateAccountThemeImplementationInConfig(params: {
-    buildContext: BuildContextLike;
+    buildContext: BuildContext;
     accountThemeType: "Single-Page" | "Multi-Page";
 }) {
     const { buildContext, accountThemeType } = params;

src/bin/initialize-email-theme.ts

@@ -1,18 +1,15 @@
 import { join as pathJoin, relative as pathRelative } from "path";
 import { transformCodebase } from "./tools/transformCodebase";
 import { promptKeycloakVersion } from "./shared/promptKeycloakVersion";
-import type { BuildContext } from "./shared/buildContext";
+import { getBuildContext } from "./shared/buildContext";
 import * as fs from "fs";
+import type { CliCommandOptions } from "./main";
 import { downloadAndExtractArchive } from "./tools/downloadAndExtractArchive";
-import { maybeDelegateCommandToCustomHandler } from "./shared/customHandler_delegate";
 
-export async function command(params: { buildContext: BuildContext }) {
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { buildContext } = params;
+    const { cliCommandOptions } = params;
 
-    maybeDelegateCommandToCustomHandler({
+    const buildContext = getBuildContext({ cliCommandOptions });
-        commandName: "initialize-email-theme",
-        buildContext
-    });
 
     const emailThemeSrcDirPath = pathJoin(buildContext.themeSrcDirPath, "email");
 

src/bin/keycloakify/keycloakify.ts

@@ -2,16 +2,19 @@ import { generateResources } from "./generateResources";
 import { join as pathJoin, relative as pathRelative, sep as pathSep } from "path";
 import * as child_process from "child_process";
 import * as fs from "fs";
-import type { BuildContext } from "../shared/buildContext";
+import { getBuildContext } from "../shared/buildContext";
 import { VITE_PLUGIN_SUB_SCRIPTS_ENV_NAMES } from "../shared/constants";
 import { buildJars } from "./buildJars";
+import type { CliCommandOptions } from "../main";
 import chalk from "chalk";
 import { readThisNpmPackageVersion } from "../tools/readThisNpmPackageVersion";
 import * as os from "os";
 import { rmSync } from "../tools/fs.rmSync";
 
-export async function command(params: { buildContext: BuildContext }) {
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { buildContext } = params;
+    const { cliCommandOptions } = params;
+
+    const buildContext = getBuildContext({ cliCommandOptions });
 
     exit_if_maven_not_installed: {
         let commandOutput: Buffer | undefined = undefined;

src/bin/main.ts

@@ -4,9 +4,8 @@ import { termost } from "termost";
 import { readThisNpmPackageVersion } from "./tools/readThisNpmPackageVersion";
 import * as child_process from "child_process";
 import { assertNoPnpmDlx } from "./tools/assertNoPnpmDlx";
-import { getBuildContext } from "./shared/buildContext";
 
-type CliCommandOptions = {
+export type CliCommandOptions = {
     projectDirPath: string | undefined;
 };
 
@@ -70,10 +69,10 @@ program
     })
     .task({
         skip,
-        handler: async ({ projectDirPath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./keycloakify");
 
-            await command({ buildContext: getBuildContext({ projectDirPath }) });
+            await command({ cliCommandOptions });
         }
     });
 
@@ -131,13 +130,10 @@ program
     })
     .task({
         skip,
-        handler: async ({ projectDirPath, keycloakVersion, port, realmJsonFilePath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./start-keycloak");
 
-            await command({
+            await command({ cliCommandOptions });
-                buildContext: getBuildContext({ projectDirPath }),
-                cliCommandOptions: { keycloakVersion, port, realmJsonFilePath }
-            });
         }
     });
 
@@ -148,10 +144,10 @@ program
     })
     .task({
         skip,
-        handler: async ({ projectDirPath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./eject-page");
 
-            await command({ buildContext: getBuildContext({ projectDirPath }) });
+            await command({ cliCommandOptions });
         }
     });
 
@@ -162,24 +158,24 @@ program
     })
     .task({
         skip,
-        handler: async ({ projectDirPath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./add-story");
 
-            await command({ buildContext: getBuildContext({ projectDirPath }) });
+            await command({ cliCommandOptions });
         }
     });
 
 program
     .command({
-        name: "initialize-login-theme",
+        name: "initialize-email-theme",
         description: "Initialize an email theme."
     })
     .task({
         skip,
-        handler: async ({ projectDirPath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./initialize-email-theme");
 
-            await command({ buildContext: getBuildContext({ projectDirPath }) });
+            await command({ cliCommandOptions });
         }
     });
 
@@ -190,10 +186,10 @@ program
     })
     .task({
         skip,
-        handler: async ({ projectDirPath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./initialize-account-theme");
 
-            await command({ buildContext: getBuildContext({ projectDirPath }) });
+            await command({ cliCommandOptions });
         }
     });
 
@@ -205,10 +201,10 @@ program
     })
     .task({
         skip,
-        handler: async ({ projectDirPath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./copy-keycloak-resources-to-public");
 
-            await command({ buildContext: getBuildContext({ projectDirPath }) });
+            await command({ cliCommandOptions });
         }
     });
 
@@ -220,10 +216,10 @@ program
     })
     .task({
         skip,
-        handler: async ({ projectDirPath }) => {
+        handler: async cliCommandOptions => {
             const { command } = await import("./update-kc-gen");
 
-            await command({ buildContext: getBuildContext({ projectDirPath }) });
+            await command({ cliCommandOptions });
         }
     });
 

src/bin/shared/buildContext.ts

@@ -7,6 +7,7 @@ import {
     dirname as pathDirname
 } from "path";
 import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
+import type { CliCommandOptions } from "../main";
 import { z } from "zod";
 import * as fs from "fs";
 import { assert, type Equals } from "tsafe/assert";
@@ -23,7 +24,7 @@ import { objectEntries } from "tsafe/objectEntries";
 import { type ThemeType } from "./constants";
 import { id } from "tsafe/id";
 import chalk from "chalk";
-import { getProxyFetchOptions, type FetchOptionsLike } from "../tools/fetchProxyOptions";
+import { getProxyFetchOptions, type ProxyFetchOptions } from "../tools/fetchProxyOptions";
 import { is } from "tsafe/is";
 
 export type BuildContext = {
@@ -42,7 +43,7 @@ export type BuildContext = {
      * In this case the urlPathname will be "/my-app/" */
     urlPathname: string | undefined;
     assetsDirPath: string;
-    fetchOptions: FetchOptionsLike;
+    fetchOptions: ProxyFetchOptions;
     kcContextExclusionsFtlCode: string | undefined;
     environmentVariables: { name: string; default: string }[];
     themeSrcDirPath: string;
@@ -128,12 +129,14 @@ export type ResolvedViteConfig = {
 };
 
 export function getBuildContext(params: {
-    projectDirPath: string | undefined;
+    cliCommandOptions: CliCommandOptions;
 }): BuildContext {
+    const { cliCommandOptions } = params;
+
     const projectDirPath =
-        params.projectDirPath !== undefined
+        cliCommandOptions.projectDirPath !== undefined
             ? getAbsoluteAndInOsFormatPath({
-                  pathIsh: params.projectDirPath,
+                  pathIsh: cliCommandOptions.projectDirPath,
                   cwd: process.cwd()
               })
             : process.cwd();

src/bin/shared/constants.ts

@@ -71,8 +71,3 @@ export type AccountThemePageId = (typeof ACCOUNT_THEME_PAGE_IDS)[number];
 export const CONTAINER_NAME = "keycloak-keycloakify";
 
 export const FALLBACK_LANGUAGE_TAG = "en";
-
-export const CUSTOM_HANDLER_ENV_NAMES = {
-    COMMAND_NAME: "KEYCLOAKIFY_COMMAND_NAME",
-    BUILD_CONTEXT: "KEYCLOAKIFY_BUILD_CONTEXT"
-};

src/bin/shared/customHandler.ts

@@ -1,41 +0,0 @@
-import { assert } from "tsafe/assert";
-import type { BuildContext } from "./buildContext";
-import { CUSTOM_HANDLER_ENV_NAMES } from "./constants";
-
-export const BIN_NAME = "_keycloakify-custom-handler";
-
-export const NOT_IMPLEMENTED_EXIT_CODE = 78;
-
-export type CommandName =
-    | "update-kc-gen"
-    | "eject-page"
-    | "add-story"
-    | "initialize-account-theme"
-    | "initialize-email-theme"
-    | "copy-keycloak-resources-to-public";
-
-export type ApiVersion = "v1";
-
-export function readParams(params: { apiVersion: ApiVersion }) {
-    const { apiVersion } = params;
-
-    assert(apiVersion === "v1");
-
-    const commandName = (() => {
-        const envValue = process.env[CUSTOM_HANDLER_ENV_NAMES.COMMAND_NAME];
-
-        assert(envValue !== undefined);
-
-        return envValue as CommandName;
-    })();
-
-    const buildContext = (() => {
-        const envValue = process.env[CUSTOM_HANDLER_ENV_NAMES.BUILD_CONTEXT];
-
-        assert(envValue !== undefined);
-
-        return JSON.parse(envValue) as BuildContext;
-    })();
-
-    return { commandName, buildContext };
-}

src/bin/shared/customHandler_delegate.ts

@@ -1,46 +0,0 @@
-import { assert, type Equals } from "tsafe/assert";
-import type { BuildContext } from "./buildContext";
-import { CUSTOM_HANDLER_ENV_NAMES } from "./constants";
-import {
-    NOT_IMPLEMENTED_EXIT_CODE,
-    type CommandName,
-    BIN_NAME,
-    ApiVersion
-} from "./customHandler";
-import * as child_process from "child_process";
-import { dirname as pathDirname } from "path";
-import * as fs from "fs";
-
-assert<Equals<ApiVersion, "v1">>();
-
-export function maybeDelegateCommandToCustomHandler(params: {
-    commandName: CommandName;
-    buildContext: BuildContext;
-}) {
-    const { commandName, buildContext } = params;
-
-    if (!fs.readdirSync(pathDirname(process.argv[1])).includes(BIN_NAME)) {
-        return;
-    }
-
-    try {
-        child_process.execSync(`npx ${BIN_NAME}`, {
-            stdio: "inherit",
-            env: {
-                ...process.env,
-                [CUSTOM_HANDLER_ENV_NAMES.COMMAND_NAME]: commandName,
-                [CUSTOM_HANDLER_ENV_NAMES.BUILD_CONTEXT]: JSON.stringify(buildContext)
-            }
-        });
-    } catch (error: any) {
-        const status = error.status;
-
-        if (status === NOT_IMPLEMENTED_EXIT_CODE) {
-            return;
-        }
-
-        process.exit(status);
-    }
-
-    process.exit(0);
-}

src/bin/shared/generateKcGenTs.ts

@@ -0,0 +1,175 @@
+import { assert, type Equals } from "tsafe/assert";
+import { id } from "tsafe/id";
+import type { BuildContext } from "./buildContext";
+import * as fs from "fs/promises";
+import { join as pathJoin } from "path";
+import { existsAsync } from "../tools/fs.existsAsync";
+import { z } from "zod";
+
+export type BuildContextLike = {
+    projectDirPath: string;
+    themeNames: string[];
+    environmentVariables: { name: string; default: string }[];
+    themeSrcDirPath: string;
+    implementedThemeTypes: Pick<
+        BuildContext["implementedThemeTypes"],
+        "login" | "account"
+    >;
+    packageJsonFilePath: string;
+};
+
+assert<BuildContext extends BuildContextLike ? true : false>();
+
+export async function generateKcGenTs(params: {
+    buildContext: BuildContextLike;
+}): Promise<void> {
+    const { buildContext } = params;
+
+    const isReactProject: boolean = await (async () => {
+        const parsedPackageJson = await (async () => {
+            type ParsedPackageJson = {
+                dependencies?: Record<string, string>;
+                devDependencies?: Record<string, string>;
+            };
+
+            const zParsedPackageJson = (() => {
+                type TargetType = ParsedPackageJson;
+
+                const zTargetType = z.object({
+                    dependencies: z.record(z.string()).optional(),
+                    devDependencies: z.record(z.string()).optional()
+                });
+
+                assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
+
+                return id<z.ZodType<TargetType>>(zTargetType);
+            })();
+
+            return zParsedPackageJson.parse(
+                JSON.parse(
+                    (await fs.readFile(buildContext.packageJsonFilePath)).toString("utf8")
+                )
+            );
+        })();
+
+        return (
+            {
+                ...parsedPackageJson.dependencies,
+                ...parsedPackageJson.devDependencies
+            }.react !== undefined
+        );
+    })();
+
+    const filePath = pathJoin(
+        buildContext.themeSrcDirPath,
+        `kc.gen.ts${isReactProject ? "x" : ""}`
+    );
+
+    const currentContent = (await existsAsync(filePath))
+        ? await fs.readFile(filePath)
+        : undefined;
+
+    const hasLoginTheme = buildContext.implementedThemeTypes.login.isImplemented;
+    const hasAccountTheme = buildContext.implementedThemeTypes.account.isImplemented;
+
+    const newContent = Buffer.from(
+        [
+            `/* prettier-ignore-start */`,
+            ``,
+            `/* eslint-disable */`,
+            ``,
+            `// @ts-nocheck`,
+            ``,
+            `// noinspection JSUnusedGlobalSymbols`,
+            ``,
+            `// This file is auto-generated by Keycloakify`,
+            ``,
+            isReactProject && `import { lazy, Suspense, type ReactNode } from "react";`,
+            ``,
+            `export type ThemeName = ${buildContext.themeNames.map(themeName => `"${themeName}"`).join(" | ")};`,
+            ``,
+            `export const themeNames: ThemeName[] = [${buildContext.themeNames.map(themeName => `"${themeName}"`).join(", ")}];`,
+            ``,
+            `export type KcEnvName = ${buildContext.environmentVariables.length === 0 ? "never" : buildContext.environmentVariables.map(({ name }) => `"${name}"`).join(" | ")};`,
+            ``,
+            `export const kcEnvNames: KcEnvName[] = [${buildContext.environmentVariables.map(({ name }) => `"${name}"`).join(", ")}];`,
+            ``,
+            `export const kcEnvDefaults: Record<KcEnvName, string> = ${JSON.stringify(
+                Object.fromEntries(
+                    buildContext.environmentVariables.map(
+                        ({ name, default: defaultValue }) => [name, defaultValue]
+                    )
+                ),
+                null,
+                2
+            )};`,
+            ``,
+            `export type KcContext =`,
+            hasLoginTheme && `    | import("./login/KcContext").KcContext`,
+            hasAccountTheme && `    | import("./account/KcContext").KcContext`,
+            `    ;`,
+            ``,
+            `declare global {`,
+            `    interface Window {`,
+            `        kcContext?: KcContext;`,
+            `    }`,
+            `}`,
+            ``,
+            ...(!isReactProject
+                ? []
+                : [
+                      hasLoginTheme &&
+                          `export const KcLoginPage = lazy(() => import("./login/KcPage"));`,
+                      hasAccountTheme &&
+                          `export const KcAccountPage = lazy(() => import("./account/KcPage"));`,
+                      ``,
+                      `export function KcPage(`,
+                      `    props: {`,
+                      `        kcContext: KcContext;`,
+                      `        fallback?: ReactNode;`,
+                      `    }`,
+                      `) {`,
+                      `    const { kcContext, fallback } = props;`,
+                      `    return (`,
+                      `        <Suspense fallback={fallback}>`,
+                      `            {(() => {`,
+                      `                switch (kcContext.themeType) {`,
+                      hasLoginTheme &&
+                          `                    case "login": return <KcLoginPage kcContext={kcContext} />;`,
+                      hasAccountTheme &&
+                          `                    case "account": return <KcAccountPage kcContext={kcContext} />;`,
+                      `                }`,
+                      `            })()}`,
+                      `        </Suspense>`,
+                      `    );`,
+                      `}`
+                  ]),
+            ``,
+            `/* prettier-ignore-end */`,
+            ``
+        ]
+            .filter(item => typeof item === "string")
+            .join("\n"),
+        "utf8"
+    );
+
+    if (currentContent !== undefined && currentContent.equals(newContent)) {
+        return;
+    }
+
+    await fs.writeFile(filePath, newContent);
+
+    delete_legacy_file: {
+        if (!isReactProject) {
+            break delete_legacy_file;
+        }
+
+        const legacyFilePath = filePath.replace(/tsx$/, "ts");
+
+        if (!(await existsAsync(legacyFilePath))) {
+            break delete_legacy_file;
+        }
+
+        await fs.unlink(legacyFilePath);
+    }
+}

src/bin/start-keycloak/start-keycloak.ts

@@ -1,5 +1,6 @@
-import type { BuildContext } from "../shared/buildContext";
+import { getBuildContext } from "../shared/buildContext";
 import { exclude } from "tsafe/exclude";
+import type { CliCommandOptions as CliCommandOptions_common } from "../main";
 import { promptKeycloakVersion } from "../shared/promptKeycloakVersion";
 import { CONTAINER_NAME } from "../shared/constants";
 import { SemVer } from "../tools/SemVer";
@@ -28,14 +29,13 @@ import { existsAsync } from "../tools/fs.existsAsync";
 import { rm } from "../tools/fs.rm";
 import { downloadAndExtractArchive } from "../tools/downloadAndExtractArchive";
 
-export async function command(params: {
+export type CliCommandOptions = CliCommandOptions_common & {
-    buildContext: BuildContext;
+    port: number | undefined;
-    cliCommandOptions: {
+    keycloakVersion: string | undefined;
-        port: number | undefined;
+    realmJsonFilePath: string | undefined;
-        keycloakVersion: string | undefined;
+};
-        realmJsonFilePath: string | undefined;
+
-    };
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-}) {
     exit_if_docker_not_installed: {
         let commandOutput: string | undefined = undefined;
 
@@ -88,7 +88,9 @@ export async function command(params: {
         process.exit(1);
     }
 
-    const { cliCommandOptions, buildContext } = params;
+    const { cliCommandOptions } = params;
+
+    const buildContext = getBuildContext({ cliCommandOptions });
 
     const { dockerImageTag } = await (async () => {
         if (cliCommandOptions.keycloakVersion !== undefined) {

src/bin/tools/fetchProxyOptions.ts

@@ -1,18 +1,16 @@
+import { type FetchOptions } from "make-fetch-happen";
 import * as child_process from "child_process";
 import * as fs from "fs";
 import { exclude } from "tsafe/exclude";
 
-export type FetchOptionsLike = {
+export type ProxyFetchOptions = Pick<
-    proxy: string | undefined;
+    FetchOptions,
-    noProxy: string | string[];
+    "proxy" | "noProxy" | "strictSSL" | "cert" | "ca"
-    strictSSL: boolean;
+>;
-    cert: string | string[] | undefined;
-    ca: string[] | undefined;
-};
 
 export function getProxyFetchOptions(params: {
     npmConfigGetCwd: string;
-}): FetchOptionsLike {
+}): ProxyFetchOptions {
     const { npmConfigGetCwd } = params;
 
     const cfg = (() => {

src/bin/update-kc-gen.ts

@@ -1,116 +1,13 @@
-import type { BuildContext } from "./shared/buildContext";
+import type { CliCommandOptions } from "./main";
-import * as fs from "fs/promises";
+import { getBuildContext } from "./shared/buildContext";
-import { join as pathJoin } from "path";
+import { generateKcGenTs } from "./shared/generateKcGenTs";
-import { existsAsync } from "./tools/fs.existsAsync";
-import { maybeDelegateCommandToCustomHandler } from "./shared/customHandler_delegate";
 
-export async function command(params: { buildContext: BuildContext }) {
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { buildContext } = params;
+    const { cliCommandOptions } = params;
 
-    maybeDelegateCommandToCustomHandler({
+    const buildContext = getBuildContext({
-        commandName: "update-kc-gen",
+        cliCommandOptions
-        buildContext
     });
 
-    const filePath = pathJoin(buildContext.themeSrcDirPath, `kc.gen.tsx`);
+    await generateKcGenTs({ buildContext });
-
-    const currentContent = (await existsAsync(filePath))
-        ? await fs.readFile(filePath)
-        : undefined;
-
-    const hasLoginTheme = buildContext.implementedThemeTypes.login.isImplemented;
-    const hasAccountTheme = buildContext.implementedThemeTypes.account.isImplemented;
-
-    const newContent = Buffer.from(
-        [
-            `/* prettier-ignore-start */`,
-            ``,
-            `/* eslint-disable */`,
-            ``,
-            `// @ts-nocheck`,
-            ``,
-            `// noinspection JSUnusedGlobalSymbols`,
-            ``,
-            `// This file is auto-generated by Keycloakify`,
-            ``,
-            `import { lazy, Suspense, type ReactNode } from "react";`,
-            ``,
-            `export type ThemeName = ${buildContext.themeNames.map(themeName => `"${themeName}"`).join(" | ")};`,
-            ``,
-            `export const themeNames: ThemeName[] = [${buildContext.themeNames.map(themeName => `"${themeName}"`).join(", ")}];`,
-            ``,
-            `export type KcEnvName = ${buildContext.environmentVariables.length === 0 ? "never" : buildContext.environmentVariables.map(({ name }) => `"${name}"`).join(" | ")};`,
-            ``,
-            `export const kcEnvNames: KcEnvName[] = [${buildContext.environmentVariables.map(({ name }) => `"${name}"`).join(", ")}];`,
-            ``,
-            `export const kcEnvDefaults: Record<KcEnvName, string> = ${JSON.stringify(
-                Object.fromEntries(
-                    buildContext.environmentVariables.map(
-                        ({ name, default: defaultValue }) => [name, defaultValue]
-                    )
-                ),
-                null,
-                2
-            )};`,
-            ``,
-            `export type KcContext =`,
-            hasLoginTheme && `    | import("./login/KcContext").KcContext`,
-            hasAccountTheme && `    | import("./account/KcContext").KcContext`,
-            `    ;`,
-            ``,
-            `declare global {`,
-            `    interface Window {`,
-            `        kcContext?: KcContext;`,
-            `    }`,
-            `}`,
-            ``,
-            hasLoginTheme &&
-                `export const KcLoginPage = lazy(() => import("./login/KcPage"));`,
-            hasAccountTheme &&
-                `export const KcAccountPage = lazy(() => import("./account/KcPage"));`,
-            ``,
-            `export function KcPage(`,
-            `    props: {`,
-            `        kcContext: KcContext;`,
-            `        fallback?: ReactNode;`,
-            `    }`,
-            `) {`,
-            `    const { kcContext, fallback } = props;`,
-            `    return (`,
-            `        <Suspense fallback={fallback}>`,
-            `            {(() => {`,
-            `                switch (kcContext.themeType) {`,
-            hasLoginTheme &&
-                `                    case "login": return <KcLoginPage kcContext={kcContext} />;`,
-            hasAccountTheme &&
-                `                    case "account": return <KcAccountPage kcContext={kcContext} />;`,
-            `                }`,
-            `            })()}`,
-            `        </Suspense>`,
-            `    );`,
-            `}`,
-            ``,
-            `/* prettier-ignore-end */`,
-            ``
-        ]
-            .filter(item => typeof item === "string")
-            .join("\n"),
-        "utf8"
-    );
-
-    if (currentContent !== undefined && currentContent.equals(newContent)) {
-        return;
-    }
-
-    await fs.writeFile(filePath, newContent);
-
-    delete_legacy_file: {
-        const legacyFilePath = filePath.replace(/tsx$/, "ts");
-
-        if (!(await existsAsync(legacyFilePath))) {
-            break delete_legacy_file;
-        }
-
-        await fs.unlink(legacyFilePath);
-    }
 }

src/vite-plugin/vite-plugin.ts

@@ -15,7 +15,7 @@ import {
     type ResolvedViteConfig
 } from "../bin/shared/buildContext";
 import MagicString from "magic-string";
-import { command as updateKcGenCommand } from "../bin/update-kc-gen";
+import { generateKcGenTs } from "../bin/shared/generateKcGenTs";
 
 export namespace keycloakify {
     export type Params = BuildOptions & {
@@ -122,12 +122,13 @@ export function keycloakify(params: keycloakify.Params) {
             }
 
             const buildContext = getBuildContext({
-                projectDirPath
+                cliCommandOptions: {
+                    projectDirPath
+                }
             });
 
-            copyKeycloakResourcesToPublic({ buildContext });
+            copyKeycloakResourcesToPublic({ buildContext }),
-
+                await generateKcGenTs({ buildContext });
-            await updateKcGenCommand({ buildContext });
         },
         transform: (code, id) => {
             assert(command !== undefined);

stories/login/pages/Register.stories.tsx

@@ -115,6 +115,7 @@ export const WithFavoritePet: Story = {
     )
 };
 
+
 export const WithNewsletter: Story = {
     render: () => (
         <KcPageStory
@@ -131,7 +132,7 @@ export const WithNewsletter: Story = {
                             },
                             annotations: {
                                 inputOptionLabels: {
-                                    yes: "I want my email inbox filled with spam"
+                                    "yes": "I want my email inbox filled with spam"
                                 },
                                 inputType: "multiselect-checkboxes"
                             },
@@ -139,12 +140,13 @@ export const WithNewsletter: Story = {
                             readOnly: false
                         } satisfies Attribute
                     }
-                }
+                },
             }}
         />
     )
 };
 
+
 export const WithEmailAsUsername: Story = {
     render: () => (
         <KcPageStory

yarn.lock

@@ -2545,6 +2545,14 @@
     "@jridgewell/resolve-uri" "^3.1.0"
     "@jridgewell/sourcemap-codec" "^1.4.14"
 
+"@keycloakify/angular@^0.0.1-rc.19":
+  version "0.0.1-rc.19"
+  resolved "https://registry.yarnpkg.com/@keycloakify/angular/-/angular-0.0.1-rc.19.tgz#56edbfc74dc66d6ea23ff3b0d2e5ce48fad200c6"
+  integrity sha512-C2etRoAv2jCv+BMaIaJcEBKWEV8uM47pUpO37ZRFj78jChM+o8a0/Q+ooadkidKupvOe9K5SB91fdL3aUwTyEw==
+  dependencies:
+    tsafe "^1.7.5"
+    tslib "^2.3.0"
+
 "@mdx-js/mdx@^1.6.22":
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/@mdx-js/mdx/-/mdx-1.6.22.tgz#8a723157bf90e78f17dc0f27995398e6c731f1ba"
@@ -12606,6 +12614,11 @@ tslib@^2.0.0, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf"
   integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg==
 
+tslib@^2.3.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.7.0.tgz#d9b40c5c40ab59e8738f297df3087bf1a2690c01"
+  integrity sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==
+
 tss-react@^4.9.10:
   version "4.9.10"
   resolved "https://registry.yarnpkg.com/tss-react/-/tss-react-4.9.10.tgz#287392f4459116ac83c51fc117fad138ac06f139"