nyc 17.0.0 → 17.1.0

package/bin/nyc.js

@@ -3,9 +3,11 @@
 
 const configUtil = require('../lib/config-util')
 const { cliWrapper, suppressEPIPE } = require('../lib/commands/helpers')
-const foreground = require('foreground-child')
+const { foregroundChild } = require('foreground-child')
 const resolveFrom = require('resolve-from')
 const NYC = require('../index.js')
+const path = require('path')
+const fs = require('fs')
 
 // parse configuration and command-line arguments;
 // we keep these values in a few different forms,
@@ -86,10 +88,22 @@ async function main () {
   // set process.exitCode. Keep track so that both children are run, but
   // a non-zero exit codes in either one leads to an overall non-zero exit code.
   process.exitCode = 0
-  foreground(childArgs, async () => {
-    const mainChildExitCode = process.exitCode
+  foregroundChild(childArgs, async (code, signal, processInfo) => {
+    let exitCode = process.exitCode || code
 
     try {
+      // clean up foreground-child watchdog process info
+      const parentDir = path.resolve(nyc.tempDirectory())
+      const dir = path.resolve(nyc.tempDirectory(), 'processinfo')
+      const files = await nyc.coverageFiles(dir)
+      for (let i = 0; i < files.length; i++) {
+        const data = await nyc.coverageFileLoad(files[i], dir)
+        if (data.pid === processInfo.watchdogPid) {
+          fs.unlinkSync(path.resolve(parentDir, files[i]))
+          fs.unlinkSync(path.resolve(dir, files[i]))
+        }
+      }
+
       await nyc.writeProcessIndex()
 
       nyc.maybePurgeSourceMapCache()
@@ -100,7 +114,7 @@ async function main () {
           branches: argv.branches,
           statements: argv.statements
         }, argv['per-file']).catch(suppressEPIPE)
-        process.exitCode = process.exitCode || mainChildExitCode
+        exitCode = process.exitCode || exitCode
       }
 
       if (!argv.silent) {
@@ -108,10 +122,12 @@ async function main () {
       }
     } catch (error) {
       /* istanbul ignore next */
-      process.exitCode = process.exitCode || mainChildExitCode || 1
+      exitCode = process.exitCode || exitCode || 1
       /* istanbul ignore next */
       console.error(error.message)
     }
+
+    return exitCode
   })
 }
 

package/lib/commands/merge.js

@@ -41,6 +41,6 @@ exports.handler = cliWrapper(async argv => {
   }
   await makeDir(path.dirname(argv.outputFile))
   const map = await nyc.getCoverageMapFromAllCoverageFiles(argv.inputDirectory)
-  await fs.writeFile(argv.outputFile, JSON.stringify(map, null, 2), 'utf8')
+  await fs.writeFile(argv.outputFile, JSON.stringify(map), 'utf8')
   console.info(`coverage files in ${argv.inputDirectory} merged into ${argv.outputFile}`)
 })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nyc",
-  "version": "17.0.0",
+  "version": "17.1.0",
   "description": "the Istanbul command line interface",
   "main": "index.js",
   "scripts": {
@@ -64,7 +64,7 @@
     "decamelize": "^1.2.0",
     "find-cache-dir": "^3.2.0",
     "find-up": "^4.1.0",
-    "foreground-child": "^2.0.0",
+    "foreground-child": "^3.3.0",
     "get-package-type": "^0.1.0",
     "glob": "^7.1.6",
     "istanbul-lib-coverage": "^3.0.0",