@j-o-r/sh 1.1.24 → 1.1.25

package/lib/SHDispatch.js

@@ -114,7 +114,7 @@ class SHDispatch {
 	* @returns {SHDispatch}
 	*/
 	options(options, prefix) {
-		if (prefix && typeof prefix === 'string') {
+		if (typeof prefix === 'string') {
 			this.#prefix = prefix;
 		}
 		if (options.stdio && typeof options.stdio === 'string') {

package/lib/SHExecute.js

@@ -1,4 +1,4 @@
-import { spawnSync, spawn} from 'node:child_process';
+import { spawnSync, spawn } from 'node:child_process';
 
 // Local helpers
 const isFinitePosInt = (n) => Number.isFinite(n) && n >= 0;
@@ -19,15 +19,13 @@ const parseDuration = (d) => {
 const childrenOf = (pid) => new Promise((resolve, reject) => {
   const p = spawn('pgrep', ['-P', String(pid)], { stdio: ['ignore', 'pipe', 'ignore'] });
   const out = [];
-  p.stdout.on('data', (b) => out.push(b));
+  p.stdout.on('data', (chunk) => out.push(chunk));
   p.on('close', (code) => {
     if (code === 0) {
       const ids = Buffer.concat(out).toString('utf8').trim().split(/\s+/).map(Number).filter(Boolean);
       resolve(ids);
     } else if (code === 1) {
-      resolve([]); // no children
-    } else {
-      reject(new Error(`pgrep -P ${pid} failed with code ${code}`));
+      resolve([]); // no children or error
     }
   });
   p.on('error', reject);
@@ -103,7 +101,7 @@ class SHExecute {
     const shellOpt = this.#options?.shell;
     if (shellOpt) {
       const sh = typeof shellOpt === 'string' ? shellOpt : 'bash';
-      const cmd = `${this.#prefix}; ${this.#command}`;
+      const cmd = this.#prefix ? `${this.#prefix}; ${this.#command}` : this.#command;
       return spawnSync(sh, ['-c', cmd], options);
     }
     // no-shell mode
@@ -139,7 +137,7 @@ class SHExecute {
     const shellOpt = this.#options?.shell;
     if (shellOpt) {
       const sh = typeof shellOpt === 'string' ? shellOpt : 'bash';
-      const cmd = `${this.#prefix}; ${this.#command}`;
+      const cmd = this.#prefix ? `${this.#prefix}; ${this.#command}` : this.#command;
       this.#proc = spawn(sh, ['-c', cmd], options);
     } else {
       this.#proc = spawn('/usr/bin/env', ['-S', this.#command], options);
@@ -199,9 +197,9 @@ class SHExecute {
           resolve(stdout);
         } else {
           const stderrBuf = this.#stderrChunks.length ? Buffer.concat(this.#stderrChunks) : Buffer.alloc(0);
-          let stderr = stderrBuf.toString('utf8').trim();
+          let stderr = stderrBuf.toString('utf8');
           if (this.#truncated.stderr) stderr += '\n[stderr truncated]\n';
-          reject(new Error(`Exit ${code ?? 'null'}${signal ? `, signal ${signal}` : ''}: ${this.#command}${stderr ? ` :: ${stderr}` : ''}`));
+          reject(new Error(`Command failed with code ${code}: ${stderr}`));
         }
       });
 

package/lib/Test.js

@@ -140,7 +140,9 @@ class Test {
 		const len = this.#tests.length;
 		for (; i < len; i++) {
 			this.#currentTest = i;
-			if (execute && !execute.includes(i)) continue;
+			if (execute && !execute.includes(i)) {
+				continue;
+			}
 			let duration = 0;
 			let start = getNow();
 			let executed = false;
@@ -179,9 +181,9 @@ class Test {
 		return this.#report();
 	}
 	/**
-	* @returns {Report}
+	* @returns {Promise<Report>}
 	*/
-	#report() {
+	async #report() {
 		let duration = 0;
 		let executed = 0;
 		const tests = this.#tests.length;
@@ -203,21 +205,29 @@ class Test {
 			console.log(`Total: ${tests} tests, executed: ${executed} in ${duration} ms - errors: ${errors}`);
 			if (tests !== executed) {
 				if (!this.#quiet) console.log('** Not all tests have been executed **');
-		    return { tests, executed, duration, errors };
+		    // return { tests, executed, duration, errors };
 			}
 			// Report on unresolved promises when NOT quiet
 			// This must be on a next tick because the current Promise (where this code is in) is not resolved yet
-			nextTick(() => {
-				const count = this.#promiseTracker.report(true);
-				if (count > 0) {
-					console.log('--------------------------------------------------');
-					console.log(`${count} Unresolved Promises detected.`);
-				}
-			});
+			setTimeout(() => {
+				 const count = this.#promiseTracker.report(true);
+				 if (count > 0) {
+				 	console.log('--------------------------------------------------');
+				 	console.log(`${count} Unresolved Promises detected.`);
+				 }
+			}, 10);
 		}
 		return { tests, executed, duration, errors };
 	}
 
+  unresolved() {
+		 const count = this.#promiseTracker.report(true);
+		 if (count > 0) {
+		 	console.log('--------------------------------------------------');
+		 	console.log(`${count} Unresolved Promises detected.`);
+		 }
+  }  
+
 	/**
 	* Empty tests
 	*/
@@ -225,6 +235,7 @@ class Test {
 		this.#tests = [];
 		this.#reports = [];
 		this.#errors = [];
+		this.#promiseTracker.reset();
 	}
 	/**
 	* Handle an error for the current test 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@j-o-r/sh",
   "author": "Jorrit Duin <j-o-r@duin.work>",
   "type": "module",
-  "version": "1.1.24",
+  "version": "1.1.25",
   "description": "Execute shell commands on Linux-based systems from javascript",
   "main": "lib/SH.js",
   "types": "types/SH.d.ts",

package/types/Test.d.ts

@@ -59,6 +59,7 @@ declare class Test {
     * @returns {Promise<Report>}
     */
     run(execute?: number[]): Promise<Report>;
+    unresolved(): void;
     /**
     * Empty tests
     */