@matter/tools 0.11.9 → 0.12.0-alpha.0-20241211-6d80d8b5c

package/src/util/bootstrap.mjs

@@ -25,13 +25,15 @@ function fatal(why, error) {
 async function findFile(name) {
     let dir = dirname(fileURLToPath(import.meta.url));
     while (true) {
-        const path = resolve(dir, name);
-        try {
-            await stat(path);
-            return path;
-        } catch (e) {
-            if (e.code !== "ENOENT") {
-                fatal("there was an unexpected error searching the filesystem", e);
+        if (!dir.endsWith("/dist/esm")) {
+            const path = resolve(dir, name);
+            try {
+                await stat(path);
+                return path;
+            } catch (e) {
+                if (e.code !== "ENOENT") {
+                    fatal("there was an unexpected error searching the filesystem", e);
+                }
             }
         }
 
@@ -88,7 +90,7 @@ async function bootstrap() {
                 if (code === 0) {
                     resolve();
                 } else {
-                    fatal(`esbuild existing with code ${code}`);
+                    fatal(`esbuild exited with code ${code}`);
                 }
             });
         });

package/src/util/progress.ts

@@ -81,6 +81,7 @@ export class Progress {
     #refreshInterval?: ReturnType<typeof setInterval>;
     #spinnerPosition = 0;
     #spinnerWindow?: number;
+    #subtasks = Array<string>();
 
     constructor() {}
 
@@ -129,7 +130,11 @@ export class Progress {
             return;
         }
 
-        writeStatus(`  ${colors.yellow(this.#spinner)} ${this.#ongoingText}`, true);
+        const subtask = this.#subtasks.length
+            ? colors.dim(` (${colors.dim(this.#subtasks[this.#subtasks.length - 1])})`)
+            : "";
+
+        writeStatus(`  ${colors.yellow(this.#spinner)} ${this.#ongoingText}${subtask}`, true);
     }
 
     success(text: string) {
@@ -169,6 +174,16 @@ export class Progress {
         }
     }
 
+    async subtask(text: string, fn: () => Promise<void>) {
+        this.#subtasks.push(text);
+
+        try {
+            await fn();
+        } finally {
+            this.#subtasks.pop();
+        }
+    }
+
     #updateSpinner() {
         if (!stdout.isTTY) {
             return false;
@@ -186,15 +201,17 @@ export class Progress {
         return true;
     }
 
-    async run(what: string, fn: () => void | Promise<void>) {
+    async run<T>(what: string, fn: () => T | Promise<T>) {
         this.update(what);
+        let result: T;
         try {
-            await fn();
+            result = await fn();
         } catch (e) {
             this.failure(what);
             throw e;
         }
         this.success(what);
+        return result;
     }
 
     get #duration() {