Correctly quote passthrough arguments

declarations/escape-it.d.ts

@@ -0,0 +1,4 @@
+declare module 'escape-it' {
+    function escape(platform?: string): (...args: string[]) => string;
+    export default escape;
+}

package.json

@@ -49,9 +49,9 @@
   "dependencies": {
     "chalk": "^4.1.0",
     "date-fns": "^2.29.1",
+    "escape-it": "^0.3.0",
     "lodash": "^4.17.21",
     "rxjs": "^7.0.0",
-    "shell-quote": "^1.7.3",
     "spawn-command": "^0.0.2-1",
     "supports-color": "^8.1.0",
     "tree-kill": "^1.2.2",

src/command-parser/expand-arguments.spec.ts

@@ -1,6 +1,8 @@
 import { CommandInfo } from '../command';
 import { ExpandArguments } from './expand-arguments';
 
+const isWindows = process.platform === 'win32';
+
 const createCommandInfo = (command: string): CommandInfo => ({
     command,
     name: '',
@@ -21,7 +23,10 @@ it('single argument placeholder is replaced', () => {
 it('argument placeholder is replaced and quoted properly', () => {
     const parser = new ExpandArguments(['foo bar']);
     const commandInfo = createCommandInfo('echo {1}');
-    expect(parser.parse(commandInfo)).toEqual({ ...commandInfo, command: "echo 'foo bar'" });
+    expect(parser.parse(commandInfo)).toEqual({
+        ...commandInfo,
+        command: isWindows ? 'echo "foo bar"' : "echo 'foo bar'",
+    });
 });
 
 it('multiple single argument placeholders are replaced', () => {
@@ -57,7 +62,10 @@ it('all arguments placeholder is replaced', () => {
 it('combined arguments placeholder is replaced', () => {
     const parser = new ExpandArguments(['foo', 'bar']);
     const commandInfo = createCommandInfo('echo {*}');
-    expect(parser.parse(commandInfo)).toEqual({ ...commandInfo, command: "echo 'foo bar'" });
+    expect(parser.parse(commandInfo)).toEqual({
+        ...commandInfo,
+        command: isWindows ? 'echo "foo bar"' : "echo 'foo bar'",
+    });
 });
 
 it('escaped argument placeholders are not replaced', () => {

src/command-parser/expand-arguments.ts

@@ -1,8 +1,10 @@
-import { quote } from 'shell-quote';
+import escapeFn from 'escape-it';
 
 import { CommandInfo } from '../command';
 import { CommandParser } from './command-parser';
 
+const escape = escapeFn();
+
 /**
  * Replace placeholders with additional arguments.
  */
@@ -22,15 +24,15 @@ export class ExpandArguments implements CommandParser {
                     !isNaN(placeholderTarget) &&
                     placeholderTarget <= this.additionalArguments.length
                 ) {
-                    return quote([this.additionalArguments[placeholderTarget - 1]]);
+                    return escape(this.additionalArguments[placeholderTarget - 1]);
                 }
                 // Replace all arguments placeholder.
                 if (placeholderTarget === '@') {
-                    return quote(this.additionalArguments);
+                    return escape(...this.additionalArguments);
                 }
                 // Replace combined arguments placeholder.
                 if (placeholderTarget === '*') {
-                    return quote([this.additionalArguments.join(' ')]);
+                    return escape(this.additionalArguments.join(' '));
                 }
                 // Replace placeholder with empty string
                 // if value doesn't exist in additional arguments.

src/concurrently.spec.ts

@@ -7,6 +7,8 @@ import { createFakeProcess, FakeCommand } from './fixtures/fake-command';
 import { FlowController } from './flow-control/flow-controller';
 import { Logger } from './logger';
 
+const isWindows = process.platform === 'win32';
+
 let spawn: SpawnCommand;
 let kill: KillProcess;
 let onFinishHooks: (() => void)[];
@@ -237,7 +239,10 @@ it('argument placeholders are properly replaced when additional arguments are pa
     expect(spawn).toHaveBeenCalledTimes(4);
     expect(spawn).toHaveBeenCalledWith('echo foo', expect.objectContaining({}));
     expect(spawn).toHaveBeenCalledWith('echo foo bar', expect.objectContaining({}));
-    expect(spawn).toHaveBeenCalledWith("echo 'foo bar'", expect.objectContaining({}));
+    expect(spawn).toHaveBeenCalledWith(
+        isWindows ? 'echo "foo bar"' : "echo 'foo bar'",
+        expect.objectContaining({})
+    );
     expect(spawn).toHaveBeenCalledWith('echo {@}', expect.objectContaining({}));
 });