Merge pull request #9 from matmanjs/fix_increase_fail

Fix increase fail

Author: helinjiang

package.json

@@ -1,6 +1,6 @@
 {
   "name": "incremental-coverage",
-  "version": "2.5.0",
+  "version": "2.5.1",
   "description": "Merge lcov.info and get incremental coverage and full coverage",
   "main": "lib/index.js",
   "bin": {

src/apis/process/full.ts

@@ -5,6 +5,8 @@ import { CommitInfo, FullResult } from '../../types';
 import { getActualGitRepoRoot } from "../../utils";
 
 export class FullProcess<T extends keyof Mapper> extends BaseProcess<T> {
+  private firstGitMessage: CommitInfo = {};
+
   constructor(lcovPath: string | string[], opts: BaseProcessOpts<T> = { stream: {} }) {
     super();
 
@@ -31,7 +33,7 @@ export class FullProcess<T extends keyof Mapper> extends BaseProcess<T> {
       createInfo = await this.getCreateInfo();
 
       if (createInfo) {
-        this.firstInfo = createInfo as CommitInfo;
+        this.firstGitMessage = createInfo as CommitInfo;
       }
     }
 

src/apis/process/increase.ts

@@ -60,7 +60,7 @@ export class IncreaseProcess<T extends keyof Mapper> extends BaseProcess<T> {
     const createInfo = await this.getCreateInfo() as CommitInfo;
 
     // 得到创建信息
-    this.firstInfo = createInfo;
+    this.firstGitMessage = createInfo;
 
     // 得到增量合并结果
     await this.getLcov();
@@ -87,12 +87,13 @@ export class IncreaseProcess<T extends keyof Mapper> extends BaseProcess<T> {
    * 得到 lcov 结果
    */
   private async getLcov() {
+    // 解析获得 lcov.info 的信息，这里是全量覆盖率信息
     const res = await getLcovFile(this.lcovPath);
 
     this.lcov = (
       await new IncreaseConcat({
         cwd: this.opts.cwd,
-        hash: this.firstGitMessage.hash,
+        hash: this.firstGitMessage?.hash,
       }).concat(...res)
     ).getRes();
   }

src/apis/process/index.ts

@@ -36,8 +36,6 @@ export abstract class BaseProcess<T extends keyof Mapper> {
     files: [],
   };
 
-  protected firstInfo: CommitInfo | undefined;
-
   abstract async exec(): Promise<FullResult>;
 
   /**

src/concat/increaseConcat.ts

@@ -85,6 +85,7 @@ export class IncreaseConcat implements Concat {
     };
 
     Object.keys(this.res.detail).forEach((lcovItem) => {
+      // 单个文件A的覆盖率数据，无法阅读的数据
       const info = this.res.detail[lcovItem];
       delete this.res.detail[lcovItem];
 
@@ -113,7 +114,9 @@ export class IncreaseConcat implements Concat {
 
           // 统计lcov中有记录的行
           const lcovLineArr: Array<number> = [];
+
           const details = info.lines;
+
           details.forEach((detail) => {
             const { hits } = detail;
             const { number } = detail;