fix

Author: cometkim

lib_dev/process.js

@@ -21,8 +21,17 @@ const signals = {
   SIGTERM: 15,
 };
 
-export const { exec, node, yarn, mocha, bsc, rescript, execBuild, execClean } =
-  setup();
+export const {
+  shell,
+  node,
+  yarn,
+  mocha,
+  bsc,
+  rescript,
+  execBin,
+  execBuild,
+  execClean,
+} = setup();
 
 /**
  * @param {string} [cwd]
@@ -71,7 +80,11 @@ export function setup(cwd = process.cwd()) {
         }
 
         if (throwOnFail && code !== 0) {
-          reject({ status: code, stdout, stderr });
+          reject(
+            new Error(
+              `Command ${command} exited with non-zero status: ${code}`,
+            ),
+          );
         } else {
           resolve({ status: code, stdout, stderr });
         }
@@ -80,32 +93,44 @@ export function setup(cwd = process.cwd()) {
   }
 
   return {
-    exec,
+    /**
+     * bash shell script
+     *
+     * @param {string} script
+     * @param {string[]} [args]
+     * @param {ExecOptions} [options]
+     * @return {Promise<ExecResult>}
+     */
+    shell(script, args = [], options = {}) {
+      return exec("bash", [script, ...args], options);
+    },
 
     /**
-     * `node` CLI
+     * Execute JavaScript on Node.js
      *
+     * @param {string} script
      * @param {string[]} [args]
      * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
-    node(args = [], options = {}) {
-      return exec("node", args, options);
+    node(script, args = [], options = {}) {
+      return exec("node", [script, ...args], options);
     },
 
     /**
-     * `yarn` CLI
+     * Execute Yarn command
      *
+     * @param {string} command
      * @param {string[]} [args]
      * @param {ExecOptions} [options]
      * @return {Promise<ExecResult>}
      */
-    yarn(args = [], options = {}) {
-      return exec("yarn", args, options);
+    yarn(command, args = [], options = {}) {
+      return exec("yarn", [...command.split(" "), ...args], options);
     },
 
     /**
-     * Mocha CLI
+     * Execute Mocha CLI
      *
      * @param {string[]} [args]
      * @param {ExecOptions} [options]
@@ -168,5 +193,18 @@ export function setup(cwd = process.cwd()) {
     execClean(args = [], options = {}) {
       return exec(rescript_exe, ["clean", ...args], options);
     },
+
+    /**
+     * Execute any binary or wrapper.
+     * It should support Windows as well
+     *
+     * @param {string} bin
+     * @param {string[]} [args]
+     * @param {ExecOptions} [options]
+     * @return {Promise<ExecResult>}
+     */
+    execBin(bin, args = [], options = {}) {
+      return exec(bin, args, options);
+    },
   };
 }

scripts/test.js

@@ -12,12 +12,13 @@ import {
 } from "#dev/paths";
 
 import {
-  exec,
+  execBin,
   execBuild,
   execClean,
   mocha,
   node,
   rescript,
+  shell,
 } from "#dev/process";
 
 let ounitTest = false;
@@ -55,7 +56,7 @@ if (process.argv.includes("-all")) {
 }
 
 if (formatTest) {
-  await exec("./scripts/format_check.sh", [], {
+  await shell("./scripts/format_check.sh", [], {
     cwd: projectDir,
     stdio: "inherit",
   });
@@ -65,7 +66,7 @@ if (ounitTest) {
   if (process.platform === "win32") {
     console.log("Skipping OUnit tests on Windows");
   } else {
-    await exec(ounitTestBin, [], {
+    await execBin(ounitTestBin, [], {
       stdio: "inherit",
     });
   }
@@ -87,12 +88,12 @@ if (mochaTest) {
     stdio: "inherit",
   });
 
-  await node(["tests/tests/src/core/Core_TestSuite.mjs"], {
+  await node("tests/tests/src/core/Core_TestSuite.mjs", [], {
     cwd: projectDir,
     stdio: "inherit",
   });
 
-  await node(["tests/tests/src/core/Core_TempTests.mjs"], {
+  await node("tests/tests/src/core/Core_TempTests.mjs", [], {
     cwd: projectDir,
     stdio: "inherit",
   });
@@ -115,7 +116,7 @@ if (bsbTest) {
       console.log(`testing ${file}`);
 
       // note existsSync test already ensure that it is a directory
-      const out = await exec("node", ["input.js"], { cwd: testDir });
+      const out = await node("input.js", [], { cwd: testDir });
       console.log(out.stdout);
 
       if (out.status === 0) {
@@ -159,7 +160,7 @@ if (runtimeDocstrings) {
     });
 
     // Generate rescript file with all tests `generated_mocha_test.res`
-    await node([path.join(docstringTestDir, "DocTest.res.js")], {
+    await node(path.join(docstringTestDir, "DocTest.res.js"), [], {
       cwd: projectDir,
       stdio: "inherit",
     });