.github/ISSUE_TEMPLATE.md

@@ -14,7 +14,7 @@ create a basic `nyc-bug-demo` repository and link to that please [mandatory].
 ## Observed Behavior
 
 ### Troubleshooting steps
-- [ ] still occurrring when I put `cache: false` in my nyc config
+- [ ] still occurring when I put `cache: false` in my nyc config
 
 ## Environment Information
 <!--

.github/stale.yml

@@ -1,3 +1,5 @@
+daysUntilStale: 365
+
 exemptLabels:
   - "Great First Contribution"
   - pinned

.taprc

@@ -0,0 +1,8 @@
+{
+	"test-ignore": "^test/(helpers|src)/",
+	"coverage": false,
+	"jobs": 1,
+	"timeout": 360,
+	"bail": false,
+	"esm": false
+}

.travis.yml

@@ -7,16 +7,17 @@ node_js:
   - "node"
   - 10
   - 8
-  - 6
 matrix:
-## An ENOMEM error occurs with 11.6.0 under Travis-CI for Windows.
+## An ENOMEM error occurs with 10+ under Travis-CI for Windows.
 ## Disable until we can determine the cause.
 #  include:
 #    - os: windows
 #      node_js: "latest"
   exclude:
     - os: windows
       node_js: "node"
+    - os: windows
+      node_js: 10
 git:
   depth:
     1

CHANGELOG.md

@@ -1,7 +1,41 @@
-# Change Log
+# Changelog
 
 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.
 
+## [15.0.0](https://github.com/istanbuljs/nyc/compare/v14.1.1...v15.0.0) (2019-12-20)
+
+
+### ⚠ BREAKING CHANGES
+
+* The `flow` and `jsx` parser plugins are no longer
+enabled by default.
+* Node.js 8 is now required to run nyc
+* Remove NYC_ROOT_ID and NYC_INSTRUMENTER environmental
+variables.
+* The `root` field has been removed from processinfo
+files.
+
+### Features
+
+* Add `--use-spawn-wrap=true` option ([#1169](https://github.com/istanbuljs/nyc/issues/1169)) ([df4de4d](https://github.com/istanbuljs/nyc/commit/df4de4d490f8cd32204fba66a810ed0444c26d0d))
+* Add `.cjs`, `.mjs`, `.ts`, `.tsx`, `.jsx` to default extensions ([#1110](https://github.com/istanbuljs/nyc/issues/1110)) ([914b776](https://github.com/istanbuljs/nyc/commit/914b776215ad3ea54f0e46b4ba2904a8a9d4dfdd)), closes [#1103](https://github.com/istanbuljs/nyc/issues/1103)
+* Allow `nyc instrument` to instrument code in place ([#1149](https://github.com/istanbuljs/nyc/issues/1149)) ([7783284](https://github.com/istanbuljs/nyc/commit/77832845b85134d21eca3a23c812c4f21f36713f))
+* Drop node.js 6, upgrade dependencies ([#1134](https://github.com/istanbuljs/nyc/issues/1134)) ([00c3b34](https://github.com/istanbuljs/nyc/commit/00c3b3440a5b2ffe11b9c19ae4e08ad2f5b70e33))
+* Filenames relative to project cwd in coverage reports ([#1212](https://github.com/istanbuljs/nyc/issues/1212)) ([5258e9f](https://github.com/istanbuljs/nyc/commit/5258e9fdb1d9e3d4abd4cc9768bc09cd8040a6be))
+* Use @istanbuljs/schema for yargs setup ([#1194](https://github.com/istanbuljs/nyc/issues/1194)) ([fd40d49](https://github.com/istanbuljs/nyc/commit/fd40d49331665d936b86f30e9a873ba80071b770))
+* Use istanbul-lib-processinfo ([#1145](https://github.com/istanbuljs/nyc/issues/1145)) ([7943413](https://github.com/istanbuljs/nyc/commit/7943413dc032f8f98a164fdde88d7344e817bb5e))
+* Use source base name to prefix cache files ([#1144](https://github.com/istanbuljs/nyc/issues/1144)) ([5c1b7a9](https://github.com/istanbuljs/nyc/commit/5c1b7a9c43771f3439af44a1104e5426519e1123))
+
+
+### Bug Fixes
+
+* Avoid `source-map` module during `signal-exit` handler ([#1191](https://github.com/istanbuljs/nyc/issues/1191)) ([83eb629](https://github.com/istanbuljs/nyc/commit/83eb6294f9492bf98405ee9fdf6281c3bc199a3d))
+* Better error handling for main execution, reporting ([#1229](https://github.com/istanbuljs/nyc/issues/1229)) ([dfd629d](https://github.com/istanbuljs/nyc/commit/dfd629d95716e6159aa7216c03e28a7fbbb161e7))
+* Correct handling of source-maps for pre-instrumented files ([#1216](https://github.com/istanbuljs/nyc/issues/1216)) ([8411a26](https://github.com/istanbuljs/nyc/commit/8411a26c9e520c66251cc8044cde2c81f33f1c5f)), closes [#1208](https://github.com/istanbuljs/nyc/issues/1208)
+* Drop coverage produced by `nyc --all` for files that were tested ([#1155](https://github.com/istanbuljs/nyc/issues/1155)) ([fc1bbbf](https://github.com/istanbuljs/nyc/commit/fc1bbbf490f6ab0272359ce10ceb4987d1716256)), closes [#1113](https://github.com/istanbuljs/nyc/issues/1113) [#1124](https://github.com/istanbuljs/nyc/issues/1124) [#1148](https://github.com/istanbuljs/nyc/issues/1148)
+* Honor eager setting (false by default) ([#1179](https://github.com/istanbuljs/nyc/issues/1179)) ([c18fb0a](https://github.com/istanbuljs/nyc/commit/c18fb0a9a8eae5904298d87c62d9934243de8674))
+* Remove vestigial environment variables ([#1078](https://github.com/istanbuljs/nyc/issues/1078)) ([cfd3da0](https://github.com/istanbuljs/nyc/commit/cfd3da05156b98952f03f7be2dd3d23ba328073f))
+
 ## [14.1.1](https://github.com/istanbuljs/nyc/compare/v14.1.0...v14.1.1) (2019-05-09)
 
 

README.md

@@ -4,9 +4,9 @@
 [![Coverage Status](https://coveralls.io/repos/istanbuljs/nyc/badge.svg?branch=)](https://coveralls.io/r/istanbuljs/nyc?branch=master)
 [![NPM version](https://img.shields.io/npm/v/nyc.svg)](https://www.npmjs.com/package/nyc)
 [![Conventional Commits](https://img.shields.io/badge/Conventional%20Commits-1.0.0-yellow.svg)](https://conventionalcommits.org)
-[![community slack](https://devtoolscommunity.herokuapp.com/badge.svg)](http://devtoolscommunity.herokuapp.com)
+[![community slack](https://devtoolscommunity.herokuapp.com/badge.svg)](https://devtoolscommunity.herokuapp.com)
 
-_Having problems? want to contribute? join our [community slack](http://devtoolscommunity.herokuapp.com)_.
+_Having problems? want to contribute? join our [community slack](https://devtoolscommunity.herokuapp.com)_.
 
 Istanbul's state of the art command line interface, with support for:
 
@@ -78,7 +78,7 @@ You can then add the specific configuration options you want that aren't in that
 
 ### Configuration files
 
-Any configuration options that can be set via the command line can also be specified in the `nyc` stanza of your package.json, or within a seperate configuration file - a variety of flavors are available:
+Any configuration options that can be set via the command line can also be specified in the `nyc` stanza of your package.json, or within a separate configuration file - a variety of flavors are available:
 
 | File name       | File Association |
 |-----------------|------------------|
@@ -98,18 +98,18 @@ This table is a quick TLDR for the rest of this readme and there are more advanc
 | ----------- | ----------- | ---- | ------- |
 | `all` | Whether or not to instrument all files (not just the ones touched by your test suite) | `Boolean` | `false` |
 | `check-coverage` | Check whether coverage is within thresholds, fail if not | `Boolean` | `false` |
-| `extension` | List of extensions that nyc should attempt to handle in addition to `.js` | `Array<String>` | `['.js']` |
+| `extension` | List of extensions that nyc should attempt to handle in addition to `.js` | `Array<String>` | `['.js', '.cjs', '.mjs', '.ts', '.tsx', '.jsx']` |
 | `include` | See [selecting files for coverage] for more info | `Array<String>` | `['**']`|
-| `exclude` | See [selecting files for coverage] for more info | `Array<String>` | [list](https://github.com/istanbuljs/istanbuljs/blob/master/packages/test-exclude/default-exclude.js) |
+| `exclude` | See [selecting files for coverage] for more info | `Array<String>` | [list](https://github.com/istanbuljs/schema/blob/master/default-exclude.js) |
 | `reporter` | [Coverage reporters to use](https://istanbul.js.org/docs/advanced/alternative-reporters/) | `Array<String>` | `['text']` |
 | `report-dir` | Where to put the coverage report files | `String` | `./coverage` |
 | `skip-full` | Don't show files with 100% statement, branch, and function coverage | `Boolean` | `false` |
 | `temp-dir` | Directory to output raw coverage information to | `String` | `./.nyc_output` |
 
 Configuration can also be provided by `nyc.config.js` if programmed logic is required:
 ```js
-'use strict'; 
-const {defaultExclude} = require('test-exclude');
+'use strict';
+const defaultExclude = require('@istanbuljs/schema/default-exclude');
 const isWindows = require('is-windows');
 
 let platformExclude = [
@@ -142,13 +142,13 @@ module.exports = {
 
 By default, nyc only collects coverage for source files that are visited during a test.
 It does this by watching for files that are `require()`'d during the test.
-When a file is `require()`'d, nyc creates and returns an instrumented version of the source, rather than the original. 
+When a file is `require()`'d, nyc creates and returns an instrumented version of the source, rather than the original.
 Only source files that are visited during a test will appear in the coverage report and contribute to coverage statistics.
 
 nyc will instrument all files if the `--all` flag is set or if running `nyc instrument`.
 In this case all files will appear in the coverage report and contribute to coverage statistics.
 
-nyc will only collect coverage for files that are located under `cwd`, and then only `*.js` files or files with extensions listed in the `extension` array.
+nyc will only collect coverage for files that are located under `cwd`, and then only files with extensions listed in the `extension` array.
 
 You can reduce the set of instrumented files by adding `include` and `exclude` filter arrays to your config.
 These allow you to shape the set of instrumented files by specifying glob patterns that can filter files from the default instrumented set.
@@ -172,7 +172,7 @@ You can also specify negated paths in the `exclude` array, by prefixing them wit
 Negated paths can restore paths that have been already been excluded in the `exclude` array.
 Multiple `exclude` globs can be specified on the command line, each must follow a `--exclude`, `-x` switch.
 
-The default `exclude` list is defined in the [test-exclude module](https://github.com/istanbuljs/istanbuljs/blob/master/packages/test-exclude/default-exclude.js).
+The default `exclude` list is defined in the [@istanbuljs/schema module](https://github.com/istanbuljs/schema/blob/master/default-exclude.js).
 Specifying your own exclude property completely replaces these defaults.
 
 For example, the following config will collect coverage for every file in the `src` directory regardless of whether it is `require()`'d in a test.
@@ -200,7 +200,7 @@ To prevent this, wrap each glob in single quotes.
 We always add `**/node_modules/**` to the exclude list, even if not specified in the config.
 You can override this by setting `--exclude-node-modules=false`.
 
-For example, in the following config, `"excludeNodeModules: false"` will prevent `node_modules` from being added to the exclude rules. 
+For example, in the following config, `"excludeNodeModules: false"` will prevent `node_modules` from being added to the exclude rules.
 The set of include rules then restrict nyc to only consider instrumenting files found under the `lib/` and `node_modules/@my-org/` directories.
 The exclude rules then prevent nyc instrumenting anything in a `test` folder and the file `node_modules/@my-org/something/unwanted.js`.
 
@@ -371,13 +371,17 @@ Otherwise nyc's reports will exclude any files that source-maps remap to folders
 
 Many testing frameworks (Mocha, Tape, Tap, etc.) can produce [TAP](https://en.wikipedia.org/wiki/Test_Anything_Protocol) output. [tap-nyc](https://github.com/MegaArman/tap-nyc) is a TAP formatter designed to look nice with nyc.
 
-## More tutorials
+## Tutorials and Advanced Documentation
 
-You can find more tutorials at http://istanbul.js.org/docs/tutorials
+See [more nyc tutorials](https://istanbul.js.org/docs/tutorials) and [advanced nyc documentation](https://istanbul.js.org/docs/advanced/).
 
-## Other advanced features
+Please feel free to [contribute documentation](https://github.com/istanbuljs/istanbuljs.github.io/tree/development/content) to help us improve.
 
-Take a look at http://istanbul.js.org/docs/advanced/ and please feel free to [contribute documentation](https://github.com/istanbuljs/istanbuljs.github.io/tree/development/content).
+## `nyc` for enterprise
+
+Available as part of the Tidelift Subscription.
+
+The maintainers of `nyc` and thousands of other packages are working with Tidelift to deliver commercial support and maintenance for the open source dependencies you use to build your applications. Save time, reduce risk, and improve code health, while paying the maintainers of the exact dependencies you use. [Learn more.](https://tidelift.com/subscription/pkg/npm-nyc?utm_source=npm-nyc&utm_medium=referral&utm_campaign=enterprise&utm_term=repo)
 
 [`@babel/register`]: https://www.npmjs.com/package/@babel/register
 [`babel-plugin-istanbul`]: https://github.com/istanbuljs/babel-plugin-istanbul

bin/nyc.js

@@ -1,91 +1,118 @@
 #!/usr/bin/env node
+'use strict'
 
 const configUtil = require('../lib/config-util')
+const { cliWrapper, suppressEPIPE } = require('../lib/commands/helpers')
 const foreground = require('foreground-child')
+const resolveFrom = require('resolve-from')
 const NYC = require('../index.js')
-const processArgs = require('../lib/process-args')
-
-const sw = require('spawn-wrap')
-const wrapper = require.resolve('./wrap.js')
 
 // parse configuration and command-line arguments;
 // we keep these values in a few different forms,
 // used in the various execution contexts of nyc:
 // reporting, instrumenting subprocesses, etc.
-const yargs = configUtil.buildYargs()
-const instrumenterArgs = processArgs.hideInstrumenteeArgs()
-const config = configUtil.loadConfig(yargs.parse(instrumenterArgs))
-configUtil.addCommandsAndHelp(yargs)
-const argv = yargs.config(config).parse(instrumenterArgs)
-
-if ([
-  'check-coverage', 'report', 'instrument', 'merge'
-].indexOf(argv._[0]) !== -1) {
-  // look in lib/commands for logic.
-} else if (argv._.length) {
+
+async function main () {
+  const { argv, childArgs, yargs } = await configUtil()
+
+  if (['check-coverage', 'report', 'instrument', 'merge'].includes(argv._[0])) {
+    // look in lib/commands for logic.
+    return
+  }
+
+  if (argv._.length === 0) {
+    // I don't have a clue what you're doing.
+    process.exitCode = 1
+    yargs.showHelp()
+    return
+  }
+
   // if instrument is set to false,
   // enable a noop instrumenter.
   if (!argv.instrument) argv.instrumenter = './lib/instrumenters/noop'
   else argv.instrumenter = './lib/instrumenters/istanbul'
 
   var nyc = (new NYC(argv))
   if (argv.clean) {
-    nyc.reset()
+    await nyc.reset()
   } else {
-    nyc.createTempDirectory()
+    await nyc.createTempDirectory()
   }
-  if (argv.all) nyc.addAllFiles()
 
-  var env = {
-    // Support running nyc as a user without HOME (e.g. linux 'nobody'),
-    // https://github.com/istanbuljs/nyc/issues/951
-    SPAWN_WRAP_SHIM_ROOT: process.env.SPAWN_WRAP_SHIM_ROOT || process.env.XDG_CACHE_HOME || require('os').homedir(),
+  const env = {
     NYC_CONFIG: JSON.stringify(argv),
-    NYC_CWD: process.cwd(),
-    NYC_ROOT_ID: nyc.rootId,
-    NYC_INSTRUMENTER: argv.instrumenter
+    NYC_CWD: process.cwd()
   }
 
+  /* istanbul ignore else */
   if (argv['babel-cache'] === false) {
     // babel's cache interferes with some configurations, so is
     // disabled by default. opt in by setting babel-cache=true.
     env.BABEL_DISABLE_CACHE = process.env.BABEL_DISABLE_CACHE = '1'
   }
 
-  sw([wrapper], env)
+  if (!argv.useSpawnWrap) {
+    const requireModules = [
+      require.resolve('../lib/register-env.js'),
+      ...nyc.require.map(mod => resolveFrom.silent(nyc.cwd, mod) || mod)
+    ]
+    const preloadList = require('node-preload')
+    preloadList.push(
+      ...requireModules,
+      require.resolve('../lib/wrap.js')
+    )
+
+    Object.assign(process.env, env)
+    requireModules.forEach(mod => {
+      require(mod)
+    })
+  }
+
+  if (argv.all) {
+    await nyc.addAllFiles()
+  }
+
+  if (argv.useSpawnWrap) {
+    const wrapper = require.resolve('./wrap.js')
+    // Support running nyc as a user without HOME (e.g. linux 'nobody'),
+    // https://github.com/istanbuljs/nyc/issues/951
+    env.SPAWN_WRAP_SHIM_ROOT = process.env.SPAWN_WRAP_SHIM_ROOT || process.env.XDG_CACHE_HOME || require('os').homedir()
+    const sw = require('spawn-wrap')
+
+    sw([wrapper], env)
+  }
 
   // Both running the test script invocation and the check-coverage run may
   // 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(processArgs.hideInstrumenterArgs(
-    // use the same argv descrption, but don't exit
-    // for flags like --help.
-    configUtil.buildYargs().parse(process.argv.slice(2))
-  ), function (done) {
-    var mainChildExitCode = process.exitCode
-
-    nyc.writeProcessIndex()
-
-    nyc.maybePurgeSourceMapCache()
-    if (argv.checkCoverage) {
-      nyc.checkCoverage({
-        lines: argv.lines,
-        functions: argv.functions,
-        branches: argv.branches,
-        statements: argv.statements
-      }, argv['per-file'])
-      process.exitCode = process.exitCode || mainChildExitCode
-    }
+  foreground(childArgs, async () => {
+    const mainChildExitCode = process.exitCode
 
-    if (!argv.silent) {
-      nyc.report()
-    }
+    try {
+      await nyc.writeProcessIndex()
+
+      nyc.maybePurgeSourceMapCache()
+      if (argv.checkCoverage) {
+        await nyc.checkCoverage({
+          lines: argv.lines,
+          functions: argv.functions,
+          branches: argv.branches,
+          statements: argv.statements
+        }, argv['per-file']).catch(suppressEPIPE)
+        process.exitCode = process.exitCode || mainChildExitCode
+      }
 
-    return done()
+      if (!argv.silent) {
+        await nyc.report().catch(suppressEPIPE)
+      }
+    } catch (error) {
+      /* istanbul ignore next */
+      process.exitCode = process.exitCode || mainChildExitCode || 1
+      /* istanbul ignore next */
+      console.error(error.message)
+    }
   })
-} else {
-  // I don't have a clue what you're doing.
-  process.exitCode = 1
-  yargs.showHelp()
 }
+
+cliWrapper(main)()

bin/wrap.js

@@ -1,27 +1,4 @@
-var sw = require('spawn-wrap')
-var NYC = require('../index.js')
+'use strict'
 
-var config = {}
-if (process.env.NYC_CONFIG) config = JSON.parse(process.env.NYC_CONFIG)
-config.isChildProcess = true
-
-config._processInfo = {
-  pid: process.pid,
-  ppid: process.ppid,
-  parent: process.env.NYC_PROCESS_ID || null,
-  root: process.env.NYC_ROOT_ID
-}
-if (process.env.NYC_PROCESSINFO_EXTERNAL_ID) {
-  config._processInfo.externalId = process.env.NYC_PROCESSINFO_EXTERNAL_ID
-  delete process.env.NYC_PROCESSINFO_EXTERNAL_ID
-}
-
-if (process.env.NYC_CONFIG_OVERRIDE) {
-  var override = JSON.parse(process.env.NYC_CONFIG_OVERRIDE)
-  config = Object.assign(config, override)
-  process.env.NYC_CONFIG = JSON.stringify(config)
-}
-
-;(new NYC(config)).wrap()
-
-sw.runMain()
+require('../lib/wrap')
+require('spawn-wrap').runMain()

build-self-coverage.js

@@ -1,3 +1,5 @@
+'use strict'
+
 const path = require('path')
 const fs = require('fs')
 const istanbul = require('istanbul-lib-instrument')