nyc 13.2.0 → 14.0.0

package/lib/commands/report.js

@@ -1,9 +1,5 @@
-var NYC
-try {
-  NYC = require('../../index.covered.js')
-} catch (e) {
-  NYC = require('../../index.js')
-}
+const testExclude = require('test-exclude')
+const NYC = require('../../index.js')
 
 exports.command = 'report'
 
@@ -28,6 +24,30 @@ exports.builder = function (yargs) {
     .option('temp-directory', {
       hidden: true
     })
+    .option('exclude', {
+      alias: 'x',
+      default: testExclude.defaultExclude,
+      describe: 'a list of specific files and directories that should be excluded from coverage, glob patterns are supported, node_modules is always excluded',
+      global: false
+    })
+    .option('exclude-node-modules', {
+      default: true,
+      type: 'boolean',
+      describe: 'whether or not to exclude all node_module folders (i.e. **/node_modules/**) by default',
+      global: false
+    })
+    .option('exclude-after-remap', {
+      default: true,
+      type: 'boolean',
+      description: 'should exclude logic be performed after the source-map remaps filenames?',
+      global: false
+    })
+    .option('include', {
+      alias: 'n',
+      default: [],
+      describe: 'a list of specific files that should be covered, glob patterns are supported',
+      global: false
+    })
     .option('show-process-tree', {
       describe: 'display the tree of spawned processes',
       default: false,
@@ -39,6 +59,38 @@ exports.builder = function (yargs) {
       type: 'boolean',
       global: false
     })
+    .option('check-coverage', {
+      type: 'boolean',
+      default: false,
+      describe: 'check whether coverage is within thresholds provided',
+      global: false
+    })
+    .option('branches', {
+      default: 0,
+      description: 'what % of branches must be covered?',
+      global: false
+    })
+    .option('functions', {
+      default: 0,
+      description: 'what % of functions must be covered?',
+      global: false
+    })
+    .option('lines', {
+      default: 90,
+      description: 'what % of lines must be covered?',
+      global: false
+    })
+    .option('statements', {
+      default: 0,
+      description: 'what % of statements must be covered?',
+      global: false
+    })
+    .option('per-file', {
+      default: false,
+      type: 'boolean',
+      description: 'check thresholds per file',
+      global: false
+    })
     .example('$0 report --reporter=lcov', 'output an HTML lcov report to ./coverage')
 }
 
@@ -46,4 +98,12 @@ exports.handler = function (argv) {
   process.env.NYC_CWD = process.cwd()
   var nyc = new NYC(argv)
   nyc.report()
+  if (argv.checkCoverage) {
+    nyc.checkCoverage({
+      lines: argv.lines,
+      functions: argv.functions,
+      branches: argv.branches,
+      statements: argv.statements
+    }, argv['per-file'])
+  }
 }

package/lib/config-util.js

@@ -1,6 +1,5 @@
 'use strict'
 
-const arrify = require('arrify')
 const fs = require('fs')
 const path = require('path')
 const findUp = require('find-up')
@@ -19,19 +18,28 @@ function guessCWD (cwd) {
 }
 
 Config.loadConfig = function (argv, cwd) {
-  const rcPath = findUp.sync([argv.nycrcPath || '.nycrc', '.nycrc.json'], { cwd: guessCWD(cwd) })
+  const rcOptions = [
+    argv.nycrcPath || '.nycrc',
+    '.nycrc.json',
+    'nyc.config.js'
+  ]
+  const rcPath = findUp.sync(rcOptions, { cwd: guessCWD(cwd) })
   let config = {}
 
   if (rcPath) {
-    config = JSON.parse(
-      fs.readFileSync(rcPath, 'utf-8')
-    )
+    if (rcPath.toLowerCase().endsWith('.js')) {
+      config = require(rcPath)
+    } else {
+      config = JSON.parse(
+        fs.readFileSync(rcPath, 'utf-8')
+      )
+    }
   }
 
-  if (config.require) config.require = arrify(config.require)
-  if (config.extension) config.extension = arrify(config.extension)
-  if (config.exclude) config.exclude = arrify(config.exclude)
-  if (config.include) config.include = arrify(config.include)
+  if (config.require) config.require = [].concat(config.require)
+  if (config.extension) config.extension = [].concat(config.extension)
+  if (config.exclude) config.exclude = [].concat(config.exclude)
+  if (config.include) config.include = [].concat(config.include)
 
   return config
 }
@@ -80,6 +88,12 @@ Config.buildYargs = function (cwd) {
       description: 'should exclude logic be performed after the source-map remaps filenames?',
       global: false
     })
+    .option('exclude-node-modules', {
+      default: true,
+      type: 'boolean',
+      describe: 'whether or not to exclude all node_module folders (i.e. **/node_modules/**) by default',
+      global: false
+    })
     .option('include', {
       alias: 'n',
       default: [],

package/lib/hash.js

@@ -1,8 +1,30 @@
 'use strict'
 
+function getInvalidatingOptions (config) {
+  return [
+    'compact',
+    'esModules',
+    'ignoreClassMethods',
+    'instrument',
+    'instrumenter',
+    'parserPlugins',
+    'preserveComments',
+    'produceSourceMap',
+    'sourceMap'
+  ].reduce((acc, optName) => {
+    acc[optName] = config[optName]
+    return acc
+  }, {})
+}
+
 module.exports = {
-  salt: JSON.stringify({
-    istanbul: require('istanbul-lib-coverage/package.json').version,
-    nyc: require('../package.json').version
-  })
+  salt (config) {
+    return JSON.stringify({
+      modules: {
+        'istanbul-lib-instrument': require('istanbul-lib-instrument/package.json').version,
+        nyc: require('../package.json').version
+      },
+      nycrc: getInvalidatingOptions(config)
+    })
+  }
 }

package/lib/instrumenters/istanbul.js

@@ -1,14 +1,14 @@
 'use strict'
 
-var convertSourceMap = require('convert-source-map')
-var mergeSourceMap = require('merge-source-map')
+const { createInstrumenter } = require('istanbul-lib-instrument')
+const convertSourceMap = require('convert-source-map')
+const mergeSourceMap = require('merge-source-map')
 
-function InstrumenterIstanbul (cwd, options) {
-  const plugins = options.plugins
+function InstrumenterIstanbul (options) {
+  const plugins = options.parserPlugins
   const configPlugins = plugins ? { plugins } : {}
 
-  var istanbul = InstrumenterIstanbul.istanbul()
-  var instrumenter = istanbul.createInstrumenter(Object.assign({
+  const instrumenter = createInstrumenter(Object.assign({
     autoWrap: true,
     coverageVariable: '__coverage__',
     embedSource: true,
@@ -20,7 +20,7 @@ function InstrumenterIstanbul (cwd, options) {
   }, configPlugins))
 
   return {
-    instrumentSync: function (code, filename, sourceMap) {
+    instrumentSync (code, filename, sourceMap) {
       var instrumented = instrumenter.instrumentSync(code, filename)
       // the instrumenter can optionally produce source maps,
       // this is useful for features like remapping stack-traces.
@@ -39,16 +39,10 @@ function InstrumenterIstanbul (cwd, options) {
       }
       return instrumented
     },
-    lastFileCoverage: function () {
+    lastFileCoverage () {
       return instrumenter.lastFileCoverage()
     }
   }
 }
 
-InstrumenterIstanbul.istanbul = function () {
-  InstrumenterIstanbul._istanbul || (InstrumenterIstanbul._istanbul = require('istanbul-lib-instrument'))
-
-  return InstrumenterIstanbul._istanbul || (InstrumenterIstanbul._istanbul = require('istanbul'))
-}
-
 module.exports = InstrumenterIstanbul

package/lib/instrumenters/noop.js

@@ -1,10 +1,10 @@
-var FileCoverage = require('istanbul-lib-coverage').classes.FileCoverage
-var readInitialCoverage = require('istanbul-lib-instrument').readInitialCoverage
+const { FileCoverage } = require('istanbul-lib-coverage').classes
+const { readInitialCoverage } = require('istanbul-lib-instrument')
 
 function NOOP () {
   return {
-    instrumentSync: function (code, filename) {
-      var extracted = readInitialCoverage(code)
+    instrumentSync (code, filename) {
+      const extracted = readInitialCoverage(code)
       if (extracted) {
         this.fileCoverage = new FileCoverage(extracted.coverageData)
       } else {
@@ -12,7 +12,7 @@ function NOOP () {
       }
       return code
     },
-    lastFileCoverage: function () {
+    lastFileCoverage () {
       return this.fileCoverage
     }
   }

package/lib/process.js

@@ -1,9 +1,12 @@
 const archy = require('archy')
 const libCoverage = require('istanbul-lib-coverage')
+const uuid = require('uuid/v4')
 
 function ProcessInfo (defaults) {
   defaults = defaults || {}
 
+  this.uuid = null
+  this.parent = null
   this.pid = String(process.pid)
   this.argv = process.argv
   this.execArgv = process.execArgv
@@ -12,13 +15,14 @@ function ProcessInfo (defaults) {
   this.ppid = null
   this.root = null
   this.coverageFilename = null
-  this.nodes = [] // list of children, filled by buildProcessTree()
-
-  this._coverageMap = null
 
   for (var key in defaults) {
     this[key] = defaults[key]
   }
+
+  if (!this.uuid) {
+    this.uuid = uuid()
+  }
 }
 
 Object.defineProperty(ProcessInfo.prototype, 'label', {
@@ -36,29 +40,19 @@ Object.defineProperty(ProcessInfo.prototype, 'label', {
 })
 
 ProcessInfo.buildProcessTree = function (infos) {
-  var treeRoot = new ProcessInfo({ _label: 'nyc' })
-  var nodes = { }
-
-  infos = infos.sort(function (a, b) {
-    return a.time - b.time
-  })
-
-  infos.forEach(function (p) {
-    nodes[p.root + ':' + p.pid] = p
-  })
-
-  infos.forEach(function (p) {
-    if (!p.ppid) {
-      return
+  const treeRoot = new ProcessInfo({ _label: 'nyc', nodes: [] })
+  const index = infos.index
+  for (const id in index.processes) {
+    const node = infos[id]
+    if (!node) {
+      throw new Error(`Invalid entry in processinfo index: ${id}`)
     }
-
-    var parent = nodes[p.root + ':' + p.ppid]
-    if (!parent) {
-      parent = treeRoot
+    const idx = index.processes[id]
+    node.nodes = idx.children.map(id => infos[id]).sort((a, b) => a.time - b.time)
+    if (!node.parent) {
+      treeRoot.nodes.push(node)
     }
-
-    parent.nodes.push(p)
-  })
+  }
 
   return treeRoot
 }

package/lib/source-maps.js

@@ -4,12 +4,12 @@ const libSourceMaps = require('istanbul-lib-source-maps')
 const fs = require('fs')
 const path = require('path')
 
-// TODO: write some unit tests for this class.
+const sourceMapCache = libSourceMaps.createSourceMapStore()
 function SourceMaps (opts) {
   this.cache = opts.cache
   this.cacheDirectory = opts.cacheDirectory
-  this.sourceMapCache = libSourceMaps.createSourceMapStore()
   this.loadedMaps = {}
+  this._sourceMapCache = sourceMapCache
 }
 
 SourceMaps.prototype.extractAndRegister = function (code, filename, hash) {
@@ -19,36 +19,35 @@ SourceMaps.prototype.extractAndRegister = function (code, filename, hash) {
       var mapPath = path.join(this.cacheDirectory, hash + '.map')
       fs.writeFileSync(mapPath, sourceMap.toJSON())
     } else {
-      this.sourceMapCache.registerMap(filename, sourceMap.sourcemap)
+      this._sourceMapCache.registerMap(filename, sourceMap.sourcemap)
     }
   }
   return sourceMap
 }
 
 SourceMaps.prototype.remapCoverage = function (obj) {
-  var transformed = this.sourceMapCache.transformCoverage(
+  var transformed = this._sourceMapCache.transformCoverage(
     libCoverage.createCoverageMap(obj)
   )
   return transformed.map.data
 }
 
 SourceMaps.prototype.reloadCachedSourceMaps = function (report) {
-  var _this = this
-  Object.keys(report).forEach(function (absFile) {
+  Object.keys(report).forEach((absFile) => {
     var fileReport = report[absFile]
     if (fileReport && fileReport.contentHash) {
       var hash = fileReport.contentHash
-      if (!(hash in _this.loadedMaps)) {
+      if (!(hash in this.loadedMaps)) {
         try {
-          var mapPath = path.join(_this.cacheDirectory, hash + '.map')
-          _this.loadedMaps[hash] = JSON.parse(fs.readFileSync(mapPath, 'utf8'))
+          var mapPath = path.join(this.cacheDirectory, hash + '.map')
+          this.loadedMaps[hash] = JSON.parse(fs.readFileSync(mapPath, 'utf8'))
         } catch (e) {
           // set to false to avoid repeatedly trying to load the map
-          _this.loadedMaps[hash] = false
+          this.loadedMaps[hash] = false
         }
       }
-      if (_this.loadedMaps[hash]) {
-        _this.sourceMapCache.registerMap(absFile, _this.loadedMaps[hash])
+      if (this.loadedMaps[hash]) {
+        this._sourceMapCache.registerMap(absFile, this.loadedMaps[hash])
       }
     }
   })

package/package.json

@@ -1,18 +1,15 @@
 {
   "name": "nyc",
-  "version": "13.2.0",
+  "version": "14.0.0",
   "description": "the Istanbul command line interface",
   "main": "index.js",
   "scripts": {
-    "bundle": "bundle-dependencies update",
+    "pretest": "npm run clean && npm run instrument",
+    "test": "tap -t360 --no-cov -b ./test/*.js && npm run report",
     "posttest": "standard",
-    "test": "npm run clean && npm run build && npm run instrument && npm run test-integration && npm run test-mocha && npm run report",
-    "clean": "rimraf ./.nyc_output ./node_modules/.cache ./.self_coverage ./test/fixtures/.nyc_output ./test/fixtures/node_modules/.cache *covered.js ./lib/*covered.js",
-    "build": "node ./build-tests",
+    "clean": "rimraf ./.nyc_output ./node_modules/.cache ./.self_coverage ./test/fixtures/.nyc_output ./test/fixtures/node_modules/.cache ./self-coverage",
     "instrument": "node ./build-self-coverage.js",
-    "test-integration": "tap -t120 --no-cov -b ./test/build/*.js && mocha --timeout=15000 ./test/nyc-bin.js",
-    "test-mocha": "node ./bin/nyc --no-clean --silent --temp-dir=./.self_coverage mocha ./test/nyc.js ./test/process-args.js",
-    "report": "node ./bin/nyc  --temp-dir ./.self_coverage/ -r text -r lcov report",
+    "report": "node ./self-coverage/bin/nyc report --temp-dir ./.self_coverage/ -r text -r lcov",
     "release": "standard-version"
   },
   "bin": {
@@ -21,22 +18,18 @@
   "files": [
     "index.js",
     "bin/*.js",
-    "lib/*.js",
-    "lib/commands/*.js",
-    "lib/instrumenters/*.js",
-    "!**/*covered.js"
+    "lib/**/*.js"
   ],
   "nyc": {
     "exclude": [
       "node_modules",
-      "bin",
       "coverage",
+      "self-coverage",
       "test/fixtures/coverage.js",
       "test/build/*",
       "test/src/*",
       "test/nyc.js",
       "test/process-args.js",
-      "index.covered.js",
       "test/fixtures/_generateCoverage.js"
     ]
   },
@@ -74,47 +67,44 @@
   "license": "ISC",
   "dependencies": {
     "archy": "^1.0.0",
-    "arrify": "^1.0.1",
-    "caching-transform": "^3.0.1",
+    "caching-transform": "^3.0.2",
     "convert-source-map": "^1.6.0",
-    "find-cache-dir": "^2.0.0",
+    "cp-file": "^6.2.0",
+    "find-cache-dir": "^2.1.0",
     "find-up": "^3.0.0",
     "foreground-child": "^1.5.6",
     "glob": "^7.1.3",
-    "istanbul-lib-coverage": "^2.0.3",
-    "istanbul-lib-hook": "^2.0.3",
-    "istanbul-lib-instrument": "^3.0.1",
-    "istanbul-lib-report": "^2.0.4",
-    "istanbul-lib-source-maps": "^3.0.2",
-    "istanbul-reports": "^2.1.0",
-    "make-dir": "^1.3.0",
+    "istanbul-lib-coverage": "^2.0.4",
+    "istanbul-lib-hook": "^2.0.6",
+    "istanbul-lib-instrument": "^3.2.0",
+    "istanbul-lib-report": "^2.0.7",
+    "istanbul-lib-source-maps": "^3.0.5",
+    "istanbul-reports": "^2.2.2",
+    "make-dir": "^2.1.0",
     "merge-source-map": "^1.1.0",
     "resolve-from": "^4.0.0",
     "rimraf": "^2.6.3",
     "signal-exit": "^3.0.2",
     "spawn-wrap": "^1.4.2",
-    "test-exclude": "^5.1.0",
+    "test-exclude": "^5.2.2",
     "uuid": "^3.3.2",
-    "yargs": "^12.0.5",
-    "yargs-parser": "^11.1.1"
+    "yargs": "^13.2.2",
+    "yargs-parser": "^13.0.0"
   },
   "devDependencies": {
     "any-path": "^1.3.0",
-    "bundle-dependencies": "^1.0.2",
     "chai": "^4.2.0",
-    "coveralls": "^3.0.2",
-    "forking-tap": "^0.1.1",
+    "coveralls": "^3.0.3",
     "is-windows": "^1.0.2",
     "lodash": "^4.17.11",
-    "mocha": "^5.2.0",
     "newline-regex": "^0.2.1",
     "requirejs": "^2.3.6",
     "sanitize-filename": "^1.6.1",
-    "source-map-support": "^0.5.10",
+    "source-map-support": "^0.5.12",
     "standard": "^12.0.1",
-    "standard-version": "^4.4.0",
+    "standard-version": "^5.0.2",
     "strip-indent": "^2.0.0",
-    "tap": "^12.4.0",
+    "tap": "^12.6.1",
     "which": "^1.3.1",
     "zero-fill": "^2.2.3"
   },
@@ -124,30 +114,5 @@
   "repository": {
     "type": "git",
     "url": "git@github.com:istanbuljs/nyc.git"
-  },
-  "bundledDependencies": [
-    "archy",
-    "arrify",
-    "caching-transform",
-    "convert-source-map",
-    "find-cache-dir",
-    "find-up",
-    "foreground-child",
-    "glob",
-    "istanbul-lib-coverage",
-    "istanbul-lib-hook",
-    "istanbul-lib-report",
-    "istanbul-lib-source-maps",
-    "istanbul-reports",
-    "make-dir",
-    "merge-source-map",
-    "resolve-from",
-    "rimraf",
-    "signal-exit",
-    "spawn-wrap",
-    "test-exclude",
-    "uuid",
-    "yargs",
-    "yargs-parser"
-  ]
+  }
 }

package/lib/self-coverage-helper.js

@@ -1,20 +0,0 @@
-/* global ___NYC_SELF_COVERAGE___ */
-
-const path = require('path')
-const fs = require('fs')
-const mkdirp = require('make-dir')
-const onExit = require('signal-exit')
-
-onExit(function () {
-  var coverage = global.___NYC_SELF_COVERAGE___
-  if (typeof ___NYC_SELF_COVERAGE___ === 'object') coverage = ___NYC_SELF_COVERAGE___
-  if (!coverage) return
-
-  var selfCoverageDir = path.join(__dirname, '../.self_coverage')
-  mkdirp.sync(selfCoverageDir)
-  fs.writeFileSync(
-    path.join(selfCoverageDir, process.pid + '.json'),
-    JSON.stringify(coverage),
-    'utf-8'
-  )
-})

package/node_modules/ansi-regex/index.js

@@ -1,10 +0,0 @@
-'use strict';
-
-module.exports = () => {
-	const pattern = [
-		'[\\u001B\\u009B][[\\]()#;?]*(?:(?:(?:[a-zA-Z\\d]*(?:;[a-zA-Z\\d]*)*)?\\u0007)',
-		'(?:(?:\\d{1,4}(?:;\\d{0,4})*)?[\\dA-PRZcf-ntqry=><~]))'
-	].join('|');
-
-	return new RegExp(pattern, 'g');
-};

package/node_modules/ansi-regex/license

@@ -1,9 +0,0 @@
-MIT License
-
-Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/node_modules/ansi-regex/package.json

@@ -1,88 +0,0 @@
-{
-  "_args": [
-    [
-      "ansi-regex@3.0.0",
-      "/usr/src/npm/nyc"
-    ]
-  ],
-  "_from": "ansi-regex@3.0.0",
-  "_id": "ansi-regex@3.0.0",
-  "_inBundle": false,
-  "_integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
-  "_location": "/ansi-regex",
-  "_phantomChildren": {},
-  "_requested": {
-    "type": "version",
-    "registry": true,
-    "raw": "ansi-regex@3.0.0",
-    "name": "ansi-regex",
-    "escapedName": "ansi-regex",
-    "rawSpec": "3.0.0",
-    "saveSpec": null,
-    "fetchSpec": "3.0.0"
-  },
-  "_requiredBy": [
-    "/strip-ansi"
-  ],
-  "_resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz",
-  "_spec": "3.0.0",
-  "_where": "/usr/src/npm/nyc",
-  "author": {
-    "name": "Sindre Sorhus",
-    "email": "sindresorhus@gmail.com",
-    "url": "sindresorhus.com"
-  },
-  "bugs": {
-    "url": "https://github.com/chalk/ansi-regex/issues"
-  },
-  "description": "Regular expression for matching ANSI escape codes",
-  "devDependencies": {
-    "ava": "*",
-    "xo": "*"
-  },
-  "engines": {
-    "node": ">=4"
-  },
-  "files": [
-    "index.js"
-  ],
-  "homepage": "https://github.com/chalk/ansi-regex#readme",
-  "keywords": [
-    "ansi",
-    "styles",
-    "color",
-    "colour",
-    "colors",
-    "terminal",
-    "console",
-    "cli",
-    "string",
-    "tty",
-    "escape",
-    "formatting",
-    "rgb",
-    "256",
-    "shell",
-    "xterm",
-    "command-line",
-    "text",
-    "regex",
-    "regexp",
-    "re",
-    "match",
-    "test",
-    "find",
-    "pattern"
-  ],
-  "license": "MIT",
-  "name": "ansi-regex",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/chalk/ansi-regex.git"
-  },
-  "scripts": {
-    "test": "xo && ava",
-    "view-supported": "node fixtures/view-codes.js"
-  },
-  "version": "3.0.0"
-}