keycloakify 11.0.1 → 11.2.0

package/bin/31.index.js

@@ -216,9 +216,7 @@ function getBuildContext(params) {
             })
                 .parse(JSON.parse(external_fs_.readFileSync(packageJsonFilePath).toString("utf8")));
             if (((_a = parsedPackageJson.dependencies) === null || _a === void 0 ? void 0 : _a.keycloakify) === undefined &&
-                ((_b = parsedPackageJson.devDependencies) === null || _b === void 0 ? void 0 : _b.keycloakify) === undefined &&
-                parsedPackageJson.name !== "keycloakify" // NOTE: For local storybook build
-            ) {
+                ((_b = parsedPackageJson.devDependencies) === null || _b === void 0 ? void 0 : _b.keycloakify) === undefined) {
                 break success;
             }
             return packageJsonFilePath;
@@ -361,22 +359,34 @@ function getBuildContext(params) {
         process.exit(-1);
     }
     const themeNames = (() => {
-        if (buildOptions.themeName === undefined) {
-            return parsedPackageJson.name === undefined
-                ? ["keycloakify"]
-                : [
-                    parsedPackageJson.name
-                        .replace(/^@(.*)/, "$1")
-                        .split("/")
-                        .join("-")
-                ];
-        }
-        if (typeof buildOptions.themeName === "string") {
-            return [buildOptions.themeName];
+        const themeNames = (() => {
+            if (buildOptions.themeName === undefined) {
+                return parsedPackageJson.name === undefined
+                    ? ["keycloakify"]
+                    : [
+                        parsedPackageJson.name
+                            .replace(/^@(.*)/, "$1")
+                            .split("/")
+                            .join("-")
+                    ];
+            }
+            if (typeof buildOptions.themeName === "string") {
+                return [buildOptions.themeName];
+            }
+            const [mainThemeName, ...themeVariantNames] = buildOptions.themeName;
+            (0,assert.assert)(mainThemeName !== undefined);
+            return [mainThemeName, ...themeVariantNames];
+        })();
+        for (const themeName of themeNames) {
+            if (!/^[a-zA-Z0-9_-]+$/.test(themeName)) {
+                console.error(source_default().red([
+                    `Invalid theme name: ${themeName}`,
+                    `Theme names should only contain letters, numbers, and "_" or "-"`
+                ].join(" ")));
+                process.exit(-1);
+            }
         }
-        const [mainThemeName, ...themeVariantNames] = buildOptions.themeName;
-        (0,assert.assert)(mainThemeName !== undefined);
-        return [mainThemeName, ...themeVariantNames];
+        return themeNames;
     })();
     const projectBuildDirPath = (() => {
         webpack: {

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

@@ -1,6 +1,6 @@
 "use strict";
-exports.id = 499;
-exports.ids = [499];
+exports.id = 573;
+exports.ids = [573];
 exports.modules = {
 
 /***/ 73817:
@@ -315,7 +315,7 @@ function recastParseTs(filePath) {
 
 /***/ }),
 
-/***/ 70499:
+/***/ 82573:
 /***/ ((__unused_webpack_module, __webpack_exports__, __webpack_require__) => {
 
 // ESM COMPAT FLAG
@@ -326,15 +326,17 @@ __webpack_require__.d(__webpack_exports__, {
   "command": () => (/* reexport */ command)
 });
 
-// EXTERNAL MODULE: ./node_modules/tsafe/assert.js
-var assert = __webpack_require__(88078);
-// EXTERNAL MODULE: ./dist/bin/tools/transformCodebase.js
-var transformCodebase = __webpack_require__(60332);
 // EXTERNAL MODULE: external "fs"
 var external_fs_ = __webpack_require__(57147);
 var external_fs_default = /*#__PURE__*/__webpack_require__.n(external_fs_);
+// EXTERNAL MODULE: ./dist/bin/tools/fs.rmSync.js
+var fs_rmSync = __webpack_require__(89693);
+// EXTERNAL MODULE: ./dist/bin/tools/transformCodebase.js
+var transformCodebase = __webpack_require__(60332);
 // EXTERNAL MODULE: external "path"
 var external_path_ = __webpack_require__(71017);
+// EXTERNAL MODULE: ./node_modules/tsafe/assert.js
+var assert = __webpack_require__(88078);
 // EXTERNAL MODULE: ./dist/bin/shared/constants.js
 var constants = __webpack_require__(173);
 ;// CONCATENATED MODULE: ./dist/bin/tools/String.prototype.replaceAll.js
@@ -753,8 +755,6 @@ function readExtraPagesNames(params) {
 //# sourceMappingURL=readExtraPageNames.js.map
 // EXTERNAL MODULE: ./dist/bin/keycloakify/generateResources/generateMessageProperties.js
 var generateMessageProperties = __webpack_require__(73817);
-// EXTERNAL MODULE: ./dist/bin/tools/fs.rmSync.js
-var fs_rmSync = __webpack_require__(89693);
 // EXTERNAL MODULE: ./dist/bin/tools/readThisNpmPackageVersion.js
 var readThisNpmPackageVersion = __webpack_require__(64795);
 ;// CONCATENATED MODULE: ./dist/bin/shared/metaInfKeycloakThemes.js
@@ -785,7 +785,11 @@ var escapeStringForPropertiesFile = __webpack_require__(27190);
 // EXTERNAL MODULE: external "child_process"
 var external_child_process_ = __webpack_require__(32081);
 var external_child_process_default = /*#__PURE__*/__webpack_require__.n(external_child_process_);
-;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/generateResourcesForMainTheme.js
+// 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/keycloakify/generateResources/generateResources.js
+
 
 
 
@@ -805,11 +809,15 @@ var external_child_process_default = /*#__PURE__*/__webpack_require__.n(external
 
 
 (0,assert.assert)();
-async function generateResourcesForMainTheme(params) {
+async function generateResources(params) {
     var _a;
-    const { themeName, resourcesDirPath, buildContext } = params;
+    const { resourcesDirPath, buildContext } = params;
+    const [themeName] = buildContext.themeNames;
+    if (external_fs_default().existsSync(resourcesDirPath)) {
+        (0,fs_rmSync/* rmSync */.a)(resourcesDirPath, { recursive: true });
+    }
     const getThemeTypeDirPath = (params) => {
-        const { themeType } = params;
+        const { themeType, themeName } = params;
         return (0,external_path_.join)(resourcesDirPath, "theme", themeName, themeType);
     };
     const writeMessagePropertiesFilesByThemeType = {};
@@ -820,7 +828,7 @@ async function generateResourcesForMainTheme(params) {
         const isForAccountSpa = themeType === "account" &&
             ((0,assert.assert)(buildContext.implementedThemeTypes.account.isImplemented),
                 buildContext.implementedThemeTypes.account.type === "Single-Page");
-        const themeTypeDirPath = getThemeTypeDirPath({ themeType });
+        const themeTypeDirPath = getThemeTypeDirPath({ themeName, themeType });
         apply_replacers_and_move_to_theme_resources: {
             const destDirPath = (0,external_path_.join)(themeTypeDirPath, "resources", constants/* WELL_KNOWN_DIRECTORY_BASE_NAME.DIST */.Ju.DIST);
             // NOTE: Prevent accumulation of files in the assets dir, as names are hashed they pile up.
@@ -830,6 +838,7 @@ async function generateResourcesForMainTheme(params) {
                 // NOTE: We prevent doing it twice, it has been done for the login theme.
                 (0,transformCodebase/* transformCodebase */.N)({
                     srcDirPath: (0,external_path_.join)(getThemeTypeDirPath({
+                        themeName,
                         themeType: "login"
                     }), "resources", constants/* WELL_KNOWN_DIRECTORY_BASE_NAME.DIST */.Ju.DIST),
                     destDirPath
@@ -838,7 +847,7 @@ async function generateResourcesForMainTheme(params) {
             }
             {
                 const dirPath = (0,external_path_.join)(buildContext.projectBuildDirPath, constants/* WELL_KNOWN_DIRECTORY_BASE_NAME.KEYCLOAKIFY_DEV_RESOURCES */.Ju.KEYCLOAKIFY_DEV_RESOURCES);
-                if (external_fs_.existsSync(dirPath)) {
+                if (external_fs_default().existsSync(dirPath)) {
                     (0,assert.assert)(buildContext.bundler === "webpack");
                     throw new Error([
                         `Keycloakify build error: The ${constants/* WELL_KNOWN_DIRECTORY_BASE_NAME.KEYCLOAKIFY_DEV_RESOURCES */.Ju.KEYCLOAKIFY_DEV_RESOURCES} directory shouldn't exist in your build directory.`,
@@ -878,7 +887,7 @@ async function generateResourcesForMainTheme(params) {
         }
         const { generateFtlFilesCode } = generateFtlFilesCodeFactory({
             themeName,
-            indexHtmlCode: external_fs_.readFileSync((0,external_path_.join)(buildContext.projectBuildDirPath, "index.html"))
+            indexHtmlCode: external_fs_default().readFileSync((0,external_path_.join)(buildContext.projectBuildDirPath, "index.html"))
                 .toString("utf8"),
             buildContext,
             keycloakifyVersion: (0,readThisNpmPackageVersion/* readThisNpmPackageVersion */.K)(),
@@ -905,7 +914,7 @@ async function generateResourcesForMainTheme(params) {
                 }))
         ].forEach(pageId => {
             const { ftlCode } = generateFtlFilesCode({ pageId });
-            external_fs_.writeFileSync((0,external_path_.join)(themeTypeDirPath, pageId), Buffer.from(ftlCode, "utf8"));
+            external_fs_default().writeFileSync((0,external_path_.join)(themeTypeDirPath, pageId), Buffer.from(ftlCode, "utf8"));
         });
         let languageTags = undefined;
         i18n_messages_generation: {
@@ -920,10 +929,6 @@ async function generateResourcesForMainTheme(params) {
             const { writeMessagePropertiesFiles } = wrap;
             writeMessagePropertiesFilesByThemeType[themeType] =
                 writeMessagePropertiesFiles;
-            writeMessagePropertiesFiles({
-                messageDirPath: (0,external_path_.join)(themeTypeDirPath, "messages"),
-                themeName
-            });
         }
         bring_in_account_v3_i18n_messages: {
             if (!buildContext.implementedThemeTypes.account.isImplemented) {
@@ -937,14 +942,38 @@ async function generateResourcesForMainTheme(params) {
             })
                 .toString("utf8")
                 .trim();
-            const messagesDirPath = (0,external_path_.join)(accountUiDirPath, "messages");
-            if (!external_fs_.existsSync(messagesDirPath)) {
+            const messageDirPath_defaults = (0,external_path_.join)(accountUiDirPath, "messages");
+            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: "account" }), "messages");
             (0,transformCodebase/* transformCodebase */.N)({
-                srcDirPath: messagesDirPath,
-                destDirPath: (0,external_path_.join)(getThemeTypeDirPath({ themeType: "account" }), "messages")
+                srcDirPath: messageDirPath_defaults,
+                destDirPath: messagesDirPath_dest
             });
+            apply_theme_changes: {
+                const messagesDirPath_theme = (0,external_path_.join)(buildContext.themeSrcDirPath, "account", "messages");
+                if (!external_fs_default().existsSync(messagesDirPath_theme)) {
+                    break apply_theme_changes;
+                }
+                external_fs_default().readdirSync(messagesDirPath_theme).forEach(basename => {
+                    const filePath_src = (0,external_path_.join)(messagesDirPath_theme, basename);
+                    const filePath_dest = (0,external_path_.join)(messagesDirPath_dest, basename);
+                    if (!external_fs_default().existsSync(filePath_dest)) {
+                        external_fs_default().cpSync(filePath_src, filePath_dest);
+                    }
+                    const messages_src = properties_parser_default().parse(external_fs_default().readFileSync(filePath_src).toString("utf8"));
+                    const messages_dest = properties_parser_default().parse(external_fs_default().readFileSync(filePath_dest).toString("utf8"));
+                    const messages = Object.assign(Object.assign({}, messages_dest), messages_src);
+                    const editor = properties_parser_default().createEditor();
+                    Object.entries(messages).forEach(([key, value]) => {
+                        editor.set(key, value);
+                    });
+                    external_fs_default().writeFileSync(filePath_dest, Buffer.from(editor.toString(), "utf8"));
+                });
+            }
+            languageTags = external_fs_default().readdirSync(messagesDirPath_dest)
+                .map(basename => basename.replace(/^messages_/, "").replace(/\.properties$/, ""));
         }
         keycloak_static_resources: {
             if (isForAccountSpa) {
@@ -955,7 +984,7 @@ async function generateResourcesForMainTheme(params) {
                 destDirPath: (0,external_path_.join)(themeTypeDirPath, "resources")
             });
         }
-        external_fs_.writeFileSync((0,external_path_.join)(themeTypeDirPath, "theme.properties"), Buffer.from([
+        external_fs_default().writeFileSync((0,external_path_.join)(themeTypeDirPath, "theme.properties"), Buffer.from([
             `parent=${(() => {
                 switch (themeType) {
                     case "account":
@@ -980,7 +1009,7 @@ async function generateResourcesForMainTheme(params) {
         const emailThemeSrcDirPath = (0,external_path_.join)(buildContext.themeSrcDirPath, "email");
         (0,transformCodebase/* transformCodebase */.N)({
             srcDirPath: emailThemeSrcDirPath,
-            destDirPath: getThemeTypeDirPath({ themeType: "email" })
+            destDirPath: getThemeTypeDirPath({ themeName, themeType: "email" })
         });
     }
     bring_in_account_v1: {
@@ -992,17 +1021,22 @@ async function generateResourcesForMainTheme(params) {
         }
         (0,transformCodebase/* transformCodebase */.N)({
             srcDirPath: (0,external_path_.join)((0,getThisCodebaseRootDirPath/* getThisCodebaseRootDirPath */.e)(), "res", "account-v1"),
-            destDirPath: (0,external_path_.join)(resourcesDirPath, "theme", "account-v1", "account")
+            destDirPath: getThemeTypeDirPath({
+                themeName: "account-v1",
+                themeType: "account"
+            })
         });
     }
     {
         const metaInfKeycloakThemes = { themes: [] };
-        metaInfKeycloakThemes.themes.push({
-            name: themeName,
-            types: (0,objectEntries.objectEntries)(buildContext.implementedThemeTypes)
-                .filter(([, { isImplemented }]) => isImplemented)
-                .map(([themeType]) => themeType)
-        });
+        for (const themeName of buildContext.themeNames) {
+            metaInfKeycloakThemes.themes.push({
+                name: themeName,
+                types: (0,objectEntries.objectEntries)(buildContext.implementedThemeTypes)
+                    .filter(([, { isImplemented }]) => isImplemented)
+                    .map(([themeType]) => themeType)
+            });
+        }
         if (buildContext.implementedThemeTypes.account.isImplemented) {
             metaInfKeycloakThemes.themes.push({
                 name: "account-v1",
@@ -1014,92 +1048,63 @@ async function generateResourcesForMainTheme(params) {
             getNewMetaInfKeycloakTheme: () => metaInfKeycloakThemes
         });
     }
-    return {
-        writeMessagePropertiesFilesForThemeVariant: ({ getMessageDirPath, themeName }) => {
-            (0,objectEntries.objectEntries)(writeMessagePropertiesFilesByThemeType).forEach(([themeType, writeMessagePropertiesFiles]) => {
-                if (writeMessagePropertiesFiles === undefined) {
-                    return;
+    for (const themeVariantName of buildContext.themeNames) {
+        if (themeVariantName === themeName) {
+            continue;
+        }
+        (0,transformCodebase/* transformCodebase */.N)({
+            srcDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeName),
+            destDirPath: (0,external_path_.join)(resourcesDirPath, "theme", themeVariantName),
+            transformSourceCode: ({ fileRelativePath, sourceCode }) => {
+                if ((0,external_path_.extname)(fileRelativePath) === ".ftl" &&
+                    fileRelativePath.split(external_path_.sep).length === 2) {
+                    const modifiedSourceCode = Buffer.from(Buffer.from(sourceCode)
+                        .toString("utf-8")
+                        .replace(`"themeName": "${themeName}"`, `"themeName": "${themeVariantName}"`), "utf8");
+                    (0,assert.assert)(Buffer.compare(modifiedSourceCode, sourceCode) !== 0);
+                    return { modifiedSourceCode };
                 }
-                writeMessagePropertiesFiles({
-                    messageDirPath: getMessageDirPath({ themeType }),
-                    themeName
-                });
+                return { modifiedSourceCode: sourceCode };
+            }
+        });
+    }
+    for (const themeName of buildContext.themeNames) {
+        for (const [themeType, writeMessagePropertiesFiles] of (0,objectEntries.objectEntries)(writeMessagePropertiesFilesByThemeType)) {
+            // NOTE: This is just a quirk of the type system: We can't really differentiate in a record
+            // between the case where the key isn't present and the case where the value is `undefined`.
+            if (writeMessagePropertiesFiles === undefined) {
+                return;
+            }
+            writeMessagePropertiesFiles({
+                messageDirPath: (0,external_path_.join)(getThemeTypeDirPath({ themeName, themeType }), "messages"),
+                themeName
             });
         }
-    };
-}
-//# sourceMappingURL=generateResourcesForMainTheme.js.map
-;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/generateResourcesForThemeVariant.js
-
-
-
-
-function generateResourcesForThemeVariant(params) {
-    const { resourcesDirPath, themeName, themeVariantName, writeMessagePropertiesFiles } = params;
-    const mainThemeDirPath = (0,external_path_.join)(resourcesDirPath, "theme", themeName);
-    const themeVariantDirPath = (0,external_path_.join)(mainThemeDirPath, "..", themeVariantName);
-    (0,transformCodebase/* transformCodebase */.N)({
-        srcDirPath: mainThemeDirPath,
-        destDirPath: themeVariantDirPath,
-        transformSourceCode: ({ fileRelativePath, sourceCode }) => {
-            if ((0,external_path_.extname)(fileRelativePath) === ".ftl" &&
-                fileRelativePath.split(external_path_.sep).length === 2) {
-                const modifiedSourceCode = Buffer.from(Buffer.from(sourceCode)
-                    .toString("utf-8")
-                    .replace(`"themeName": "${themeName}"`, `"themeName": "${themeVariantName}"`), "utf8");
-                (0,assert.assert)(Buffer.compare(modifiedSourceCode, sourceCode) !== 0);
-                return { modifiedSourceCode };
-            }
-            return { modifiedSourceCode: sourceCode };
+    }
+    modify_email_theme_per_variant: {
+        if (!buildContext.implementedThemeTypes.email.isImplemented) {
+            break modify_email_theme_per_variant;
         }
-    });
-    writeMetaInfKeycloakThemes({
-        resourcesDirPath,
-        getNewMetaInfKeycloakTheme: ({ metaInfKeycloakTheme }) => {
-            (0,assert.assert)(metaInfKeycloakTheme !== undefined);
-            const newMetaInfKeycloakTheme = metaInfKeycloakTheme;
-            newMetaInfKeycloakTheme.themes.push({
-                name: themeVariantName,
-                types: (() => {
-                    const theme = newMetaInfKeycloakTheme.themes.find(({ name }) => name === themeName);
-                    (0,assert.assert)(theme !== undefined);
-                    return theme.types;
-                })()
+        for (const themeName of buildContext.themeNames) {
+            const emailThemeDirPath = getThemeTypeDirPath({
+                themeName,
+                themeType: "email"
+            });
+            (0,transformCodebase/* transformCodebase */.N)({
+                srcDirPath: emailThemeDirPath,
+                destDirPath: emailThemeDirPath,
+                transformSourceCode: ({ filePath, sourceCode }) => {
+                    if (!filePath.endsWith(".ftl")) {
+                        return { modifiedSourceCode: sourceCode };
+                    }
+                    return {
+                        modifiedSourceCode: Buffer.from(sourceCode
+                            .toString("utf8")
+                            .replace(/xKeycloakify\.themeName/g, `"${themeName}"`), "utf8")
+                    };
+                }
             });
-            return newMetaInfKeycloakTheme;
         }
-    });
-    writeMessagePropertiesFiles({
-        getMessageDirPath: ({ themeType }) => (0,external_path_.join)(themeVariantDirPath, themeType, "messages"),
-        themeName: themeVariantName
-    });
-}
-//# sourceMappingURL=generateResourcesForThemeVariant.js.map
-;// CONCATENATED MODULE: ./dist/bin/keycloakify/generateResources/generateResources.js
-
-
-
-
-
-(0,assert.assert)();
-async function generateResources(params) {
-    const { resourcesDirPath, buildContext } = params;
-    const [themeName, ...themeVariantNames] = buildContext.themeNames;
-    if (external_fs_default().existsSync(resourcesDirPath)) {
-        (0,fs_rmSync/* rmSync */.a)(resourcesDirPath, { recursive: true });
-    }
-    const { writeMessagePropertiesFilesForThemeVariant } = await generateResourcesForMainTheme({
-        resourcesDirPath,
-        themeName,
-        buildContext
-    });
-    for (const themeVariantName of themeVariantNames) {
-        generateResourcesForThemeVariant({
-            resourcesDirPath,
-            themeName,
-            themeVariantName,
-            writeMessagePropertiesFiles: writeMessagePropertiesFilesForThemeVariant
-        });
     }
 }
 //# sourceMappingURL=generateResources.js.map