changed extra args to array passing without JSON parsing.

lib/make-spawn-args.js

@@ -12,11 +12,12 @@ const makeSpawnArgs = options => {
     env = {},
     stdio,
     cmd,
+    cmdargs = [],
     stdioString = false,
   } = options
 
   const isCmd = /(?:^|\\)cmd(?:\.exe)?$/i.test(scriptShell)
-  const args = isCmd ? ['/d', '/s', '/c', cmd] : ['-c', cmd]
+  const args = isCmd ? ['/d', '/s', '/c', cmd, ...cmdargs] : ['-c', cmd, ...cmdargs]
 
   const spawnOpts = {
     env: setPATH(path, {

lib/run-script-pkg.js

@@ -28,10 +28,12 @@ const runScriptPkg = async options => {
 
   const { scripts = {}, gypfile } = pkg
   let cmd = null
+  let cmdargs = []
   if (options.cmd) {
     cmd = options.cmd
   } else if (pkg.scripts && pkg.scripts[event]) {
-    cmd = pkg.scripts[event] + args.map(a => ` ${JSON.stringify(a)}`).join('')
+    cmd = pkg.scripts[event]
+    cmdargs = args
   } else if (
     // If there is no preinstall or install script, default to rebuilding node-gyp packages.
     event === 'install' &&
@@ -42,16 +44,19 @@ const runScriptPkg = async options => {
   ) {
     cmd = defaultGypInstallScript
   } else if (event === 'start' && await isServerPackage(path)) {
-    cmd = 'node server.js' + args.map(a => ` ${JSON.stringify(a)}`).join('')
+    cmd = 'node server.js'
+    cmdargs = args
   }
 
   if (!cmd) {
     return { code: 0, signal: null }
   }
 
+  const script = cmd + cmdargs.map(a => ` ${JSON.stringify(a)}`).join('')
+
   if (stdio === 'inherit' && banner !== false) {
     // we're dumping to the parent's stdout, so print the banner
-    console.log(bruce(pkg._id, event, cmd))
+    console.log(bruce(pkg._id, event, script))
   }
 
   const p = promiseSpawn(...makeSpawnArgs({
@@ -61,10 +66,11 @@ const runScriptPkg = async options => {
     env: packageEnvs(env, pkg),
     stdio,
     cmd,
+    cmdargs,
     stdioString,
   }), {
     event,
-    script: cmd,
+    script,
     pkgid: pkg._id,
     path,
   })

test/run-script-pkg.js

@@ -7,7 +7,7 @@ let SIGNAL = null
 const EXIT_CODE = 0
 
 const runScriptPkg = requireInject('../lib/run-script-pkg.js', {
-  '../lib/make-spawn-args.js': options => ['sh', ['-c', options.cmd], options],
+  '../lib/make-spawn-args.js': options => ['sh', ['-c', options.cmd, ...options.cmdargs], options],
   '@npmcli/promise-spawn': (...args) => {
     const p = SIGNAL || EXIT_CODE
       ? Promise.reject(Object.assign(new Error('test command failed'), {
@@ -64,6 +64,7 @@ t.test('pkg has server.js, start not specified', async t => {
     },
     stdio: 'pipe',
     cmd: 'node server.js',
+    cmdargs: [],
   }, {
     event: 'start',
     script: 'node server.js',
@@ -81,14 +82,14 @@ t.test('pkg has server.js, start not specified, with args', async t => {
     env: {
       environ: 'value',
     },
-    args: ['a', 'b', 'c'],
+    args: ['a', 'b\\S+b', 'c'],
     stdio: 'pipe',
     pkg: {
       _id: '[email protected]',
       scripts: {},
     },
   })
-  t.strictSame(res, ['sh', ['-c', 'node server.js "a" "b" "c"'], {
+  t.strictSame(res, ['sh', ['-c', 'node server.js', 'a', 'b\\S+b', 'c'], {
     stdioString: false,
     event: 'start',
     path,
@@ -97,10 +98,11 @@ t.test('pkg has server.js, start not specified, with args', async t => {
       environ: 'value',
     },
     stdio: 'pipe',
-    cmd: 'node server.js "a" "b" "c"',
+    cmd: 'node server.js',
+    cmdargs: ['a', 'b\\S+b', 'c'],
   }, {
     event: 'start',
-    script: 'node server.js "a" "b" "c"',
+    script: 'node server.js "a" "b\\\\S+b" "c"',
     pkgid: '[email protected]',
     path,
   }])
@@ -134,6 +136,7 @@ t.test('pkg has no foo script, but custom cmd provided', t => runScriptPkg({
   },
   stdio: 'pipe',
   cmd: 'bar',
+  cmdargs: [],
 }, {
   event: 'foo',
   script: 'bar',
@@ -169,6 +172,7 @@ t.test('do the banner when stdio is inherited, handle line breaks', t => {
     },
     stdio: 'inherit',
     cmd: 'bar\nbaz\n',
+    cmdargs: [],
   }, {
     event: 'foo',
     script: 'bar\nbaz\n',
@@ -206,6 +210,7 @@ t.test('do not show banner when stdio is inherited, if suppressed', t => {
     },
     stdio: 'inherit',
     cmd: 'bar',
+    cmdargs: [],
   }, {
     event: 'foo',
     script: 'bar',
@@ -241,6 +246,7 @@ t.test('do the banner with no pkgid', t => {
     },
     stdio: 'inherit',
     cmd: 'bar',
+    cmdargs: [],
   }, {
     event: 'foo',
     script: 'bar',
@@ -273,6 +279,7 @@ t.test('pkg has foo script', t => runScriptPkg({
   },
   stdio: 'pipe',
   cmd: 'bar',
+  cmdargs: [],
 }, {
   event: 'foo',
   script: 'bar',
@@ -294,8 +301,8 @@ t.test('pkg has foo script, with args', t => runScriptPkg({
       foo: 'bar',
     },
   },
-  args: ['a', 'b', 'c'],
-}).then(res => t.strictSame(res, ['sh', ['-c', 'bar "a" "b" "c"'], {
+  args: ['a', 'b', 'c\\sc'],
+}).then(res => t.strictSame(res, ['sh', ['-c', 'bar', 'a', 'b', 'c\\sc'], {
   stdioString: false,
   event: 'foo',
   path: 'path',
@@ -304,10 +311,11 @@ t.test('pkg has foo script, with args', t => runScriptPkg({
     environ: 'value',
   },
   stdio: 'pipe',
-  cmd: 'bar "a" "b" "c"',
+  cmd: 'bar',
+  cmdargs: ['a', 'b', 'c\\sc'],
 }, {
   event: 'foo',
-  script: 'bar "a" "b" "c"',
+  script: 'bar "a" "b" "c\\\\sc"',
   pkgid: '[email protected]',
   path: 'path',
 }])))
@@ -340,6 +348,7 @@ t.test('pkg has no install or preinstall script, but node-gyp files are present'
       env: { environ: 'value' },
       stdio: 'pipe',
       cmd: 'node-gyp rebuild',
+      cmdargs: [],
       stdioString: false,
     },
     {