From 37dbd49589101ad8b7196cac4b611c2bce4ad030 Mon Sep 17 00:00:00 2001
From: garronej <joseph.garrone@data.gouv.fr>
Date: Mon, 4 Sep 2023 00:53:57 +0200
Subject: [PATCH] Rename extraThemeNames to themeVariantNames

---
 README.md                                                   | 2 +-
 src/bin/keycloakify/BuildOptions.ts                         | 6 +++---
 .../generateJavaStackFiles/generateJavaStackFiles.ts        | 6 +++---
 src/bin/keycloakify/keycloakify.ts                          | 2 +-
 src/bin/keycloakify/parsedPackageJson.ts                    | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index d989cce7..419ede4c 100644
--- a/README.md
+++ b/README.md
@@ -166,7 +166,7 @@ There are very few breaking changes in this major version. [Check them out](http
 ## 7.12
 
 -   You can now pack multiple themes variant in a single `.jar` bundle. In vanilla Keycloak themes you have the ability to extend a base theme.
-    There is now an idiomatic way of achieving the same result. [Learn more](https://docs.keycloakify.dev/build-options#keycloakify.extrathemenames).
+    There is now an idiomatic way of achieving the same result. [Learn more](https://docs.keycloakify.dev/build-options#keycloakify.themeVariantNames).
 
 ## 7.9
 
diff --git a/src/bin/keycloakify/BuildOptions.ts b/src/bin/keycloakify/BuildOptions.ts
index 2148c73a..606f889f 100644
--- a/src/bin/keycloakify/BuildOptions.ts
+++ b/src/bin/keycloakify/BuildOptions.ts
@@ -9,7 +9,7 @@ export type BuildOptions = {
     isSilent: boolean;
     themeVersion: string;
     themeName: string;
-    extraThemeNames: string[];
+    themeVariantNames: string[];
     extraThemeProperties: string[] | undefined;
     groupId: string;
     artifactId: string;
@@ -48,7 +48,7 @@ export function readBuildOptions(params: { reactAppRootDirPath: string; processA
         artifactId,
         doCreateJar,
         loginThemeResourcesFromKeycloakVersion,
-        extraThemeNames = []
+        themeVariantNames = []
     } = keycloakify ?? {};
 
     const themeName =
@@ -61,7 +61,7 @@ export function readBuildOptions(params: { reactAppRootDirPath: string; processA
     return {
         reactAppRootDirPath,
         themeName,
-        extraThemeNames,
+        themeVariantNames,
         "doCreateJar": doCreateJar ?? true,
         "artifactId": process.env.KEYCLOAKIFY_ARTIFACT_ID ?? artifactId ?? `${themeName}-keycloak-theme`,
         "groupId": (() => {
diff --git a/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts b/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
index 307e990d..6d5941d0 100644
--- a/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
+++ b/src/bin/keycloakify/generateJavaStackFiles/generateJavaStackFiles.ts
@@ -8,7 +8,7 @@ import { bringInAccountV1, accountV1 } from "./bringInAccountV1";
 
 export type BuildOptionsLike = {
     themeName: string;
-    extraThemeNames: string[];
+    themeVariantNames: string[];
     groupId: string;
     artifactId: string;
     themeVersion: string;
@@ -178,7 +178,7 @@ export async function generateJavaStackFiles(params: {
                                           "types": ["account"]
                                       }
                                   ]),
-                            ...[buildOptions.themeName, ...buildOptions.extraThemeNames]
+                            ...[buildOptions.themeName, ...buildOptions.themeVariantNames]
                                 .map(themeName => [
                                     {
                                         "name": themeName,
@@ -190,7 +190,7 @@ export async function generateJavaStackFiles(params: {
                                         ? []
                                         : [
                                               {
-                                                  "name": `${themeName}_retrocompatible`,
+                                                  "name": `${themeName}_retrocompat`,
                                                   "types": ["account"]
                                               }
                                           ])
diff --git a/src/bin/keycloakify/keycloakify.ts b/src/bin/keycloakify/keycloakify.ts
index af05f9d0..b55b9e19 100644
--- a/src/bin/keycloakify/keycloakify.ts
+++ b/src/bin/keycloakify/keycloakify.ts
@@ -26,7 +26,7 @@ export async function main() {
 
     const { themeSrcDirPath } = getThemeSrcDirPath({ reactAppRootDirPath });
 
-    for (const themeName of [buildOptions.themeName, ...buildOptions.extraThemeNames]) {
+    for (const themeName of [buildOptions.themeName, ...buildOptions.themeVariantNames]) {
         await generateTheme({
             themeSrcDirPath,
             "keycloakifySrcDirPath": pathJoin(keycloakifyDirPath, "src"),
diff --git a/src/bin/keycloakify/parsedPackageJson.ts b/src/bin/keycloakify/parsedPackageJson.ts
index 90665ec3..ed069e11 100644
--- a/src/bin/keycloakify/parsedPackageJson.ts
+++ b/src/bin/keycloakify/parsedPackageJson.ts
@@ -18,7 +18,7 @@ export type ParsedPackageJson = {
         reactAppBuildDirPath?: string;
         keycloakifyBuildDirPath?: string;
         themeName?: string;
-        extraThemeNames?: string[];
+        themeVariantNames?: string[];
     };
 };
 
@@ -37,7 +37,7 @@ export const zParsedPackageJson = z.object({
             "reactAppBuildDirPath": z.string().optional(),
             "keycloakifyBuildDirPath": z.string().optional(),
             "themeName": z.string().optional(),
-            "extraThemeNames": z.array(z.string()).optional()
+            "themeVariantNames": z.array(z.string()).optional()
         })
         .optional()
 });