[v4.0] coverage map

CHANGELOG.md

@@ -9,6 +9,7 @@ Bug-fixes within the same version aren't needed
 * improve the detection of cases in which Jest needs to be restarted with `--watchAll` - [@lordofthelake](https://github.com/lordofthelake)  
 * upgrade all dependencies to the latest, except istanbul-lib-xxx, which requires more code change and will be handled in a separate coverage PR. - @connectdotz
 * code base clean up: migrate from tslint to eslint and adopted the latest recommended coding style, adopt semi-colon, added more ci check... - @connectdotz
+* upgrade istanbul dependencies to the latest and move to async coverageMap update. @connectdotz
 -->
 
 ### 3.2.0

package.json

@@ -277,12 +277,14 @@
     "watch-test": "yarn test -- --watch"
   },
   "dependencies": {
-    "istanbul-lib-coverage": "^1.1.1",
-    "istanbul-lib-source-maps": "^1.1.0",
+    "istanbul-lib-coverage": "^3.0.0",
+    "istanbul-lib-source-maps": "^4.0.0",
     "jest-editor-support": "^27.2.0",
     "jest-snapshot": "^25.5.0"
   },
   "devDependencies": {
+    "@types/istanbul-lib-coverage": "^2.0.2",
+    "@types/istanbul-lib-source-maps": "^4.0.1",
     "@types/jest": "^25.2.1",
     "@types/node": "^8.0.31",
     "@types/vscode": "^1.23.0",

src/Coverage/CoverageCodeLensProvider.ts

@@ -4,14 +4,21 @@ import { GetJestExtByURI } from '../extensionManager';
 
 export class CoverageCodeLensProvider implements vscode.CodeLensProvider {
   private getJestExt: GetJestExtByURI;
+  private onDidChange: vscode.EventEmitter<void>;
+  onDidChangeCodeLenses: vscode.Event<void>;
 
   constructor(getJestExt: GetJestExtByURI) {
     this.getJestExt = getJestExt;
+    this.onDidChange = new vscode.EventEmitter();
+    this.onDidChangeCodeLenses = this.onDidChange.event;
   }
 
-  public provideCodeLenses(document: vscode.TextDocument, _token: vscode.CancellationToken) {
+  public provideCodeLenses(document: vscode.TextDocument): vscode.CodeLens[] {
     const ext = this.getJestExt(document.uri);
-    const coverage = ext && ext.coverageMapProvider.getFileCoverage(document.fileName);
+    const coverage =
+      ext &&
+      ext.coverageOverlay.enabled &&
+      ext.coverageMapProvider.getFileCoverage(document.fileName);
     if (!coverage) {
       return;
     }
@@ -30,4 +37,7 @@ export class CoverageCodeLensProvider implements vscode.CodeLensProvider {
 
     return [new vscode.CodeLens(range, command)];
   }
+  public coverageChanged(): void {
+    this.onDidChange.fire();
+  }
 }

src/Coverage/CoverageMapProvider.ts

@@ -1,5 +1,10 @@
 import { createSourceMapStore, MapStore } from 'istanbul-lib-source-maps';
-import { createCoverageMap, CoverageMap } from 'istanbul-lib-coverage';
+import {
+  createCoverageMap,
+  CoverageMap,
+  CoverageMapData,
+  FileCoverage,
+} from 'istanbul-lib-coverage';
 
 export class CoverageMapProvider {
   private mapStore: MapStore;
@@ -10,25 +15,38 @@ export class CoverageMapProvider {
   private _map: CoverageMap;
 
   constructor() {
+    this.init();
+  }
+
+  init(): void {
     this._map = createCoverageMap();
     this.mapStore = createSourceMapStore();
   }
-
   get map(): CoverageMap {
     return this._map;
   }
 
-  update(obj: CoverageMap | object) {
+  async update(obj?: CoverageMap | CoverageMapData): Promise<void> {
     const map = createCoverageMap(obj);
-    const transformed = this.mapStore.transformCoverage(map);
+    const transformed = await this.mapStore.transformCoverage(map);
     if (this._map) {
-      this._map.merge(transformed.map);
+      transformed.files().forEach((fileName) => {
+        this.setFileCoverage(fileName, transformed);
+      });
     } else {
-      this._map = transformed.map;
+      this._map = transformed;
     }
   }
 
-  public getFileCoverage(filePath: string) {
+  setFileCoverage(filePath: string, map: CoverageMap): void {
+    this._map.data[filePath] = map.fileCoverageFor(filePath);
+  }
+  public getFileCoverage(filePath: string): FileCoverage {
     return this._map.data[filePath];
   }
+  public onVisibilityChanged(visible: boolean): void {
+    if (!visible) {
+      this.init();
+    }
+  }
 }

src/Coverage/Formatters/GutterFormatter/index.ts

@@ -48,7 +48,7 @@ export class GutterFormatter extends AbstractFormatter {
     });
   }
 
-  format(editor: vscode.TextEditor) {
+  format(editor: vscode.TextEditor): void {
     const fileCoverage = this.coverageMapProvider.getFileCoverage(editor.document.fileName);
     if (!fileCoverage) {
       return;
@@ -72,7 +72,7 @@ export class GutterFormatter extends AbstractFormatter {
 
     for (let line = 1; line <= editor.document.lineCount; line++) {
       const zeroBasedLineNumber = line - 1;
-      if (uncoveredLines.indexOf(line.toString()) >= 0) {
+      if (uncoveredLines.indexOf(line) >= 0) {
         coverageFormatting.uncovered.push(
           new vscode.Range(zeroBasedLineNumber, 0, zeroBasedLineNumber, 0)
         );
@@ -121,7 +121,7 @@ export class GutterFormatter extends AbstractFormatter {
     return coverageFormatting;
   }
 
-  clear(editor: vscode.TextEditor) {
+  clear(editor: vscode.TextEditor): void {
     editor.setDecorations(this.coveredLine, []);
     editor.setDecorations(this.partiallyCoveredLine, []);
     editor.setDecorations(this.uncoveredLine, []);

src/Coverage/Formatters/helpers.ts

@@ -1,9 +1,9 @@
-import { Location, Position } from 'istanbul-lib-coverage';
+import { Range, Location } from 'istanbul-lib-coverage';
 
-export function isValidPosition(p: Position) {
+export function isValidPosition(p: Location): boolean {
   return (p || false) && p.line !== null && p.line >= 0;
 }
 
-export function isValidLocation(l: Location) {
+export function isValidLocation(l: Range): boolean {
   return isValidPosition(l.start) && isValidPosition(l.end);
 }