jestjs · SimenB · Dec 17, 2019 · Jun 23, 2019 · Nov 26, 2019 · Dec 2, 2019
diff --git a/TestUtils.ts b/TestUtils.ts
@@ -16,6 +16,7 @@ const DEFAULT_GLOBAL_CONFIG: Config.GlobalConfig = {
   collectCoverageFrom: [],
   collectCoverageOnlyFrom: null,
   coverageDirectory: 'coverage',
+  coverageProvider: 'babel',
   coverageReporters: [],
   coverageThreshold: {global: {}},
   detectLeaks: false,

diff --git a/docs/CLI.md b/docs/CLI.md
@@ -152,6 +152,15 @@ Alias: `-c`. The path to a Jest config file specifying how to find and execute t
 
 Alias: `--collectCoverage`. Indicates that test coverage information should be collected and reported in the output. Optionally pass `<boolean>` to override option set in configuration.
 
+### `--coverageProvider=<provider>`
+
+Indicates which provider should be used to instrument code for coverage. Allowed values are `babel` (default) or `v8`.
+
+Note that using `v8` is considered experimental. This uses V8's builtin code coverage rather than one based on Babel and comes with a few caveats
+
+1. Your node version must include `vm.compileFunction`, which was introduced in [node 10.10](https://nodejs.org/dist/latest-v12.x/docs/api/vm.html#vm_vm_compilefunction_code_params_options)
+1. Tests needs to run in Node test environment (support for `jsdom` is in the works)
+
 ### `--debug`
 
 Print debugging info about your Jest config.

diff --git a/docs/Configuration.md b/docs/Configuration.md
@@ -131,6 +131,8 @@ Default: `false`
 
 Indicates whether the coverage information should be collected while executing the test. Because this retrofits all executed files with coverage collection statements, it may significantly slow down your tests.
 
+Cannot be used together with `v8Coverage`.
+
 ### `collectCoverageFrom` [array]
 
 Default: `undefined`
@@ -185,6 +187,15 @@ An array of regexp pattern strings that are matched against all file paths befor
 
 These pattern strings match against the full path. Use the `<rootDir>` string token to include the path to your project's root directory to prevent it from accidentally ignoring all of your files in different environments that may have different root directories. Example: `["<rootDir>/build/", "<rootDir>/node_modules/"]`.
 
+### `coverageProvider` [string]
+
+Indicates which provider should be used to instrument code for coverage. Allowed values are `babel` (default) or `v8`.
+
+Note that using `v8` is considered experimental. This uses V8's builtin code coverage rather than one based on Babel and comes with a few caveats
+
+1. Your node version must include `vm.compileFunction`, which was introduced in [node 10.10](https://nodejs.org/dist/latest-v12.x/docs/api/vm.html#vm_vm_compilefunction_code_params_options)
+1. Tests needs to run in Node test environment (support for `jsdom` is in the works)
+
 ### `coverageReporters` [array\<string>]
 
 Default: `["json", "lcov", "text", "clover"]`

diff --git a/e2e/__tests__/__snapshots__/showConfig.test.ts.snap b/e2e/__tests__/__snapshots__/showConfig.test.ts.snap
@@ -84,6 +84,7 @@ exports[`--showConfig outputs config info and exits 1`] = `
     "collectCoverage": false,
     "collectCoverageFrom": [],
     "coverageDirectory": "<<REPLACED_ROOT_DIR>>/coverage",
+    "coverageProvider": "babel",
     "coverageReporters": [
       "json",
       "text",

diff --git a/e2e/__tests__/v8Coverage.test.ts b/e2e/__tests__/v8Coverage.test.ts
@@ -0,0 +1,46 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import * as path from 'path';
+import {onNodeVersions} from '@jest/test-utils';
+import runJest from '../runJest';
+
+const DIR = path.resolve(__dirname, '../v8-coverage');
+
+onNodeVersions('>=10', () => {
+  test('prints coverage', () => {
+    const sourcemapDir = path.join(DIR, 'no-sourcemap');
+    const {stdout, exitCode} = runJest(
+      sourcemapDir,
+      ['--coverage', '--coverage-provider', 'v8'],
+      {
+        stripAnsi: true,
+      },
+    );
+
+    expect(exitCode).toBe(0);
+    expect(
+      '\n' +
+        stdout
+          .split('\n')
+          .map(s => s.trimRight())
+          .join('\n') +
+        '\n',
+    ).toEqual(`
+  console.log __tests__/Thing.test.js:10
+    42
+
+----------|---------|----------|---------|---------|-------------------
+File      | % Stmts | % Branch | % Funcs | % Lines | Uncovered Line #s
+----------|---------|----------|---------|---------|-------------------
+All files |     100 |      100 |     100 |     100 |
+ Thing.js |     100 |      100 |     100 |     100 |
+ x.css    |     100 |      100 |     100 |     100 |
+----------|---------|----------|---------|---------|-------------------
+`);
+  });
+});
diff --git a/e2e/v8-coverage/no-sourcemap/Thing.js b/e2e/v8-coverage/no-sourcemap/Thing.js
@@ -0,0 +1,10 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+require('./x.css');
+
+module.exports = 42;
diff --git a/e2e/v8-coverage/no-sourcemap/__tests__/Thing.test.js b/e2e/v8-coverage/no-sourcemap/__tests__/Thing.test.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+const Thing = require('../Thing');
+
+console.log(Thing);
+test.todo('whatever');
diff --git a/e2e/v8-coverage/no-sourcemap/cssTransform.js b/e2e/v8-coverage/no-sourcemap/cssTransform.js
@@ -0,0 +1,11 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+module.exports = {
+  getCacheKey: () => 'cssTransform',
+  process: () => 'module.exports = {};',
+};
diff --git a/e2e/v8-coverage/no-sourcemap/package.json b/e2e/v8-coverage/no-sourcemap/package.json
@@ -0,0 +1,11 @@
+{
+  "name": "no-sourcemap",
+  "version": "1.0.0",
+  "jest": {
+    "testEnvironment": "node",
+    "transform": {
+      "^.+\\.[jt]sx?$": "babel-jest",
+      "^.+\\.css$": "<rootDir>/cssTransform.js"
+    }
+  }
+}
diff --git a/e2e/v8-coverage/no-sourcemap/x.css b/e2e/v8-coverage/no-sourcemap/x.css
diff --git a/jest.config.js b/jest.config.js
@@ -65,6 +65,7 @@ module.exports = {
   transform: {
     '^.+\\.[jt]sx?$': '<rootDir>/packages/babel-jest',
   },
+  watchPathIgnorePatterns: ['coverage'],
   watchPlugins: [
     'jest-watch-typeahead/filename',
     'jest-watch-typeahead/testname',

diff --git a/package.json b/package.json
@@ -47,7 +47,7 @@
     "isbinaryfile": "^4.0.0",
     "istanbul-lib-coverage": "^3.0.0-alpha.1",
     "istanbul-lib-report": "^3.0.0-alpha.1",
-    "istanbul-reports": "^3.0.0-alpha.4",
+    "istanbul-reports": "^3.0.0-alpha.5",
     "jest-junit": "^9.0.0",
     "jest-silent-reporter": "^0.1.2",
     "jest-snapshot-serializer-raw": "^1.1.0",

diff --git a/packages/jest-cli/src/cli/args.ts b/packages/jest-cli/src/cli/args.ts
@@ -202,6 +202,11 @@ export const options = {
     string: true,
     type: 'array',
   },
+  coverageProvider: {
+    choices: ['babel', 'v8'],
+    default: 'babel',
+    description: 'Select between Babel and V8 to collect coverage',
+  },
   coverageReporters: {
     description:
       'A list of reporter names that Jest uses when writing ' +

diff --git a/packages/jest-config/src/Defaults.ts b/packages/jest-config/src/Defaults.ts
@@ -22,6 +22,7 @@ const defaultOptions: Config.DefaultOptions = {
   clearMocks: false,
   collectCoverage: false,
   coveragePathIgnorePatterns: [NODE_MODULES_REGEXP],
+  coverageProvider: 'babel',
   coverageReporters: ['json', 'text', 'lcov', 'clover'],
   errorOnDeprecated: false,
   expand: false,

diff --git a/packages/jest-config/src/ValidConfig.ts b/packages/jest-config/src/ValidConfig.ts
@@ -28,6 +28,7 @@ const initialOptions: Config.InitialOptions = {
   },
   coverageDirectory: 'coverage',
   coveragePathIgnorePatterns: [NODE_MODULES_REGEXP],
+  coverageProvider: 'v8',
   coverageReporters: ['json', 'text', 'lcov', 'clover'],
   coverageThreshold: {
     global: {

diff --git a/packages/jest-config/src/index.ts b/packages/jest-config/src/index.ts
@@ -110,6 +110,7 @@ const groupOptions = (
     collectCoverageFrom: options.collectCoverageFrom,
     collectCoverageOnlyFrom: options.collectCoverageOnlyFrom,
     coverageDirectory: options.coverageDirectory,
+    coverageProvider: options.coverageProvider,
     coverageReporters: options.coverageReporters,
     coverageThreshold: options.coverageThreshold,
     detectLeaks: options.detectLeaks,

diff --git a/packages/jest-config/src/normalize.ts b/packages/jest-config/src/normalize.ts
@@ -836,6 +836,7 @@ export default function normalize(
       case 'changedFilesWithAncestor':
       case 'clearMocks':
       case 'collectCoverage':
+      case 'coverageProvider':
       case 'coverageReporters':
       case 'coverageThreshold':
       case 'detectLeaks':

diff --git a/packages/jest-core/src/lib/__tests__/__snapshots__/log_debug_messages.test.ts.snap b/packages/jest-core/src/lib/__tests__/__snapshots__/log_debug_messages.test.ts.snap
@@ -71,6 +71,7 @@ exports[`prints the config object 1`] = `
     "collectCoverageFrom": [],
     "collectCoverageOnlyFrom": null,
     "coverageDirectory": "coverage",
+    "coverageProvider": "babel",
     "coverageReporters": [],
     "coverageThreshold": {
       "global": {}

diff --git a/packages/jest-coverage/.npmignore b/packages/jest-coverage/.npmignore
@@ -0,0 +1,3 @@
+**/__mocks__/**
+**/__tests__/**
+src
diff --git a/packages/jest-coverage/package.json b/packages/jest-coverage/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "@jest/coverage",
+  "version": "24.9.0",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/facebook/jest.git",
+    "directory": "packages/jest-coverage"
+  },
+  "license": "MIT",
+  "main": "build/index.js",
+  "types": "build/index.d.ts",
+  "devDependencies": {
+    "@types/node": "*"
+  },
+  "engines": {
+    "node": ">= 8"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "gitHead": "0efb1d7809cb96ae87a7601e7802f1dab3774280"
+}
diff --git a/packages/jest-coverage/src/index.ts b/packages/jest-coverage/src/index.ts
@@ -0,0 +1,76 @@
+/**
+ * Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+import {Profiler, Session} from 'inspector';
+
+export type V8Coverage = ReadonlyArray<Profiler.ScriptCoverage>;
+
+export class CoverageInstrumenter {
+  private readonly session = new Session();
+
+  async startInstrumenting() {
+    this.session.connect();
+
+    await new Promise((resolve, reject) => {
+      this.session.post('Profiler.enable', err => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    });
+
+    await new Promise((resolve, reject) => {
+      this.session.post(
+        'Profiler.startPreciseCoverage',
+        {callCount: true, detailed: true},
+        err => {
+          if (err) {
+            reject(err);
+          } else {
+            resolve();
+          }
+        },
+      );
+    });
+  }
+
+  async stopInstrumenting(): Promise<V8Coverage> {
+    const preciseCoverage = await new Promise<V8Coverage>((resolve, reject) => {
+      this.session.post('Profiler.takePreciseCoverage', (err, res) => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve(res.result);
+        }
+      });
+    });
+
+    await new Promise((resolve, reject) => {
+      this.session.post('Profiler.stopPreciseCoverage', err => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    });
+
+    await new Promise((resolve, reject) => {
+      this.session.post('Profiler.disable', err => {
+        if (err) {
+          reject(err);
+        } else {
+          resolve();
+        }
+      });
+    });
+
+    return preciseCoverage;
+  }
+}
diff --git a/packages/jest-coverage/tsconfig.json b/packages/jest-coverage/tsconfig.json
@@ -0,0 +1,7 @@
+{
+  "extends": "../../tsconfig.json",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "build"
+  }
+}
diff --git a/packages/jest-reporters/package.json b/packages/jest-reporters/package.json
@@ -5,7 +5,9 @@
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "dependencies": {
+    "@bcoe/v8-coverage": "^0.2.3",
     "@jest/console": "^24.9.0",
+    "@jest/coverage": "^24.9.0",
     "@jest/environment": "^24.9.0",
     "@jest/test-result": "^24.9.0",
     "@jest/transform": "^24.9.0",
@@ -17,7 +19,7 @@
     "istanbul-lib-instrument": "^4.0.0-alpha.2",
     "istanbul-lib-report": "^3.0.0-alpha.1",
     "istanbul-lib-source-maps": "^4.0.0-alpha.4",
-    "istanbul-reports": "^3.0.0-alpha.4",
+    "istanbul-reports": "^3.0.0-alpha.5",
     "jest-haste-map": "^24.9.0",
     "jest-resolve": "^24.9.0",
     "jest-runtime": "^24.9.0",
@@ -26,7 +28,8 @@
     "slash": "^3.0.0",
     "source-map": "^0.6.0",
     "string-length": "^3.1.0",
-    "terminal-link": "^2.0.0"
+    "terminal-link": "^2.0.0",
+    "v8-to-istanbul": "^4.0.0"
   },
   "devDependencies": {
     "@types/exit": "^0.1.30",