fix: reject with error from parent context on close

lib/index.js

@@ -12,54 +12,55 @@
  return spawnWithShell(cmd, args, opts, extra)
  }
 
- let proc
+ let resolve, reject
+ const promise = new Promise((_resolve, _reject) => {
+ resolve = _resolve
+ reject = _reject
+ })
 
- const p = new Promise((res, rej) => {
-  proc = spawn(cmd, args, opts)
+ // Create error here so we have a more useful stack trace when rejecting
+ const commandError = new Error('command failed')
 
-  const stdout = []
-  const stderr = []
+ const stdout = []
+ const stderr = []
 
- const reject = er => rej(Object.assign(er, {
- cmd,
- args,
- ...stdioResult(stdout, stderr, opts),
- ...extra,
- }))
+ const getResult = (result) => ({
+ cmd,
+ args,
+ ...result,
+ ...stdioResult(stdout, stderr, opts),
+ ...extra,
+ })
+ const rejectWithOpts = (er, erOpts) => {
+ const resultError = getResult(erOpts)
+ reject(Object.assign(er, resultError))
+ }
 
- proc.on('error', reject)
+ const proc = spawn(cmd, args, opts)
+ promise.stdin = proc.stdin
+ promise.process = proc
 
- if (proc.stdout) {
- proc.stdout.on('data', c => stdout.push(c)).on('error', reject)
- proc.stdout.on('error', er => reject(er))
- }
+ proc.on('error', rejectWithOpts)
 
-  if (proc.stderr) {
-  proc.stderr.on('data', c => stderr.push(c)).on('error', reject)
-  proc.stderr.on('error', er => reject(er))
-  }
+ if (proc.stdout) {
+ proc.stdout.on('data', c => stdout.push(c))
+ proc.stdout.on('error', rejectWithOpts)
+ }
 
- proc.on('close', (code, signal) => {
- const result = {
- cmd,
- args,
- code,
- signal,
- ...stdioResult(stdout, stderr, opts),
- ...extra,
- }
+ if (proc.stderr) {
+ proc.stderr.on('data', c => stderr.push(c))
+ proc.stderr.on('error', rejectWithOpts)
+ }
 
-  if (code || signal) {
-  rej(Object.assign(new Error('command failed'), result))
- } else {
-  res(result)
- }
- })
+ proc.on('close', (code, signal) => {
+ if (code || signal) {
+ rejectWithOpts(commandError, { code, signal })
+ } else {
+ resolve(getResult({ code, signal }))
+ }
  })
 
- p.stdin = proc.stdin
- p.process = proc
- return p
+ return promise
 }
 
 const spawnWithShell = (cmd, args, opts, extra) => {
@@ -111,13 +112,13 @@
  for (const arg of args) {
  script += ` ${escape.cmd(arg, doubleEscape)}`
  }
  realArgs.push('/d', '/s', '/c', script)
  options.windowsVerbatimArguments = true
  } else {
  for (const arg of args) {
  script += ` ${escape.sh(arg)}`
  }
  realArgs.push('-c', script)
  }
 
  return promiseSpawn(command, realArgs, options, extra)