keycloakify 11.8.31 → 11.8.33

package/bin/main.js

@@ -15540,11 +15540,17 @@ function getBuildContext(params) {
         if (themeSrcDirPath !== undefined) {
             return { themeSrcDirPath };
         }
-        for (const themeType of [...constants/* THEME_TYPES */.Jh, "email"]) {
-            if (!external_fs_.existsSync((0,external_path_.join)(srcDirPath, themeType))) {
-                continue;
+        {
+            const basenames = external_fs_.readdirSync(srcDirPath);
+            for (const basename of basenames) {
+                const path = (0,external_path_.join)(srcDirPath, basename);
+                if (!external_fs_.statSync(path).isFile()) {
+                    continue;
+                }
+                if (external_fs_.readFileSync(path).toString("utf8").includes("./kc.gen")) {
+                    return { themeSrcDirPath: srcDirPath };
+                }
             }
-            return { themeSrcDirPath: srcDirPath };
         }
         console.log(source_default().red([
             `Can't locate your Keycloak theme source directory in .${external_path_.sep}${(0,external_path_.relative)(process.cwd(), srcDirPath)}`,
@@ -16235,7 +16241,7 @@ program
     .task({
     skip,
     handler: async ({ projectDirPath, keycloakVersion, port, realmJsonFilePath }) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(226), __nccwpck_require__.e(297), __nccwpck_require__.e(97)]).then(__nccwpck_require__.bind(__nccwpck_require__, 64097));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(69), __nccwpck_require__.e(910), __nccwpck_require__.e(375)]).then(__nccwpck_require__.bind(__nccwpck_require__, 64097));
         await command({
             buildContext: getBuildContext({ projectDirPath }),
             cliCommandOptions: {
@@ -16355,7 +16361,7 @@ program
     .task({
     skip,
     handler: async ({ projectDirPath }) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(226), __nccwpck_require__.e(363), __nccwpck_require__.e(946)]).then(__nccwpck_require__.bind(__nccwpck_require__, 74946));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(69), __nccwpck_require__.e(97), __nccwpck_require__.e(946)]).then(__nccwpck_require__.bind(__nccwpck_require__, 74946));
         await command({ buildContext: getBuildContext({ projectDirPath }) });
     }
 });
@@ -16409,7 +16415,7 @@ program
     .task({
     skip,
     handler: async ({ projectDirPath, path, revert }) => {
-        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(226), __nccwpck_require__.e(363), __nccwpck_require__.e(930)]).then(__nccwpck_require__.bind(__nccwpck_require__, 71930));
+        const { command } = await Promise.all(/* import() */[__nccwpck_require__.e(69), __nccwpck_require__.e(97), __nccwpck_require__.e(930)]).then(__nccwpck_require__.bind(__nccwpck_require__, 71930));
         await command({
             buildContext: getBuildContext({ projectDirPath }),
             cliCommandOptions: { path, isRevert: revert }

package/bin/tools/gitUtils.d.ts

@@ -0,0 +1,6 @@
+export declare const getIsKnownByGit: (params: {
+    filePath: string;
+}) => Promise<boolean>;
+export declare const untrackFromGit: (params: {
+    filePath: string;
+}) => Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "keycloakify",
-    "version": "11.8.31",
+    "version": "11.8.33",
     "description": "Framework to create custom Keycloak UIs",
     "repository": {
         "type": "git",
@@ -745,8 +745,8 @@
         "src/bin/tools/getAbsoluteAndInOsFormatPath.ts",
         "src/bin/tools/getInstalledModuleDirPath.ts",
         "src/bin/tools/getThisCodebaseRootDirPath.ts",
+        "src/bin/tools/gitUtils.ts",
         "src/bin/tools/isInside.ts",
-        "src/bin/tools/isKnownByGit.ts",
         "src/bin/tools/isRootPath.ts",
         "src/bin/tools/kebabCaseToSnakeCase.ts",
         "src/bin/tools/listInstalledModules.ts",
@@ -756,7 +756,6 @@
         "src/bin/tools/readThisNpmPackageVersion.ts",
         "src/bin/tools/runPrettier.ts",
         "src/bin/tools/transformCodebase.ts",
-        "src/bin/tools/untrackFromGit.ts",
         "src/bin/tsconfig.json",
         "src/bin/update-kc-gen.ts",
         "src/lib/BASE_URL.ts",
@@ -1107,8 +1106,8 @@
         "bin/tools/getAbsoluteAndInOsFormatPath.d.ts",
         "bin/tools/getInstalledModuleDirPath.d.ts",
         "bin/tools/getThisCodebaseRootDirPath.d.ts",
+        "bin/tools/gitUtils.d.ts",
         "bin/tools/isInside.d.ts",
-        "bin/tools/isKnownByGit.d.ts",
         "bin/tools/isRootPath.d.ts",
         "bin/tools/kebabCaseToSnakeCase.d.ts",
         "bin/tools/listInstalledModules.d.ts",
@@ -1121,27 +1120,26 @@
         "bin/tools/String.prototype.replaceAll.d.ts",
         "bin/tools/Stringifyable.d.ts",
         "bin/tools/transformCodebase.d.ts",
-        "bin/tools/untrackFromGit.d.ts",
         "bin/update-kc-gen.d.ts",
         "bin/main.js",
-        "bin/226.index.js",
         "bin/266.index.js",
-        "bin/297.index.js",
         "bin/304.index.js",
         "bin/355.index.js",
-        "bin/363.index.js",
         "bin/369.index.js",
+        "bin/375.index.js",
         "bin/40.index.js",
         "bin/453.index.js",
         "bin/502.index.js",
         "bin/656.index.js",
         "bin/658.index.js",
+        "bin/69.index.js",
         "bin/712.index.js",
         "bin/720.index.js",
         "bin/780.index.js",
         "bin/783.index.js",
         "bin/786.index.js",
         "bin/877.index.js",
+        "bin/910.index.js",
         "bin/930.index.js",
         "bin/932.index.js",
         "bin/946.index.js",

package/src/bin/shared/buildContext.ts

@@ -18,7 +18,7 @@ import {
 import type { KeycloakVersionRange } from "./KeycloakVersionRange";
 import { exclude } from "tsafe";
 import { crawl } from "../tools/crawl";
-import { THEME_TYPES, KEYCLOAK_THEME, type ThemeType } from "./constants";
+import { KEYCLOAK_THEME, type ThemeType } from "./constants";
 import { objectEntries } from "tsafe/objectEntries";
 import { id } from "tsafe/id";
 import chalk from "chalk";
@@ -166,11 +166,20 @@ export function getBuildContext(params: {
             return { themeSrcDirPath };
         }
 
-        for (const themeType of [...THEME_TYPES, "email"]) {
-            if (!fs.existsSync(pathJoin(srcDirPath, themeType))) {
-                continue;
+        {
+            const basenames = fs.readdirSync(srcDirPath);
+
+            for (const basename of basenames) {
+                const path = pathJoin(srcDirPath, basename);
+
+                if (!fs.statSync(path).isFile()) {
+                    continue;
+                }
+
+                if (fs.readFileSync(path).toString("utf8").includes("./kc.gen")) {
+                    return { themeSrcDirPath: srcDirPath };
+                }
             }
-            return { themeSrcDirPath: srcDirPath };
         }
 
         console.log(

package/src/bin/sync-extensions/sync-extension.ts

@@ -9,8 +9,7 @@ import { dirname as pathDirname } from "path";
 import { join as pathJoin } from "path";
 import { existsAsync } from "../tools/fs.existsAsync";
 import * as fsPr from "fs/promises";
-import { getIsKnownByGit } from "../tools/isKnownByGit";
-import { untrackFromGit } from "../tools/untrackFromGit";
+import { getIsKnownByGit, untrackFromGit } from "../tools/gitUtils";
 
 export async function command(params: { buildContext: BuildContext }) {
     const { buildContext } = params;

package/src/bin/tools/gitUtils.ts

@@ -0,0 +1,86 @@
+import * as child_process from "child_process";
+import {
+    dirname as pathDirname,
+    basename as pathBasename,
+    join as pathJoin,
+    sep as pathSep
+} from "path";
+import { Deferred } from "evt/tools/Deferred";
+import * as fs from "fs";
+import * as runExclusive from "run-exclusive";
+import { existsAsync } from "./fs.existsAsync";
+
+const groupRef = runExclusive.createGroupRef();
+
+export const getIsKnownByGit = runExclusive.build(
+    groupRef,
+    (params: { filePath: string }): Promise<boolean> => {
+        const { filePath } = params;
+
+        const dIsKnownByGit = new Deferred<boolean>();
+
+        let relativePath = pathBasename(filePath);
+
+        let dirPath = pathDirname(filePath);
+
+        while (!fs.existsSync(dirPath)) {
+            relativePath = pathJoin(pathBasename(dirPath), relativePath);
+
+            dirPath = pathDirname(dirPath);
+        }
+
+        child_process.exec(
+            `git ls-files --error-unmatch '${relativePath.split(pathSep).join("/")}'`,
+            { cwd: dirPath },
+            error => {
+                if (error === null) {
+                    dIsKnownByGit.resolve(true);
+                    return;
+                }
+
+                if (error.code === 1) {
+                    dIsKnownByGit.resolve(false);
+                    return;
+                }
+
+                dIsKnownByGit.reject(error);
+            }
+        );
+
+        return dIsKnownByGit.pr;
+    }
+);
+
+export const untrackFromGit = runExclusive.build(
+    groupRef,
+    async (params: { filePath: string }): Promise<void> => {
+        const { filePath } = params;
+
+        const dDone = new Deferred<void>();
+
+        let relativePath = pathBasename(filePath);
+
+        let dirPath = pathDirname(filePath);
+
+        while (!(await existsAsync(dirPath))) {
+            relativePath = pathJoin(pathBasename(dirPath), relativePath);
+
+            dirPath = pathDirname(dirPath);
+        }
+
+        child_process.exec(
+            `git rm --cached '${relativePath.split(pathSep).join("/")}'`,
+            { cwd: dirPath },
+            error => {
+                if (error !== null) {
+                    dDone.reject(error);
+                    return;
+                }
+
+                dDone.resolve();
+            }
+        );
+
+        await dDone.pr;
+    }
+);

package/vite-plugin/index.js

@@ -408,11 +408,17 @@ function getBuildContext(params) {
         if (themeSrcDirPath !== undefined) {
             return { themeSrcDirPath };
         }
-        for (const themeType of [...constants.THEME_TYPES, "email"]) {
-            if (!external_fs_.existsSync((0,external_path_.join)(srcDirPath, themeType))) {
-                continue;
+        {
+            const basenames = external_fs_.readdirSync(srcDirPath);
+            for (const basename of basenames) {
+                const path = (0,external_path_.join)(srcDirPath, basename);
+                if (!external_fs_.statSync(path).isFile()) {
+                    continue;
+                }
+                if (external_fs_.readFileSync(path).toString("utf8").includes("./kc.gen")) {
+                    return { themeSrcDirPath: srcDirPath };
+                }
             }
-            return { themeSrcDirPath: srcDirPath };
         }
         console.log(source_default().red([
             `Can't locate your Keycloak theme source directory in .${external_path_.sep}${(0,external_path_.relative)(process.cwd(), srcDirPath)}`,