keycloakify 11.2.9 → 11.3.0-rc.0

package/src/bin/main.ts

@@ -4,8 +4,10 @@ import { termost } from "termost";
 import { readThisNpmPackageVersion } from "./tools/readThisNpmPackageVersion";
 import * as child_process from "child_process";
 import { assertNoPnpmDlx } from "./tools/assertNoPnpmDlx";
+import { callHandlerIfAny } from "./shared/customHandler_caller";
+import { getBuildContext } from "./shared/buildContext";
 
-export type CliCommandOptions = {
+type CliCommandOptions = {
     projectDirPath: string | undefined;
 };
 
@@ -69,115 +71,154 @@ program
     })
     .task({
         skip,
-        handler: async cliCommandOptions => {
+        handler: async ({ projectDirPath }) => {
+            const buildContext = getBuildContext({ projectDirPath });
+
             const { command } = await import("./keycloakify");
 
-            await command({ cliCommandOptions });
+            await command({ buildContext });
         }
     });
 
-program
-    .command<{
-        port: number | undefined;
-        keycloakVersion: string | undefined;
-        realmJsonFilePath: string | undefined;
-    }>({
-        name: "start-keycloak",
-        description:
-            "Spin up a pre configured Docker image of Keycloak to test your theme."
-    })
-    .option({
-        key: "port",
-        name: (() => {
-            const name = "port";
+{
+    const commandName = "start-keycloak";
+
+    program
+        .command<{
+            port: number | undefined;
+            keycloakVersion: string | undefined;
+            realmJsonFilePath: string | undefined;
+        }>({
+            name: commandName,
+            description:
+                "Spin up a pre configured Docker image of Keycloak to test your theme."
+        })
+        .option({
+            key: "port",
+            name: (() => {
+                const name = "port";
+
+                optionsKeys.push(name);
+
+                return name;
+            })(),
+            description: ["Keycloak server port.", "Example `--port 8085`"].join(" "),
+            defaultValue: undefined
+        })
+        .option({
+            key: "keycloakVersion",
+            name: (() => {
+                const name = "keycloak-version";
+
+                optionsKeys.push(name);
+
+                return name;
+            })(),
+            description: [
+                "Use a specific version of Keycloak.",
+                "Example `--keycloak-version 21.1.1`"
+            ].join(" "),
+            defaultValue: undefined
+        })
+        .option({
+            key: "realmJsonFilePath",
+            name: (() => {
+                const name = "import";
+
+                optionsKeys.push(name);
+
+                return name;
+            })(),
+            defaultValue: undefined,
+            description: [
+                "Import your own realm configuration file",
+                "Example `--import path/to/myrealm-realm.json`"
+            ].join(" ")
+        })
+        .task({
+            skip,
+            handler: async ({
+                projectDirPath,
+                keycloakVersion,
+                port,
+                realmJsonFilePath
+            }) => {
+                const buildContext = getBuildContext({ projectDirPath });
+
+                const { command } = await import("./start-keycloak");
+
+                await command({
+                    buildContext,
+                    cliCommandOptions: { keycloakVersion, port, realmJsonFilePath }
+                });
+            }
+        });
+}
 
-            optionsKeys.push(name);
+{
+    const commandName = "eject-page";
 
-            return name;
-        })(),
-        description: ["Keycloak server port.", "Example `--port 8085`"].join(" "),
-        defaultValue: undefined
-    })
-    .option({
-        key: "keycloakVersion",
-        name: (() => {
-            const name = "keycloak-version";
-
-            optionsKeys.push(name);
-
-            return name;
-        })(),
-        description: [
-            "Use a specific version of Keycloak.",
-            "Example `--keycloak-version 21.1.1`"
-        ].join(" "),
-        defaultValue: undefined
-    })
-    .option({
-        key: "realmJsonFilePath",
-        name: (() => {
-            const name = "import";
-
-            optionsKeys.push(name);
-
-            return name;
-        })(),
-        defaultValue: undefined,
-        description: [
-            "Import your own realm configuration file",
-            "Example `--import path/to/myrealm-realm.json`"
-        ].join(" ")
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./start-keycloak");
+    program
+        .command({
+            name: commandName,
+            description: "Eject a Keycloak page."
+        })
+        .task({
+            skip,
+            handler: async ({ projectDirPath }) => {
+                const buildContext = getBuildContext({ projectDirPath });
 
-            await command({ cliCommandOptions });
-        }
-    });
+                callHandlerIfAny({ buildContext, commandName });
 
-program
-    .command({
-        name: "eject-page",
-        description: "Eject a Keycloak page."
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./eject-page");
+                const { command } = await import("./eject-page");
 
-            await command({ cliCommandOptions });
-        }
-    });
+                await command({ buildContext });
+            }
+        });
+}
 
-program
-    .command({
-        name: "add-story",
-        description: "Add *.stories.tsx file for a specific page to in your Storybook."
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./add-story");
+{
+    const commandName = "add-story";
 
-            await command({ cliCommandOptions });
-        }
-    });
+    program
+        .command({
+            name: commandName,
+            description:
+                "Add *.stories.tsx file for a specific page to in your Storybook."
+        })
+        .task({
+            skip,
+            handler: async ({ projectDirPath }) => {
+                const buildContext = getBuildContext({ projectDirPath });
 
-program
-    .command({
-        name: "initialize-email-theme",
-        description: "Initialize an email theme."
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./initialize-email-theme");
+                callHandlerIfAny({ buildContext, commandName });
 
-            await command({ cliCommandOptions });
-        }
-    });
+                const { command } = await import("./add-story");
+
+                await command({ buildContext });
+            }
+        });
+}
+
+{
+    const comandName = "initialize-login-theme";
+
+    program
+        .command({
+            name: comandName,
+            description: "Initialize an email theme."
+        })
+        .task({
+            skip,
+            handler: async ({ projectDirPath }) => {
+                const buildContext = getBuildContext({ projectDirPath });
+
+                const { command } = await import("./initialize-email-theme");
+
+                await command({ buildContext });
+            }
+        });
+}
 
 program
     .command({
@@ -186,42 +227,58 @@ program
     })
     .task({
         skip,
-        handler: async cliCommandOptions => {
+        handler: async ({ projectDirPath }) => {
+            const buildContext = getBuildContext({ projectDirPath });
+
             const { command } = await import("./initialize-account-theme");
 
-            await command({ cliCommandOptions });
+            await command({ buildContext });
         }
     });
 
-program
-    .command({
-        name: "copy-keycloak-resources-to-public",
-        description:
-            "(Webpack/Create-React-App only) Copy Keycloak default theme resources to the public directory."
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./copy-keycloak-resources-to-public");
+{
+    const commandName = "copy-keycloak-resources-to-public";
+
+    program
+        .command({
+            name: commandName,
+            description:
+                "(Webpack/Create-React-App only) Copy Keycloak default theme resources to the public directory."
+        })
+        .task({
+            skip,
+            handler: async ({ projectDirPath }) => {
+                const buildContext = getBuildContext({ projectDirPath });
+
+                const { command } = await import("./copy-keycloak-resources-to-public");
+
+                await command({ buildContext });
+            }
+        });
+}
 
-            await command({ cliCommandOptions });
-        }
-    });
+{
+    const commandName = "update-kc-gen";
 
-program
-    .command({
-        name: "update-kc-gen",
-        description:
-            "(Webpack/Create-React-App only) Create/update the kc.gen.ts file in your project."
-    })
-    .task({
-        skip,
-        handler: async cliCommandOptions => {
-            const { command } = await import("./update-kc-gen");
+    program
+        .command({
+            name: commandName,
+            description:
+                "(Webpack/Create-React-App only) Create/update the kc.gen.ts file in your project."
+        })
+        .task({
+            skip,
+            handler: async ({ projectDirPath }) => {
+                const buildContext = getBuildContext({ projectDirPath });
 
-            await command({ cliCommandOptions });
-        }
-    });
+                callHandlerIfAny({ buildContext, commandName });
+
+                const { command } = await import("./update-kc-gen");
+
+                await command({ buildContext });
+            }
+        });
+}
 
 // Fallback to build command if no command is provided
 {

package/src/bin/shared/buildContext.ts

@@ -7,7 +7,6 @@ import {
     dirname as pathDirname
 } from "path";
 import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
-import type { CliCommandOptions } from "../main";
 import { z } from "zod";
 import * as fs from "fs";
 import { assert, type Equals } from "tsafe/assert";
@@ -129,14 +128,12 @@ export type ResolvedViteConfig = {
 };
 
 export function getBuildContext(params: {
-    cliCommandOptions: CliCommandOptions;
+    projectDirPath: string | undefined;
 }): BuildContext {
-    const { cliCommandOptions } = params;
-
     const projectDirPath =
-        cliCommandOptions.projectDirPath !== undefined
+        params.projectDirPath !== undefined
             ? getAbsoluteAndInOsFormatPath({
-                  pathIsh: cliCommandOptions.projectDirPath,
+                  pathIsh: params.projectDirPath,
                   cwd: process.cwd()
               })
             : process.cwd();

package/src/bin/shared/constants.ts

@@ -71,3 +71,8 @@ export type AccountThemePageId = (typeof ACCOUNT_THEME_PAGE_IDS)[number];
 export const CONTAINER_NAME = "keycloak-keycloakify";
 
 export const FALLBACK_LANGUAGE_TAG = "en";
+
+export const CUSTOM_HANDLER_ENV_NAMES = {
+    COMMAND_NAME: "KEYCLOAKIFY_COMMAND_NAME",
+    BUILD_CONTEXT: "KEYCLOAKIFY_BUILD_CONTEXT"
+};

package/src/bin/shared/customHandler.ts

@@ -0,0 +1,35 @@
+import { assert } from "tsafe/assert";
+import type { BuildContext } from "./buildContext";
+import { CUSTOM_HANDLER_ENV_NAMES } from "./constants";
+
+export const BIN_NAME = "_keycloakify-custom-handler";
+
+export const NOT_IMPLEMENTED_EXIT_CODE = 78;
+
+export type CommandName = "update-kc-gen" | "eject-page" | "add-story";
+
+export type ApiVersion = "v1";
+
+export function readParams(params: { apiVersion: ApiVersion }) {
+    const { apiVersion } = params;
+
+    assert(apiVersion === "v1");
+
+    const commandName = (() => {
+        const envValue = process.env[CUSTOM_HANDLER_ENV_NAMES.COMMAND_NAME];
+
+        assert(envValue !== undefined);
+
+        return envValue as CommandName;
+    })();
+
+    const buildContext = (() => {
+        const envValue = process.env[CUSTOM_HANDLER_ENV_NAMES.BUILD_CONTEXT];
+
+        assert(envValue !== undefined);
+
+        return JSON.parse(envValue) as BuildContext;
+    })();
+
+    return { commandName, buildContext };
+}

package/src/bin/shared/customHandler_caller.ts

@@ -0,0 +1,47 @@
+import { assert, type Equals } from "tsafe/assert";
+import type { BuildContext } from "./buildContext";
+import { CUSTOM_HANDLER_ENV_NAMES } from "./constants";
+import {
+    NOT_IMPLEMENTED_EXIT_CODE,
+    type CommandName,
+    BIN_NAME,
+    ApiVersion
+} from "./customHandler";
+import * as child_process from "child_process";
+import { is } from "tsafe/is";
+import { dirname as pathDirname } from "path";
+import * as fs from "fs";
+
+assert<Equals<ApiVersion, "v1">>();
+
+export function callHandlerIfAny(params: {
+    commandName: CommandName;
+    buildContext: BuildContext;
+}) {
+    const { commandName, buildContext } = params;
+
+    if (!fs.readdirSync(pathDirname(process.argv[1])).includes(BIN_NAME)) {
+        return;
+    }
+
+    try {
+        child_process.execSync(`npx ${BIN_NAME}`, {
+            stdio: "inherit",
+            env: {
+                ...process.env,
+                [CUSTOM_HANDLER_ENV_NAMES.COMMAND_NAME]: commandName,
+                [CUSTOM_HANDLER_ENV_NAMES.BUILD_CONTEXT]: JSON.stringify(buildContext)
+            }
+        });
+    } catch (error) {
+        assert(is<child_process.ExecException>(error));
+
+        if (error.code === NOT_IMPLEMENTED_EXIT_CODE) {
+            return;
+        }
+
+        process.exit(error.code);
+    }
+
+    process.exit(0);
+}

package/src/bin/start-keycloak/start-keycloak.ts

@@ -1,6 +1,5 @@
-import { getBuildContext } from "../shared/buildContext";
+import type { BuildContext } from "../shared/buildContext";
 import { exclude } from "tsafe/exclude";
-import type { CliCommandOptions as CliCommandOptions_common } from "../main";
 import { promptKeycloakVersion } from "../shared/promptKeycloakVersion";
 import { CONTAINER_NAME } from "../shared/constants";
 import { SemVer } from "../tools/SemVer";
@@ -29,13 +28,14 @@ import { existsAsync } from "../tools/fs.existsAsync";
 import { rm } from "../tools/fs.rm";
 import { downloadAndExtractArchive } from "../tools/downloadAndExtractArchive";
 
-export type CliCommandOptions = CliCommandOptions_common & {
-    port: number | undefined;
-    keycloakVersion: string | undefined;
-    realmJsonFilePath: string | undefined;
-};
-
-export async function command(params: { cliCommandOptions: CliCommandOptions }) {
+export async function command(params: {
+    buildContext: BuildContext;
+    cliCommandOptions: {
+        port: number | undefined;
+        keycloakVersion: string | undefined;
+        realmJsonFilePath: string | undefined;
+    };
+}) {
     exit_if_docker_not_installed: {
         let commandOutput: string | undefined = undefined;
 
@@ -88,9 +88,7 @@ export async function command(params: { cliCommandOptions: CliCommandOptions })
         process.exit(1);
     }
 
-    const { cliCommandOptions } = params;
-
-    const buildContext = getBuildContext({ cliCommandOptions });
+    const { cliCommandOptions, buildContext } = params;
 
     const { dockerImageTag } = await (async () => {
         if (cliCommandOptions.keycloakVersion !== undefined) {

package/src/bin/update-kc-gen.ts

@@ -1,13 +1,8 @@
-import type { CliCommandOptions } from "./main";
-import { getBuildContext } from "./shared/buildContext";
+import type { BuildContext } from "./shared/buildContext";
 import { generateKcGenTs } from "./shared/generateKcGenTs";
 
-export async function command(params: { cliCommandOptions: CliCommandOptions }) {
-    const { cliCommandOptions } = params;
-
-    const buildContext = getBuildContext({
-        cliCommandOptions
-    });
+export async function command(params: { buildContext: BuildContext }) {
+    const { buildContext } = params;
 
     await generateKcGenTs({ buildContext });
 }

package/src/vite-plugin/vite-plugin.ts

@@ -122,9 +122,7 @@ export function keycloakify(params: keycloakify.Params) {
             }
 
             const buildContext = getBuildContext({
-                cliCommandOptions: {
-                    projectDirPath
-                }
+                projectDirPath
             });
 
             copyKeycloakResourcesToPublic({ buildContext }),

package/vite-plugin/index.js

@@ -233,10 +233,9 @@ function ensureSingleOrNone(arg0) {
 (0,assert/* assert */.h)();
 function getBuildContext(params) {
     var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-    const { cliCommandOptions } = params;
-    const projectDirPath = cliCommandOptions.projectDirPath !== undefined
+    const projectDirPath = params.projectDirPath !== undefined
         ? getAbsoluteAndInOsFormatPath({
-            pathIsh: cliCommandOptions.projectDirPath,
+            pathIsh: params.projectDirPath,
             cwd: process.cwd()
         })
         : process.cwd();
@@ -830,6 +829,7 @@ __nccwpck_require__.r(__webpack_exports__);
 /* harmony export */   "ACCOUNT_THEME_PAGE_IDS": () => (/* binding */ ACCOUNT_THEME_PAGE_IDS),
 /* harmony export */   "BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME": () => (/* binding */ BUILD_FOR_KEYCLOAK_MAJOR_VERSION_ENV_NAME),
 /* harmony export */   "CONTAINER_NAME": () => (/* binding */ CONTAINER_NAME),
+/* harmony export */   "CUSTOM_HANDLER_ENV_NAMES": () => (/* binding */ CUSTOM_HANDLER_ENV_NAMES),
 /* harmony export */   "FALLBACK_LANGUAGE_TAG": () => (/* binding */ FALLBACK_LANGUAGE_TAG),
 /* harmony export */   "LOGIN_THEME_PAGE_IDS": () => (/* binding */ LOGIN_THEME_PAGE_IDS),
 /* harmony export */   "THEME_TYPES": () => (/* binding */ THEME_TYPES),
@@ -896,6 +896,10 @@ const ACCOUNT_THEME_PAGE_IDS = [
 ];
 const CONTAINER_NAME = "keycloak-keycloakify";
 const FALLBACK_LANGUAGE_TAG = "en";
+const CUSTOM_HANDLER_ENV_NAMES = {
+    COMMAND_NAME: "KEYCLOAKIFY_COMMAND_NAME",
+    BUILD_CONTEXT: "KEYCLOAKIFY_BUILD_CONTEXT"
+};
 //# sourceMappingURL=constants.js.map
 
 /***/ }),
@@ -1531,9 +1535,7 @@ function keycloakify(params) {
                 process.exit(0);
             }
             const buildContext = (0, buildContext_1.getBuildContext)({
-                cliCommandOptions: {
-                    projectDirPath
-                }
+                projectDirPath
             });
             (0, copyKeycloakResourcesToPublic_1.copyKeycloakResourcesToPublic)({ buildContext }),
                 await (0, generateKcGenTs_1.generateKcGenTs)({ buildContext });