keycloakify 11.4.2 → 11.4.4

package/account/i18n/withJsx/i18nBuilder.d.ts

@@ -12,7 +12,7 @@ export type I18nBuilder<ThemeName extends string = never, MessageKey_themeDefine
     }) => I18nBuilder<ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withExtraLanguages">;
     withCustomTranslations: <MessageKey_themeDefined extends string>(messagesByLanguageTag_themeDefined: Partial<{
         [LanguageTag in LanguageTag_defaultSet | LanguageTag_notInDefaultSet]: Record<MessageKey_themeDefined, string | Record<ThemeName, string>>;
-    }>) => I18nBuilder<ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withCustomTranslations">;
+    }>) => I18nBuilder<ThemeName, string extends MessageKey_themeDefined ? never : MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withCustomTranslations">;
     build: () => ReturnTypeOfCreateUseI18n<MessageKey_themeDefined, LanguageTag_notInDefaultSet>;
 }, ExcludedMethod>;
 export declare const i18nBuilder: I18nBuilder<never, never, never, never>;

package/bin/392.index.js

@@ -50,6 +50,10 @@ var runExclusive = __webpack_require__(81708);
 var extractArchive = __webpack_require__(29121);
 // EXTERNAL MODULE: ./node_modules/evt/tools/Deferred.js
 var Deferred = __webpack_require__(50689);
+// EXTERNAL MODULE: ./node_modules/tsafe/esm/id.mjs
+var id = __webpack_require__(38469);
+// EXTERNAL MODULE: ./node_modules/zod/lib/index.mjs
+var lib = __webpack_require__(52300);
 ;// CONCATENATED MODULE: ./dist/bin/start-keycloak/appBuild.js
 
 
@@ -59,42 +63,26 @@ var Deferred = __webpack_require__(50689);
 
 
 
+
+
 (0,assert/* assert */.h)();
 async function appBuild(params) {
-    const { buildContext } = params;
-    switch (buildContext.bundler) {
-        case "vite":
-            return appBuild_vite({ buildContext });
-        case "webpack":
-            return appBuild_webpack({ buildContext });
-    }
-}
-async function appBuild_vite(params) {
-    const { buildContext } = params;
-    (0,assert/* assert */.h)(buildContext.bundler === "vite");
-    const dIsSuccess = new Deferred.Deferred();
-    console.log(source_default().blue("$ npx vite build"));
-    const child = external_child_process_.spawn("npx", ["vite", "build"], {
-        cwd: buildContext.projectDirPath,
-        shell: true
-    });
-    child.stdout.on("data", data => {
-        if (data.toString("utf8").includes("gzip:")) {
-            return;
-        }
-        process.stdout.write(data);
-    });
-    child.stderr.on("data", data => process.stderr.write(data));
-    child.on("exit", code => dIsSuccess.resolve(code === 0));
-    const isSuccess = await dIsSuccess.pr;
-    return { isAppBuildSuccess: isSuccess };
-}
-async function appBuild_webpack(params) {
     var _a;
     const { buildContext } = params;
-    (0,assert/* assert */.h)(buildContext.bundler === "webpack");
-    const entries = Object.entries(((_a = JSON.parse(external_fs_.readFileSync(buildContext.packageJsonFilePath).toString("utf8"))
-        .scripts) !== null && _a !== void 0 ? _a : {})).filter(([, scriptCommand]) => scriptCommand.includes("keycloakify build"));
+    const { parsedPackageJson } = (() => {
+        const zParsedPackageJson = (() => {
+            const zTargetType = lib.z.object({
+                scripts: lib.z.record(lib.z.string()).optional()
+            });
+            (0,assert/* assert */.h)();
+            return (0,id.id)(zTargetType);
+        })();
+        const parsedPackageJson = JSON.parse(external_fs_.readFileSync(buildContext.packageJsonFilePath).toString("utf8"));
+        zParsedPackageJson.parse(parsedPackageJson);
+        (0,assert/* assert */.h)((0,assert.is)(parsedPackageJson));
+        return { parsedPackageJson };
+    })();
+    const entries = Object.entries((_a = parsedPackageJson.scripts) !== null && _a !== void 0 ? _a : {}).filter(([, scriptCommand]) => scriptCommand.includes("keycloakify build"));
     if (entries.length === 0) {
         console.log(source_default().red([
             `You should have a script in your package.json at ${(0,external_path_.relative)(process.cwd(), (0,external_path_.dirname)(buildContext.packageJsonFilePath))}`,
@@ -124,6 +112,54 @@ async function appBuild_webpack(params) {
         console.log(source_default().red(`Your ${scriptName} script should look like "... && keycloakify build ..."`));
         process.exit(-1);
     }
+    common_case: {
+        if (appBuildSubCommands.length !== 1) {
+            break common_case;
+        }
+        const [appBuildSubCommand] = appBuildSubCommands;
+        const isNpmRunBuild = (() => {
+            for (const packageManager of ["npm", "yarn", "pnpm", "bun", "deno"]) {
+                for (const doUseRun of [true, false]) {
+                    if (`${packageManager}${doUseRun ? " run " : " "}build` ===
+                        appBuildSubCommand) {
+                        return true;
+                    }
+                }
+            }
+            return false;
+        })();
+        if (!isNpmRunBuild) {
+            break common_case;
+        }
+        const { scripts } = parsedPackageJson;
+        (0,assert/* assert */.h)(scripts !== undefined);
+        const buildCmd = scripts.build;
+        if (buildCmd !== "tsc && vite build") {
+            break common_case;
+        }
+        if (scripts.prebuild !== undefined) {
+            break common_case;
+        }
+        if (scripts.postbuild !== undefined) {
+            break common_case;
+        }
+        const dIsSuccess = new Deferred.Deferred();
+        console.log(source_default().blue("$ npx vite build"));
+        const child = external_child_process_.spawn("npx", ["vite", "build"], {
+            cwd: buildContext.projectDirPath,
+            shell: true
+        });
+        child.stdout.on("data", data => {
+            if (data.toString("utf8").includes("gzip:")) {
+                return;
+            }
+            process.stdout.write(data);
+        });
+        child.stderr.on("data", data => process.stderr.write(data));
+        child.on("exit", code => dIsSuccess.resolve(code === 0));
+        const isSuccess = await dIsSuccess.pr;
+        return { isAppBuildSuccess: isSuccess };
+    }
     let commandCwd = (0,external_path_.dirname)(buildContext.packageJsonFilePath);
     for (const subCommand of appBuildSubCommands) {
         const dIsSuccess = new Deferred.Deferred();

package/bin/start-keycloak/appBuild.d.ts

@@ -1,9 +1,5 @@
-import type { BuildContext } from "../shared/buildContext";
 export type BuildContextLike = {
     projectDirPath: string;
-    keycloakifyBuildDirPath: string;
-    bundler: BuildContext["bundler"];
-    projectBuildDirPath: string;
     packageJsonFilePath: string;
 };
 export declare function appBuild(params: {

package/login/i18n/withJsx/i18nBuilder.d.ts

@@ -12,7 +12,7 @@ export type I18nBuilder<ThemeName extends string = never, MessageKey_themeDefine
     }) => I18nBuilder<ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withExtraLanguages">;
     withCustomTranslations: <MessageKey_themeDefined extends string>(messagesByLanguageTag_themeDefined: Partial<{
         [LanguageTag in LanguageTag_defaultSet | LanguageTag_notInDefaultSet]: Record<MessageKey_themeDefined, string | Record<ThemeName, string>>;
-    }>) => I18nBuilder<ThemeName, MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withCustomTranslations">;
+    }>) => I18nBuilder<ThemeName, string extends MessageKey_themeDefined ? never : MessageKey_themeDefined, LanguageTag_notInDefaultSet, ExcludedMethod | "withCustomTranslations">;
     build: () => ReturnTypeOfCreateUseI18n<MessageKey_themeDefined, LanguageTag_notInDefaultSet>;
 }, ExcludedMethod>;
 export declare const i18nBuilder: I18nBuilder<never, never, never, never>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.4.2",
+    "version": "11.4.4",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",

package/src/account/i18n/withJsx/i18nBuilder.ts

@@ -46,7 +46,7 @@ export type I18nBuilder<
             }>
         ) => I18nBuilder<
             ThemeName,
-            MessageKey_themeDefined,
+            string extends MessageKey_themeDefined ? never : MessageKey_themeDefined,
             LanguageTag_notInDefaultSet,
             ExcludedMethod | "withCustomTranslations"
         >;

package/src/bin/initialize-account-theme/src/multi-page/i18n.ts

@@ -1,11 +1,9 @@
 import { i18nBuilder } from "keycloakify/account";
 import type { ThemeName } from "../kc.gen";
 
-const { useI18n, ofTypeI18n } = i18nBuilder
-    .withThemeName<ThemeName>()
-    .withExtraLanguages({})
-    .withCustomTranslations({})
-    .build();
+/** @see: https://docs.keycloakify.dev/i18n */
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+const { useI18n, ofTypeI18n } = i18nBuilder.withThemeName<ThemeName>().build();
 
 type I18n = typeof ofTypeI18n;
 

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

@@ -1,18 +1,17 @@
 import * as child_process from "child_process";
 import { Deferred } from "evt/tools/Deferred";
-import { assert } from "tsafe/assert";
+import { assert, is, type Equals } from "tsafe/assert";
+import { id } from "tsafe/id";
 import type { BuildContext } from "../shared/buildContext";
 import chalk from "chalk";
 import { sep as pathSep, join as pathJoin } from "path";
 import { getAbsoluteAndInOsFormatPath } from "../tools/getAbsoluteAndInOsFormatPath";
 import * as fs from "fs";
 import { dirname as pathDirname, relative as pathRelative } from "path";
+import { z } from "zod";
 
 export type BuildContextLike = {
     projectDirPath: string;
-    keycloakifyBuildDirPath: string;
-    bundler: BuildContext["bundler"];
-    projectBuildDirPath: string;
     packageJsonFilePath: string;
 };
 
@@ -23,58 +22,36 @@ export async function appBuild(params: {
 }): Promise<{ isAppBuildSuccess: boolean }> {
     const { buildContext } = params;
 
-    switch (buildContext.bundler) {
-        case "vite":
-            return appBuild_vite({ buildContext });
-        case "webpack":
-            return appBuild_webpack({ buildContext });
-    }
-}
-
-async function appBuild_vite(params: {
-    buildContext: BuildContextLike;
-}): Promise<{ isAppBuildSuccess: boolean }> {
-    const { buildContext } = params;
-
-    assert(buildContext.bundler === "vite");
+    const { parsedPackageJson } = (() => {
+        type ParsedPackageJson = {
+            scripts?: Record<string, string>;
+        };
 
-    const dIsSuccess = new Deferred<boolean>();
+        const zParsedPackageJson = (() => {
+            type TargetType = ParsedPackageJson;
 
-    console.log(chalk.blue("$ npx vite build"));
-
-    const child = child_process.spawn("npx", ["vite", "build"], {
-        cwd: buildContext.projectDirPath,
-        shell: true
-    });
-
-    child.stdout.on("data", data => {
-        if (data.toString("utf8").includes("gzip:")) {
-            return;
-        }
-
-        process.stdout.write(data);
-    });
+            const zTargetType = z.object({
+                scripts: z.record(z.string()).optional()
+            });
 
-    child.stderr.on("data", data => process.stderr.write(data));
+            assert<Equals<z.infer<typeof zTargetType>, TargetType>>();
 
-    child.on("exit", code => dIsSuccess.resolve(code === 0));
+            return id<z.ZodType<TargetType>>(zTargetType);
+        })();
+        const parsedPackageJson = JSON.parse(
+            fs.readFileSync(buildContext.packageJsonFilePath).toString("utf8")
+        );
 
-    const isSuccess = await dIsSuccess.pr;
+        zParsedPackageJson.parse(parsedPackageJson);
 
-    return { isAppBuildSuccess: isSuccess };
-}
+        assert(is<ParsedPackageJson>(parsedPackageJson));
 
-async function appBuild_webpack(params: {
-    buildContext: BuildContextLike;
-}): Promise<{ isAppBuildSuccess: boolean }> {
-    const { buildContext } = params;
-
-    assert(buildContext.bundler === "webpack");
+        return { parsedPackageJson };
+    })();
 
-    const entries = Object.entries(
-        (JSON.parse(fs.readFileSync(buildContext.packageJsonFilePath).toString("utf8"))
-            .scripts ?? {}) as Record<string, string>
-    ).filter(([, scriptCommand]) => scriptCommand.includes("keycloakify build"));
+    const entries = Object.entries(parsedPackageJson.scripts ?? {}).filter(
+        ([, scriptCommand]) => scriptCommand.includes("keycloakify build")
+    );
 
     if (entries.length === 0) {
         console.log(
@@ -127,6 +104,76 @@ async function appBuild_webpack(params: {
         process.exit(-1);
     }
 
+    common_case: {
+        if (appBuildSubCommands.length !== 1) {
+            break common_case;
+        }
+
+        const [appBuildSubCommand] = appBuildSubCommands;
+
+        const isNpmRunBuild = (() => {
+            for (const packageManager of ["npm", "yarn", "pnpm", "bun", "deno"]) {
+                for (const doUseRun of [true, false]) {
+                    if (
+                        `${packageManager}${doUseRun ? " run " : " "}build` ===
+                        appBuildSubCommand
+                    ) {
+                        return true;
+                    }
+                }
+            }
+
+            return false;
+        })();
+
+        if (!isNpmRunBuild) {
+            break common_case;
+        }
+
+        const { scripts } = parsedPackageJson;
+
+        assert(scripts !== undefined);
+
+        const buildCmd = scripts.build;
+
+        if (buildCmd !== "tsc && vite build") {
+            break common_case;
+        }
+
+        if (scripts.prebuild !== undefined) {
+            break common_case;
+        }
+
+        if (scripts.postbuild !== undefined) {
+            break common_case;
+        }
+
+        const dIsSuccess = new Deferred<boolean>();
+
+        console.log(chalk.blue("$ npx vite build"));
+
+        const child = child_process.spawn("npx", ["vite", "build"], {
+            cwd: buildContext.projectDirPath,
+            shell: true
+        });
+
+        child.stdout.on("data", data => {
+            if (data.toString("utf8").includes("gzip:")) {
+                return;
+            }
+
+            process.stdout.write(data);
+        });
+
+        child.stderr.on("data", data => process.stderr.write(data));
+
+        child.on("exit", code => dIsSuccess.resolve(code === 0));
+
+        const isSuccess = await dIsSuccess.pr;
+
+        return { isAppBuildSuccess: isSuccess };
+    }
+
     let commandCwd = pathDirname(buildContext.packageJsonFilePath);
 
     for (const subCommand of appBuildSubCommands) {

package/src/login/i18n/withJsx/i18nBuilder.ts

@@ -46,7 +46,7 @@ export type I18nBuilder<
             }>
         ) => I18nBuilder<
             ThemeName,
-            MessageKey_themeDefined,
+            string extends MessageKey_themeDefined ? never : MessageKey_themeDefined,
             LanguageTag_notInDefaultSet,
             ExcludedMethod | "withCustomTranslations"
         >;