Update spawn args (#60)

asamuzaK · May 14, 2024 · e5b3036 · e5b3036
1 parent ce9b582
commit e5b3036
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 3 deletions.
diff --git a/modules/child-process.js b/modules/child-process.js
@@ -7,7 +7,7 @@ import childProcess from 'node:child_process';
 import os from 'node:os';
 import path from 'node:path';
 import process from 'node:process';
-import { parse, quote } from 'shell-quote';
+import { parse as parseCmd } from 'shell-quote';
 import { escapeChar, getType, isString } from './common.js';
 import { isExecutable, isFile } from './file-util.js';
 
@@ -143,9 +143,10 @@ export class ChildProcess {
   constructor(cmd, args, opt) {
     this.#cmd = isString(cmd) ? cmd : null;
     if (Array.isArray(args)) {
-      this.#args = parse(quote(args));
+      args = new CmdArgs(args).toString();
+      this.#args = parseCmd(args);
     } else if (args && isString(args)) {
-      this.#args = parse(args);
+      this.#args = parseCmd(args);
     } else {
       this.#args = [];
     }

diff --git a/test/child-process.test.js b/test/child-process.test.js
@@ -446,5 +446,49 @@ describe('ChildProcess', () => {
       stub.restore();
       assert.isTrue(calledOnce);
     });
+
+    it('should spawn with file path as last argument', async () => {
+      const app = path.resolve(IS_WIN
+        ? path.join('test', 'file', 'test.cmd')
+        : path.join('test', 'file', 'test.sh'));
+      const arg = ['-a', '--b="c d\\e"'];
+      const file = path.resolve(path.join('test', 'file', 'test.txt'));
+      await fs.chmodSync(app, PERM_EXEC);
+      await fs.chmodSync(file, PERM_FILE);
+      const stub = sinon.stub(childProcess, 'spawn').callsFake((...args) => {
+        const [, cmdArgs] = args;
+        const [arg1, arg2, arg3] = cmdArgs;
+        assert.strictEqual(cmdArgs.length, 3);
+        assert.strictEqual(arg1, '-a');
+        assert.strictEqual(arg2, '--b="c d\\e"');
+        assert.strictEqual(arg3, file);
+      });
+      await new ChildProcess(app, arg).spawn(file);
+      const { calledOnce } = stub;
+      stub.restore();
+      assert.isTrue(calledOnce);
+    });
+
+    it('should spawn with file path as last argument', async () => {
+      const app = path.resolve(IS_WIN
+        ? path.join('test', 'file', 'test.cmd')
+        : path.join('test', 'file', 'test.sh'));
+      const arg = '-a --b="c d\\e"';
+      const file = path.resolve(path.join('test', 'file', 'test.txt'));
+      await fs.chmodSync(app, PERM_EXEC);
+      await fs.chmodSync(file, PERM_FILE);
+      const stub = sinon.stub(childProcess, 'spawn').callsFake((...args) => {
+        const [, cmdArgs] = args;
+        const [arg1, arg2, arg3] = cmdArgs;
+        assert.strictEqual(cmdArgs.length, 3);
+        assert.strictEqual(arg1, '-a');
+        assert.strictEqual(arg2, '--b=c d\\e');
+        assert.strictEqual(arg3, file);
+      });
+      await new ChildProcess(app, arg).spawn(file);
+      const { calledOnce } = stub;
+      stub.restore();
+      assert.isTrue(calledOnce);
+    });
   });
 });