[#203] Use proper latest version of parse

Misc cleanup of definitions and coverage parser system
ryanluker · Mar 30, 2019 · a797e57 · a797e57
1 parent a4877dd
commit a797e57
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 31 deletions.
diff --git a/@types/cobertura-parse/index.d.ts b/@types/cobertura-parse/index.d.ts
@@ -1,5 +1,9 @@
 declare namespace parse {
-    function parseContent(str: string, cb: (err: Error, data: Array<Section>) => void, absPath: string): void
+    function parseContent(
+        str: string,
+        cb: (err: Error, data: Array<Section>) => void,
+        absPath: boolean
+    ): void
 
     interface LineDetail {
         hit: number,

diff --git a/@types/jacoco-parse/index.d.ts b/@types/jacoco-parse/index.d.ts
@@ -1,5 +1,8 @@
 declare namespace parse {
-    function parseContent(str: string, cb: (err: Error, data: Array<Section>) => void): void
+    function parseContent(
+        str: string,
+        cb: (err: Error, data: Array<Section>) => void
+    ): void
 
     interface LineDetail {
         hit: number,

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -250,7 +250,7 @@
   },
   "dependencies": {
     "@cvrg-report/clover-json": "0.3.0",
-    "cobertura-parse": "1.0.5",
+    "cobertura-parse": "github:vokal/cobertura-parse#53109a6",
     "glob": "7.1.2",
     "jacoco-parse": "2.0.1",
     "lcov-parse": "1.0.0",

diff --git a/src/coverage-system/coverageservice.ts b/src/coverage-system/coverageservice.ts
@@ -57,7 +57,6 @@ export class CoverageService {
             this.sectionFinder,
         );
         this.coverageParser = new CoverageParser(
-            configStore,
             this.outputChannel,
             this.eventReporter,
         );

diff --git a/src/files/coverageparser.ts b/src/files/coverageparser.ts
@@ -1,25 +1,21 @@
 import {parseContent as parseContentClover} from "@cvrg-report/clover-json";
 import {parseContent as parseContentCobertura} from "cobertura-parse";
-import * as glob from "glob";
 import {parseContent as parseContentJacoco} from "jacoco-parse";
 import {Section, source} from "lcov-parse";
-import {OutputChannel, workspace} from "vscode";
+import {OutputChannel} from "vscode";
 
 import {Config} from "../extension/config";
 import {Reporter} from "../extension/reporter";
 import {CoverageFile, CoverageType} from "./coveragefile";
 
 export class CoverageParser {
-    private configStore: Config;
     private outputChannel: OutputChannel;
     private eventReporter: Reporter;
 
     constructor(
-        configStore: Config,
         outputChannel: OutputChannel,
         eventReporter: Reporter,
     ) {
-        this.configStore = configStore;
         this.outputChannel = outputChannel;
         this.eventReporter = eventReporter;
     }
@@ -68,7 +64,6 @@ export class CoverageParser {
 
     private async convertSectionsToMap(
         data: Section[],
-        fileType: CoverageType,
     ): Promise<Map<string, Section>> {
         const sections = new Map<string, Section>();
         const addToSectionsMap = async (section) => {
@@ -94,13 +89,10 @@ export class CoverageParser {
             try {
                 parseContentCobertura(xmlFile, async (err, data) => {
                     checkError(err);
-                    const sections = await this.convertSectionsToMap(
-                        data,
-                        CoverageType.COBERTURA,
-                    );
+                    const sections = await this.convertSectionsToMap(data);
                     this.eventReporter.sendEvent("system", "xmlExtractCobrtura-success");
                     return resolve(sections);
-                });
+                }, true);
             } catch (error) {
                 checkError(error);
             }
@@ -120,10 +112,7 @@ export class CoverageParser {
             try {
                 parseContentJacoco(xmlFile, async (err, data) => {
                     checkError(err);
-                    const sections = await this.convertSectionsToMap(
-                        data,
-                        CoverageType.JACOCO,
-                    );
+                    const sections = await this.convertSectionsToMap(data);
                     this.eventReporter.sendEvent("system", "xmlExtractJacoco-success");
                     return resolve(sections);
                 });
@@ -136,10 +125,7 @@ export class CoverageParser {
     private async xmlExtractClover(filename: string, xmlFile: string) {
         try {
             const data = await parseContentClover(xmlFile);
-            const sections = await this.convertSectionsToMap(
-                data,
-                CoverageType.CLOVER,
-            );
+            const sections = await this.convertSectionsToMap(data);
             this.eventReporter.sendEvent("system", "xmlExtractClover-success");
             return sections;
         } catch (error) {
@@ -162,10 +148,7 @@ export class CoverageParser {
             try {
                 source(lcovFile, async (err, data) => {
                     checkError(err);
-                    const sections = await this.convertSectionsToMap(
-                        data,
-                        CoverageType.LCOV,
-                    );
+                    const sections = await this.convertSectionsToMap(data);
                     this.eventReporter.sendEvent("system", "lcovExtract-success");
                     return resolve(sections);
                 });