nyc 11.7.3 → 11.8.0

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+<a name="11.8.0"></a>
+# [11.8.0](https://github.com/istanbuljs/nyc/compare/v11.7.3...v11.8.0) (2018-05-14)
+
+
+### Features
+
+* merge together multiple istanbul format reports ([#840](https://github.com/istanbuljs/nyc/issues/840)) ([9def3eb](https://github.com/istanbuljs/nyc/commit/9def3eb))
+
+
+
 <a name="11.7.3"></a>
 ## [11.7.3](https://github.com/istanbuljs/nyc/compare/v11.7.2...v11.7.3) (2018-05-10)
 

package/bin/nyc.js

@@ -23,12 +23,10 @@ const config = configUtil.loadConfig(yargs.parse(instrumenterArgs))
 configUtil.addCommandsAndHelp(yargs)
 const argv = yargs.config(config).parse(instrumenterArgs)
 
-if (argv._[0] === 'report') {
-  // look in lib/commands/report.js for logic.
-} else if (argv._[0] === 'check-coverage') {
-  // look in lib/commands/check-coverage.js for logic.
-} else if (argv._[0] === 'instrument') {
-  // look in lib/commands/instrument.js for logic.
+if ([
+  'check-coverage', 'report', 'instrument', 'merge'
+].indexOf(argv._[0]) !== -1) {
+  // look in lib/commands for logic.
 } else if (argv._.length) {
   // if instrument is set to false,
   // enable a noop instrumenter.

package/index.js

@@ -421,13 +421,13 @@ function coverageFinder () {
   return coverage
 }
 
-NYC.prototype._getCoverageMapFromAllCoverageFiles = function () {
+NYC.prototype.getCoverageMapFromAllCoverageFiles = function (baseDirectory) {
   var _this = this
   var map = libCoverage.createCoverageMap({})
 
-  this.eachReport(function (report) {
+  this.eachReport(undefined, (report) => {
     map.merge(report)
-  })
+  }, baseDirectory)
   // depending on whether source-code is pre-instrumented
   // or instrumented using a JIT plugin like babel-require
   // you may opt to exclude files after applying
@@ -443,7 +443,7 @@ NYC.prototype._getCoverageMapFromAllCoverageFiles = function () {
 
 NYC.prototype.report = function () {
   var tree
-  var map = this._getCoverageMapFromAllCoverageFiles()
+  var map = this.getCoverageMapFromAllCoverageFiles()
   var context = libReport.createContext({
     dir: this.reportDirectory(),
     watermarks: this.config.watermarks
@@ -469,7 +469,7 @@ NYC.prototype.showProcessTree = function () {
 }
 
 NYC.prototype.checkCoverage = function (thresholds, perFile) {
-  var map = this._getCoverageMapFromAllCoverageFiles()
+  var map = this.getCoverageMapFromAllCoverageFiles()
   var nyc = this
 
   if (perFile) {
@@ -516,20 +516,22 @@ NYC.prototype._loadProcessInfos = function () {
   })
 }
 
-NYC.prototype.eachReport = function (filenames, iterator) {
+NYC.prototype.eachReport = function (filenames, iterator, baseDirectory) {
+  baseDirectory = baseDirectory || this.tempDirectory()
+
   if (typeof filenames === 'function') {
     iterator = filenames
     filenames = undefined
   }
 
   var _this = this
-  var files = filenames || fs.readdirSync(this.tempDirectory())
+  var files = filenames || fs.readdirSync(baseDirectory)
 
   files.forEach(function (f) {
     var report
     try {
       report = JSON.parse(fs.readFileSync(
-        path.resolve(_this.tempDirectory(), f),
+        path.resolve(baseDirectory, f),
         'utf-8'
       ))
 
@@ -545,7 +547,7 @@ NYC.prototype.eachReport = function (filenames, iterator) {
 NYC.prototype.loadReports = function (filenames) {
   var reports = []
 
-  this.eachReport(filenames, function (report) {
+  this.eachReport(filenames, (report) => {
     reports.push(report)
   })
 

package/lib/commands/merge.js

@@ -0,0 +1,51 @@
+'use strict'
+const fs = require('fs')
+
+var NYC
+try {
+  NYC = require('../../index.covered.js')
+} catch (e) {
+  NYC = require('../../index.js')
+}
+
+exports.command = 'merge <input-directory> [output-file]'
+
+exports.describe = 'merge istanbul format coverage output in a given folder'
+
+exports.builder = function (yargs) {
+  return yargs
+    .positional('input-directory', {
+      describe: 'directory containing multiple istanbul coverage files',
+      type: 'text',
+      default: './.nyc_output'
+    })
+    .positional('output-file', {
+      describe: 'file to output combined istanbul format coverage to',
+      type: 'text',
+      default: 'coverage.json'
+    })
+    .option('temp-directory', {
+      describe: 'directory to read raw coverage information from',
+      default: './.nyc_output'
+    })
+    .example('$0 merge ./out coverage.json', 'merge together reports in ./out and output as coverage.json')
+}
+
+exports.handler = function (argv) {
+  process.env.NYC_CWD = process.cwd()
+  const nyc = new NYC(argv)
+  let inputStat
+  try {
+    inputStat = fs.statSync(argv.inputDirectory)
+    if (!inputStat.isDirectory()) {
+      console.error(`${argv.inputDirectory} was not a directory`)
+      process.exit(1)
+    }
+  } catch (err) {
+    console.error(`failed access input directory ${argv.inputDirectory} with error:\n\n${err.message}`)
+    process.exit(1)
+  }
+  const map = nyc.getCoverageMapFromAllCoverageFiles(argv.inputDirectory)
+  fs.writeFileSync(argv.outputFile, JSON.stringify(map, null, 2), 'utf8')
+  console.info(`coverage files in ${argv.inputDirectory} merged into ${argv.outputFile}`)
+}

package/lib/config-util.js

@@ -243,6 +243,7 @@ Config.addCommandsAndHelp = function (yargs) {
     .command(require('../lib/commands/check-coverage'))
     .command(require('../lib/commands/instrument'))
     .command(require('../lib/commands/report'))
+    .command(require('../lib/commands/merge'))
 }
 
 module.exports = Config

package/lib/process-args.js

@@ -2,7 +2,8 @@ const parser = require('yargs-parser')
 const commands = [
   'report',
   'check-coverage',
-  'instrument'
+  'instrument',
+  'merge'
 ]
 
 module.exports = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nyc",
-  "version": "11.7.3",
+  "version": "11.8.0",
   "description": "the Istanbul command line interface",
   "main": "index.js",
   "scripts": {