keycloakify 2.3.0 → 2.5.2

package/src/bin/build-keycloak-theme/replaceImportFromStatic.ts

@@ -1,14 +1,7 @@
-
 import * as crypto from "crypto";
 import { ftlValuesGlobalName } from "./ftlValuesGlobalName";
 
-export function replaceImportsFromStaticInJsCode(
-    params: {
-        jsCode: string;
-        urlOrigin: undefined | string;
-    }
-): { fixedJsCode: string; } {
-
+export function replaceImportsFromStaticInJsCode(params: { jsCode: string; urlOrigin: undefined | string }): { fixedJsCode: string } {
     /* 
     NOTE:
 
@@ -23,114 +16,77 @@ export function replaceImportsFromStaticInJsCode(
 
     const { jsCode, urlOrigin } = params;
 
-    const fixedJsCode =
-        jsCode
-            .replace(
-                /([a-z]+\.[a-z]+)\+"static\//g,
-                (...[, group]) =>
-                    urlOrigin === undefined ?
-                        `window.${ftlValuesGlobalName}.url.resourcesPath + "/build/static/` :
-                        `("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group} + "static/`
-            )
-            .replace(
-                /".chunk.css",([a-z])+=([a-z]+\.[a-z]+)\+([a-z]+),/,
-                (...[, group1, group2, group3]) =>
-                    urlOrigin === undefined ?
-                        `".chunk.css",${group1} = window.${ftlValuesGlobalName}.url.resourcesPath + "/build/" + ${group3},` :
-                        `".chunk.css",${group1} = ("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group2} + ${group3},`
-            );
+    const fixedJsCode = jsCode
+        .replace(/([a-z]+\.[a-z]+)\+"static\//g, (...[, group]) =>
+            urlOrigin === undefined
+                ? `window.${ftlValuesGlobalName}.url.resourcesPath + "/build/static/`
+                : `("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group} + "static/`,
+        )
+        .replace(/".chunk.css",([a-z])+=([a-z]+\.[a-z]+)\+([a-z]+),/, (...[, group1, group2, group3]) =>
+            urlOrigin === undefined
+                ? `".chunk.css",${group1} = window.${ftlValuesGlobalName}.url.resourcesPath + "/build/" + ${group3},`
+                : `".chunk.css",${group1} = ("${ftlValuesGlobalName}" in window ? "${urlOrigin}" : "") + ${group2} + ${group3},`,
+        );
 
     return { fixedJsCode };
-
 }
 
-export function replaceImportsInInlineCssCode(
-    params: {
-        cssCode: string;
-        urlPathname: string;
-        urlOrigin: undefined | string;
-    }
-): { fixedCssCode: string; } {
-
+export function replaceImportsInInlineCssCode(params: { cssCode: string; urlPathname: string; urlOrigin: undefined | string }): {
+    fixedCssCode: string;
+} {
     const { cssCode, urlPathname, urlOrigin } = params;
 
     const fixedCssCode = cssCode.replace(
-        urlPathname === "/" ?
-            /url\(\/([^/][^)]+)\)/g :
-            new RegExp(`url\\(${urlPathname}([^)]+)\\)`, "g"),
-        (...[, group]) => `url(${urlOrigin === undefined ?
-            "${url.resourcesPath}/build/" + group :
-            params.urlOrigin + urlPathname + group})`
+        urlPathname === "/" ? /url\(\/([^/][^)]+)\)/g : new RegExp(`url\\(${urlPathname}([^)]+)\\)`, "g"),
+        (...[, group]) => `url(${urlOrigin === undefined ? "${url.resourcesPath}/build/" + group : params.urlOrigin + urlPathname + group})`,
     );
 
     return { fixedCssCode };
-
 }
 
-export function replaceImportsInCssCode(
-    params: {
-        cssCode: string;
-    }
-): {
+export function replaceImportsInCssCode(params: { cssCode: string }): {
     fixedCssCode: string;
     cssGlobalsToDefine: Record<string, string>;
 } {
-
     const { cssCode } = params;
 
     const cssGlobalsToDefine: Record<string, string> = {};
 
-    new Set(cssCode.match(/url\(\/[^/][^)]+\)[^;}]*/g) ?? [])
-        .forEach(match =>
-            cssGlobalsToDefine[
-            "url" + crypto
-                .createHash("sha256")
-                .update(match)
-                .digest("hex")
-                .substring(0, 15)
-            ] = match
-        );
+    new Set(cssCode.match(/url\(\/[^/][^)]+\)[^;}]*/g) ?? []).forEach(
+        match => (cssGlobalsToDefine["url" + crypto.createHash("sha256").update(match).digest("hex").substring(0, 15)] = match),
+    );
 
     let fixedCssCode = cssCode;
 
     Object.keys(cssGlobalsToDefine).forEach(
         cssVariableName =>
             //NOTE: split/join pattern ~ replace all
-            fixedCssCode =
-            fixedCssCode.split(cssGlobalsToDefine[cssVariableName])
-                .join(`var(--${cssVariableName})`)
+            (fixedCssCode = fixedCssCode.split(cssGlobalsToDefine[cssVariableName]).join(`var(--${cssVariableName})`)),
     );
 
     return { fixedCssCode, cssGlobalsToDefine };
-
 }
 
-export function generateCssCodeToDefineGlobals(
-    params: {
-        cssGlobalsToDefine: Record<string, string>;
-        urlPathname: string;
-    }
-): {
+export function generateCssCodeToDefineGlobals(params: { cssGlobalsToDefine: Record<string, string>; urlPathname: string }): {
     cssCodeToPrependInHead: string;
 } {
-
     const { cssGlobalsToDefine, urlPathname } = params;
 
     return {
         "cssCodeToPrependInHead": [
             ":root {",
             ...Object.keys(cssGlobalsToDefine)
-                .map(cssVariableName => [
-                    `--${cssVariableName}:`,
-                    cssGlobalsToDefine[cssVariableName]
-                        .replace(new RegExp(`url\\(${urlPathname.replace(/\//g, "\\/")}`, "g"), "url(${url.resourcesPath}/build/")
-                ].join(" "))
+                .map(cssVariableName =>
+                    [
+                        `--${cssVariableName}:`,
+                        cssGlobalsToDefine[cssVariableName].replace(
+                            new RegExp(`url\\(${urlPathname.replace(/\//g, "\\/")}`, "g"),
+                            "url(${url.resourcesPath}/build/",
+                        ),
+                    ].join(" "),
+                )
                 .map(line => `    ${line};`),
-            "}"
-        ].join("\n")
+            "}",
+        ].join("\n"),
     };
-
 }
-
-
-

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

@@ -2,42 +2,30 @@
 
 import { keycloakThemeBuildingDirPath } from "./build-keycloak-theme";
 import { join as pathJoin } from "path";
-import { downloadAndUnzip } from "./tools/downloadAndUnzip"
+import { downloadAndUnzip } from "./tools/downloadAndUnzip";
 import type { KeycloakVersion } from "./KeycloakVersion";
 
-export function downloadBuiltinKeycloakTheme(
-    params: {
-        keycloakVersion: KeycloakVersion;
-        destDirPath: string;
-    }
-) {
-
+export function downloadBuiltinKeycloakTheme(params: { keycloakVersion: KeycloakVersion; destDirPath: string }) {
     const { keycloakVersion, destDirPath } = params;
 
     for (const ext of ["", "-community"]) {
-
         downloadAndUnzip({
             "destDirPath": destDirPath,
             "url": `https://github.com/keycloak/keycloak/archive/refs/tags/${keycloakVersion}.zip`,
-            "pathOfDirToExtractInArchive": `keycloak-${keycloakVersion}/themes/src/main/resources${ext}/theme`
+            "pathOfDirToExtractInArchive": `keycloak-${keycloakVersion}/themes/src/main/resources${ext}/theme`,
         });
-
     }
-
 }
 
 if (require.main === module) {
-
     const keycloakVersion = (() => {
-
-        const keycloakVersion = process.argv[2] as (KeycloakVersion | undefined);
+        const keycloakVersion = process.argv[2] as KeycloakVersion | undefined;
 
         if (keycloakVersion === undefined) {
             return "15.0.2";
         }
 
         return keycloakVersion;
-
     })();
 
     const destDirPath = pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources", "theme");
@@ -46,8 +34,6 @@ if (require.main === module) {
 
     downloadBuiltinKeycloakTheme({
         keycloakVersion,
-        destDirPath
+        destDirPath,
     });
-
 }
-

package/src/bin/generate-i18n-messages.ts

@@ -11,7 +11,6 @@ import { keycloakVersions } from "./KeycloakVersion";
 const propertiesParser = require("properties-parser");
 
 for (const keycloakVersion of keycloakVersions) {
-
     console.log({ keycloakVersion });
 
     const tmpDirPath = pathJoin(getProjectRoot(), "tmp_xImOef9dOd44");
@@ -20,7 +19,7 @@ for (const keycloakVersion of keycloakVersions) {
 
     downloadBuiltinKeycloakTheme({
         keycloakVersion,
-        "destDirPath": tmpDirPath
+        "destDirPath": tmpDirPath,
     });
 
     type Dictionary = { [idiomId: string]: string };
@@ -28,11 +27,9 @@ for (const keycloakVersion of keycloakVersions) {
     const record: { [typeOfPage: string]: { [language: string]: Dictionary } } = {};
 
     {
-
         const baseThemeDirPath = pathJoin(tmpDirPath, "base");
 
         crawl(baseThemeDirPath).forEach(filePath => {
-
             const match = filePath.match(/^([^/]+)\/messages\/messages_([^.]+)\.properties$/);
 
             if (match === null) {
@@ -41,20 +38,12 @@ for (const keycloakVersion of keycloakVersions) {
 
             const [, typeOfPage, language] = match;
 
-            (record[typeOfPage] ??= {})[language.replace(/_/g, "-")] =
-                Object.fromEntries(
-                    Object.entries(
-                        propertiesParser.parse(
-                            fs.readFileSync(
-                                pathJoin(baseThemeDirPath, filePath)
-                            )
-                                .toString("utf8")
-                        )
-                    ).map(([key, value]: any) => [key, value.replace(/''/g, "'")])
-                );
-
+            (record[typeOfPage] ??= {})[language.replace(/_/g, "-")] = Object.fromEntries(
+                Object.entries(propertiesParser.parse(fs.readFileSync(pathJoin(baseThemeDirPath, filePath)).toString("utf8"))).map(
+                    ([key, value]: any) => [key, value.replace(/''/g, "'")],
+                ),
+            );
         });
-
     }
 
     rm_r(tmpDirPath);
@@ -64,7 +53,6 @@ for (const keycloakVersion of keycloakVersions) {
     fs.mkdirSync(targetDirPath, { "recursive": true });
 
     Object.keys(record).forEach(pageType => {
-
         const filePath = pathJoin(targetDirPath, `${pageType}.ts`);
 
         fs.writeFileSync(
@@ -72,16 +60,16 @@ for (const keycloakVersion of keycloakVersions) {
             Buffer.from(
                 [
                     `//This code was automatically generated by running ${pathRelative(getProjectRoot(), __filename)}`,
-                    '//PLEASE DO NOT EDIT MANUALLY',
-                    '',
-                    '/* spell-checker: disable */',
+                    "//PLEASE DO NOT EDIT MANUALLY",
+                    "",
+                    "/* spell-checker: disable */",
                     `export const kcMessages= ${JSON.stringify(record[pageType], null, 2)};`,
-                    '/* spell-checker: enable */'
-                ].join("\n"), "utf8")
+                    "/* spell-checker: enable */",
+                ].join("\n"),
+                "utf8",
+            ),
         );
 
         console.log(`${filePath} wrote`);
-
     });
-
 }

package/src/bin/link_in_test_app.ts

@@ -1,4 +1,3 @@
-
 import { execSync } from "child_process";
 import { join as pathJoin, relative as pathRelative } from "path";
 import * as fs from "fs";
@@ -10,11 +9,7 @@ fs.writeFileSync(
     Buffer.from(
         JSON.stringify(
             (() => {
-                const packageJsonParsed = JSON.parse(
-                    fs
-                        .readFileSync(pathJoin(keycloakifyDirPath, "package.json"))
-                        .toString("utf8"),
-                );
+                const packageJsonParsed = JSON.parse(fs.readFileSync(pathJoin(keycloakifyDirPath, "package.json")).toString("utf8"));
 
                 return {
                     ...packageJsonParsed,
@@ -37,17 +32,8 @@ const commonThirdPartyDeps = (() => {
         ...namespaceModuleNames
             .map(namespaceModuleName =>
                 fs
-                    .readdirSync(
-                        pathJoin(
-                            keycloakifyDirPath,
-                            "node_modules",
-                            namespaceModuleName,
-                        ),
-                    )
-                    .map(
-                        submoduleName =>
-                            `${namespaceModuleName}/${submoduleName}`,
-                    ),
+                    .readdirSync(pathJoin(keycloakifyDirPath, "node_modules", namespaceModuleName))
+                    .map(submoduleName => `${namespaceModuleName}/${submoduleName}`),
             )
             .reduce((prev, curr) => [...prev, ...curr], []),
         ...standaloneModuleNames,
@@ -56,18 +42,12 @@ const commonThirdPartyDeps = (() => {
 
 const yarnHomeDirPath = pathJoin(keycloakifyDirPath, ".yarn_home");
 
-execSync(
-    ["rm -rf", "mkdir"].map(cmd => `${cmd} ${yarnHomeDirPath}`).join(" && "),
-);
+execSync(["rm -rf", "mkdir"].map(cmd => `${cmd} ${yarnHomeDirPath}`).join(" && "));
 
 const execYarnLink = (params: { targetModuleName?: string; cwd: string }) => {
     const { targetModuleName, cwd } = params;
 
-    const cmd = [
-        "yarn",
-        "link",
-        ...(targetModuleName !== undefined ? [targetModuleName] : []),
-    ].join(" ");
+    const cmd = ["yarn", "link", ...(targetModuleName !== undefined ? [targetModuleName] : [])].join(" ");
 
     console.log(`$ cd ${pathRelative(keycloakifyDirPath, cwd) || "."} && ${cmd}`);
 
@@ -82,12 +62,9 @@ const execYarnLink = (params: { targetModuleName?: string; cwd: string }) => {
 
 const testAppNames = ["keycloakify-demo-app"] as const;
 
-const getTestAppPath = (testAppName: typeof testAppNames[number]) =>
-    pathJoin(keycloakifyDirPath, "..", testAppName);
+const getTestAppPath = (testAppName: typeof testAppNames[number]) => pathJoin(keycloakifyDirPath, "..", testAppName);
 
-testAppNames.forEach(testAppName =>
-    execSync("yarn install", { "cwd": getTestAppPath(testAppName) }),
-);
+testAppNames.forEach(testAppName => execSync("yarn install", { "cwd": getTestAppPath(testAppName) }));
 
 console.log("=== Linking common dependencies ===");
 
@@ -100,13 +77,7 @@ commonThirdPartyDeps.forEach(commonThirdPartyDep => {
     console.log(`${current}/${total} ${commonThirdPartyDep}`);
 
     const localInstallPath = pathJoin(
-        ...[
-            keycloakifyDirPath,
-            "node_modules",
-            ...(commonThirdPartyDep.startsWith("@")
-                ? commonThirdPartyDep.split("/")
-                : [commonThirdPartyDep]),
-        ],
+        ...[keycloakifyDirPath, "node_modules", ...(commonThirdPartyDep.startsWith("@") ? commonThirdPartyDep.split("/") : [commonThirdPartyDep])],
     );
 
     execYarnLink({ "cwd": localInstallPath });
@@ -128,4 +99,4 @@ testAppNames.forEach(testAppName =>
         "cwd": getTestAppPath(testAppName),
         "targetModuleName": "keycloakify",
     }),
-);
+);

package/src/bin/tools/crawl.ts

@@ -3,35 +3,25 @@ import * as path from "path";
 
 /** List all files in a given directory return paths relative to the dir_path */
 export const crawl = (() => {
-
     const crawlRec = (dir_path: string, paths: string[]) => {
-
         for (const file_name of fs.readdirSync(dir_path)) {
-
             const file_path = path.join(dir_path, file_name);
 
             if (fs.lstatSync(file_path).isDirectory()) {
-
                 crawlRec(file_path, paths);
 
                 continue;
-
             }
 
             paths.push(file_path);
-
         }
-
     };
 
     return function crawl(dir_path: string): string[] {
-
         const paths: string[] = [];
 
         crawlRec(dir_path, paths);
 
         return paths.map(file_path => path.relative(dir_path, file_path));
-
-    }
-
-})();
+    };
+})();

package/src/bin/tools/downloadAndUnzip.ts

@@ -1,4 +1,3 @@
-
 import { basename as pathBasename, join as pathJoin } from "path";
 import { execSync } from "child_process";
 import fs from "fs";
@@ -6,14 +5,7 @@ import { transformCodebase } from "../tools/transformCodebase";
 import { rm_rf, rm, rm_r } from "./rm";
 
 /** assert url ends with .zip */
-export function downloadAndUnzip(
-    params: {
-        url: string;
-        destDirPath: string;
-        pathOfDirToExtractInArchive?: string;
-    }
-) {
-
+export function downloadAndUnzip(params: { url: string; destDirPath: string; pathOfDirToExtractInArchive?: string }) {
     const { url, destDirPath, pathOfDirToExtractInArchive } = params;
 
     const tmpDirPath = pathJoin(destDirPath, "..", "tmp_xxKdOxnEdx");
@@ -24,24 +16,16 @@ export function downloadAndUnzip(
 
     execSync(`wget ${url}`, { "cwd": tmpDirPath });
 
-    execSync(
-        `unzip ${pathBasename(url)
-        }${pathOfDirToExtractInArchive === undefined ?
-            "" : ` "${pathOfDirToExtractInArchive}/*"`
-        }`,
-        { "cwd": tmpDirPath }
-    );
+    execSync(`unzip ${pathBasename(url)}${pathOfDirToExtractInArchive === undefined ? "" : ` "${pathOfDirToExtractInArchive}/*"`}`, {
+        "cwd": tmpDirPath,
+    });
 
     rm(pathBasename(url), { "cwd": tmpDirPath });
 
     transformCodebase({
-        "srcDirPath": pathOfDirToExtractInArchive === undefined ?
-            tmpDirPath :
-            pathJoin(tmpDirPath, pathOfDirToExtractInArchive)
-        ,
+        "srcDirPath": pathOfDirToExtractInArchive === undefined ? tmpDirPath : pathJoin(tmpDirPath, pathOfDirToExtractInArchive),
         destDirPath,
     });
 
     rm_r(tmpDirPath);
-
-}
+}

package/src/bin/tools/getProjectRoot.ts

@@ -16,4 +16,4 @@ export function getProjectRoot(): string {
     }
 
     return (result = getProjectRootRec(__dirname));
-}
+}

package/src/bin/tools/grant-exec-perms.ts

@@ -1,8 +1,9 @@
+import { getProjectRoot } from "./getProjectRoot";
+import { join as pathJoin } from "path";
+import child_process from "child_process";
 
-import { getProjectRoot } from "./getProjectRoot";
-import { join as pathJoin } from "path";
-import child_process from "child_process";
-
-Object.entries<string>(require(pathJoin(getProjectRoot(), "package.json"))["bin"])
-    .forEach(([, scriptPath]) => child_process.execSync(`chmod +x ${scriptPath}`, { "cwd": getProjectRoot() }));
-
+Object.entries<string>(require(pathJoin(getProjectRoot(), "package.json"))["bin"]).forEach(([, scriptPath]) =>
+    child_process.execSync(`chmod +x ${scriptPath}`, {
+        "cwd": getProjectRoot(),
+    }),
+);

package/src/bin/tools/isInside.ts

@@ -1,14 +1,7 @@
 import { relative as pathRelative } from "path";
 
-export function isInside(
-    params: {
-        dirPath: string;
-        filePath: string;
-    }
-) {
-
+export function isInside(params: { dirPath: string; filePath: string }) {
     const { dirPath, filePath } = params;
 
     return !pathRelative(dirPath, filePath).startsWith("..");
-
-}
+}

package/src/bin/tools/rm.ts

@@ -1,42 +1,31 @@
-
 import { execSync } from "child_process";
 
-function rmInternal(
-	params: {
-		pathToRemove: string;
-		args: string | undefined;
-		cwd: string | undefined;
-	}
-) {
-
-	const { pathToRemove, args, cwd } = params;
+function rmInternal(params: { pathToRemove: string; args: string | undefined; cwd: string | undefined }) {
+    const { pathToRemove, args, cwd } = params;
 
-	execSync(
-		`rm ${args ? `-${args} ` : ""}${pathToRemove.replace(/\ /g, "\\ ")}`,
-		cwd !== undefined ? { cwd } : undefined
-	);
+    execSync(`rm ${args ? `-${args} ` : ""}${pathToRemove.replace(/ /g, "\\ ")}`, cwd !== undefined ? { cwd } : undefined);
 }
 
-export function rm(pathToRemove: string, options?: { cwd: string; }) {
-	rmInternal({
-		pathToRemove,
-		"args": undefined,
-		"cwd": options?.cwd,
-	});
+export function rm(pathToRemove: string, options?: { cwd: string }) {
+    rmInternal({
+        pathToRemove,
+        "args": undefined,
+        "cwd": options?.cwd,
+    });
 }
 
-export function rm_r(pathToRemove: string, options?: { cwd: string; }) {
-	rmInternal({
-		pathToRemove,
-		"args": "r",
-		"cwd": options?.cwd,
-	});
+export function rm_r(pathToRemove: string, options?: { cwd: string }) {
+    rmInternal({
+        pathToRemove,
+        "args": "r",
+        "cwd": options?.cwd,
+    });
 }
 
-export function rm_rf(pathToRemove: string, options?: { cwd: string; }) {
-	rmInternal({
-		pathToRemove,
-		"args": "rf",
-		"cwd": options?.cwd,
-	});
+export function rm_rf(pathToRemove: string, options?: { cwd: string }) {
+    rmInternal({
+        pathToRemove,
+        "args": "rf",
+        "cwd": options?.cwd,
+    });
 }