add new option dataDir

cenfun · Jul 3, 2024 · 6154e47 · 6154e47
1 parent 6165dd2
commit 6154e47
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 2 deletions.
diff --git a/lib/default/options.js b/lib/default/options.js
@@ -27,6 +27,9 @@ module.exports = {
     // {string} base dir for normalizing the relative source path, defaults to cwd
     baseDir: null,
 
+    // {string} coverage data dir, alternative to method `addFromDir()`, defaults to null
+    dataDir: null,
+
     // (V8 only) {function} A filter function to execute for each element in the V8 list.
     // entryFilter: (entry) => {
     //     if (entry.url.indexOf('googleapis.com') !== -1) {

diff --git a/lib/index.d.ts b/lib/index.d.ts
@@ -118,6 +118,18 @@ declare namespace MCR {
             skipPercent?: number;
             metrics?: Array<"bytes" | "statements" | "branches" | "functions" | "lines">;
         }] |
+        ['markdown-summary'] | ['markdown-summary', {
+            color: 'unicode' | 'html' | 'tex' | string;
+            metrics?: Array<"bytes" | "statements" | "branches" | "functions" | "lines">;
+            outputFile?: string;
+        }] |
+        ['markdown-details'] | ['markdown-details', {
+            baseUrl?: string;
+            color: 'unicode' | 'html' | 'tex' | string;
+            skipPercent?: number;
+            metrics?: Array<"bytes" | "statements" | "branches" | "functions" | "lines">;
+            outputFile?: string;
+        }] |
         ['raw'] | ['raw', {
             outputDir?: string;
         }] |
@@ -237,6 +249,9 @@ declare namespace MCR {
         /** {string} base dir for normalizing the relative source path, defaults to cwd */
         baseDir?: string;
 
+        /** {string} coverage data dir, alternative to method `addFromDir()`, defaults to null */
+        dataDir?: string;
+
         /** (V8 only) 
          * 
          * {string} `minimatch` pattern for entry url; 

diff --git a/lib/index.js b/lib/index.js
@@ -136,6 +136,11 @@ class CoverageReport {
 
         this.initOptions();
 
+        const dataDir = this.options.dataDir;
+        if (dataDir) {
+            await this.addFromDir(dataDir);
+        }
+
         const inputData = await getInputData(this);
         if (!inputData) {
             return;

diff --git a/test/generate-report.js b/test/generate-report.js
@@ -16,6 +16,8 @@ const generate = async () => {
         assetsPath: '../assets',
         // lcov: true,
 
+        dataDir: dir,
+
         entryFilter: {
             '**/test/mock/node/**': true
         },
@@ -31,7 +33,6 @@ const generate = async () => {
     // clean cache before add coverage data
     coverageReport.cleanCache();
 
-    await coverageReport.addFromDir(dir);
     const coverageResults = await coverageReport.generate();
     console.log('test-node-env coverage reportPath', EC.magenta(coverageResults.reportPath));
 

diff --git a/test/test-node-api.js b/test/test-node-api.js
@@ -15,6 +15,8 @@ const coverageOptions = {
     assetsPath: '../assets',
     // lcov: true,
 
+    dataDir: dir,
+
     entryFilter: {
         '**/test/mock/node/**': true
     },
@@ -32,7 +34,6 @@ const generate = async () => {
     // clean cache before add coverage data
     coverageReport.cleanCache();
 
-    await coverageReport.addFromDir(dir);
     const coverageResults = await coverageReport.generate();
     console.log('test-node-api coverage reportPath', EC.magenta(coverageResults.reportPath));