Moving on

2024-01-30 05:54:36 +01:00
parent 2799a52d0c
commit 22fa1411bf
5 changed files with 166 additions and 146 deletions
--- a/src/bin/keycloakify/BuildOptions.ts
+++ b/src/bin/keycloakify/BuildOptions.ts
@ -4,9 +4,11 @@ import { join as pathJoin } from "path";
 import parseArgv from "minimist";
 import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
 import * as fs from "fs";
+import { getParsedKeycloakifyViteConfig, getKeycloakifyBuildDirPath } from "./parsedKeycloakifyViteConfig";

 /** Consolidated build option gathered form CLI arguments and config in package.json */
 export type BuildOptions = {
+    bundler: "vite" | "webpack";
    isSilent: boolean;
    themeVersion: string;
    themeNames: string[];
@ -25,113 +27,102 @@ export type BuildOptions = {
     * In this case the urlPathname will be "/my-app/" */
    urlPathname: string | undefined;
    assetsDirPath: string;
-    bundler: "vite" | "webpack";
 };

 export function readBuildOptions(params: { reactAppRootDirPath: string; processArgv: string[] }): BuildOptions {
    const { reactAppRootDirPath, processArgv } = params;

-    const { isSilentCliParamProvided } = (() => {
-        const argv = parseArgv(processArgv);
-
-        return {
-            "isSilentCliParamProvided": typeof argv["silent"] === "boolean" ? argv["silent"] : false
-        };
-    })();
-
    const parsedPackageJson = getParsedPackageJson({ reactAppRootDirPath });

-    const { name, keycloakify = {}, version, homepage } = parsedPackageJson;
-
-    const { extraThemeProperties, groupId, artifactId, doCreateJar, loginThemeResourcesFromKeycloakVersion } = keycloakify ?? {};
+    const { parsedKeycloakifyViteConfig } =
+        getParsedKeycloakifyViteConfig({
+            "parsedPackageJson_keycloakify_keycloakifyBuildDirPath": parsedPackageJson.keycloakify?.keycloakifyBuildDirPath,
+            reactAppRootDirPath
+        }) ?? {};

    const themeNames = (() => {
-        if (keycloakify.themeName === undefined) {
+        if (parsedPackageJson.keycloakify?.themeName === undefined) {
            return [
-                name
+                parsedPackageJson.name
                    .replace(/^@(.*)/, "$1")
                    .split("/")
                    .join("-")
            ];
        }

-        if (typeof keycloakify.themeName === "string") {
-            return [keycloakify.themeName];
+        if (typeof parsedPackageJson.keycloakify.themeName === "string") {
+            return [parsedPackageJson.keycloakify.themeName];
        }

-        return keycloakify.themeName;
+        return parsedPackageJson.keycloakify.themeName;
    })();

-    return {
+    const { keycloakifyBuildDirPath } = getKeycloakifyBuildDirPath({
+        "parsedPackageJson_keycloakify_keycloakifyBuildDirPath": parsedPackageJson.keycloakify?.keycloakifyBuildDirPath,
        reactAppRootDirPath,
+        "bundler": parsedKeycloakifyViteConfig !== undefined ? "vite" : "webpack"
+    });
+    //const keycloakifyBuildDirPath = keycloakifyBuildDirPath_vite ?? pathJoin(reactAppRootDirPath, "build_keycloak");
+
+    return {
+        "bundler": parsedKeycloakifyViteConfig !== undefined ? "vite" : "webpack",
+        "isSilent": (() => {
+            const argv = parseArgv(processArgv);
+
+            return typeof argv["silent"] === "boolean" ? argv["silent"] : false;
+        })(),
+        "themeVersion": process.env.KEYCLOAKIFY_THEME_VERSION ?? parsedPackageJson.version ?? "0.0.0",
        themeNames,
-        "doCreateJar": doCreateJar ?? true,
-        "artifactId": process.env.KEYCLOAKIFY_ARTIFACT_ID ?? artifactId ?? `${themeNames[0]}-keycloak-theme`,
+        "extraThemeProperties": parsedPackageJson.keycloakify?.extraThemeProperties,
        "groupId": (() => {
            const fallbackGroupId = `${themeNames[0]}.keycloak`;

            return (
                process.env.KEYCLOAKIFY_GROUP_ID ??
-                groupId ??
-                (!homepage
+                parsedPackageJson.keycloakify?.groupId ??
+                (parsedPackageJson.homepage === undefined
                    ? fallbackGroupId
-                    : urlParse(homepage)
+                    : urlParse(parsedPackageJson.homepage)
                          .host?.replace(/:[0-9]+$/, "")
                          ?.split(".")
                          .reverse()
                          .join(".") ?? fallbackGroupId) + ".keycloak"
            );
        })(),
-        "themeVersion": process.env.KEYCLOAKIFY_THEME_VERSION ?? process.env.KEYCLOAKIFY_VERSION ?? version ?? "0.0.0",
-        extraThemeProperties,
-        "isSilent": isSilentCliParamProvided,
-        "loginThemeResourcesFromKeycloakVersion": loginThemeResourcesFromKeycloakVersion ?? "11.0.3",
-        "publicDirPath": (() => {
-            let { PUBLIC_DIR_PATH } = process.env;
+        "artifactId": process.env.KEYCLOAKIFY_ARTIFACT_ID ?? parsedPackageJson.keycloakify?.artifactId ?? `${themeNames[0]}-keycloak-theme`,
+        "doCreateJar": parsedPackageJson.keycloakify?.doCreateJar ?? true,
+        "loginThemeResourcesFromKeycloakVersion": parsedPackageJson.keycloakify?.loginThemeResourcesFromKeycloakVersion ?? "11.0.3",
+        reactAppRootDirPath,
+        "reactAppBuildDirPath": (() => {
+            if (parsedKeycloakifyViteConfig !== undefined) {
+                return pathJoin(reactAppRootDirPath, parsedKeycloakifyViteConfig.buildDir);
+            }

-            if (PUBLIC_DIR_PATH !== undefined) {
+            if (parsedPackageJson.keycloakify?.reactAppBuildDirPath !== undefined) {
                return getAbsoluteAndInOsFormatPath({
-                    "pathIsh": PUBLIC_DIR_PATH,
+                    "pathIsh": parsedPackageJson.keycloakify?.reactAppBuildDirPath,
+                    "cwd": reactAppRootDirPath
+                });
+            }
+
+            return pathJoin(reactAppRootDirPath, "build");
+        })(),
+
+        "publicDirPath": (() => {
+            if (parsedKeycloakifyViteConfig !== undefined) {
+                return parsedKeycloakifyViteConfig.publicDirPath;
+            }
+
+            if (process.env.PUBLIC_DIR_PATH !== undefined) {
+                return getAbsoluteAndInOsFormatPath({
+                    "pathIsh": process.env.PUBLIC_DIR_PATH,
                    "cwd": reactAppRootDirPath
                });
            }

            return pathJoin(reactAppRootDirPath, "public");
        })(),
-        "reactAppBuildDirPath": (() => {
-            const { reactAppBuildDirPath } = parsedPackageJson.keycloakify ?? {};
-
-            if (reactAppBuildDirPath !== undefined) {
-                return getAbsoluteAndInOsFormatPath({
-                    "pathIsh": reactAppBuildDirPath,
-                    "cwd": reactAppRootDirPath
-                });
-            }
-
-            for (const name of ["build", "dist"]) {
-                const out = pathJoin(reactAppRootDirPath, name);
-
-                if (!fs.existsSync(out)) {
-                    continue;
-                }
-
-                return out;
-            }
-
-            throw new Error("Please use the reactAppBuildDirPath option to specify the build directory of your react app");
-        })(),
-        "keycloakifyBuildDirPath": (() => {
-            const { keycloakifyBuildDirPath } = parsedPackageJson.keycloakify ?? {};
-
-            if (keycloakifyBuildDirPath !== undefined) {
-                return getAbsoluteAndInOsFormatPath({
-                    "pathIsh": keycloakifyBuildDirPath,
-                    "cwd": reactAppRootDirPath
-                });
-            }
-
-            return pathJoin(reactAppRootDirPath, "build_keycloak");
-        })(),
+        keycloakifyBuildDirPath,
        "cacheDirPath": pathJoin(
            (() => {
                let { XDG_CACHE_HOME } = process.env;
--- a/src/bin/keycloakify/parsedKeycloakifyViteConfig.ts
+++ b/src/bin/keycloakify/parsedKeycloakifyViteConfig.ts
@ -5,20 +5,19 @@ import { z } from "zod";
 import { pathJoin } from "../tools/pathJoin";
 import { keycloakifyViteConfigJsonBasename } from "../constants";
 import type { OptionalIfCanBeUndefined } from "../tools/OptionalIfCanBeUndefined";
+import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";

 export type ParsedKeycloakifyViteConfig = {
-    reactAppRootDirPath: string;
-    publicDirPath: string;
-    assetsDirPath: string;
-    reactAppBuildDirPath: string;
+    buildDir: string;
+    publicDir: string;
+    assetsDir: string;
    urlPathname: string | undefined;
 };

-export const zParsedKeycloakifyViteConfig = z.object({
-    "reactAppRootDirPath": z.string(),
-    "publicDirPath": z.string(),
-    "assetsDirPath": z.string(),
-    "reactAppBuildDirPath": z.string(),
+const zParsedKeycloakifyViteConfig = z.object({
+    "buildDir": z.string(),
+    "publicDir": z.string(),
+    "assetsDir": z.string(),
    "urlPathname": z.string().optional()
 });

@ -29,20 +28,33 @@ export const zParsedKeycloakifyViteConfig = z.object({
    assert<Equals<Got, Expected>>();
 }

-let cache: { parsedKeycloakifyViteConfig: ParsedKeycloakifyViteConfig | undefined } | undefined = undefined;
+export function getParsedKeycloakifyViteConfig(params: {
+    reactAppRootDirPath: string;
+    parsedPackageJson_keycloakify_keycloakifyBuildDirPath: string | undefined;
+}):
+    | {
+          parsedKeycloakifyViteConfig: ParsedKeycloakifyViteConfig;
+      }
+    | undefined {
+    const { reactAppRootDirPath, parsedPackageJson_keycloakify_keycloakifyBuildDirPath } = params;

-export function getParsedKeycloakifyViteConfig(params: { keycloakifyBuildDirPath: string }): ParsedKeycloakifyViteConfig | undefined {
-    const { keycloakifyBuildDirPath } = params;
+    const viteConfigTsFilePath = pathJoin(reactAppRootDirPath, "vite.config.ts");

-    if (cache !== undefined) {
-        return cache.parsedKeycloakifyViteConfig;
+    if (!fs.existsSync(viteConfigTsFilePath)) {
+        return undefined;
    }

+    const { keycloakifyBuildDirPath } = getKeycloakifyBuildDirPath({
+        reactAppRootDirPath,
+        parsedPackageJson_keycloakify_keycloakifyBuildDirPath,
+        "bundler": "vite"
+    });
+
    const parsedKeycloakifyViteConfig = (() => {
        const keycloakifyViteConfigJsonFilePath = pathJoin(keycloakifyBuildDirPath, keycloakifyViteConfigJsonBasename);

        if (!fs.existsSync(keycloakifyViteConfigJsonFilePath)) {
-            return undefined;
+            throw new Error("Missing Keycloakify Vite plugin output.");
        }

        let out: ParsedKeycloakifyViteConfig;
@ -69,11 +81,36 @@ export function getParsedKeycloakifyViteConfig(params: { keycloakifyBuildDirPath
        return out;
    })();

-    if (parsedKeycloakifyViteConfig === undefined && fs.existsSync(pathJoin(keycloakifyBuildDirPath, "vite.config.ts"))) {
-        throw new Error("Make sure you have enabled the Keycloakiy plugin in your vite.config.ts");
-    }
-
-    cache = { parsedKeycloakifyViteConfig };
-
-    return parsedKeycloakifyViteConfig;
+    return { parsedKeycloakifyViteConfig };
+}
+
+export function getKeycloakifyBuildDirPath(params: {
+    reactAppRootDirPath: string;
+    parsedPackageJson_keycloakify_keycloakifyBuildDirPath: string | undefined;
+    bundler: "vite" | "webpack";
+}) {
+    const { reactAppRootDirPath, parsedPackageJson_keycloakify_keycloakifyBuildDirPath, bundler } = params;
+
+    const keycloakifyBuildDirPath = (() => {
+        if (parsedPackageJson_keycloakify_keycloakifyBuildDirPath !== undefined) {
+            getAbsoluteAndInOsFormatPath({
+                "pathIsh": parsedPackageJson_keycloakify_keycloakifyBuildDirPath,
+                "cwd": reactAppRootDirPath
+            });
+        }
+
+        return pathJoin(
+            reactAppRootDirPath,
+            `${(() => {
+                switch (bundler) {
+                    case "vite":
+                        return "dist";
+                    case "webpack":
+                        return "build";
+                }
+            })()}_keycloak`
+        );
+    })();
+
+    return { keycloakifyBuildDirPath };
 }
--- a/src/bin/keycloakify/parsedPackageJson.ts
+++ b/src/bin/keycloakify/parsedPackageJson.ts
@ -20,7 +20,7 @@ export type ParsedPackageJson = {
    };
 };

-export const zParsedPackageJson = z.object({
+const zParsedPackageJson = z.object({
    "name": z.string(),
    "version": z.string().optional(),
    "homepage": z.string().optional(),
--- a/src/bin/tools/getAbsoluteAndInOsFormatPath.ts
+++ b/src/bin/tools/getAbsoluteAndInOsFormatPath.ts
@ -7,6 +7,8 @@ export function getAbsoluteAndInOsFormatPath(params: { pathIsh: string; cwd: str

    pathOut = pathOut.replace(/\//g, pathSep);

+    pathOut = pathOut.endsWith(pathSep) ? pathOut.slice(0, -1) : pathOut;
+
    if (!pathIsAbsolute(pathOut)) {
        pathOut = pathJoin(cwd, pathOut);
    }