wdio-monocart-service 1.0.1 → 1.0.2

package/README.md

@@ -18,7 +18,13 @@ npm i wdio-monocart-service
     services: [
         ['monocart', {
             name: 'My WebdriverIO Coverage Report',
+            // v8 (default) or istanbul (requires instrumenting source code)
+            // coverageProvider: 'v8',
             entryFilter: '**/src/**',
+            reports: [
+                'v8',
+                'console-details'
+            ],
             outputDir: './coverage-reports'
         }]
     ]

package/lib/index.d.ts

@@ -1,5 +1,5 @@
 import type {
-    CoverageReportOptions,
+    CoverageReportOptions as BaseOptions,
     ReportDescription,
     V8CoverageEntry,
     Watermarks,
@@ -13,6 +13,10 @@ import type {
     CoverageReport
 } from "monocart-coverage-reports";
 
+interface CoverageReportOptions extends BaseOptions {
+    coverageProvider?: 'v8' | "istanbul";
+}
+
 export type {
     CoverageReportOptions,
     ReportDescription,

package/lib/index.js

@@ -16,15 +16,19 @@ export default class CoverageReportService {
         this.coverageReport = new CoverageReport({
             ... serviceOptions
         });
-        this.coverageReport.cleanCache();
+        // v8 or istanbul
+        this.coverageProvider = 'v8';
     }
 
     /**
      * this browser object is passed in here for the first time
      */
-    before(config, capabilities, browser) {
+    async before(config, capabilities, browser) {
         this.browser = browser;
         // something before all tests are run, e.g.
+        await this.coverageReport.loadConfig();
+        this.coverageProvider = this.coverageReport.options.coverageProvider;
+        this.coverageReport.cleanCache();
     }
 
     async after(exitCode, config, capabilities) {
@@ -40,15 +44,21 @@ export default class CoverageReportService {
         if (puppeteer) {
             const page = (await puppeteer.pages())[0];
             if (page) {
-                await Promise.all([
-                    page.coverage.startJSCoverage({
-                        resetOnNavigation: false,
-                        includeRawScriptCoverage: true
-                    }),
-                    page.coverage.startCSSCoverage({
-                        resetOnNavigation: false
-                    })
-                ]);
+
+                if (this.coverageProvider === 'istanbul') {
+                    // no need start for istanbul, but it requires instrumenting source code
+                    // https://github.com/cenfun/monocart-coverage-reports?tab=readme-ov-file#collecting-istanbul-coverage-data
+                } else {
+                    await Promise.all([
+                        page.coverage.startJSCoverage({
+                            resetOnNavigation: false,
+                            includeRawScriptCoverage: true
+                        }),
+                        page.coverage.startCSSCoverage({
+                            resetOnNavigation: false
+                        })
+                    ]);
+                }
             }
         }
 
@@ -59,18 +69,25 @@ export default class CoverageReportService {
         if (puppeteer) {
             const page = (await puppeteer.pages())[0];
             if (page) {
-                const [jsCoverage, cssCoverage] = await Promise.all([
-                    page.coverage.stopJSCoverage(),
-                    page.coverage.stopCSSCoverage()
-                ]);
-                // to raw V8 script coverage
-                const coverageList = [... jsCoverage.map((it) => {
-                    return {
-                        source: it.text,
-                        ... it.rawScriptCoverage
-                    };
-                }), ... cssCoverage];
-                await this.coverageReport.add(coverageList);
+
+                if (this.coverageProvider === 'istanbul') {
+                    const coverageData = await page.evaluate(() => window.__coverage__);
+                    await this.coverageReport.add(coverageData);
+                } else {
+                    const [jsCoverage, cssCoverage] = await Promise.all([
+                        page.coverage.stopJSCoverage(),
+                        page.coverage.stopCSSCoverage()
+                    ]);
+                    // to raw V8 script coverage
+                    const coverageList = [... jsCoverage.map((it) => {
+                        return {
+                            source: it.text,
+                            ... it.rawScriptCoverage
+                        };
+                    }), ... cssCoverage];
+                    await this.coverageReport.add(coverageList);
+                }
+
             }
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "wdio-monocart-service",
-    "version": "1.0.1",
+    "version": "1.0.2",
     "description": "WebdriverIO Monocart Coverage Reports",
     "type": "module",
     "main": "./lib/index.js",