feat: add include and exclude options to instrument command

index.js

@@ -6,7 +6,9 @@ const arrify = require('arrify')
 const cachingTransform = require('caching-transform')
 const util = require('util')
 const findCacheDir = require('find-cache-dir')
+const { copySync } = require('fs-extra')
 const fs = require('fs')
+const glob = require('glob')
 const Hash = require('./lib/hash')
 const libCoverage = require('istanbul-lib-coverage')
 const libHook = require('istanbul-lib-hook')
@@ -178,9 +180,11 @@ NYC.prototype.instrumentAllFiles = function (input, output, cb) {
     const outCode = this._transform(inCode, inFile) || inCode
 
     if (output) {
+      const mode = fs.statSync(inFile).mode
       const outFile = path.resolve(output, relFile)
       mkdirp.sync(path.dirname(outFile))
-      fs.writeFileSync(outFile, outCode, 'utf-8')
+      fs.writeFileSync(outFile, outCode)
+      fs.chmodSync(outFile, mode)
     } else {
       console.log(outCode)
     }
@@ -191,8 +195,27 @@ NYC.prototype.instrumentAllFiles = function (input, output, cb) {
   try {
     const stats = fs.lstatSync(input)
     if (stats.isDirectory()) {
+      const globOptions = { dot: true, mark: true, ignore: ['**/.git', '**/.git/**/*'] }
+      const outputPaths = (output) ? glob.sync(`${path.resolve(input)}/**/*`, globOptions) : []
+
+      const partition = (universal, subsetFilter) => {
+        return universal.reduce(([a, aDash], member) => {
+          return subsetFilter(member) ? [[...a, member], aDash] : [a, [...aDash, member]]
+        }, [[], []])
+      }
+
+      const [dirs, files] = partition(outputPaths, filename => filename.endsWith('/'))
+
       inputDir = input
       this.walkAllFiles(input, visitor)
+
+      if (files.length || dirs.length) {
+        dirs.map(file => path.resolve(output, path.relative(input, file)))
+          .forEach(dir => mkdirp.sync(dir))
+
+        files.map(file => path.relative(input, file))
+          .forEach(file => { copySync(path.join(input, file), path.join(output, file), { overwrite: false }) })
+      }
     } else {
       visitor(input)
     }

lib/commands/instrument.js

@@ -1,6 +1,7 @@
 const NYC = require('../../index.js')
 const path = require('path')
 const rimraf = require('rimraf')
+const testExclude = require('test-exclude')
 
 exports.command = 'instrument <input> [output]'
 
@@ -48,6 +49,16 @@ exports.builder = function (yargs) {
       type: 'boolean',
       description: 'should nyc exit when an instrumentation failure occurs?'
     })
+    .option('include', {
+      alias: 'n',
+      default: [],
+      describe: 'a list of specific files and directories that should be instrumented, glob patterns are supported'
+    })
+    .option('exclude', {
+      alias: 'x',
+      default: testExclude.defaultExclude,
+      describe: 'a list of specific files and directories that should not be instrumented, glob patterns are supported'
+    })
     .option('es-modules', {
       default: true,
       type: 'boolean',
@@ -62,6 +73,28 @@ exports.builder = function (yargs) {
 }
 
 exports.handler = function (argv) {
+  if (argv.output && (path.resolve(argv.cwd, argv.input) === path.resolve(argv.cwd, argv.output))) {
+    console.error(`nyc instrument failed: cannot instrument files in place, <input> must differ from <output>`)
+    process.exitCode = 1
+    return
+  }
+
+  if (path.relative(argv.cwd, path.resolve(argv.cwd, argv.input)).startsWith('..')) {
+    console.error(`nyc instrument failed: cannot instrument files outside of project root directory`)
+    process.exitCode = 1
+    return
+  }
+
+  if (argv.delete && argv.output && argv.output.length !== 0) {
+    const relPath = path.relative(process.cwd(), path.resolve(argv.output))
+    if (relPath !== '' && !relPath.startsWith('..')) {
+      rimraf.sync(argv.output)
+    } else {
+      console.error(`nyc instrument failed: attempt to delete '${process.cwd()}' or containing directory.`)
+      process.exit(1)
+    }
+  }
+
   // If instrument is set to false enable a noop instrumenter.
   argv.instrumenter = (argv.instrument)
     ? './lib/instrumenters/istanbul'
@@ -76,20 +109,12 @@ exports.handler = function (argv) {
     cwd: argv.cwd,
     compact: argv.compact,
     preserveComments: argv.preserveComments,
+    include: argv.include,
+    exclude: argv.exclude,
     esModules: argv.esModules,
     exitOnError: argv.exitOnError
   })
 
-  if (argv.delete && argv.output && argv.output.length !== 0) {
-    const relPath = path.relative(process.cwd(), path.resolve(argv.output))
-    if (relPath !== '' && !relPath.startsWith('..')) {
-      rimraf.sync(argv.output)
-    } else {
-      console.error(`nyc instrument failed: attempt to delete '${process.cwd()}' or containing directory.`)
-      process.exit(1)
-    }
-  }
-
   nyc.instrumentAllFiles(argv.input, argv.output, err => {
     if (err) {
       console.error(err.message)

package.json

@@ -74,6 +74,8 @@
     "find-cache-dir": "^2.0.0",
     "find-up": "^3.0.0",
     "foreground-child": "^1.5.6",
+    "fs-extra": "^7.0.1",
+    "glob": "^7.1.3",
     "istanbul-lib-coverage": "^2.0.4",
     "istanbul-lib-hook": "^2.0.4",
     "istanbul-lib-instrument": "^3.1.1",
@@ -95,7 +97,6 @@
     "any-path": "^1.3.0",
     "chai": "^4.2.0",
     "coveralls": "^3.0.3",
-    "glob": "^7.1.3",
     "is-windows": "^1.0.2",
     "lodash": "^4.17.11",
     "newline-regex": "^0.2.1",

test/fixtures/cli/.instrument-nycrc

@@ -0,0 +1,5 @@
+{
+  "exclude": [
+    "**/exclude-me/**"
+  ]
+}

test/fixtures/cli/subdir/.gitignore

@@ -1 +1,2 @@
 output-dir
+!node_modules

test/fixtures/cli/subdir/input-dir/exclude-me/index.js

@@ -0,0 +1,2 @@
+'use strict';
+console.log('Hello, World!')