keycloakify 7.6.0 → 7.6.2

package/bin/tools/trimIndent.js.map

@@ -1 +1 @@
-{"version":3,"file":"trimIndent.js","sourceRoot":"","sources":["../../src/bin/tools/trimIndent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;GAGG;AACH,SAAS,gBAAgB,CAAC,OAA6B;;IAAE,cAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,6BAAc;;IACnE,IAAM,MAAM,GAAG,EAAE,CAAC;IAClB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAC7B,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;YACZ,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACxB,6CAA6C;YAC7C,oBAAoB,GAAG,MAAA,MAAA,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0CAAE,MAAM,mCAAI,CAAC,CAAC;SACrE;QACD,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;YACT,2EAA2E;YAC3E,qCAAqC;YACrC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC,CAAC;SACvF;KACJ;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3B,CAAC;AAED,SAAS,iBAAiB,CAAC,kCAA2C,EAAE,OAA6B;;IAAE,cAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,6BAAc;;IACjH,oCAAoC;IACpC,IAAI,MAAM,GAAG,gBAAgB,8BAAC,OAAO,UAAK,IAAI,UAAC,CAAC;IAChD,IAAI,kCAAkC;QAAE,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;IAChH,IAAM,KAAK,GAAG,MAAA,MAAA,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,0CAAE,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAC,mCAAI,EAAE,CAAC;IACpE,+BAA+B;IAC/B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IAC/C,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,OAAR,IAAI,2BAAQ,KAAK,UAAC,CAAC;IACnC,6CAA6C;IAC7C,IAAI,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC;IAC5B,IAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,WAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;IACjF,OAAO,QAAQ,CAAC;AACpB,CAAC;AAED;;;GAGG;AACH,SAAwB,UAAU,CAAC,OAA6B;IAAE,cAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,6BAAc;;IAC5E,OAAO,iBAAiB,8BAAC,IAAI,EAAE,OAAO,UAAK,IAAI,WAAE;AACrD,CAAC;AAFD,6BAEC;AAED;;;GAGG;AACH,UAAU,CAAC,8BAA8B,GAAG,UAAU,OAA6B;IAAE,cAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,6BAAc;;IAC/F,OAAO,iBAAiB,8BAAC,KAAK,EAAE,OAAO,UAAK,IAAI,WAAE;AACtD,CAAC,CAAC"}
+{"version":3,"file":"trimIndent.js","sourceRoot":"","sources":["../../src/bin/tools/trimIndent.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;;;GAGG;AACH,SAAS,gBAAgB,CAAC,OAA6B;;IAAE,cAAkB;SAAlB,UAAkB,EAAlB,qBAAkB,EAAlB,IAAkB;QAAlB,6BAAkB;;IACvE,IAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;QACrC,IAAI,oBAAoB,GAAG,CAAC,CAAC;QAC7B,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;YACZ,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;YACxB,6CAA6C;YAC7C,oBAAoB,GAAG,MAAA,MAAA,OAAO,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,0CAAE,MAAM,mCAAI,CAAC,CAAC;SACrE;QACD,IAAI,IAAI,CAAC,CAAC,CAAC,EAAE;YACT,2EAA2E;YAC3E,qCAAqC;YACrC,IAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,YAAY,EAAE,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC,CAAC;YAC7F,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;SACtB;KACJ;IACD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;AAC3B,CAAC;AAED;;;GAGG;AACH,SAAwB,UAAU,CAAC,OAA6B;;IAAE,cAAc;SAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;QAAd,6BAAc;;IAC5E,oCAAoC;IACpC,IAAI,MAAM,GAAG,gBAAgB,8BAAC,OAAO,UAAK,IAAI,WACzC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC;SACtB,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC7B,IAAM,KAAK,GACP,MAAA,MAAA,MAAA,MAAM;SACD,KAAK,CAAC,aAAa,CAAC,0CACnB,MAAM,CAAC,UAAA,CAAC,IAAI,OAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC,0CAC5B,GAAG,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAC,mCAAI,EAAE,CAAC;IACnC,+BAA+B;IAC/B,IAAI,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,IAAI,CAAC;QAAE,OAAO,MAAM,CAAC;IAC/C,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,OAAR,IAAI,2BAAQ,KAAK,UAAC,CAAC;IACnC,6CAA6C;IAC7C,IAAI,CAAC,OAAO;QAAE,OAAO,MAAM,CAAC;IAC5B,IAAM,EAAE,GAAG,IAAI,MAAM,CAAC,WAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAE,EAAE,IAAI,CAAC,CAAC;IACvD,IAAM,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;IACxC,OAAO,QAAQ,CAAC;AACpB,CAAC;AAlBD,6BAkBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "7.6.0",
+    "version": "7.6.2",
     "description": "Create Keycloak themes using React",
     "repository": {
         "type": "git",
@@ -68,9 +68,9 @@
         "src/account/pages/Password.tsx",
         "src/bin/download-builtin-keycloak-theme.ts",
         "src/bin/eject-keycloak-page.ts",
+        "src/bin/getSrcDirPath.ts",
         "src/bin/initialize-email-theme.ts",
         "src/bin/keycloakify/BuildOptions.ts",
-        "src/bin/keycloakify/build-paths.ts",
         "src/bin/keycloakify/ftlValuesGlobalName.ts",
         "src/bin/keycloakify/generateFtl/ftl_object_to_js_code_declaring_an_object.ftl",
         "src/bin/keycloakify/generateFtl/generateFtl.ts",
@@ -315,15 +315,15 @@
         "bin/eject-keycloak-page.d.ts",
         "bin/eject-keycloak-page.js",
         "bin/eject-keycloak-page.js.map",
+        "bin/getSrcDirPath.d.ts",
+        "bin/getSrcDirPath.js",
+        "bin/getSrcDirPath.js.map",
         "bin/initialize-email-theme.d.ts",
         "bin/initialize-email-theme.js",
         "bin/initialize-email-theme.js.map",
         "bin/keycloakify/BuildOptions.d.ts",
         "bin/keycloakify/BuildOptions.js",
         "bin/keycloakify/BuildOptions.js.map",
-        "bin/keycloakify/build-paths.d.ts",
-        "bin/keycloakify/build-paths.js",
-        "bin/keycloakify/build-paths.js.map",
         "bin/keycloakify/ftlValuesGlobalName.d.ts",
         "bin/keycloakify/ftlValuesGlobalName.js",
         "bin/keycloakify/ftlValuesGlobalName.js.map",

package/src/bin/download-builtin-keycloak-theme.ts

@@ -4,7 +4,7 @@ import { downloadAndUnzip } from "./tools/downloadAndUnzip";
 import { promptKeycloakVersion } from "./promptKeycloakVersion";
 import { getCliOptions } from "./tools/cliOptions";
 import { getLogger } from "./tools/logger";
-import { getKeycloakBuildPath } from "./keycloakify/build-paths";
+import { readBuildOptions } from "./keycloakify/BuildOptions";
 
 export async function downloadBuiltinKeycloakTheme(params: { keycloakVersion: string; destDirPath: string; isSilent: boolean }) {
     const { keycloakVersion, destDirPath } = params;
@@ -25,7 +25,17 @@ async function main() {
     const logger = getLogger({ isSilent });
     const { keycloakVersion } = await promptKeycloakVersion();
 
-    const destDirPath = pathJoin(getKeycloakBuildPath(), "src", "main", "resources", "theme");
+    const destDirPath = pathJoin(
+        readBuildOptions({
+            "isSilent": true,
+            "isExternalAssetsCliParamProvided": false,
+            "projectDirPath": process.cwd()
+        }).keycloakifyBuildDirPath,
+        "src",
+        "main",
+        "resources",
+        "theme"
+    );
 
     logger.log(`Downloading builtins theme of Keycloak ${keycloakVersion} here ${destDirPath}`);
 

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

@@ -16,10 +16,10 @@ import { existsSync } from "fs";
 import { join as pathJoin, relative as pathRelative } from "path";
 import { kebabCaseToCamelCase } from "./tools/kebabCaseToSnakeCase";
 import { assert, Equals } from "tsafe/assert";
-import { getThemeSrcDirPath } from "./keycloakify/build-paths";
+import { getThemeSrcDirPath } from "./getSrcDirPath";
 
 (async () => {
-    const projectRootDir = getProjectRoot();
+    const projectDirPath = getProjectRoot();
 
     console.log("Select a theme type");
 
@@ -51,7 +51,7 @@ import { getThemeSrcDirPath } from "./keycloakify/build-paths";
 
     const pageBasename = capitalize(kebabCaseToCamelCase(pageId)).replace(/ftl$/, "tsx");
 
-    const { themeSrcDirPath } = getThemeSrcDirPath();
+    const { themeSrcDirPath } = getThemeSrcDirPath({ "projectDirPath": projectDirPath });
 
     if (themeSrcDirPath === undefined) {
         throw new Error("Couldn't locate your theme sources");
@@ -65,7 +65,7 @@ import { getThemeSrcDirPath } from "./keycloakify/build-paths";
         process.exit(-1);
     }
 
-    writeFile(targetFilePath, await readFile(pathJoin(projectRootDir, "src", themeType, "pages", pageBasename)));
+    writeFile(targetFilePath, await readFile(pathJoin(projectDirPath, "src", themeType, "pages", pageBasename)));
 
     console.log(`${pathRelative(process.cwd(), targetFilePath)} created`);
 })();

package/src/bin/getSrcDirPath.ts

@@ -0,0 +1,43 @@
+import * as fs from "fs";
+import { exclude } from "tsafe";
+import { crawl } from "./tools/crawl";
+import { join as pathJoin } from "path";
+
+const themeSrcDirBasename = "keycloak-theme";
+
+export function getThemeSrcDirPath(params: { projectDirPath: string }) {
+    const { projectDirPath } = params;
+
+    const srcDirPath = pathJoin(projectDirPath, "src");
+
+    const themeSrcDirPath: string | undefined = crawl(srcDirPath)
+        .map(fileRelativePath => {
+            const split = fileRelativePath.split(themeSrcDirBasename);
+
+            if (split.length !== 2) {
+                return undefined;
+            }
+
+            return pathJoin(srcDirPath, split[0] + themeSrcDirBasename);
+        })
+        .filter(exclude(undefined))[0];
+
+    if (themeSrcDirPath === undefined) {
+        if (fs.existsSync(pathJoin(srcDirPath, "login")) || fs.existsSync(pathJoin(srcDirPath, "account"))) {
+            return { "themeSrcDirPath": srcDirPath };
+        }
+        return { "themeSrcDirPath": undefined };
+    }
+
+    return { themeSrcDirPath };
+}
+
+export function getEmailThemeSrcDirPath(params: { projectDirPath: string }) {
+    const { projectDirPath } = params;
+
+    const { themeSrcDirPath } = getThemeSrcDirPath({ projectDirPath });
+
+    const emailThemeSrcDirPath = themeSrcDirPath === undefined ? undefined : pathJoin(themeSrcDirPath, "email");
+
+    return { emailThemeSrcDirPath };
+}

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

@@ -7,13 +7,15 @@ import { promptKeycloakVersion } from "./promptKeycloakVersion";
 import * as fs from "fs";
 import { getCliOptions } from "./tools/cliOptions";
 import { getLogger } from "./tools/logger";
-import { getEmailThemeSrcDirPath } from "./keycloakify/build-paths";
+import { getEmailThemeSrcDirPath } from "./getSrcDirPath";
 
 export async function main() {
     const { isSilent } = getCliOptions(process.argv.slice(2));
     const logger = getLogger({ isSilent });
 
-    const { emailThemeSrcDirPath } = getEmailThemeSrcDirPath();
+    const { emailThemeSrcDirPath } = getEmailThemeSrcDirPath({
+        "projectDirPath": process.cwd()
+    });
 
     if (emailThemeSrcDirPath === undefined) {
         logger.warn("Couldn't locate your theme source directory");

package/src/bin/keycloakify/BuildOptions.ts

@@ -4,7 +4,8 @@ import { parse as urlParse } from "url";
 import { typeGuard } from "tsafe/typeGuard";
 import { symToStr } from "tsafe/symToStr";
 import { bundlers, getParsedPackageJson, type Bundler } from "./parsedPackageJson";
-import { getAppInputPath, getKeycloakBuildPath } from "./build-paths";
+import * as fs from "fs";
+import { join as pathJoin, sep as pathSep } from "path";
 
 /** Consolidated build option gathered form CLI arguments and config in package.json */
 export type BuildOptions = BuildOptions.Standalone | BuildOptions.ExternalAssets;
@@ -21,10 +22,10 @@ export namespace BuildOptions {
         artifactId: string;
         bundler: Bundler;
         keycloakVersionDefaultAssets: string;
-        // Directory of your built react project. Defaults to {cwd}/build
-        appInputPath: string;
-        // Directory that keycloakify outputs to. Defaults to {cwd}/build_keycloak
-        keycloakBuildPath: string;
+        /** Directory of your built react project. Defaults to {cwd}/build */
+        reactAppBuildDirPath: string;
+        /** Directory that keycloakify outputs to. Defaults to {cwd}/build_keycloak */
+        keycloakifyBuildDirPath: string;
         customUserAttributes: string[];
     };
 
@@ -52,10 +53,10 @@ export namespace BuildOptions {
     }
 }
 
-export function readBuildOptions(params: { CNAME: string | undefined; isExternalAssetsCliParamProvided: boolean; isSilent: boolean }): BuildOptions {
-    const { CNAME, isExternalAssetsCliParamProvided, isSilent } = params;
+export function readBuildOptions(params: { projectDirPath: string; isExternalAssetsCliParamProvided: boolean; isSilent: boolean }): BuildOptions {
+    const { projectDirPath, isExternalAssetsCliParamProvided, isSilent } = params;
 
-    const parsedPackageJson = getParsedPackageJson();
+    const parsedPackageJson = getParsedPackageJson({ projectDirPath });
 
     const url = (() => {
         const { homepage } = parsedPackageJson;
@@ -66,6 +67,16 @@ export function readBuildOptions(params: { CNAME: string | undefined; isExternal
             url = new URL(homepage);
         }
 
+        const CNAME = (() => {
+            const cnameFilePath = pathJoin(projectDirPath, "public", "CNAME");
+
+            if (!fs.existsSync(cnameFilePath)) {
+                return undefined;
+            }
+
+            return fs.readFileSync(cnameFilePath).toString("utf8");
+        })();
+
         if (CNAME !== undefined) {
             url = new URL(`https://${CNAME.replace(/\s+$/, "")}`);
         }
@@ -134,8 +145,40 @@ export function readBuildOptions(params: { CNAME: string | undefined; isExternal
             extraThemeProperties,
             isSilent,
             "keycloakVersionDefaultAssets": keycloakVersionDefaultAssets ?? "11.0.3",
-            appInputPath: getAppInputPath(),
-            keycloakBuildPath: getKeycloakBuildPath(),
+            "reactAppBuildDirPath": (() => {
+                let { reactAppBuildDirPath = undefined } = parsedPackageJson.keycloakify ?? {};
+
+                if (reactAppBuildDirPath === undefined) {
+                    return pathJoin(projectDirPath, "build");
+                }
+
+                if (pathSep === "\\") {
+                    reactAppBuildDirPath = reactAppBuildDirPath.replace(/\//g, pathSep);
+                }
+
+                if (reactAppBuildDirPath.startsWith(`.${pathSep}`)) {
+                    return pathJoin(projectDirPath, reactAppBuildDirPath);
+                }
+
+                return reactAppBuildDirPath;
+            })(),
+            "keycloakifyBuildDirPath": (() => {
+                let { keycloakifyBuildDirPath = undefined } = parsedPackageJson.keycloakify ?? {};
+
+                if (keycloakifyBuildDirPath === undefined) {
+                    return pathJoin(projectDirPath, "build_keycloak");
+                }
+
+                if (pathSep === "\\") {
+                    keycloakifyBuildDirPath = keycloakifyBuildDirPath.replace(/\//g, pathSep);
+                }
+
+                if (keycloakifyBuildDirPath.startsWith(`.${pathSep}`)) {
+                    return pathJoin(projectDirPath, keycloakifyBuildDirPath);
+                }
+
+                return keycloakifyBuildDirPath;
+            })(),
             "customUserAttributes": keycloakify.customUserAttributes ?? []
         };
     })();

package/src/bin/keycloakify/keycloakify.ts

@@ -10,32 +10,25 @@ import { getCliOptions } from "../tools/cliOptions";
 import jar from "../tools/jar";
 import { assert } from "tsafe/assert";
 import { Equals } from "tsafe";
-import { getEmailThemeSrcDirPath } from "./build-paths";
-import { getCnamePath, getAppInputPath, getKeycloakBuildPath, getReactProjectDirPath } from "./build-paths";
+import { getEmailThemeSrcDirPath } from "../getSrcDirPath";
 
 export async function main() {
     const { isSilent, hasExternalAssets } = getCliOptions(process.argv.slice(2));
     const logger = getLogger({ isSilent });
     logger.log("🔏 Building the keycloak theme...⌚");
 
-    const buildOptions = readBuildOptions({
-        "CNAME": (() => {
-            const cnameFilePath = getCnamePath();
-
-            if (!fs.existsSync(cnameFilePath)) {
-                return undefined;
-            }
+    const projectDirPath = process.cwd();
 
-            return fs.readFileSync(cnameFilePath).toString("utf8");
-        })(),
+    const buildOptions = readBuildOptions({
+        projectDirPath,
         "isExternalAssetsCliParamProvided": hasExternalAssets,
         "isSilent": isSilent
     });
 
     const { doBundlesEmailTemplate } = await generateKeycloakThemeResources({
-        keycloakThemeBuildingDirPath: buildOptions.keycloakBuildPath,
+        keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,
         "emailThemeSrcDirPath": (() => {
-            const { emailThemeSrcDirPath } = getEmailThemeSrcDirPath();
+            const { emailThemeSrcDirPath } = getEmailThemeSrcDirPath({ projectDirPath });
 
             if (emailThemeSrcDirPath === undefined || !fs.existsSync(emailThemeSrcDirPath)) {
                 return;
@@ -43,13 +36,13 @@ export async function main() {
 
             return emailThemeSrcDirPath;
         })(),
-        "reactAppBuildDirPath": getAppInputPath(),
+        "reactAppBuildDirPath": buildOptions.reactAppBuildDirPath,
         buildOptions,
         "keycloakVersion": buildOptions.keycloakVersionDefaultAssets
     });
 
     const { jarFilePath } = generateJavaStackFiles({
-        keycloakThemeBuildingDirPath: buildOptions.keycloakBuildPath,
+        keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,
         doBundlesEmailTemplate,
         buildOptions
     });
@@ -61,7 +54,7 @@ export async function main() {
         case "keycloakify":
             logger.log("🫶 Let keycloakify do its thang");
             await jar({
-                "rootPath": pathJoin(buildOptions.keycloakBuildPath, "src", "main", "resources"),
+                "rootPath": pathJoin(buildOptions.keycloakifyBuildDirPath, "src", "main", "resources"),
                 "version": buildOptions.version,
                 "groupId": buildOptions.groupId,
                 "artifactId": buildOptions.artifactId,
@@ -70,7 +63,7 @@ export async function main() {
             break;
         case "mvn":
             logger.log("🫙 Run maven to deliver a jar");
-            child_process.execSync("mvn package", { "cwd": buildOptions.keycloakBuildPath });
+            child_process.execSync("mvn package", { "cwd": buildOptions.keycloakifyBuildDirPath });
             break;
         default:
             assert<Equals<typeof buildOptions.bundler, never>>(false);
@@ -80,7 +73,7 @@ export async function main() {
     const containerKeycloakVersion = "20.0.1";
 
     generateStartKeycloakTestingContainer({
-        keycloakThemeBuildingDirPath: buildOptions.keycloakBuildPath,
+        keycloakThemeBuildingDirPath: buildOptions.keycloakifyBuildDirPath,
         "keycloakVersion": containerKeycloakVersion,
         buildOptions
     });
@@ -88,7 +81,7 @@ export async function main() {
     logger.log(
         [
             "",
-            `✅ Your keycloak theme has been generated and bundled into ./${pathRelative(getReactProjectDirPath(), jarFilePath)} 🚀`,
+            `✅ Your keycloak theme has been generated and bundled into .${pathSep}${pathRelative(projectDirPath, jarFilePath)} 🚀`,
             `It is to be placed in "/opt/keycloak/providers" in the container running a quay.io/keycloak/keycloak Docker image.`,
             "",
             //TODO: Restore when we find a good Helm chart for Keycloak.
@@ -123,8 +116,8 @@ export async function main() {
             `To test your theme locally you can spin up a Keycloak ${containerKeycloakVersion} container image with the theme pre loaded by running:`,
             "",
             `👉 $ .${pathSep}${pathRelative(
-                getReactProjectDirPath(),
-                pathJoin(getKeycloakBuildPath(), generateStartKeycloakTestingContainer.basename)
+                projectDirPath,
+                pathJoin(buildOptions.keycloakifyBuildDirPath, generateStartKeycloakTestingContainer.basename)
             )} 👈`,
             "",
             `Test with different Keycloak versions by editing the .sh file. see available versions here: https://quay.io/repository/keycloak/keycloak?tab=tags`,

package/src/bin/keycloakify/parsedPackageJson.ts

@@ -4,10 +4,9 @@ import type { Equals } from "tsafe";
 import { z } from "zod";
 import { pathJoin } from "../tools/pathJoin";
 
-const reactProjectDirPath = process.cwd();
 export const bundlers = ["mvn", "keycloakify", "none"] as const;
 export type Bundler = (typeof bundlers)[number];
-type ParsedPackageJson = {
+export type ParsedPackageJson = {
     name: string;
     version: string;
     homepage?: string;
@@ -22,8 +21,8 @@ type ParsedPackageJson = {
         groupId?: string;
         bundler?: Bundler;
         keycloakVersionDefaultAssets?: string;
-        appInputPath?: string;
-        keycloakBuildPath?: string;
+        reactAppBuildDirPath?: string;
+        keycloakifyBuildDirPath?: string;
         customUserAttributes?: string[];
         themeName?: string;
     };
@@ -44,8 +43,8 @@ const zParsedPackageJson = z.object({
             "groupId": z.string().optional(),
             "bundler": z.enum(bundlers).optional(),
             "keycloakVersionDefaultAssets": z.string().optional(),
-            "appInputPath": z.string().optional(),
-            "keycloakBuildPath": z.string().optional(),
+            "reactAppBuildDirPath": z.string().optional(),
+            "keycloakifyBuildDirPath": z.string().optional(),
             "customUserAttributes": z.array(z.string()).optional(),
             "themeName": z.string().optional()
         })
@@ -55,8 +54,11 @@ const zParsedPackageJson = z.object({
 assert<Equals<ReturnType<(typeof zParsedPackageJson)["parse"]>, ParsedPackageJson>>();
 
 let parsedPackageJson: undefined | ReturnType<(typeof zParsedPackageJson)["parse"]>;
-export const getParsedPackageJson = () => {
-    if (parsedPackageJson) return parsedPackageJson;
-    parsedPackageJson = zParsedPackageJson.parse(JSON.parse(fs.readFileSync(pathJoin(reactProjectDirPath, "package.json")).toString("utf8")));
+export function getParsedPackageJson(params: { projectDirPath: string }) {
+    const { projectDirPath } = params;
+    if (parsedPackageJson) {
+        return parsedPackageJson;
+    }
+    parsedPackageJson = zParsedPackageJson.parse(JSON.parse(fs.readFileSync(pathJoin(projectDirPath, "package.json")).toString("utf8")));
     return parsedPackageJson;
-};
+}

package/src/bin/tools/trimIndent.ts

@@ -2,8 +2,8 @@
  * Concatenate the string fragments and interpolated values
  * to get a single string.
  */
-function populateTemplate(strings: TemplateStringsArray, ...args: any[]) {
-    const chunks = [];
+function populateTemplate(strings: TemplateStringsArray, ...args: unknown[]) {
+    const chunks: string[] = [];
     for (let i = 0; i < strings.length; i++) {
         let lastStringLineLength = 0;
         if (strings[i]) {
@@ -14,38 +14,33 @@ function populateTemplate(strings: TemplateStringsArray, ...args: any[]) {
         if (args[i]) {
             // if the interpolation value has newlines, indent the interpolation values
             // using the last known string indent
-            chunks.push(args[i].replace(/([\r?\n])/g, "$1" + " ".repeat(lastStringLineLength)));
+            const chunk = String(args[i]).replace(/([\r?\n])/g, "$1" + " ".repeat(lastStringLineLength));
+            chunks.push(chunk);
         }
     }
     return chunks.join("");
 }
 
-function trimIndentPrivate(removeEmptyLeadingAndTrailingLines: boolean, strings: TemplateStringsArray, ...args: any[]) {
+/**
+ * Shift all lines left by the *smallest* indentation level,
+ * and remove initial newline and all trailing spaces.
+ */
+export default function trimIndent(strings: TemplateStringsArray, ...args: any[]) {
     // Remove initial and final newlines
-    let string = populateTemplate(strings, ...args);
-    if (removeEmptyLeadingAndTrailingLines) string = string.replace(/^[\r\n]/, "").replace(/[^\S\r\n]*[\r\n]$/, "");
-    const dents = string.match(/^([ \t])+/gm)?.map(s => s.length) ?? [];
+    let string = populateTemplate(strings, ...args)
+        .replace(/^[\r\n]/, "")
+        .replace(/\r?\n *$/, "");
+    const dents =
+        string
+            .match(/^([ \t])+/gm)
+            ?.filter(s => /^\s+$/.test(s))
+            ?.map(s => s.length) ?? [];
     // No dents? no change required
     if (!dents || dents.length == 0) return string;
     const minDent = Math.min(...dents);
     // The min indentation is 0, no change needed
     if (!minDent) return string;
-    const dedented = string.replace(new RegExp(`^${" ".repeat(minDent)}`, "gm"), "");
+    const re = new RegExp(`^${" ".repeat(minDent)}`, "gm");
+    const dedented = string.replace(re, "");
     return dedented;
 }
-
-/**
- * Shift all lines left by the *smallest* indentation level,
- * and remove initial newline and all trailing spaces.
- */
-export default function trimIndent(strings: TemplateStringsArray, ...args: any[]) {
-    return trimIndentPrivate(true, strings, ...args);
-}
-
-/**
- * Shift all lines left by the *smallest* indentation level,
- * and _keep_ initial newline and all trailing spaces.
- */
-trimIndent.keepLeadingAndTrailingNewlines = function (strings: TemplateStringsArray, ...args: any[]) {
-    return trimIndentPrivate(false, strings, ...args);
-};

package/bin/keycloakify/build-paths.d.ts

@@ -1,12 +0,0 @@
-export declare const getReactProjectDirPath: () => string;
-export declare const getCnamePath: () => string;
-export declare const getAppInputPath: () => string;
-export declare const getKeycloakBuildPath: () => string;
-export declare const getThemeSrcDirPath: () => {
-    themeSrcDirPath: string;
-} | {
-    themeSrcDirPath: undefined;
-};
-export declare const getEmailThemeSrcDirPath: () => {
-    emailThemeSrcDirPath: string | undefined;
-};

package/bin/keycloakify/build-paths.js

@@ -1,93 +0,0 @@
-"use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEmailThemeSrcDirPath = exports.getThemeSrcDirPath = exports.getKeycloakBuildPath = exports.getAppInputPath = exports.getCnamePath = exports.getReactProjectDirPath = void 0;
-var fs = __importStar(require("fs"));
-var tsafe_1 = require("tsafe");
-var crawl_1 = require("../tools/crawl");
-var pathJoin_1 = require("../tools/pathJoin");
-var parsedPackageJson_1 = require("./parsedPackageJson");
-var DEFAULT_APP_INPUT_PATH = "build";
-var DEFAULT_KEYCLOAK_BUILD_PATH = "build_keycloak";
-var THEME_SRC_DIR_BASENAME = "keycloak-theme";
-var getReactProjectDirPath = function () { return process.cwd(); };
-exports.getReactProjectDirPath = getReactProjectDirPath;
-var getCnamePath = function () { return (0, pathJoin_1.pathJoin)((0, exports.getReactProjectDirPath)(), "public", "CNAME"); };
-exports.getCnamePath = getCnamePath;
-var parseAppInputPath = function (path) {
-    if (!path) {
-        return (0, pathJoin_1.pathJoin)(process.cwd(), DEFAULT_APP_INPUT_PATH);
-    }
-    else if (path.startsWith("./")) {
-        return (0, pathJoin_1.pathJoin)(process.cwd(), path.replace("./", ""));
-    }
-    return path;
-};
-var parseKeycloakBuildPath = function (path) {
-    if (!path) {
-        return (0, pathJoin_1.pathJoin)(process.cwd(), DEFAULT_KEYCLOAK_BUILD_PATH);
-    }
-    else if (path.startsWith("./")) {
-        return (0, pathJoin_1.pathJoin)(process.cwd(), path.replace("./", ""));
-    }
-    return path;
-};
-var getAppInputPath = function () {
-    var _a;
-    return parseAppInputPath((_a = (0, parsedPackageJson_1.getParsedPackageJson)().keycloakify) === null || _a === void 0 ? void 0 : _a.appInputPath);
-};
-exports.getAppInputPath = getAppInputPath;
-var getKeycloakBuildPath = function () {
-    var _a;
-    return parseKeycloakBuildPath((_a = (0, parsedPackageJson_1.getParsedPackageJson)().keycloakify) === null || _a === void 0 ? void 0 : _a.keycloakBuildPath);
-};
-exports.getKeycloakBuildPath = getKeycloakBuildPath;
-var getThemeSrcDirPath = function () {
-    var srcDirPath = (0, pathJoin_1.pathJoin)((0, exports.getReactProjectDirPath)(), "src");
-    var themeSrcDirPath = (0, crawl_1.crawl)(srcDirPath)
-        .map(function (fileRelativePath) {
-        var split = fileRelativePath.split(THEME_SRC_DIR_BASENAME);
-        if (split.length !== 2) {
-            return undefined;
-        }
-        return (0, pathJoin_1.pathJoin)(srcDirPath, split[0] + THEME_SRC_DIR_BASENAME);
-    })
-        .filter((0, tsafe_1.exclude)(undefined))[0];
-    if (themeSrcDirPath === undefined) {
-        if (fs.existsSync((0, pathJoin_1.pathJoin)(srcDirPath, "login")) || fs.existsSync((0, pathJoin_1.pathJoin)(srcDirPath, "account"))) {
-            return { "themeSrcDirPath": srcDirPath };
-        }
-        return { "themeSrcDirPath": undefined };
-    }
-    return { themeSrcDirPath: themeSrcDirPath };
-};
-exports.getThemeSrcDirPath = getThemeSrcDirPath;
-var getEmailThemeSrcDirPath = function () {
-    var themeSrcDirPath = (0, exports.getThemeSrcDirPath)().themeSrcDirPath;
-    var emailThemeSrcDirPath = themeSrcDirPath === undefined ? undefined : (0, pathJoin_1.pathJoin)(themeSrcDirPath, "email");
-    return { emailThemeSrcDirPath: emailThemeSrcDirPath };
-};
-exports.getEmailThemeSrcDirPath = getEmailThemeSrcDirPath;
-//# sourceMappingURL=build-paths.js.map

package/bin/keycloakify/build-paths.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"build-paths.js","sourceRoot":"","sources":["../../src/bin/keycloakify/build-paths.ts"],"names":[],"mappings":"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"}