Merge pull request #241 from lordvlad/mvn-begone

Mvn begone addendum

src/bin/keycloakify/index.ts

@@ -4,5 +4,5 @@ export * from "./keycloakify";
 import { main } from "./keycloakify";
 
 if (require.main === module) {
-    main();
+    main().catch(e => console.error(e));
 }

src/bin/keycloakify/keycloakify.ts

@@ -60,10 +60,10 @@ export async function main() {
         case "keycloakify":
             logger.log("🫶 Let keycloakify do its thang");
             await jar({
-                "rootPath": keycloakThemeBuildingDirPath,
+                "rootPath": pathJoin(keycloakThemeBuildingDirPath, "src", "main", "resources"),
                 "version": buildOptions.version,
                 "groupId": buildOptions.groupId,
-                "artifactId": buildOptions.artifactId || `${buildOptions.themeName}-keycloak-theme`,
+                "artifactId": buildOptions.artifactId,
                 "targetPath": jarFilePath
             });
             break;

src/bin/tools/jar.ts

@@ -1,11 +1,11 @@
 import { Readable, Transform } from "stream";
-import { pipeline } from "stream/promises";
+import { dirname, relative, sep } from "path";
-import { relative, sep } from "path";
 import { createWriteStream } from "fs";
 
 import walk from "./walk";
 import type { ZipSource } from "./zip";
 import zip from "./zip";
+import { mkdir } from "fs/promises";
 
 /** Trim leading whitespace from every line */
 const trimIndent = (s: string) => s.replace(/(\n)\s+/g, "$1");
@@ -57,9 +57,9 @@ export default async function jar({ groupId, artifactId, version, rootPath, targ
     const pathToRecord = () =>
         new Transform({
             objectMode: true,
-            transform: function (path, _, cb) {
+            transform: function (fsPath, _, cb) {
-                const filename = relative(rootPath, path).split(sep).join("/");
+                const path = relative(rootPath, fsPath).split(sep).join("/");
-                this.push({ filename, path });
+                this.push({ path, fsPath });
                 cb();
             },
             final: function () {
@@ -69,19 +69,21 @@ export default async function jar({ groupId, artifactId, version, rootPath, targ
             }
         });
 
-    /**
+    await mkdir(dirname(targetPath), { recursive: true });
-     * Create an async pipeline, wait until everything is fully processed
+
-     */
+    // Create an async pipeline, wait until everything is fully processed
-    await pipeline(
+    await new Promise<void>((resolve, reject) => {
         // walk all files in `rootPath` recursively
-        Readable.from(walk(rootPath)),
+        Readable.from(walk(rootPath))
-        // transform every path into a ZipSource object
+            // transform every path into a ZipSource object
-        pathToRecord(),
+            .pipe(pathToRecord())
-        // let the zip lib convert all ZipSource objects into a byte stream
+            // let the zip lib convert all ZipSource objects into a byte stream
-        zip(),
+            .pipe(zip())
-        // write that byte stream to targetPath
+            // write that byte stream to targetPath
-        createWriteStream(targetPath, { encoding: "binary" })
+            .pipe(createWriteStream(targetPath, { encoding: "binary" }))
-    );
+            .on("finish", () => resolve())
+            .on("error", e => reject(e));
+    });
 }
 
 /**

src/bin/tools/zip.ts

@@ -216,7 +216,7 @@ export default function zip() {
     const writeRecord = async (source: ZipSource) => {
         if ("fsPath" in source) await writeFromPath(source.path, source.fsPath);
         else if ("data" in source) await writeFromBuffer(source.path, source.data);
-        else throw new Error("Illegal argument " + typeof source + "  " + source);
+        else throw new Error("Illegal argument " + typeof source + "  " + JSON.stringify(source));
     };
 
     /**