c8 7.7.3 → 7.11.0

package/CHANGELOG.md

@@ -2,6 +2,39 @@
 
 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.
 
+## [7.11.0](https://github.com/bcoe/c8/compare/v7.10.0...v7.11.0) (2021-12-30)
+
+
+### Features
+
+* add --extension option ([#331](https://github.com/bcoe/c8/issues/331)) ([ff01cd8](https://github.com/bcoe/c8/commit/ff01cd832a155494892b24c30c5a1c8f0169fd8e))
+
+
+### Bug Fixes
+
+* **config:** support configuration inheritance ([#343](https://github.com/bcoe/c8/issues/343)) ([e81ed5d](https://github.com/bcoe/c8/commit/e81ed5dd9ef5dac1a1f2f6dc26a07abb6c05d709))
+
+## [7.10.0](https://www.github.com/bcoe/c8/compare/v7.9.0...v7.10.0) (2021-10-06)
+
+
+### Features
+
+* `--100` ([#332](https://www.github.com/bcoe/c8/issues/332)) ([4205f2f](https://www.github.com/bcoe/c8/commit/4205f2f33585693d82c2500d0d6850571965bb8b))
+
+## [7.9.0](https://www.github.com/bcoe/c8/compare/v7.8.0...v7.9.0) (2021-09-10)
+
+
+### Features
+
+* add --exclude-node-modules option ([#321](https://www.github.com/bcoe/c8/issues/321)) ([a4733c6](https://www.github.com/bcoe/c8/commit/a4733c68abd778757bb6ed641e074be94b79c417))
+
+## [7.8.0](https://www.github.com/bcoe/c8/compare/v7.7.3...v7.8.0) (2021-07-10)
+
+
+### Features
+
+* add --config option and documentation on options and configs ([#308](https://www.github.com/bcoe/c8/issues/308)) ([99436ef](https://www.github.com/bcoe/c8/commit/99436ef131c2ab966174b5012fe22e499fb44ccd))
+
 ### [7.7.3](https://www.github.com/bcoe/c8/compare/v7.7.2...v7.7.3) (2021-06-03)
 
 

package/README.md

@@ -16,6 +16,32 @@ c8 node foo.js
 
 The above example will output coverage metrics for `foo.js`.
 
+## CLI Options / Configuration
+
+c8 can be configured via command-line flags, a `c8` section in `package.json`, or a JSON configuration file on disk.
+
+A configuration file can be specified by passing its path on the command line with `--config` or `-c`. If no config option is provided, c8 searches for files named `.c8rc`, `.c8rc.json`, `.nycrc`, or `.nycrc.json`, starting from
+`cwd` and walking up the filesystem tree.
+
+When using `package.json` configuration or a dedicated configuration file, omit the `--` prefix from the long-form of the desired command-line option.
+
+Here is a list of common options. Run `c8 --help` for the full list and documentation.
+
+| Option | Description | Type | Default |
+| ------ | ----------- | ---- | ------- |
+| `-c`, `--config` | path to JSON configuration file | `string` | See above |
+| `-r`, `--reporter` | coverage reporter(s) to use | `Array<string>` | `['text']` |
+| `-o`, `--reports-dir`, `--report-dir` | directory where coverage reports will be output to | `string` | `./coverage` |
+| `--all` | see [section below](#checking-for-full-source-coverage-using---all) for more info | `boolean` | `false` |
+| `--src` | see [section below](#checking-for-full-source-coverage-using---all) for more info | `Array<string>` | `[process.cwd()]`|
+| `-n`, `--include` | see [section below](#checking-for-full-source-coverage-using---all) for more info | `Array<string>` | `[]` (include all files) |
+| `-x`, `--exclude` | see [section below](#checking-for-full-source-coverage-using---all) for more info | `Array<string>` | [list](https://github.com/istanbuljs/schema/blob/master/default-exclude.js) |
+| `-e`, `--extension` | only files matching these extensions will show coverage | `string | Array<string>` | [list](https://github.com/istanbuljs/schema/blob/master/default-extension.js) |
+| `--skip-full` | do not show files with 100% statement, branch, and function coverage | `boolean` | `false` |
+| `--check-coverage` | check whether coverage is within thresholds provided | `boolean` | `false` |
+| `--temp-directory` | directory V8 coverage data is written to and read from | `string` | `process.env.NODE_V8_COVERAGE` |
+| `--clean` | should temp files be deleted before script execution | `boolean` | `true` |
+
 ## Checking for "full" source coverage using `--all`
 
 By default v8 will only give us coverage for files that were loaded by the engine. If there are source files in your
@@ -23,8 +49,9 @@ project that are flexed in production but not in your tests, your coverage numbe
 if your project's `main.js` loads `a.js` and `b.js` but your unit tests only load `a.js` your total coverage
 could show as `100%` for `a.js` when in fact both `main.js` and `b.js` are uncovered.
 
-By supplying `--all` to c8, all files in `cwd` that pass the `--include` and `--exclude` flag checks, will be loaded into the
-report. If any of those files remain uncovered they will be factored into the report with a default of 0% coverage.
+By supplying `--all` to c8, all files in directories specified with `--src` (defaults to `cwd`) that pass the `--include`
+and `--exclude` flag checks, will be loaded into the report. If any of those files remain uncovered they will be factored
+into the report with a default of 0% coverage.
 
 ## c8 report
 
@@ -54,6 +81,24 @@ To check thresholds on a per-file basis run:
 c8 check-coverage --lines 95 --per-file
 ```
 
+If you want to check for 100% coverage across all dimensions, use `--100`:
+
+```shell
+c8 --100 npm test
+```
+
+Is equivalent to
+
+```shell
+c8 --check-coverage --lines 100 --functions 100 --branches 100 --statements 100  npm test
+```
+
+The `--100` flag can be set for the `check-coverage` as well:
+
+```shell
+c8 check-coverage --100
+```
+
 ## Ignoring Uncovered Lines, Functions, and Blocks
 
 Sometimes you might find yourself wanting to ignore uncovered portions of your

package/index.d.ts

@@ -3,6 +3,7 @@ export type Watermark = [number, number];
 export declare class Report {
     constructor(opts: {
         exclude?: string | string[],
+        extension?: string | string[],
         excludeAfterRemap?: boolean,
         include?: string | string[],
         reporter: string[],

package/lib/commands/check-coverage.js

@@ -11,9 +11,18 @@ exports.builder = function (yargs) {
 }
 
 exports.handler = function (argv) {
+  // TODO: this is a workaround until yargs gets upgraded to v17, see https://github.com/bcoe/c8/pull/332#discussion_r721636191
+  if (argv['100']) {
+    argv.lines = 100
+    argv.functions = 100
+    argv.branches = 100
+    argv.statements = 100
+  }
+
   const report = Report({
     include: argv.include,
     exclude: argv.exclude,
+    extension: argv.extension,
     reporter: Array.isArray(argv.reporter) ? argv.reporter : [argv.reporter],
     reportsDirectory: argv['reports-dir'],
     tempDirectory: argv.tempDirectory,

package/lib/commands/report.js

@@ -10,9 +10,18 @@ exports.handler = async function (argv) {
 }
 
 exports.outputReport = async function (argv) {
+  // TODO: this is a workaround until yargs gets upgraded to v17, see https://github.com/bcoe/c8/pull/332#discussion_r721636191
+  if (argv['100']) {
+    argv.checkCoverage = 100
+    argv.lines = 100
+    argv.functions = 100
+    argv.branches = 100
+    argv.statements = 100
+  }
   const report = Report({
     include: argv.include,
     exclude: argv.exclude,
+    extension: argv.extension,
     excludeAfterRemap: argv.excludeAfterRemap,
     reporter: Array.isArray(argv.reporter) ? argv.reporter : [argv.reporter],
     reportsDirectory: argv['reports-dir'],
@@ -24,7 +33,8 @@ exports.outputReport = async function (argv) {
     all: argv.all,
     allowExternal: argv.allowExternal,
     src: argv.src,
-    skipFull: argv.skipFull
+    skipFull: argv.skipFull,
+    excludeNodeModules: argv.excludeNodeModules
   })
   await report.run()
   if (argv.checkCoverage) await checkCoverages(argv, report)

package/lib/parse-args.js

@@ -1,76 +1,138 @@
 const defaultExclude = require('@istanbuljs/schema/default-exclude')
+const defaultExtension = require('@istanbuljs/schema/default-extension')
 const findUp = require('find-up')
 const { readFileSync } = require('fs')
 const Yargs = require('yargs/yargs')
+const { applyExtends } = require('yargs/helpers')
 const parser = require('yargs-parser')
 const { resolve } = require('path')
 
-const configPath = findUp.sync(['.c8rc', '.c8rc.json', '.nycrc', '.nycrc.json'])
-const config = configPath ? JSON.parse(readFileSync(configPath)) : {}
-
 function buildYargs (withCommands = false) {
   const yargs = Yargs([])
     .usage('$0 [opts] [script] [opts]')
+    .options('config', {
+      alias: 'c',
+      config: true,
+      describe: 'path to JSON configuration file',
+      configParser: (path) => {
+        const config = JSON.parse(readFileSync(path))
+        return applyExtends(config, process.cwd(), true)
+      },
+      default: () => findUp.sync(['.c8rc', '.c8rc.json', '.nycrc', '.nycrc.json'])
+    })
     .option('reporter', {
       alias: 'r',
+      group: 'Reporting options',
       describe: 'coverage reporter(s) to use',
       default: 'text'
     })
     .option('reports-dir', {
       alias: ['o', 'report-dir'],
+      group: 'Reporting options',
       describe: 'directory where coverage reports will be output to',
       default: './coverage'
     })
+    .options('all', {
+      default: false,
+      type: 'boolean',
+      group: 'Reporting options',
+      describe: 'supplying --all will cause c8 to consider all src files in the current working directory ' +
+        'when the determining coverage. Respects include/exclude.'
+    })
+    .options('src', {
+      default: undefined,
+      type: 'string',
+      group: 'Reporting options',
+      describe: 'supplying --src will override cwd as the default location where --all looks for src files. --src can be ' +
+        'supplied multiple times and each directory will be included. This allows for workspaces spanning multiple projects'
+    })
+    .option('exclude-node-modules', {
+      default: true,
+      type: 'boolean',
+      describe: 'whether or not to exclude all node_module folders (i.e. **/node_modules/**) by default'
+    })
+    .option('include', {
+      alias: 'n',
+      default: [],
+      group: 'Reporting options',
+      describe: 'a list of specific files that should be covered (glob patterns are supported)'
+    })
     .option('exclude', {
       alias: 'x',
       default: defaultExclude,
+      group: 'Reporting options',
       describe: 'a list of specific files and directories that should be excluded from coverage (glob patterns are supported)'
     })
+    .option('extension', {
+      alias: 'e',
+      default: defaultExtension,
+      group: 'Reporting options',
+      describe: 'a list of specific file extensions that should be covered'
+    })
     .option('exclude-after-remap', {
       alias: 'a',
       type: 'boolean',
       default: false,
+      group: 'Reporting options',
       describe: 'apply exclude logic to files after they are remapped by a source-map'
     })
-    .option('include', {
-      alias: 'n',
-      default: [],
-      describe: 'a list of specific files that should be covered (glob patterns are supported)'
+    .options('skip-full', {
+      default: false,
+      type: 'boolean',
+      group: 'Reporting options',
+      describe: 'do not show files with 100% statement, branch, and function coverage'
     })
     .option('check-coverage', {
       default: false,
       type: 'boolean',
+      group: 'Coverage thresholds',
       description: 'check whether coverage is within thresholds provided'
     })
     .option('branches', {
       default: 0,
+      group: 'Coverage thresholds',
       description: 'what % of branches must be covered?',
       type: 'number'
     })
     .option('functions', {
       default: 0,
+      group: 'Coverage thresholds',
       description: 'what % of functions must be covered?',
       type: 'number'
     })
     .option('lines', {
       default: 90,
+      group: 'Coverage thresholds',
       description: 'what % of lines must be covered?',
       type: 'number'
     })
     .option('statements', {
       default: 0,
+      group: 'Coverage thresholds',
       description: 'what % of statements must be covered?',
       type: 'number'
     })
     .option('per-file', {
       default: false,
+      group: 'Coverage thresholds',
       description: 'check thresholds per file',
       type: 'boolean'
     })
+    .option('100', {
+      default: false,
+      group: 'Coverage thresholds',
+      description: 'shortcut for --check-coverage --lines 100 --functions 100 --branches 100 --statements 100',
+      type: 'boolean'
+    })
     .option('temp-directory', {
       describe: 'directory V8 coverage data is written to and read from',
       default: process.env.NODE_V8_COVERAGE
     })
+    .option('clean', {
+      default: true,
+      type: 'boolean',
+      describe: 'should temp files be deleted before script execution'
+    })
     .option('resolve', {
       default: '',
       describe: 'resolve paths to alternate base directory'
@@ -84,36 +146,13 @@ function buildYargs (withCommands = false) {
       type: 'boolean',
       describe: 'omit any paths that are not absolute, e.g., internal/net.js'
     })
-    .option('clean', {
-      default: true,
-      type: 'boolean',
-      describe: 'should temp files be deleted before script execution'
-    })
-    .options('all', {
-      default: false,
-      type: 'boolean',
-      describe: 'supplying --all will cause c8 to consider all src files in the current working directory ' +
-        'when the determining coverage. Respects include/exclude.'
-    })
     .options('allowExternal', {
       default: false,
       type: 'boolean',
       describe: 'supplying --allowExternal will cause c8 to allow files from outside of your cwd. This applies both to ' +
         'files discovered in coverage temp files and also src files discovered if using the --all flag.'
     })
-    .options('src', {
-      default: undefined,
-      type: 'string',
-      describe: 'supplying --src will override cwd as the default location where --all looks for src files. --src can be ' +
-        'supplied multiple times and each directory will be included. This allows for workspaces spanning multiple projects'
-    })
-    .options('skip-full', {
-      default: false,
-      type: 'boolean',
-      describe: 'do not show files with 100% statement, branch, and function coverage'
-    })
     .pkgConf('c8')
-    .config(config)
     .demandCommand(1)
     .check((argv) => {
       if (!argv.tempDirectory) {
@@ -123,6 +162,19 @@ function buildYargs (withCommands = false) {
     })
     .epilog('visit https://git.io/vHysA for list of available reporters')
 
+  // TODO: enable once yargs upgraded to v17: https://github.com/bcoe/c8/pull/332#discussion_r721636191
+  // yargs.middleware((argv) => {
+  //   if (!argv['100']) return argv
+
+  //   return {
+  //     ...argv,
+  //     branches: 100,
+  //     functions: 100,
+  //     lines: 100,
+  //     statements: 100,
+  //   }
+  // })
+
   const checkCoverage = require('./commands/check-coverage')
   const report = require('./commands/report')
   if (withCommands) {

package/lib/report.js

@@ -15,6 +15,7 @@ const debuglog = util.debuglog('c8')
 class Report {
   constructor ({
     exclude,
+    extension,
     excludeAfterRemap,
     include,
     reporter,
@@ -27,7 +28,8 @@ class Report {
     all,
     src,
     allowExternal = false,
-    skipFull
+    skipFull,
+    excludeNodeModules
   }) {
     this.reporter = reporter
     this.reportsDirectory = reportsDirectory
@@ -37,7 +39,9 @@ class Report {
     this.exclude = new Exclude({
       exclude: exclude,
       include: include,
-      relativePath: !allowExternal
+      extension: extension,
+      relativePath: !allowExternal,
+      excludeNodeModules: excludeNodeModules
     })
     this.excludeAfterRemap = excludeAfterRemap
     this.omitRelative = omitRelative

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "c8",
-  "version": "7.7.3",
+  "version": "7.11.0",
   "description": "output coverage reports using Node.js' built in coverage",
   "main": "./index.js",
   "types": "./index.d.ts",
@@ -37,7 +37,7 @@
     "@istanbuljs/schema": "^0.1.2",
     "find-up": "^5.0.0",
     "foreground-child": "^2.0.0",
-    "istanbul-lib-coverage": "^3.0.0",
+    "istanbul-lib-coverage": "^3.0.1",
     "istanbul-lib-report": "^3.0.0",
     "istanbul-reports": "^3.0.2",
     "rimraf": "^3.0.0",
@@ -47,11 +47,12 @@
     "yargs-parser": "^20.2.7"
   },
   "devDependencies": {
+    "@types/node": "^16.9.1",
     "chai": "^4.2.0",
     "chai-jest-snapshot": "^2.0.0",
-    "mocha": "^8.1.3",
+    "mocha": "^9.0.0",
     "standard": "^16.0.3",
-    "ts-node": "^9.0.0",
+    "ts-node": "^10.0.0",
     "typescript": "^4.0.0"
   },
   "engines": {