keycloakify 10.0.0-rc.4 → 10.0.0-rc.6

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

@@ -2,24 +2,26 @@
 
 import { getThisCodebaseRootDirPath } from "./tools/getThisCodebaseRootDirPath";
 import cliSelect from "cli-select";
-import { loginThemePageIds, accountThemePageIds, type LoginThemePageId, type AccountThemePageId } from "./keycloakify/generateFtl";
+import { loginThemePageIds, accountThemePageIds, type LoginThemePageId, type AccountThemePageId } from "./shared/pageIds";
 import { capitalize } from "tsafe/capitalize";
-import { readFile, writeFile } from "fs/promises";
-import { existsSync } from "fs";
-import { join as pathJoin, relative as pathRelative } from "path";
+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 { getThemeSrcDirPath } from "./getThemeSrcDirPath";
-import { themeTypes, type ThemeType } from "./constants";
-import { getReactAppRootDirPath } from "./keycloakify/buildOptions/getReactAppRootDirPath";
+import { getThemeSrcDirPath } from "./shared/getThemeSrcDirPath";
+import { themeTypes, type ThemeType } from "./shared/constants";
+import type { CliCommandOptions } from "./main";
+import { readBuildOptions } from "./shared/buildOptions";
 
-(async () => {
-    console.log("Select a theme type");
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
+    const { cliCommandOptions } = params;
 
-    const { reactAppRootDirPath } = getReactAppRootDirPath({
-        "processArgv": process.argv.slice(2)
+    const buildOptions = readBuildOptions({
+        cliCommandOptions
     });
 
+    console.log("Theme type:");
+
     const { value: themeType } = await cliSelect<ThemeType>({
         "values": [...themeTypes]
     }).catch(() => {
@@ -28,7 +30,7 @@ import { getReactAppRootDirPath } from "./keycloakify/buildOptions/getReactAppRo
         process.exit(-1);
     });
 
-    console.log("Select a page you would like to eject");
+    console.log("Select the page you want to customize:");
 
     const { value: pageId } = await cliSelect<LoginThemePageId | AccountThemePageId>({
         "values": (() => {
@@ -46,19 +48,73 @@ import { getReactAppRootDirPath } from "./keycloakify/buildOptions/getReactAppRo
         process.exit(-1);
     });
 
-    const pageBasename = capitalize(kebabCaseToCamelCase(pageId)).replace(/ftl$/, "tsx");
+    const componentPageBasename = capitalize(kebabCaseToCamelCase(pageId)).replace(/ftl$/, "tsx");
 
-    const { themeSrcDirPath } = getThemeSrcDirPath({ reactAppRootDirPath });
+    const { themeSrcDirPath } = getThemeSrcDirPath({ "reactAppRootDirPath": buildOptions.reactAppRootDirPath });
 
-    const targetFilePath = pathJoin(themeSrcDirPath, themeType, "pages", pageBasename);
+    const targetFilePath = pathJoin(themeSrcDirPath, themeType, "pages", componentPageBasename);
 
-    if (existsSync(targetFilePath)) {
+    if (fs.existsSync(targetFilePath)) {
         console.log(`${pageId} is already ejected, ${pathRelative(process.cwd(), targetFilePath)} already exists`);
 
         process.exit(-1);
     }
 
-    await writeFile(targetFilePath, await readFile(pathJoin(getThisCodebaseRootDirPath(), "src", themeType, "pages", pageBasename)));
+    {
+        const targetDirPath = pathDirname(targetFilePath);
+
+        if (!fs.existsSync(targetDirPath)) {
+            fs.mkdirSync(targetDirPath, { "recursive": true });
+        }
+    }
+
+    const componentPageContent = fs
+        .readFileSync(pathJoin(getThisCodebaseRootDirPath(), "src", themeType, "pages", componentPageBasename))
+        .toString("utf8");
+
+    fs.writeFileSync(targetFilePath, Buffer.from(componentPageContent, "utf8"));
+
+    const userProfileFormFieldComponentName = "UserProfileFormFields";
 
-    console.log(`${pathRelative(process.cwd(), targetFilePath)} created`);
-})();
+    console.log(
+        [
+            ``,
+            `\`${pathJoin(".", pathRelative(process.cwd(), targetFilePath))}\` copy pasted from the Keycloakify source code into your project.`,
+            ``,
+            `You now need to update your page router:`,
+            ``,
+            `\`${pathJoin(".", pathRelative(process.cwd(), themeSrcDirPath), themeType, "KcApp.tsx")}\`:`,
+            "```",
+            `// ...`,
+            ``,
+            `+const ${componentPageBasename.replace(/.tsx$/, "")} = lazy(() => import("./pages/${componentPageBasename}"));`,
+            ``,
+            ` export default function KcApp(props: { kcContext: KcContext; }) {`,
+            ``,
+            `     // ...`,
+            ``,
+            `     return (`,
+            `         <Suspense>`,
+            `             {(() => {`,
+            `                 switch (kcContext.pageId) {`,
+            `                     // ...`,
+            `                     case "${pageId}": return (`,
+            `+                        <Login`,
+            `+                            {...{ kcContext, i18n, classes }}`,
+            `+                            Template={Template}`,
+            ...(!componentPageContent.includes(userProfileFormFieldComponentName)
+                ? []
+                : [`+                            ${userProfileFormFieldComponentName}={${userProfileFormFieldComponentName}}`]),
+            `+                            doUseDefaultCss={true}`,
+            `+                        />`,
+            `+                    );`,
+            `                     default: return <Fallback /* .. */ />;`,
+            `                 }`,
+            `             })()}`,
+            `         </Suspense>`,
+            `     );`,
+            ` }`,
+            "```"
+        ].join("\n")
+    );
+}

package/src/bin/initialize-email-theme.ts

@@ -1,19 +1,18 @@
-#!/usr/bin/env node
-
-import { downloadBuiltinKeycloakTheme } from "./download-builtin-keycloak-theme";
+import { downloadBuiltinKeycloakTheme } from "./shared/downloadBuiltinKeycloakTheme";
 import { join as pathJoin, relative as pathRelative } from "path";
 import { transformCodebase } from "./tools/transformCodebase";
-import { promptKeycloakVersion } from "./promptKeycloakVersion";
-import { readBuildOptions } from "./keycloakify/buildOptions";
+import { promptKeycloakVersion } from "./shared/promptKeycloakVersion";
+import { readBuildOptions } from "./shared/buildOptions";
 import * as fs from "fs";
 import { getLogger } from "./tools/logger";
-import { getThemeSrcDirPath } from "./getThemeSrcDirPath";
+import { getThemeSrcDirPath } from "./shared/getThemeSrcDirPath";
 import { rmSync } from "./tools/fs.rmSync";
+import type { CliCommandOptions } from "./main";
 
-export async function main() {
-    const buildOptions = readBuildOptions({
-        "processArgv": process.argv.slice(2)
-    });
+export async function command(params: { cliCommandOptions: CliCommandOptions }) {
+    const { cliCommandOptions } = params;
+
+    const buildOptions = readBuildOptions({ cliCommandOptions });
 
     const logger = getLogger({ "isSilent": buildOptions.isSilent });
 
@@ -29,9 +28,13 @@ export async function main() {
         process.exit(-1);
     }
 
-    const { keycloakVersion } = await promptKeycloakVersion();
+    const { keycloakVersion } = await promptKeycloakVersion({
+        "startingFromMajor": 17
+    });
 
-    const builtinKeycloakThemeTmpDirPath = pathJoin(emailThemeSrcDirPath, "..", "tmp_xIdP3_builtin_keycloak_theme");
+    const builtinKeycloakThemeTmpDirPath = pathJoin(buildOptions.cacheDirPath, "initialize-email-theme_tmp");
+
+    rmSync(builtinKeycloakThemeTmpDirPath, { "recursive": true, "force": true });
 
     await downloadBuiltinKeycloakTheme({
         keycloakVersion,
@@ -52,9 +55,5 @@ export async function main() {
 
     logger.log(`${pathRelative(process.cwd(), emailThemeSrcDirPath)} ready to be customized, feel free to remove every file you do not customize`);
 
-    rmSync(builtinKeycloakThemeTmpDirPath, { "recursive": true, "force": true });
-}
-
-if (require.main === module) {
-    main();
+    rmSync(builtinKeycloakThemeTmpDirPath, { "recursive": true });
 }

package/src/bin/keycloakify/buildJars/buildJar.ts

@@ -2,19 +2,22 @@ import { assert, type Equals } from "tsafe/assert";
 import type { KeycloakAccountV1Version, KeycloakThemeAdditionalInfoExtensionVersion } from "./extensionVersions";
 import { join as pathJoin, dirname as pathDirname } from "path";
 import { transformCodebase } from "../../tools/transformCodebase";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
 import * as fs from "fs/promises";
-import { accountV1ThemeName } from "../../constants";
+import { accountV1ThemeName } from "../../shared/constants";
 import { generatePom, BuildOptionsLike as BuildOptionsLike_generatePom } from "./generatePom";
-import { existsSync, readFileSync } from "fs";
+import { readFileSync } from "fs";
 import { isInside } from "../../tools/isInside";
 import child_process from "child_process";
+import { rmSync } from "../../tools/fs.rmSync";
+import { getMetaInfKeycloakThemesJsonPath } from "../../shared/metaInfKeycloakThemes";
 
 export type BuildOptionsLike = BuildOptionsLike_generatePom & {
     keycloakifyBuildDirPath: string;
     themeNames: string[];
     artifactId: string;
     themeVersion: string;
+    cacheDirPath: string;
 };
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
@@ -27,25 +30,18 @@ export async function buildJar(params: {
 }): Promise<void> {
     const { jarFileBasename, keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, buildOptions } = params;
 
-    const keycloakifyBuildTmpDirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "..", jarFileBasename.replace(".jar", ""));
+    const keycloakifyBuildTmpDirPath = pathJoin(buildOptions.cacheDirPath, jarFileBasename.replace(".jar", ""));
 
-    if (existsSync(keycloakifyBuildTmpDirPath)) {
-        await fs.rm(keycloakifyBuildTmpDirPath, { "recursive": true });
-    }
-
-    await fs.mkdir(keycloakifyBuildTmpDirPath, { "recursive": true });
-    await fs.writeFile(pathJoin(keycloakifyBuildTmpDirPath, ".gitignore"), Buffer.from("*", "utf8"));
-
-    const srcMainResourcesRelativeDirPath = pathJoin("src", "main", "resources");
+    rmSync(keycloakifyBuildTmpDirPath, { "recursive": true, "force": true });
 
     {
-        const keycloakThemesJsonFilePath = pathJoin(srcMainResourcesRelativeDirPath, "META-INF", "keycloak-themes.json");
+        const keycloakThemesJsonFilePath = getMetaInfKeycloakThemesJsonPath({ "keycloakifyBuildDirPath": "" });
 
         const themePropertiesFilePathSet = new Set(
-            ...buildOptions.themeNames.map(themeName => pathJoin(srcMainResourcesRelativeDirPath, "theme", themeName, "account", "theme.properties"))
+            ...buildOptions.themeNames.map(themeName => pathJoin("src", "main", "resources", "theme", themeName, "account", "theme.properties"))
         );
 
-        const accountV1RelativeDirPath = pathJoin(srcMainResourcesRelativeDirPath, "theme", accountV1ThemeName);
+        const accountV1RelativeDirPath = pathJoin("src", "main", "resources", "theme", accountV1ThemeName);
 
         transformCodebase({
             "srcDirPath": buildOptions.keycloakifyBuildDirPath,
@@ -107,7 +103,7 @@ export async function buildJar(params: {
 
         (["register.ftl", "login-update-profile.ftl"] as const).forEach(pageId =>
             buildOptions.themeNames.map(themeName => {
-                const ftlFilePath = pathJoin(keycloakifyBuildTmpDirPath, srcMainResourcesRelativeDirPath, "theme", themeName, "login", pageId);
+                const ftlFilePath = pathJoin(keycloakifyBuildTmpDirPath, "src", "main", "resources", "theme", themeName, "login", pageId);
 
                 const ftlFileContent = readFileSync(ftlFilePath).toString("utf8");
 
@@ -170,5 +166,5 @@ export async function buildJar(params: {
         pathJoin(buildOptions.keycloakifyBuildDirPath, jarFileBasename)
     );
 
-    await fs.rm(keycloakifyBuildTmpDirPath, { "recursive": true });
+    rmSync(keycloakifyBuildTmpDirPath, { "recursive": true });
 }

package/src/bin/keycloakify/buildJars/buildJars.ts

@@ -3,7 +3,10 @@ import { exclude } from "tsafe/exclude";
 import { keycloakAccountV1Versions, keycloakThemeAdditionalInfoExtensionVersions } from "./extensionVersions";
 import { getKeycloakVersionRangeForJar } from "./getKeycloakVersionRangeForJar";
 import { buildJar, BuildOptionsLike as BuildOptionsLike_buildJar } from "./buildJar";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
+import { getJarFileBasename } from "../../shared/getJarFileBasename";
+import { readMetaInfKeycloakThemes } from "../../shared/metaInfKeycloakThemes";
+import { accountV1ThemeName } from "../../shared/constants";
 
 export type BuildOptionsLike = BuildOptionsLike_buildJar & {
     keycloakifyBuildDirPath: string;
@@ -11,13 +14,12 @@ export type BuildOptionsLike = BuildOptionsLike_buildJar & {
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export async function buildJars(params: {
-    doesImplementAccountTheme: boolean;
-    buildOptions: BuildOptionsLike;
-}): Promise<{ lastJarFileBasename: string }> {
-    const { doesImplementAccountTheme, buildOptions } = params;
+export async function buildJars(params: { buildOptions: BuildOptionsLike }): Promise<void> {
+    const { buildOptions } = params;
 
-    let lastJarFileBasename: string | undefined = undefined;
+    const doesImplementAccountTheme = readMetaInfKeycloakThemes({
+        "keycloakifyBuildDirPath": buildOptions.keycloakifyBuildDirPath
+    }).themes.some(({ name }) => name === accountV1ThemeName);
 
     await Promise.all(
         keycloakAccountV1Versions
@@ -38,11 +40,12 @@ export async function buildJars(params: {
                     })
                     .filter(exclude(undefined))
                     .map(({ keycloakThemeAdditionalInfoExtensionVersion, keycloakVersionRange }) => {
-                        const jarFileBasename = `keycloak-theme-for-kc-${keycloakVersionRange}.jar`;
+                        const { jarFileBasename } = getJarFileBasename({ keycloakVersionRange });
 
-                        lastJarFileBasename = jarFileBasename;
-
-                        return { keycloakThemeAdditionalInfoExtensionVersion, jarFileBasename };
+                        return {
+                            keycloakThemeAdditionalInfoExtensionVersion,
+                            jarFileBasename
+                        };
                     })
                     .map(({ keycloakThemeAdditionalInfoExtensionVersion, jarFileBasename }) =>
                         buildJar({
@@ -55,8 +58,4 @@ export async function buildJars(params: {
             )
             .flat()
     );
-
-    assert(lastJarFileBasename !== undefined);
-
-    return { lastJarFileBasename };
 }

package/src/bin/keycloakify/buildJars/generatePom.ts

@@ -1,5 +1,5 @@
 import { assert } from "tsafe/assert";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
 import type { KeycloakAccountV1Version, KeycloakThemeAdditionalInfoExtensionVersion } from "./extensionVersions";
 
 export type BuildOptionsLike = {

package/src/bin/keycloakify/buildJars/getKeycloakVersionRangeForJar.ts

@@ -1,37 +1,64 @@
 import { assert, type Equals } from "tsafe/assert";
 import type { KeycloakAccountV1Version, KeycloakThemeAdditionalInfoExtensionVersion } from "./extensionVersions";
+import type { KeycloakVersionRange } from "../../shared/KeycloakVersionRange";
 
 export function getKeycloakVersionRangeForJar(params: {
     doesImplementAccountTheme: boolean;
     keycloakAccountV1Version: KeycloakAccountV1Version;
     keycloakThemeAdditionalInfoExtensionVersion: KeycloakThemeAdditionalInfoExtensionVersion;
-}): string | undefined {
+}): KeycloakVersionRange | undefined {
     const { keycloakAccountV1Version, keycloakThemeAdditionalInfoExtensionVersion, doesImplementAccountTheme } = params;
 
-    switch (keycloakAccountV1Version) {
-        case null:
-            switch (keycloakThemeAdditionalInfoExtensionVersion) {
+    if (doesImplementAccountTheme) {
+        const keycloakVersionRange = (() => {
+            switch (keycloakAccountV1Version) {
                 case null:
-                    return doesImplementAccountTheme ? "21-and-below" : "21-and-below";
-                case "1.1.5":
-                    return doesImplementAccountTheme ? undefined : "22-and-above";
+                    switch (keycloakThemeAdditionalInfoExtensionVersion) {
+                        case null:
+                            return "21-and-below" as const;
+                        case "1.1.5":
+                            return undefined;
+                    }
+                    assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
+                case "0.3":
+                    switch (keycloakThemeAdditionalInfoExtensionVersion) {
+                        case null:
+                            return undefined;
+                        case "1.1.5":
+                            return "23" as const;
+                    }
+                    assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
+                case "0.4":
+                    switch (keycloakThemeAdditionalInfoExtensionVersion) {
+                        case null:
+                            return undefined;
+                        case "1.1.5":
+                            return "24-and-above" as const;
+                    }
+                    assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
             }
-            assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
-        case "0.3":
-            switch (keycloakThemeAdditionalInfoExtensionVersion) {
-                case null:
-                    return doesImplementAccountTheme ? undefined : undefined;
-                case "1.1.5":
-                    return doesImplementAccountTheme ? "23" : undefined;
+        })();
+
+        assert<Equals<typeof keycloakVersionRange, KeycloakVersionRange.WithAccountTheme | undefined>>();
+
+        return keycloakVersionRange;
+    } else {
+        const keycloakVersionRange = (() => {
+            if (keycloakAccountV1Version !== null) {
+                return undefined;
             }
-            assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
-        case "0.4":
+
             switch (keycloakThemeAdditionalInfoExtensionVersion) {
                 case null:
-                    return doesImplementAccountTheme ? undefined : undefined;
+                    return "21-and-below";
                 case "1.1.5":
-                    return doesImplementAccountTheme ? "24-and-above" : undefined;
+                    return "22-and-above";
             }
             assert<Equals<typeof keycloakThemeAdditionalInfoExtensionVersion, never>>(false);
+        })();
+
+        assert<Equals<typeof keycloakVersionRange, KeycloakVersionRange.WithoutAccountTheme | undefined>>();
+
+        return keycloakVersionRange;
     }
 }

package/src/bin/keycloakify/generateFtl/generateFtl.ts

@@ -4,9 +4,9 @@ import { generateCssCodeToDefineGlobals } from "../replacers/replaceImportsInCss
 import { replaceImportsInInlineCssCode } from "../replacers/replaceImportsInInlineCssCode";
 import * as fs from "fs";
 import { join as pathJoin } from "path";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
 import { assert } from "tsafe/assert";
-import { type ThemeType, nameOfTheGlobal, basenameOfTheKeycloakifyResourcesDir, resources_common } from "../../constants";
+import { type ThemeType, nameOfTheGlobal, basenameOfTheKeycloakifyResourcesDir, resources_common } from "../../shared/constants";
 
 export type BuildOptionsLike = {
     bundler: "vite" | "webpack";

package/src/bin/keycloakify/generateFtl/index.ts

@@ -1,2 +1 @@
 export * from "./generateFtl";
-export * from "./pageId";

package/src/bin/keycloakify/{generateTheme → generateSrcMainResources}/bringInAccountV1.ts

@@ -1,23 +1,24 @@
 import * as fs from "fs";
 import { join as pathJoin } from "path";
 import { assert } from "tsafe/assert";
-import type { BuildOptions } from "../buildOptions";
-import { resources_common, lastKeycloakVersionWithAccountV1, accountV1ThemeName } from "../../constants";
-import { downloadBuiltinKeycloakTheme } from "../../download-builtin-keycloak-theme";
+import type { BuildOptions } from "../../shared/buildOptions";
+import { resources_common, lastKeycloakVersionWithAccountV1, accountV1ThemeName } from "../../shared/constants";
+import { downloadBuiltinKeycloakTheme } from "../../shared/downloadBuiltinKeycloakTheme";
 import { transformCodebase } from "../../tools/transformCodebase";
 import { rmSync } from "../../tools/fs.rmSync";
 
 type BuildOptionsLike = {
     cacheDirPath: string;
     npmWorkspaceRootDirPath: string;
+    keycloakifyBuildDirPath: string;
 };
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export async function bringInAccountV1(params: { buildOptions: BuildOptionsLike; srcMainResourcesDirPath: string }) {
-    const { buildOptions, srcMainResourcesDirPath } = params;
+export async function bringInAccountV1(params: { buildOptions: BuildOptionsLike }) {
+    const { buildOptions } = params;
 
-    const builtinKeycloakThemeTmpDirPath = pathJoin(srcMainResourcesDirPath, "..", "tmp_yxdE2_builtin_keycloak_theme");
+    const builtinKeycloakThemeTmpDirPath = pathJoin(buildOptions.cacheDirPath, "bringInAccountV1_tmp");
 
     await downloadBuiltinKeycloakTheme({
         "destDirPath": builtinKeycloakThemeTmpDirPath,
@@ -25,7 +26,7 @@ export async function bringInAccountV1(params: { buildOptions: BuildOptionsLike;
         buildOptions
     });
 
-    const accountV1DirPath = pathJoin(srcMainResourcesDirPath, "theme", accountV1ThemeName, "account");
+    const accountV1DirPath = pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", accountV1ThemeName, "account");
 
     transformCodebase({
         "srcDirPath": pathJoin(builtinKeycloakThemeTmpDirPath, "base", "account"),

package/src/bin/keycloakify/{generateTheme → generateSrcMainResources}/generateMessageProperties.ts

@@ -1,4 +1,4 @@
-import type { ThemeType } from "../../constants";
+import type { ThemeType } from "../../shared/constants";
 import { crawl } from "../../tools/crawl";
 import { join as pathJoin } from "path";
 import { readFileSync } from "fs";

package/src/bin/keycloakify/generateSrcMainResources/generateSrcMainResources.ts

@@ -0,0 +1,32 @@
+import type { BuildOptions } from "../../shared/buildOptions";
+import { assert } from "tsafe/assert";
+import {
+    generateSrcMainResourcesForMainTheme,
+    type BuildOptionsLike as BuildOptionsLike_generateSrcMainResourcesForMainTheme
+} from "./generateSrcMainResourcesForMainTheme";
+import { generateSrcMainResourcesForThemeVariant } from "./generateSrcMainResourcesForThemeVariant";
+
+export type BuildOptionsLike = BuildOptionsLike_generateSrcMainResourcesForMainTheme & {
+    themeNames: string[];
+};
+
+assert<BuildOptions extends BuildOptionsLike ? true : false>();
+
+export async function generateSrcMainResources(params: { buildOptions: BuildOptionsLike }): Promise<void> {
+    const { buildOptions } = params;
+
+    const [themeName, ...themeVariantNames] = buildOptions.themeNames;
+
+    await generateSrcMainResourcesForMainTheme({
+        themeName,
+        buildOptions
+    });
+
+    for (const themeVariantName of themeVariantNames) {
+        generateSrcMainResourcesForThemeVariant({
+            themeName,
+            themeVariantName,
+            buildOptions
+        });
+    }
+}

package/src/bin/keycloakify/{generateTheme/generateSrcMainResources.ts → generateSrcMainResources/generateSrcMainResourcesForMainTheme.ts}

@@ -1,25 +1,30 @@
 import { transformCodebase } from "../../tools/transformCodebase";
 import * as fs from "fs";
-import { join as pathJoin, resolve as pathResolve, dirname as pathDirname } from "path";
+import { join as pathJoin, resolve as pathResolve } from "path";
 import { replaceImportsInJsCode } from "../replacers/replaceImportsInJsCode";
 import { replaceImportsInCssCode } from "../replacers/replaceImportsInCssCode";
-import { generateFtlFilesCodeFactory, loginThemePageIds, accountThemePageIds } from "../generateFtl";
+import { generateFtlFilesCodeFactory } from "../generateFtl";
+import { loginThemePageIds, accountThemePageIds } from "../../shared/pageIds";
 import {
     type ThemeType,
     lastKeycloakVersionWithAccountV1,
     keycloak_resources,
     accountV1ThemeName,
     basenameOfTheKeycloakifyResourcesDir
-} from "../../constants";
+} from "../../shared/constants";
 import { isInside } from "../../tools/isInside";
-import type { BuildOptions } from "../buildOptions";
+import type { BuildOptions } from "../../shared/buildOptions";
 import { assert, type Equals } from "tsafe/assert";
-import { downloadKeycloakStaticResources } from "./downloadKeycloakStaticResources";
+import { downloadKeycloakStaticResources } from "../../shared/downloadKeycloakStaticResources";
 import { readFieldNameUsage } from "./readFieldNameUsage";
 import { readExtraPagesNames } from "./readExtraPageNames";
 import { generateMessageProperties } from "./generateMessageProperties";
 import { bringInAccountV1 } from "./bringInAccountV1";
+import { getThemeSrcDirPath } from "../../shared/getThemeSrcDirPath";
 import { rmSync } from "../../tools/fs.rmSync";
+import { readThisNpmProjectVersion } from "../../tools/readThisNpmProjectVersion";
+import { writeMetaInfKeycloakThemes, type MetaInfKeycloakTheme } from "../../shared/metaInfKeycloakThemes";
+import { objectEntries } from "tsafe/objectEntries";
 
 export type BuildOptionsLike = {
     bundler: "vite" | "webpack";
@@ -31,23 +36,20 @@ export type BuildOptionsLike = {
     assetsDirPath: string;
     urlPathname: string | undefined;
     npmWorkspaceRootDirPath: string;
+    reactAppRootDirPath: string;
+    keycloakifyBuildDirPath: string;
 };
 
 assert<BuildOptions extends BuildOptionsLike ? true : false>();
 
-export async function generateSrcMainResources(params: {
-    themeName: string;
-    themeSrcDirPath: string;
-    keycloakifySrcDirPath: string;
-    buildOptions: BuildOptionsLike;
-    keycloakifyVersion: string;
-    srcMainResourcesDirPath: string;
-}): Promise<{ doesImplementAccountTheme: boolean }> {
-    const { themeName, themeSrcDirPath, keycloakifySrcDirPath, buildOptions, keycloakifyVersion, srcMainResourcesDirPath } = params;
+export async function generateSrcMainResourcesForMainTheme(params: { themeName: string; buildOptions: BuildOptionsLike }): Promise<void> {
+    const { themeName, buildOptions } = params;
+
+    const { themeSrcDirPath } = getThemeSrcDirPath({ "reactAppRootDirPath": buildOptions.reactAppRootDirPath });
 
     const getThemeTypeDirPath = (params: { themeType: ThemeType | "email" }) => {
         const { themeType } = params;
-        return pathJoin(srcMainResourcesDirPath, "theme", themeName, themeType);
+        return pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources", "theme", themeName, themeType);
     };
 
     const cssGlobalsToDefine: Record<string, string> = {};
@@ -74,7 +76,7 @@ export async function generateSrcMainResources(params: {
             rmSync(destDirPath, { "recursive": true, "force": true });
 
             if (themeType === "account" && implementedThemeTypes.login) {
-                // NOTE: We prevend doing it twice, it has been done for the login theme.
+                // NOTE: We prevent doing it twice, it has been done for the login theme.
 
                 transformCodebase({
                     "srcDirPath": pathJoin(
@@ -136,10 +138,9 @@ export async function generateSrcMainResources(params: {
             "indexHtmlCode": fs.readFileSync(pathJoin(buildOptions.reactAppBuildDirPath, "index.html")).toString("utf8"),
             cssGlobalsToDefine,
             buildOptions,
-            keycloakifyVersion,
+            "keycloakifyVersion": readThisNpmProjectVersion(),
             themeType,
             "fieldNames": readFieldNameUsage({
-                keycloakifySrcDirPath,
                 themeSrcDirPath,
                 themeType
             })
@@ -228,40 +229,32 @@ export async function generateSrcMainResources(params: {
         });
     }
 
-    const parsedKeycloakThemeJson: { themes: { name: string; types: string[] }[] } = { "themes": [] };
-
-    parsedKeycloakThemeJson.themes.push({
-        "name": themeName,
-        "types": Object.entries(implementedThemeTypes)
-            .filter(([, isImplemented]) => isImplemented)
-            .map(([themeType]) => themeType)
-    });
-
-    account_specific_extra_work: {
-        if (!implementedThemeTypes.account) {
-            break account_specific_extra_work;
-        }
-
+    if (implementedThemeTypes.account) {
         await bringInAccountV1({
-            srcMainResourcesDirPath,
             buildOptions
         });
-
-        parsedKeycloakThemeJson.themes.push({
-            "name": accountV1ThemeName,
-            "types": ["account"]
-        });
     }
 
     {
-        const keycloakThemeJsonFilePath = pathJoin(srcMainResourcesDirPath, "META-INF", "keycloak-themes.json");
+        const metaInfKeycloakThemes: MetaInfKeycloakTheme = { "themes": [] };
 
-        try {
-            fs.mkdirSync(pathDirname(keycloakThemeJsonFilePath));
-        } catch {}
+        metaInfKeycloakThemes.themes.push({
+            "name": themeName,
+            "types": objectEntries(implementedThemeTypes)
+                .filter(([, isImplemented]) => isImplemented)
+                .map(([themeType]) => themeType)
+        });
 
-        fs.writeFileSync(keycloakThemeJsonFilePath, Buffer.from(JSON.stringify(parsedKeycloakThemeJson, null, 2), "utf8"));
-    }
+        if (implementedThemeTypes.account) {
+            metaInfKeycloakThemes.themes.push({
+                "name": accountV1ThemeName,
+                "types": ["account"]
+            });
+        }
 
-    return { "doesImplementAccountTheme": implementedThemeTypes.account };
+        writeMetaInfKeycloakThemes({
+            "keycloakifyBuildDirPath": buildOptions.keycloakifyBuildDirPath,
+            metaInfKeycloakThemes
+        });
+    }
 }