keycloakify 10.0.0-rc.37 → 10.0.0-rc.39

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

@@ -11,21 +11,22 @@ import { rm } from "../bin/tools/fs.rm";
 import { copyKeycloakResourcesToPublic } from "../bin/shared/copyKeycloakResourcesToPublic";
 import { assert } from "tsafe/assert";
 import {
-    readBuildOptions,
+    getBuildContext,
+    type BuildContext,
     type BuildOptions,
-    type UserProvidedBuildOptions,
     type ResolvedViteConfig
-} from "../bin/shared/buildOptions";
+} from "../bin/shared/buildContext";
 import MagicString from "magic-string";
+import { generateKcGenTs } from "../bin/shared/generateKcGenTs";
 
-export type Params = UserProvidedBuildOptions & {
-    postBuild?: (buildOptions: Omit<BuildOptions, "bundler">) => Promise<void>;
+export type Params = BuildOptions & {
+    postBuild?: (buildContext: Omit<BuildContext, "bundler">) => Promise<void>;
 };
 
 export function keycloakify(params?: Params) {
-    const { postBuild, ...userProvidedBuildOptions } = params ?? {};
+    const { postBuild, ...buildOptions } = params ?? {};
 
-    let reactAppRootDirPath: string | undefined = undefined;
+    let projectDirPath: string | undefined = undefined;
     let urlPathname: string | undefined = undefined;
     let buildDirPath: string | undefined = undefined;
     let command: "build" | "serve" | undefined = undefined;
@@ -44,16 +45,16 @@ export function keycloakify(params?: Params) {
                     break run_post_build_script_case;
                 }
 
-                const buildOptions = JSON.parse(envValue) as BuildOptions;
+                const buildContext = JSON.parse(envValue) as BuildContext;
 
-                await postBuild?.(buildOptions);
+                await postBuild?.(buildContext);
 
                 process.exit(0);
             }
 
             command = resolvedConfig.command;
 
-            reactAppRootDirPath = resolvedConfig.root;
+            projectDirPath = resolvedConfig.root;
             urlPathname = (() => {
                 let out = resolvedConfig.env.BASE_URL;
 
@@ -85,7 +86,7 @@ export function keycloakify(params?: Params) {
                 return out;
             })();
 
-            buildDirPath = pathJoin(reactAppRootDirPath, resolvedConfig.build.outDir);
+            buildDirPath = pathJoin(projectDirPath, resolvedConfig.build.outDir);
 
             resolve_vite_config_case: {
                 const envValue =
@@ -101,13 +102,13 @@ export function keycloakify(params?: Params) {
                     JSON.stringify(
                         id<ResolvedViteConfig>({
                             publicDir: pathRelative(
-                                reactAppRootDirPath,
+                                projectDirPath,
                                 resolvedConfig.publicDir
                             ),
                             assetsDir: resolvedConfig.build.assetsDir,
                             buildDir: resolvedConfig.build.outDir,
                             urlPathname,
-                            userProvidedBuildOptions
+                            buildOptions
                         })
                     )
                 );
@@ -115,13 +116,20 @@ export function keycloakify(params?: Params) {
                 process.exit(0);
             }
 
-            await copyKeycloakResourcesToPublic({
-                buildOptions: readBuildOptions({
-                    cliCommandOptions: {
-                        reactAppRootDirPath
-                    }
-                })
+            const buildContext = getBuildContext({
+                cliCommandOptions: {
+                    projectDirPath
+                }
             });
+
+            await Promise.all([
+                copyKeycloakResourcesToPublic({
+                    buildContext
+                }),
+                generateKcGenTs({
+                    buildContext
+                })
+            ]);
         },
         transform: (code, id) => {
             assert(command !== undefined);
@@ -131,11 +139,11 @@ export function keycloakify(params?: Params) {
                 return;
             }
 
-            assert(reactAppRootDirPath !== undefined);
+            assert(projectDirPath !== undefined);
 
             {
                 const isWithinSourceDirectory = id.startsWith(
-                    pathJoin(reactAppRootDirPath, "src") + pathSep
+                    pathJoin(projectDirPath, "src") + pathSep
                 );
 
                 if (!isWithinSourceDirectory) {

package/tools/clsx.d.ts

@@ -1,2 +1,3 @@
-export type CxArg = undefined | null | string | boolean | Partial<Record<string, boolean | null | undefined>> | readonly CxArg[];
-export declare const clsx: (...args: CxArg[]) => string;
+import { type CxArg as CxArg_generic } from "./clsx_withTransform";
+export type CxArg = CxArg_generic<string>;
+export declare function clsx(...args: CxArg[]): string;

package/tools/clsx.js

@@ -1,42 +1,6 @@
-import { assert } from "tsafe/assert";
-import { typeGuard } from "tsafe/typeGuard";
-export const clsx = (...args) => {
-    const len = args.length;
-    let i = 0;
-    let cls = "";
-    for (; i < len; i++) {
-        const arg = args[i];
-        if (arg == null)
-            continue;
-        let toAdd;
-        switch (typeof arg) {
-            case "boolean":
-                break;
-            case "object": {
-                if (Array.isArray(arg)) {
-                    toAdd = clsx(...arg);
-                }
-                else {
-                    assert(!typeGuard(arg, false));
-                    toAdd = "";
-                    for (const k in arg) {
-                        if (arg[k] && k) {
-                            toAdd && (toAdd += " ");
-                            toAdd += k;
-                        }
-                    }
-                }
-                break;
-            }
-            default: {
-                toAdd = arg;
-            }
-        }
-        if (toAdd) {
-            cls && (cls += " ");
-            cls += toAdd;
-        }
-    }
-    return cls;
-};
+import { id } from "tsafe";
+import { clsx_withTransform } from "./clsx_withTransform";
+export function clsx(...args) {
+    return clsx_withTransform({ args, transform: id });
+}
 //# sourceMappingURL=clsx.js.map

package/tools/clsx.js.map

@@ -1 +1 @@
-{"version":3,"file":"clsx.js","sourceRoot":"","sources":["../src/tools/clsx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAU5C,MAAM,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,IAAa,EAAU,EAAE;IAC7C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IACxB,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,IAAI,IAAI;YAAE,SAAS;QAE1B,IAAI,KAAK,CAAC;QACV,QAAQ,OAAO,GAAG,EAAE;YAChB,KAAK,SAAS;gBACV,MAAM;YACV,KAAK,QAAQ,CAAC,CAAC;gBACX,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACpB,KAAK,GAAG,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;iBACxB;qBAAM;oBACH,MAAM,CAAC,CAAC,SAAS,CAAqB,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;oBAEnD,KAAK,GAAG,EAAE,CAAC;oBACX,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;wBACjB,IAAI,GAAG,CAAC,CAAW,CAAC,IAAI,CAAC,EAAE;4BACvB,KAAK,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;4BACxB,KAAK,IAAI,CAAC,CAAC;yBACd;qBACJ;iBACJ;gBACD,MAAM;aACT;YACD,OAAO,CAAC,CAAC;gBACL,KAAK,GAAG,GAAG,CAAC;aACf;SACJ;QACD,IAAI,KAAK,EAAE;YACP,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;YACpB,GAAG,IAAI,KAAK,CAAC;SAChB;KACJ;IACD,OAAO,GAAG,CAAC;AACf,CAAC,CAAC"}
+{"version":3,"file":"clsx.js","sourceRoot":"","sources":["../src/tools/clsx.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC;AAC3B,OAAO,EAAE,kBAAkB,EAA+B,MAAM,sBAAsB,CAAC;AAIvF,MAAM,UAAU,IAAI,CAAC,GAAG,IAAa;IACjC,OAAO,kBAAkB,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,EAAE,EAAE,CAAC,CAAC;AACvD,CAAC"}

package/tools/clsx_withTransform.d.ts

@@ -0,0 +1,5 @@
+export type CxArg<ClassName extends string = string> = undefined | null | ClassName | boolean | Partial<Record<ClassName, boolean | null | undefined>> | readonly CxArg<ClassName>[];
+export declare function clsx_withTransform(params: {
+    args: CxArg[];
+    transform: (arg: string) => string;
+}): string;

package/tools/clsx_withTransform.js

@@ -0,0 +1,43 @@
+import { assert } from "tsafe/assert";
+import { typeGuard } from "tsafe/typeGuard";
+export function clsx_withTransform(params) {
+    const { args, transform } = params;
+    const len = args.length;
+    let i = 0;
+    let cls = "";
+    for (; i < len; i++) {
+        const arg = args[i];
+        if (arg == null)
+            continue;
+        let toAdd;
+        switch (typeof arg) {
+            case "boolean":
+                break;
+            case "object": {
+                if (Array.isArray(arg)) {
+                    toAdd = clsx_withTransform({ args: arg, transform });
+                }
+                else {
+                    assert(!typeGuard(arg, false));
+                    toAdd = "";
+                    for (const k in arg) {
+                        if (arg[k] && k) {
+                            toAdd && (toAdd += " ");
+                            toAdd += transform(k);
+                        }
+                    }
+                }
+                break;
+            }
+            default: {
+                toAdd = transform(arg);
+            }
+        }
+        if (toAdd) {
+            cls && (cls += " ");
+            cls += toAdd;
+        }
+    }
+    return cls;
+}
+//# sourceMappingURL=clsx_withTransform.js.map

package/tools/clsx_withTransform.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"clsx_withTransform.js","sourceRoot":"","sources":["../src/tools/clsx_withTransform.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAU5C,MAAM,UAAU,kBAAkB,CAAC,MAGlC;IACG,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;IAEnC,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IACxB,IAAI,CAAC,GAAG,CAAC,CAAC;IACV,IAAI,GAAG,GAAG,EAAE,CAAC;IACb,OAAO,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;QACjB,MAAM,GAAG,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC;QACpB,IAAI,GAAG,IAAI,IAAI;YAAE,SAAS;QAE1B,IAAI,KAAK,CAAC;QACV,QAAQ,OAAO,GAAG,EAAE;YAChB,KAAK,SAAS;gBACV,MAAM;YACV,KAAK,QAAQ,CAAC,CAAC;gBACX,IAAI,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBACpB,KAAK,GAAG,kBAAkB,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,CAAC,CAAC;iBACxD;qBAAM;oBACH,MAAM,CAAC,CAAC,SAAS,CAAqB,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC;oBAEnD,KAAK,GAAG,EAAE,CAAC;oBACX,KAAK,MAAM,CAAC,IAAI,GAAG,EAAE;wBACjB,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE;4BACb,KAAK,IAAI,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;4BACxB,KAAK,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC;yBACzB;qBACJ;iBACJ;gBACD,MAAM;aACT;YACD,OAAO,CAAC,CAAC;gBACL,KAAK,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;aAC1B;SACJ;QACD,IAAI,KAAK,EAAE;YACP,GAAG,IAAI,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC;YACpB,GAAG,IAAI,KAAK,CAAC;SAChB;KACJ;IACD,OAAO,GAAG,CAAC;AACf,CAAC"}