keycloakify 11.5.4 → 11.6.0

package/bin/153.index.js

@@ -1317,13 +1317,57 @@ async function command(params) {
             source_default().cyan("On which version of Keycloak do you want to test your theme?"),
             source_default().gray("You can also explicitly provide the version with `npx keycloakify start-keycloak --keycloak-version 26` (or any other version)")
         ].join("\n"));
-        const { value: tag } = await dist_default()({
-            values: latestMajorTags
-        }).catch(() => {
-            process.exit(-1);
-        });
-        console.log(`→ ${tag}`);
-        return { dockerImageTag: tag };
+        const tag_userSelected = await (async () => {
+            let tag;
+            let latestMajorTags_copy = [...latestMajorTags];
+            while (true) {
+                const { value } = await dist_default()({
+                    values: latestMajorTags_copy
+                }).catch(() => {
+                    process.exit(-1);
+                });
+                tag = value;
+                {
+                    const doImplementAccountMpa = buildContext.implementedThemeTypes.account.isImplemented &&
+                        buildContext.implementedThemeTypes.account.type === "Multi-Page";
+                    if (doImplementAccountMpa && tag.startsWith("22.")) {
+                        console.log(source_default().yellow(`You are implementing a Multi-Page Account theme. Keycloak 22 is not supported, select another version`));
+                        latestMajorTags_copy = latestMajorTags_copy.filter(tag => !tag.startsWith("22."));
+                        continue;
+                    }
+                }
+                const readMajor = (tag) => {
+                    const major = parseInt(tag.split(".")[0]);
+                    (0,assert/* assert */.h)(!isNaN(major));
+                    return major;
+                };
+                {
+                    const major = readMajor(tag);
+                    const doImplementAdminTheme = buildContext.implementedThemeTypes.admin.isImplemented;
+                    const getIsSupported = (major) => major >= 23;
+                    if (doImplementAdminTheme && !getIsSupported(major)) {
+                        console.log(source_default().yellow(`You are implementing an Admin theme. Only Keycloak 23 and later are supported, select another version`));
+                        latestMajorTags_copy = latestMajorTags_copy.filter(tag => getIsSupported(readMajor(tag)));
+                        continue;
+                    }
+                }
+                {
+                    const doImplementAccountSpa = buildContext.implementedThemeTypes.account.isImplemented &&
+                        buildContext.implementedThemeTypes.account.type === "Single-Page";
+                    const major = readMajor(tag);
+                    const getIsSupported = (major) => major >= 19;
+                    if (doImplementAccountSpa && !getIsSupported(major)) {
+                        console.log(source_default().yellow(`You are implementing a Single-Page Account theme. Only Keycloak 19 and later are supported, select another version`));
+                        latestMajorTags_copy = latestMajorTags_copy.filter(tag => getIsSupported(readMajor(tag)));
+                        continue;
+                    }
+                }
+                break;
+            }
+            return tag;
+        })();
+        console.log(`→ ${tag_userSelected}`);
+        return { dockerImageTag: tag_userSelected };
     })();
     const keycloakMajorVersionNumber = (() => {
         const [wrap] = getSupportedKeycloakMajorVersions()
@@ -1634,31 +1678,40 @@ async function command(params) {
             ignoreInitial: true
         })
             .on("all", async (...[, filePath]) => {
-            ignore_account_spa: {
-                const doImplementAccountSpa = buildContext.implementedThemeTypes.account.isImplemented &&
-                    buildContext.implementedThemeTypes.account.type === "Single-Page";
-                if (!doImplementAccountSpa) {
-                    break ignore_account_spa;
+            ignore_path_covered_by_hmr: {
+                if (filePath.endsWith(".properties")) {
+                    break ignore_path_covered_by_hmr;
                 }
-                if (!(0,isInside/* isInside */.V)({
-                    dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "account"),
-                    filePath
-                })) {
-                    break ignore_account_spa;
+                if (!doStartDevServer) {
+                    break ignore_path_covered_by_hmr;
                 }
-                return;
-            }
-            ignore_admin: {
-                if (!buildContext.implementedThemeTypes.admin.isImplemented) {
-                    break ignore_admin;
+                ignore_account_spa: {
+                    const doImplementAccountSpa = buildContext.implementedThemeTypes.account.isImplemented &&
+                        buildContext.implementedThemeTypes.account.type ===
+                            "Single-Page";
+                    if (!doImplementAccountSpa) {
+                        break ignore_account_spa;
+                    }
+                    if (!(0,isInside/* isInside */.V)({
+                        dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "account"),
+                        filePath
+                    })) {
+                        break ignore_account_spa;
+                    }
+                    return;
                 }
-                if (!(0,isInside/* isInside */.V)({
-                    dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "admin"),
-                    filePath
-                })) {
-                    break ignore_admin;
+                ignore_admin: {
+                    if (!buildContext.implementedThemeTypes.admin.isImplemented) {
+                        break ignore_admin;
+                    }
+                    if (!(0,isInside/* isInside */.V)({
+                        dirPath: (0,external_path_.join)(buildContext.themeSrcDirPath, "admin"),
+                        filePath
+                    })) {
+                        break ignore_admin;
+                    }
+                    return;
                 }
-                return;
             }
             console.log(`Detected changes in ${filePath}`);
             await waitForDebounce();

package/bin/356.index.js

@@ -25,31 +25,20 @@ exports.modules = {
 async function getUiModuleFileSourceCodeReadyToBeCopied(params) {
     const { buildContext, uiModuleDirPath, fileRelativePath, isForEjection, uiModuleName, uiModuleVersion } = params;
     let sourceCode = (await fs_promises__WEBPACK_IMPORTED_MODULE_1__.readFile((0,path__WEBPACK_IMPORTED_MODULE_2__.join)(uiModuleDirPath, _shared_constants__WEBPACK_IMPORTED_MODULE_4__/* .KEYCLOAK_THEME */ .PC, fileRelativePath))).toString("utf8");
-    const toComment = (lines) => {
-        for (const ext of [".ts", ".tsx", ".css", ".less", ".sass", ".js", ".jsx"]) {
-            if (!fileRelativePath.endsWith(ext)) {
-                continue;
-            }
-            return [`/**`, ...lines.map(line => ` * ${line}`), ` */`].join("\n");
-        }
-        if (fileRelativePath.endsWith(".html")) {
-            return [`<!--`, ...lines.map(line => ` ${line}`), `-->`].join("\n");
-        }
-        return undefined;
-    };
-    const comment = toComment(isForEjection
-        ? [`This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`]
-        : [
-            `WARNING: Before modifying this file run the following command:`,
-            ``,
-            `$ npx keycloakify eject-file --file ${fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_2__.sep).join("/")}`,
-            ``,
-            `This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
-            `This file has been copied over to your repo by your postinstall script: \`npx keycloakify postinstall\``
-        ]);
-    if (comment !== undefined) {
-        sourceCode = [comment, ``, sourceCode].join("\n");
-    }
+    sourceCode = addCommentToSourceCode({
+        sourceCode,
+        fileRelativePath,
+        commentLines: isForEjection
+            ? [`This file was ejected from ${uiModuleName} version ${uiModuleVersion}.`]
+            : [
+                `WARNING: Before modifying this file run the following command:`,
+                ``,
+                `$ npx keycloakify eject-file --file '${fileRelativePath.split(path__WEBPACK_IMPORTED_MODULE_2__.sep).join("/")}'`,
+                ``,
+                `This file comes from ${uiModuleName} version ${uiModuleVersion}.`,
+                `This file has been copied over to your repo by your postinstall script: \`npx keycloakify postinstall\``
+            ]
+    });
     const destFilePath = (0,path__WEBPACK_IMPORTED_MODULE_2__.join)(buildContext.themeSrcDirPath, fileRelativePath);
     format: {
         if (!(await (0,_tools_runPrettier__WEBPACK_IMPORTED_MODULE_0__/* .getIsPrettierAvailable */ .MT)())) {
@@ -62,6 +51,40 @@ async function getUiModuleFileSourceCodeReadyToBeCopied(params) {
     }
     return Buffer.from(sourceCode, "utf8");
 }
+function addCommentToSourceCode(params) {
+    const { sourceCode, fileRelativePath, commentLines } = params;
+    const toResult = (comment) => {
+        return [comment, ``, sourceCode].join("\n");
+    };
+    for (const ext of [".ts", ".tsx", ".css", ".less", ".sass", ".js", ".jsx"]) {
+        if (!fileRelativePath.endsWith(ext)) {
+            continue;
+        }
+        return toResult([`/**`, ...commentLines.map(line => ` * ${line}`), ` */`].join("\n"));
+    }
+    if (fileRelativePath.endsWith(".properties")) {
+        return toResult(commentLines.map(line => `# ${line}`).join("\n"));
+    }
+    if (fileRelativePath.endsWith(".html") || fileRelativePath.endsWith(".svg")) {
+        const comment = [
+            `<!--`,
+            ...commentLines.map(line => ` ${line.replace("--file", "-f").replace("Before modifying", "Before modifying or replacing")}`),
+            `-->`
+        ].join("\n");
+        if (fileRelativePath.endsWith(".html") && sourceCode.trim().startsWith("<!")) {
+            const [first, ...rest] = sourceCode.split(">");
+            const last = rest.join(">");
+            return [`${first}>`, comment, last].join("\n");
+        }
+        if (fileRelativePath.endsWith(".svg") && sourceCode.trim().startsWith("<?")) {
+            const [first, ...rest] = sourceCode.split("?>");
+            const last = rest.join("?>");
+            return [`${first}?>`, comment, last].join("\n");
+        }
+        return toResult(comment);
+    }
+    return sourceCode;
+}
 //# sourceMappingURL=getUiModuleFileSourceCodeReadyToBeCopied.js.map
 
 /***/ }),

package/bin/{573.index.js → 880.index.js}

@@ -1,6 +1,6 @@
 "use strict";
-exports.id = 573;
-exports.ids = [573];
+exports.id = 880;
+exports.ids = [880];
 exports.modules = {
 
 /***/ 73817:
@@ -314,7 +314,7 @@ function recastParseTs(filePath) {
 
 /***/ }),
 
-/***/ 82573:
+/***/ 59880:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -788,6 +788,66 @@ var external_child_process_default = /*#__PURE__*/__webpack_require__.n(external
 // EXTERNAL MODULE: ./node_modules/properties-parser/index.js
 var properties_parser = __webpack_require__(44414);
 var properties_parser_default = /*#__PURE__*/__webpack_require__.n(properties_parser);
+;// CONCATENATED MODULE: ./dist/bin/tools/createObjectThatThrowsIfAccessed.js
+const keyIsTrapped = "isTrapped_zSskDe9d";
+class AccessError extends Error {
+    constructor(message) {
+        super(message);
+        Object.setPrototypeOf(this, new.target.prototype);
+    }
+}
+function createObjectThatThrowsIfAccessed(params) {
+    const { debugMessage = "", isPropertyWhitelisted = () => false } = params !== null && params !== void 0 ? params : {};
+    const get = (...args) => {
+        const [, prop] = args;
+        if (isPropertyWhitelisted(prop)) {
+            return Reflect.get(...args);
+        }
+        if (prop === keyIsTrapped) {
+            return true;
+        }
+        throw new AccessError(`Cannot access ${String(prop)} yet ${debugMessage}`);
+    };
+    const trappedObject = new Proxy({}, {
+        get,
+        set: get
+    });
+    return trappedObject;
+}
+function createObjectThatThrowsIfAccessedFactory(params) {
+    const { isPropertyWhitelisted } = params;
+    return {
+        createObjectThatThrowsIfAccessed: (params) => {
+            const { debugMessage } = params !== null && params !== void 0 ? params : {};
+            return createObjectThatThrowsIfAccessed({
+                debugMessage,
+                isPropertyWhitelisted
+            });
+        }
+    };
+}
+function isObjectThatThrowIfAccessed(obj) {
+    return obj[keyIsTrapped] === true;
+}
+const THROW_IF_ACCESSED = {
+    __brand: "THROW_IF_ACCESSED"
+};
+function createObjectWithSomePropertiesThatThrowIfAccessed(obj, debugMessage) {
+    return Object.defineProperties(obj, Object.fromEntries(Object.entries(obj)
+        .filter(([, value]) => value === THROW_IF_ACCESSED)
+        .map(([key]) => {
+        const getAndSet = () => {
+            throw new AccessError(`Cannot access ${key} yet ${debugMessage !== null && debugMessage !== void 0 ? debugMessage : ""}`);
+        };
+        const pd = {
+            get: getAndSet,
+            set: getAndSet,
+            enumerable: true
+        };
+        return [key, pd];
+    })));
+}
+//# sourceMappingURL=createObjectThatThrowsIfAccessed.js.map
 ;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/generateResources.js
 
 
@@ -808,6 +868,7 @@ var properties_parser_default = /*#__PURE__*/__webpack_require__.n(properties_pa
 
 
 
+
 (0,assert/* assert */.h)();
 async function generateResources(params) {
     var _a;
@@ -950,12 +1011,14 @@ async function generateResources(params) {
             writeMessagePropertiesFilesByThemeType[themeType] =
                 writeMessagePropertiesFiles;
         }
-        bring_in_spas_messages: {
+        bring_in_account_spa_messages: {
             if (!isSpa) {
-                break bring_in_spas_messages;
+                break bring_in_account_spa_messages;
+            }
+            if (themeType !== "account") {
+                break bring_in_account_spa_messages;
             }
-            (0,assert/* assert */.h)(themeType !== "login");
-            const accountUiDirPath = external_child_process_.execSync(`npm list @keycloakify/keycloak-${themeType}-ui --parseable`, {
+            const accountUiDirPath = external_child_process_.execSync(`npm list @keycloakify/keycloak-account-ui --parseable`, {
                 cwd: (0,external_path_.dirname)(buildContext.packageJsonFilePath)
             })
                 .toString("utf8")
@@ -964,13 +1027,13 @@ async function generateResources(params) {
             if (!external_fs_default().existsSync(messageDirPath_defaults)) {
                 throw new Error(`Please update @keycloakify/keycloak-account-ui to 25.0.4-rc.5 or later.`);
             }
-            const messagesDirPath_dest = (0,external_path_.join)(getThemeTypeDirPath({ themeName, themeType }), "messages");
+            const messagesDirPath_dest = (0,external_path_.join)(getThemeTypeDirPath({ themeName, themeType: "account" }), "messages");
             (0,transformCodebase/* transformCodebase */.N)({
                 srcDirPath: messageDirPath_defaults,
                 destDirPath: messagesDirPath_dest
             });
             apply_theme_changes: {
-                const messagesDirPath_theme = (0,external_path_.join)(buildContext.themeSrcDirPath, themeType, "messages");
+                const messagesDirPath_theme = (0,external_path_.join)(buildContext.themeSrcDirPath, "account", "messages");
                 if (!external_fs_default().existsSync(messagesDirPath_theme)) {
                     break apply_theme_changes;
                 }
@@ -993,6 +1056,89 @@ async function generateResources(params) {
             languageTags = external_fs_default().readdirSync(messagesDirPath_dest)
                 .map(basename => basename.replace(/^messages_/, "").replace(/\.properties$/, ""));
         }
+        bring_in_admin_messages: {
+            if (themeType !== "admin") {
+                break bring_in_admin_messages;
+            }
+            const messagesDirPath_theme = (0,external_path_.join)(buildContext.themeSrcDirPath, "admin", "i18n");
+            (0,assert/* assert */.h)(external_fs_default().existsSync(messagesDirPath_theme), `${messagesDirPath_theme} is supposed to exist`);
+            const propertiesByLang = {};
+            external_fs_default().readdirSync(messagesDirPath_theme).forEach(basename => {
+                var _a;
+                var _b;
+                const parsedBasename = (() => {
+                    const match = basename.match(/^messages_([^.]+)\.properties$/);
+                    if (match === null) {
+                        return undefined;
+                    }
+                    const discriminator = match[1];
+                    const split = discriminator.split("_override");
+                    if (split.length === 1) {
+                        return {
+                            lang: discriminator,
+                            isOverride: false
+                        };
+                    }
+                    (0,assert/* assert */.h)(split.length === 2);
+                    if (split[1] === "") {
+                        return {
+                            lang: split[0],
+                            isOverride: true,
+                            themeName: undefined
+                        };
+                    }
+                    const match2 = split[1].match(/^_(.+)$/);
+                    (0,assert/* assert */.h)(match2 !== null);
+                    return {
+                        lang: split[0],
+                        isOverride: true,
+                        themeName: match2[1]
+                    };
+                })();
+                if (parsedBasename === undefined) {
+                    return;
+                }
+                (_a = propertiesByLang[_b = parsedBasename.lang]) !== null && _a !== void 0 ? _a : (propertiesByLang[_b] = {
+                    base: createObjectThatThrowsIfAccessed({
+                        debugMessage: `No base ${parsedBasename.lang} translation for admin theme`
+                    }),
+                    override: undefined,
+                    overrideByThemeName: {}
+                });
+                const buffer = external_fs_default().readFileSync((0,external_path_.join)(messagesDirPath_theme, basename));
+                if (parsedBasename.isOverride === false) {
+                    propertiesByLang[parsedBasename.lang].base = buffer;
+                    return;
+                }
+                if (parsedBasename.themeName === undefined) {
+                    propertiesByLang[parsedBasename.lang].override = buffer;
+                    return;
+                }
+                propertiesByLang[parsedBasename.lang].overrideByThemeName[parsedBasename.themeName] = buffer;
+            });
+            writeMessagePropertiesFilesByThemeType.admin = ({ messageDirPath, themeName }) => {
+                if (!external_fs_default().existsSync(messageDirPath)) {
+                    external_fs_default().mkdirSync(messageDirPath, { recursive: true });
+                }
+                Object.entries(propertiesByLang).forEach(([lang, { base, override, overrideByThemeName }]) => {
+                    (languageTags !== null && languageTags !== void 0 ? languageTags : (languageTags = [])).push(lang);
+                    const messages = properties_parser_default().parse(base.toString("utf8"));
+                    if (override !== undefined) {
+                        const overrideMessages = properties_parser_default().parse(override.toString("utf8"));
+                        Object.entries(overrideMessages).forEach(([key, value]) => (messages[key] = value));
+                    }
+                    if (themeName in overrideByThemeName) {
+                        const overrideMessages = properties_parser_default().parse(overrideByThemeName[themeName].toString("utf8"));
+                        Object.entries(overrideMessages).forEach(([key, value]) => (messages[key] = value));
+                    }
+                    const editor = properties_parser_default().createEditor();
+                    Object.entries(messages).forEach(([key, value]) => {
+                        editor.set(key, value);
+                    });
+                    external_fs_default().writeFileSync((0,external_path_.join)(messageDirPath, `messages_${lang}.properties`), Buffer.from(editor.toString(), "utf8"));
+                });
+            };
+        }
         keycloak_static_resources: {
             if (isSpa) {
                 break keycloak_static_resources;

package/bin/main.js

@@ -16153,7 +16153,7 @@ program
     .task({
     skip,
     handler: async ({ projectDirPath }) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(783), __nccwpck_require__.e(573)]).then(__nccwpck_require__.bind(__nccwpck_require__, 82573));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(783), __nccwpck_require__.e(880)]).then(__nccwpck_require__.bind(__nccwpck_require__, 59880));
         await command({ buildContext: getBuildContext({ projectDirPath }) });
     }
 });
@@ -16307,9 +16307,10 @@ program
     .option({
     key: "file",
     name: (() => {
-        const name = "file";
-        optionsKeys.push(name);
-        return name;
+        const long = "file";
+        const short = "f";
+        optionsKeys.push(long, short);
+        return { long, short };
     })(),
     description: [
         "Relative path of the file relative to the directory of your keycloak theme source",

package/bin/tools/createObjectThatThrowsIfAccessed.d.ts

@@ -0,0 +1,21 @@
+export declare class AccessError extends Error {
+    constructor(message: string);
+}
+export declare function createObjectThatThrowsIfAccessed<T extends object>(params?: {
+    debugMessage?: string;
+    isPropertyWhitelisted?: (prop: string | number | symbol) => boolean;
+}): T;
+export declare function createObjectThatThrowsIfAccessedFactory(params: {
+    isPropertyWhitelisted?: (prop: string | number | symbol) => boolean;
+}): {
+    createObjectThatThrowsIfAccessed: <T extends object>(params?: {
+        debugMessage?: string;
+    }) => T;
+};
+export declare function isObjectThatThrowIfAccessed(obj: object): boolean;
+export declare const THROW_IF_ACCESSED: {
+    __brand: string;
+};
+export declare function createObjectWithSomePropertiesThatThrowIfAccessed<T extends Record<string, unknown>>(obj: {
+    [K in keyof T]: T[K] | typeof THROW_IF_ACCESSED;
+}, debugMessage?: string): T;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.5.4",
+    "version": "11.6.0",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",
@@ -714,6 +714,7 @@
         "src/bin/start-keycloak/realmConfig/defaultConfig/realm-kc-19.json",
         "src/bin/start-keycloak/realmConfig/defaultConfig/realm-kc-20.json",
         "src/bin/start-keycloak/realmConfig/defaultConfig/realm-kc-21.json",
+        "src/bin/start-keycloak/realmConfig/defaultConfig/realm-kc-22.json",
         "src/bin/start-keycloak/realmConfig/defaultConfig/realm-kc-23.json",
         "src/bin/start-keycloak/realmConfig/defaultConfig/realm-kc-24.json",
         "src/bin/start-keycloak/realmConfig/defaultConfig/realm-kc-25.json",
@@ -733,6 +734,7 @@
         "src/bin/tools/crawl.ts",
         "src/bin/tools/crawlAsync.ts",
         "src/bin/tools/crc32.ts",
+        "src/bin/tools/createObjectThatThrowsIfAccessed.ts",
         "src/bin/tools/deflate.ts",
         "src/bin/tools/downloadAndExtractArchive.ts",
         "src/bin/tools/escapeStringForPropertiesFile.ts",
@@ -1098,6 +1100,7 @@
         "bin/tools/crawl.d.ts",
         "bin/tools/crawlAsync.d.ts",
         "bin/tools/crc32.d.ts",
+        "bin/tools/createObjectThatThrowsIfAccessed.d.ts",
         "bin/tools/deflate.d.ts",
         "bin/tools/downloadAndExtractArchive.d.ts",
         "bin/tools/escapeStringForPropertiesFile.d.ts",
@@ -1141,7 +1144,6 @@
         "bin/490.index.js",
         "bin/503.index.js",
         "bin/525.index.js",
-        "bin/573.index.js",
         "bin/653.index.js",
         "bin/658.index.js",
         "bin/720.index.js",
@@ -1152,6 +1154,7 @@
         "bin/805.index.js",
         "bin/854.index.js",
         "bin/877.index.js",
+        "bin/880.index.js",
         "bin/921.index.js",
         "bin/97.index.js",
         "bin/shared/constants.js",