nyc 12.0.2 → 13.0.0

package/CHANGELOG.md

@@ -2,6 +2,26 @@
 
 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="13.0.0"></a>
+# [13.0.0](https://github.com/istanbuljs/nyc/compare/v12.0.2...v13.0.0) (2018-06-08)
+
+
+### Bug Fixes
+
+* source was being instrumented twice, due to upstream fix in ista… ([#853](https://github.com/istanbuljs/nyc/issues/853)) ([d0f654c](https://github.com/istanbuljs/nyc/commit/d0f654c))
+
+
+### Features
+
+* allow rows with 100% statement, branch, and function coverage to be skipped in text report ([#859](https://github.com/istanbuljs/nyc/issues/859)) ([893345a](https://github.com/istanbuljs/nyc/commit/893345a))
+
+
+### BREAKING CHANGES
+
+* --hook-run-in-context, and --hook-run-in-this-context are no longer true by default (they should be enabled if you're using a library like requirejs).
+
+
+
 <a name="12.0.2"></a>
 ## [12.0.2](https://github.com/istanbuljs/nyc/compare/v12.0.1...v12.0.2) (2018-06-03)
 

package/README.md

@@ -103,7 +103,7 @@ project uses the babel tool chain:
     }
   ```
 
-  Note: With this configuration, the Istanbul instrumentation will only be active when `NODE_ENV` or `BABEL_ENV` is `test`.
+  Note: With this configuration, the Istanbul instrumentation will only be active when `NODE_ENV` or `BABEL_ENV` is `test` unless the environment is a valid entry in `"env"` within the `.babelrc` file.
 
   We recommend using the [`cross-env`](https://npmjs.com/package/cross-env) package to set these environment variables
   in your `package.json` scripts in a way that works cross-platform.
@@ -205,7 +205,7 @@ You can tell nyc to exclude specific files and directories by adding
 an `nyc.exclude` array to your `package.json`. Each element of
 the array is a glob pattern indicating which paths should be omitted.
 
-Globs are matched using [micromatch](https://www.npmjs.com/package/micromatch).
+Globs are matched using [minimatch](https://www.npmjs.com/package/minimatch).
 
 For example, the following config will exclude any files with the extension `.spec.js`,
 and anything in the `build` directory:
@@ -240,7 +240,7 @@ an `include` key with a list of globs to specify specific files that should be c
 }
 ```
 
-> `nyc` uses micromatch for glob expansions, you can read its documentation [here](https://www.npmjs.com/package/micromatch).
+> `nyc` uses minimatch for glob expansions, you can read its documentation [here](https://www.npmjs.com/package/minimatch).
 
 > Note: include defaults to `['**']`
 

package/index.js

@@ -9,12 +9,11 @@ const findCacheDir = require('find-cache-dir')
 const fs = require('fs')
 const glob = require('glob')
 const Hash = require('./lib/hash')
-const js = require('default-require-extensions/js')
 const libCoverage = require('istanbul-lib-coverage')
 const libHook = require('istanbul-lib-hook')
 const libReport = require('istanbul-lib-report')
 const md5hex = require('md5-hex')
-const mkdirp = require('mkdirp')
+const mkdirp = require('make-dir')
 const Module = require('module')
 const onExit = require('signal-exit')
 const path = require('path')
@@ -80,6 +79,7 @@ function NYC (config) {
     return transforms
   }.bind(this), {})
 
+  this.hookRequire = config.hookRequire
   this.hookRunInContext = config.hookRunInContext
   this.hookRunInThisContext = config.hookRunInThisContext
   this.fakeRequire = null
@@ -122,7 +122,7 @@ NYC.prototype._loadAdditionalModules = function () {
   this.require.forEach(function (r) {
     // first attempt to require the module relative to
     // the directory being instrumented.
-    var p = resolveFrom(_this.cwd, r)
+    var p = resolveFrom.silent(_this.cwd, r)
     if (p) {
       require(p)
       return
@@ -298,7 +298,8 @@ NYC.prototype._transformFactory = function (cacheDir) {
   }
 }
 
-NYC.prototype._handleJs = function (code, filename) {
+NYC.prototype._handleJs = function (code, options) {
+  var filename = options.filename
   var relFile = path.relative(this.cwd, filename)
   // ensure the path has correct casing (see istanbuljs/nyc#269 and nodejs/node#6624)
   filename = path.resolve(this.cwd, relFile)
@@ -311,14 +312,10 @@ NYC.prototype._addHook = function (type) {
   libHook['hook' + type](dummyMatcher, handleJs, { extensions: this.extensions })
 }
 
-NYC.prototype._wrapRequire = function () {
-  this.extensions.forEach(function (ext) {
-    require.extensions[ext] = js
-  })
-  this._addHook('Require')
-}
-
-NYC.prototype._addOtherHooks = function () {
+NYC.prototype._addRequireHooks = function () {
+  if (this.hookRequire) {
+    this._addHook('Require')
+  }
   if (this.hookRunInContext) {
     this._addHook('RunInContext')
   }
@@ -362,8 +359,7 @@ NYC.prototype._wrapExit = function () {
 }
 
 NYC.prototype.wrap = function (bin) {
-  this._wrapRequire()
-  this._addOtherHooks()
+  this._addRequireHooks()
   this._wrapExit()
   this._loadAdditionalModules()
   return this
@@ -457,7 +453,8 @@ NYC.prototype.report = function () {
 
   this.reporter.forEach((_reporter) => {
     tree.visit(reports.create(_reporter, {
-      skipEmpty: this.config.skipEmpty
+      skipEmpty: this.config.skipEmpty,
+      skipFull: this.config.skipFull
     }), context)
   })
 

package/lib/config-util.js

@@ -181,14 +181,20 @@ Config.buildYargs = function (cwd) {
       description: 'should nyc handle instrumentation?',
       global: false
     })
-    .option('hook-run-in-context', {
+    .option('hook-require', {
       default: true,
       type: 'boolean',
+      description: 'should nyc wrap require?',
+      global: false
+    })
+    .option('hook-run-in-context', {
+      default: false,
+      type: 'boolean',
       description: 'should nyc wrap vm.runInContext?',
       global: false
     })
     .option('hook-run-in-this-context', {
-      default: true,
+      default: false,
       type: 'boolean',
       description: 'should nyc wrap vm.runInThisContext?',
       global: false
@@ -221,6 +227,12 @@ Config.buildYargs = function (cwd) {
       type: 'boolean',
       global: false
     })
+    .option('skip-full', {
+      describe: 'don\'t show files with 100% statement, branch, and function coverage',
+      default: false,
+      type: 'boolean',
+      global: false
+    })
     .pkgConf('nyc', cwd)
     .example('$0 npm test', 'instrument your tests with coverage')
     .example('$0 --require babel-core/register npm test', 'instrument your tests with coverage and transpile with Babel')

package/lib/self-coverage-helper.js

@@ -2,7 +2,7 @@
 
 const path = require('path')
 const fs = require('fs')
-const mkdirp = require('mkdirp')
+const mkdirp = require('make-dir')
 const onExit = require('signal-exit')
 
 onExit(function () {

package/node_modules/align-text/package.json

@@ -1,51 +1,33 @@
 {
   "_args": [
     [
-      {
-        "raw": "align-text@^0.1.3",
-        "scope": null,
-        "escapedName": "align-text",
-        "name": "align-text",
-        "rawSpec": "^0.1.3",
-        "spec": ">=0.1.3 <0.2.0",
-        "type": "range"
-      },
-      "/Users/benjamincoe/bcoe/nyc/node_modules/center-align"
+      "align-text@0.1.4",
+      "/Users/benjamincoe/bcoe/nyc"
     ]
   ],
-  "_from": "align-text@>=0.1.3 <0.2.0",
+  "_from": "align-text@0.1.4",
   "_id": "align-text@0.1.4",
-  "_inCache": true,
+  "_inBundle": false,
+  "_integrity": "sha1-DNkKVhCT810KmSVsIrcGlDP60Rc=",
   "_location": "/align-text",
-  "_nodeVersion": "5.5.0",
-  "_npmOperationalInternal": {
-    "host": "packages-9-west.internal.npmjs.com",
-    "tmp": "tmp/align-text-0.1.4.tgz_1454377856920_0.9624228512402624"
-  },
-  "_npmUser": {
-    "name": "shinnn",
-    "email": "snnskwtnb@gmail.com"
-  },
-  "_npmVersion": "3.6.0",
   "_phantomChildren": {},
   "_requested": {
-    "raw": "align-text@^0.1.3",
-    "scope": null,
-    "escapedName": "align-text",
+    "type": "version",
+    "registry": true,
+    "raw": "align-text@0.1.4",
     "name": "align-text",
-    "rawSpec": "^0.1.3",
-    "spec": ">=0.1.3 <0.2.0",
-    "type": "range"
+    "escapedName": "align-text",
+    "rawSpec": "0.1.4",
+    "saveSpec": null,
+    "fetchSpec": "0.1.4"
   },
   "_requiredBy": [
     "/center-align",
     "/right-align"
   ],
   "_resolved": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz",
-  "_shasum": "0cd90a561093f35d0a99256c22b7069433fad117",
-  "_shrinkwrap": null,
-  "_spec": "align-text@^0.1.3",
-  "_where": "/Users/benjamincoe/bcoe/nyc/node_modules/center-align",
+  "_spec": "0.1.4",
+  "_where": "/Users/benjamincoe/bcoe/nyc",
   "author": {
     "name": "Jon Schlinkert",
     "url": "https://github.com/jonschlinkert"
@@ -64,18 +46,12 @@
     "should": "*",
     "word-wrap": "^1.0.3"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "0cd90a561093f35d0a99256c22b7069433fad117",
-    "tarball": "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"
-  },
   "engines": {
     "node": ">=0.10.0"
   },
   "files": [
     "index.js"
   ],
-  "gitHead": "7f08e823a54c6bda319d875895813537a66a4c5e",
   "homepage": "https://github.com/jonschlinkert/align-text",
   "keywords": [
     "align",
@@ -93,19 +69,7 @@
   ],
   "license": "MIT",
   "main": "index.js",
-  "maintainers": [
-    {
-      "name": "jonschlinkert",
-      "email": "github@sellside.com"
-    },
-    {
-      "name": "shinnn",
-      "email": "snnskwtnb@gmail.com"
-    }
-  ],
   "name": "align-text",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git://github.com/jonschlinkert/align-text.git"

package/node_modules/amdefine/package.json

@@ -1,50 +1,32 @@
 {
   "_args": [
     [
-      {
-        "raw": "amdefine@>=0.0.4",
-        "scope": null,
-        "escapedName": "amdefine",
-        "name": "amdefine",
-        "rawSpec": ">=0.0.4",
-        "spec": ">=0.0.4",
-        "type": "range"
-      },
-      "/Users/benjamincoe/bcoe/nyc/node_modules/handlebars/node_modules/source-map"
+      "amdefine@1.0.1",
+      "/Users/benjamincoe/bcoe/nyc"
     ]
   ],
-  "_from": "amdefine@>=0.0.4",
+  "_from": "amdefine@1.0.1",
   "_id": "amdefine@1.0.1",
-  "_inCache": true,
+  "_inBundle": false,
+  "_integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
   "_location": "/amdefine",
-  "_nodeVersion": "6.7.0",
-  "_npmOperationalInternal": {
-    "host": "packages-18-east.internal.npmjs.com",
-    "tmp": "tmp/amdefine-1.0.1.tgz_1478062849665_0.19916908955201507"
-  },
-  "_npmUser": {
-    "name": "jrburke",
-    "email": "jrburke@gmail.com"
-  },
-  "_npmVersion": "3.10.3",
   "_phantomChildren": {},
   "_requested": {
-    "raw": "amdefine@>=0.0.4",
-    "scope": null,
-    "escapedName": "amdefine",
+    "type": "version",
+    "registry": true,
+    "raw": "amdefine@1.0.1",
     "name": "amdefine",
-    "rawSpec": ">=0.0.4",
-    "spec": ">=0.0.4",
-    "type": "range"
+    "escapedName": "amdefine",
+    "rawSpec": "1.0.1",
+    "saveSpec": null,
+    "fetchSpec": "1.0.1"
   },
   "_requiredBy": [
     "/handlebars/source-map"
   ],
   "_resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
-  "_shasum": "4a5282ac164729e93619bcfd3ad151f817ce91f5",
-  "_shrinkwrap": null,
-  "_spec": "amdefine@>=0.0.4",
-  "_where": "/Users/benjamincoe/bcoe/nyc/node_modules/handlebars/node_modules/source-map",
+  "_spec": "1.0.1",
+  "_where": "/Users/benjamincoe/bcoe/nyc",
   "author": {
     "name": "James Burke",
     "email": "jrburke@gmail.com",
@@ -53,34 +35,17 @@
   "bugs": {
     "url": "https://github.com/jrburke/amdefine/issues"
   },
-  "dependencies": {},
   "description": "Provide AMD's define() API for declaring modules in the AMD format",
-  "devDependencies": {},
-  "directories": {},
-  "dist": {
-    "shasum": "4a5282ac164729e93619bcfd3ad151f817ce91f5",
-    "tarball": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"
-  },
   "engines": {
     "node": ">=0.4.2"
   },
-  "gitHead": "e59edc9da24404ec7937098e3992f8fb0e260be7",
   "homepage": "http://github.com/jrburke/amdefine",
   "license": "BSD-3-Clause OR MIT",
   "main": "./amdefine.js",
-  "maintainers": [
-    {
-      "name": "jrburke",
-      "email": "jrburke@gmail.com"
-    }
-  ],
   "name": "amdefine",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/jrburke/amdefine.git"
   },
-  "scripts": {},
   "version": "1.0.1"
 }

package/node_modules/ansi-regex/package.json

@@ -1,50 +1,32 @@
 {
   "_args": [
     [
-      {
-        "raw": "ansi-regex@^3.0.0",
-        "scope": null,
-        "escapedName": "ansi-regex",
-        "name": "ansi-regex",
-        "rawSpec": "^3.0.0",
-        "spec": ">=3.0.0 <4.0.0",
-        "type": "range"
-      },
-      "/Users/benjamincoe/bcoe/nyc/node_modules/strip-ansi"
+      "ansi-regex@3.0.0",
+      "/Users/benjamincoe/bcoe/nyc"
     ]
   ],
-  "_from": "ansi-regex@>=3.0.0 <4.0.0",
+  "_from": "ansi-regex@3.0.0",
   "_id": "ansi-regex@3.0.0",
-  "_inCache": true,
+  "_inBundle": false,
+  "_integrity": "sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=",
   "_location": "/ansi-regex",
-  "_nodeVersion": "4.8.3",
-  "_npmOperationalInternal": {
-    "host": "s3://npm-registry-packages",
-    "tmp": "tmp/ansi-regex-3.0.0.tgz_1497985412590_0.5700640194118023"
-  },
-  "_npmUser": {
-    "name": "sindresorhus",
-    "email": "sindresorhus@gmail.com"
-  },
-  "_npmVersion": "2.15.11",
   "_phantomChildren": {},
   "_requested": {
-    "raw": "ansi-regex@^3.0.0",
-    "scope": null,
-    "escapedName": "ansi-regex",
+    "type": "version",
+    "registry": true,
+    "raw": "ansi-regex@3.0.0",
     "name": "ansi-regex",
-    "rawSpec": "^3.0.0",
-    "spec": ">=3.0.0 <4.0.0",
-    "type": "range"
+    "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",
-  "_shasum": "ed0317c322064f79466c02966bddb605ab37d998",
-  "_shrinkwrap": null,
-  "_spec": "ansi-regex@^3.0.0",
-  "_where": "/Users/benjamincoe/bcoe/nyc/node_modules/strip-ansi",
+  "_spec": "3.0.0",
+  "_where": "/Users/benjamincoe/bcoe/nyc",
   "author": {
     "name": "Sindre Sorhus",
     "email": "sindresorhus@gmail.com",
@@ -53,24 +35,17 @@
   "bugs": {
     "url": "https://github.com/chalk/ansi-regex/issues"
   },
-  "dependencies": {},
   "description": "Regular expression for matching ANSI escape codes",
   "devDependencies": {
     "ava": "*",
     "xo": "*"
   },
-  "directories": {},
-  "dist": {
-    "shasum": "ed0317c322064f79466c02966bddb605ab37d998",
-    "tarball": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-3.0.0.tgz"
-  },
   "engines": {
     "node": ">=4"
   },
   "files": [
     "index.js"
   ],
-  "gitHead": "0a8cc19946c03c38520fe8c086b8adb66f9cce0b",
   "homepage": "https://github.com/chalk/ansi-regex#readme",
   "keywords": [
     "ansi",
@@ -100,23 +75,7 @@
     "pattern"
   ],
   "license": "MIT",
-  "maintainers": [
-    {
-      "name": "dthree",
-      "email": "threedeecee@gmail.com"
-    },
-    {
-      "name": "qix",
-      "email": "i.am.qix@gmail.com"
-    },
-    {
-      "name": "sindresorhus",
-      "email": "sindresorhus@gmail.com"
-    }
-  ],
   "name": "ansi-regex",
-  "optionalDependencies": {},
-  "readme": "ERROR: No README data found!",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/chalk/ansi-regex.git"

package/node_modules/append-transform/index.js

@@ -1,10 +1,9 @@
 'use strict';
-
-var js = require('default-require-extensions/js');
+const js = require('default-require-extensions/js');
 
 module.exports = appendTransform;
 
-var count = 0;
+let count = 0;
 
 function appendTransform(transform, ext, extensions) {
 	// Generate a unique key for this transform
@@ -13,10 +12,10 @@ function appendTransform(transform, ext, extensions) {
 	ext = ext || '.js';
 	extensions = extensions || require.extensions;
 
-	var forwardGet;
-	var forwardSet;
+	let forwardGet;
+	let forwardSet;
 
-	var descriptor = Object.getOwnPropertyDescriptor(extensions, ext) || {value: js, configurable: true};
+	const descriptor = Object.getOwnPropertyDescriptor(extensions, ext) || {value: js, configurable: true};
 
 	if (
 		((descriptor.get || descriptor.set) && !(descriptor.get && descriptor.set)) ||
@@ -26,7 +25,7 @@ function appendTransform(transform, ext, extensions) {
 	}
 
 	if (descriptor.get) {
-		// wrap a previous append-transform install and pass through to the getter/setter pair it created
+		// Wrap a previous append-transform install and pass through to the getter/setter pair it created
 		forwardGet = function () {
 			return descriptor.get();
 		};
@@ -50,8 +49,9 @@ function appendTransform(transform, ext, extensions) {
 			if (!module[key]) {
 				module[key] = true;
 
-				var originalCompile = module._compile;
+				const originalCompile = module._compile;
 
+				// eslint-disable-next-line func-name-matching func-names
 				module._compile = function replacementCompile(code, filename) {
 					module._compile = originalCompile;
 					code = transform(code, filename);
@@ -63,17 +63,18 @@ function appendTransform(transform, ext, extensions) {
 		};
 	}
 
-	// wrap the original
+	// Wrap the original
 	forwardSet(wrapCustomHook(forwardGet()));
 
-	var hooks = [forwardGet()];
+	const hooks = [forwardGet()];
 
 	function setCurrentHook(hook) {
-		var restoreIndex = hooks.indexOf(hook);
+		const restoreIndex = hooks.indexOf(hook);
+
 		if (restoreIndex === -1) {
 			hooks.push(forwardSet(wrapCustomHook(hook)));
 		} else {
-			// we have already scene this hook, and it is being reverted (proxyquire, etc) - don't wrap again.
+			// We have already scene this hook, and it is being reverted (proxyquire, etc) - don't wrap again.
 			hooks.splice(restoreIndex + 1, hooks.length);
 			forwardSet(hook);
 		}