fix tests

Author: cometkim

lib_dev/process.js

@@ -3,6 +3,10 @@ import * as path from "node:path";
 import { bsc_exe, rescript_exe } from "#cli/bins";
 
 /**
+ * @typedef {{
+ *   throwOnFail?: boolean,
+ * } & child_process.SpawnOptions} ExecOptions
+ *
  * @typedef {{
  *   status: number,
  *   stdout: string,
@@ -20,24 +24,18 @@ const signals = {
 export const { exec, node, npx, mocha, bsc, rescript, execBuild, execClean } =
   setup();
 
-/**
- * @typedef {{
- *   throwOnExit?: boolean,
- * }} ExecOptions
- */
-
 /**
  * @param {string} [cwd]
  */
 export function setup(cwd = process.cwd()) {
   /**
    * @param {string} command
    * @param {string[]} [args]
-   * @param {child_process.SpawnOptions & ExecOptions} [options]
+   * @param {ExecOptions} [options]
    * @return {Promise<ExecResult>}
    */
   async function exec(command, args = [], options = {}) {
-    const { throwOnExit = true } = options;
+    const { throwOnFail = options.stdio === "inherit" } = options;
 
     const stdoutChunks = [];
     const stderrChunks = [];
@@ -63,20 +61,16 @@ export function setup(cwd = process.cwd()) {
       });
 
       subprocess.once("close", (exitCode, signal) => {
-        const stdout = stdoutChunks.length
-          ? Buffer.concat(stdoutChunks).toString("utf8")
-          : null;
-        const stderr = stdoutChunks.length
-          ? Buffer.concat(stderrChunks).toString("utf8")
-          : null;
+        const stdout = Buffer.concat(stdoutChunks).toString("utf8");
+        const stderr = Buffer.concat(stderrChunks).toString("utf8");
 
         let code = exitCode ?? 1;
         if (signals[signal]) {
           // + 128 is standard POSIX practice, see also https://nodejs.org/api/process.html#exit-codes
           code = signals[signal] + 128;
         }
 
-        if (throwOnExit && code !== 0) {
+        if (throwOnFail && code !== 0) {
           reject({ status: code, stdout, stderr });
         } else {
           resolve({ status: code, stdout, stderr });
@@ -92,7 +86,7 @@ export function setup(cwd = process.cwd()) {
      * `node` CLI
      *
      * @param {string[]} [args]
-     * @param {child_process.SpawnOptions} [options]
+     * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
     node(args = [], options = {}) {
@@ -103,7 +97,7 @@ export function setup(cwd = process.cwd()) {
      * `npx` CLI
      *
      * @param {string[]} [args]
-     * @param {child_process.SpawnOptions} [options]
+     * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
     npx(args = [], options = {}) {
@@ -114,7 +108,7 @@ export function setup(cwd = process.cwd()) {
      * Mocha CLI
      *
      * @param {string[]} [args]
-     * @param {child_process.SpawnOptions} [options]
+     * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
     mocha(args = [], options = {}) {
@@ -132,7 +126,7 @@ export function setup(cwd = process.cwd()) {
      *   | (string & {})
      * )} command
      * @param {string[]} [args]
-     * @param {child_process.SpawnOptions} [options]
+     * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
     rescript(command, args = [], options = {}) {
@@ -144,7 +138,7 @@ export function setup(cwd = process.cwd()) {
      * `bsc` CLI
      *
      * @param {string[]} [args]
-     * @param {child_process.SpawnOptions} [options]
+     * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
     bsc(args = [], options = {}) {
@@ -155,7 +149,7 @@ export function setup(cwd = process.cwd()) {
      * Execute ReScript `build` command directly
      *
      * @param {string[]} [args]
-     * @param {child_process.SpawnOptions} [options]
+     * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
     execBuild(args = [], options = {}) {
@@ -166,7 +160,7 @@ export function setup(cwd = process.cwd()) {
      * Execute ReScript `clean` command directly
      *
      * @param {string[]} [args]
-     * @param {child_process.SpawnOptions} [options]
+     * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
     execClean(args = [], options = {}) {

package.json

@@ -73,7 +73,7 @@
     "./package.json": "./package.json"
   },
   "imports": {
-    "#cli/bins": "./cli/common/bins.js",
+    "#cli/*": "./cli/common/*.js",
     "#dev/*": "./lib_dev/*.js",
     "#lib/minisocket": "./lib/minisocket.js"
   },

scripts/test.js

@@ -55,7 +55,7 @@ if (process.argv.includes("-all")) {
 }
 
 if (formatTest) {
-  await exec("bash", ["scripts/format_check.sh"], {
+  await exec("./scripts/format_check.sh", [], {
     cwd: projectDir,
     stdio: "inherit",
   });