monocart-coverage-reports 2.0.3 → 2.0.5

package/lib/utils/decode-mappings-worker.js

@@ -0,0 +1,9 @@
+const { parentPort } = require('worker_threads');
+const { decode } = require('../packages/monocart-coverage-vendor.js');
+
+parentPort.on('message', (message) => {
+    const result = decode(message);
+    parentPort.postMessage(result);
+});
+
+parentPort.postMessage('workerReady');

package/lib/utils/decode-mappings.js

@@ -1,49 +1,35 @@
-const {
-    Worker, isMainThread, parentPort
-} = require('worker_threads');
+const path = require('path');
+const { Worker } = require('worker_threads');
 const Util = require('./util.js');
 
-if (isMainThread) {
+// do NOT use isMainThread because it could be executed in worker too. (worker in worker)
 
-    const decodeMappings = (mappings = '') => {
-        if (typeof text !== 'string') {
-            mappings = String(mappings);
-        }
+const decodeMappings = (mappings = '') => {
+    if (typeof text !== 'string') {
+        mappings = String(mappings);
+    }
 
-        return new Promise((resolve) => {
+    return new Promise((resolve) => {
 
-            const worker = new Worker(__filename);
-
-            worker.on('message', (message) => {
-                if (message === 'workerReady') {
-                    worker.postMessage(mappings);
-                    return;
-                }
-                resolve(message);
-                worker.terminate();
-            });
-
-            worker.on('error', (e) => {
-                Util.logError(e.message);
-                resolve([]);
-                worker.terminate();
-            });
+        const workerPath = path.resolve(__dirname, 'decode-mappings-worker.js');
+        const worker = new Worker(workerPath);
 
+        worker.on('message', (message) => {
+            if (message === 'workerReady') {
+                worker.postMessage(mappings);
+                return;
+            }
+            resolve(message);
+            worker.terminate();
         });
-    };
-
-    module.exports = decodeMappings;
-
-} else {
 
-    const { decode } = require('../packages/monocart-coverage-vendor.js');
+        worker.on('error', (e) => {
+            Util.logError(e.message);
+            resolve([]);
+            worker.terminate();
+        });
 
-    parentPort.on('message', (message) => {
-        const result = decode(message);
-        parentPort.postMessage(result);
     });
+};
 
-    parentPort.postMessage('workerReady');
-
-}
-
+module.exports = decodeMappings;

package/lib/v8/v8.js

@@ -7,7 +7,7 @@ const { mergeScriptCovs } = require('../packages/monocart-coverage-vendor.js');
 const collectSourceMaps = require('../converter/collect-source-maps.js');
 const version = require('../../package.json').version;
 
-const initV8ListAndSourcemap = async (v8list, options, inlineSourceMap) => {
+const initV8ListAndSourcemap = async (v8list, options) => {
 
     // filter list first
     const entryFilter = options.entryFilter;
@@ -47,8 +47,8 @@ const initV8ListAndSourcemap = async (v8list, options, inlineSourceMap) => {
             data.type = 'js';
             data.functions = item.functions;
             data.source = item.source;
-            // useless here
-            // data.scriptId = item.scriptId;
+            // could be existed
+            data.sourceMap = item.sourceMap;
         } else if (item.ranges) {
             data.type = 'css';
             data.ranges = item.ranges;
@@ -72,7 +72,7 @@ const initV8ListAndSourcemap = async (v8list, options, inlineSourceMap) => {
 
     // collect sourcemap first
     const time_start = Date.now();
-    const count = await collectSourceMaps(v8list, options, inlineSourceMap);
+    const count = await collectSourceMaps(v8list, options);
     if (count) {
         // debug level time
         Util.logTime(`loaded ${count} sourcemaps`, time_start);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "monocart-coverage-reports",
-    "version": "2.0.3",
+    "version": "2.0.5",
     "description": "Monocart coverage reports",
     "main": "lib/index.js",
     "exports": {
@@ -17,12 +17,15 @@
         "build-docs": "node ./scripts/build-docs.js",
         "build-test": "node ./scripts/build-test.js",
         "build": "sf lint && sf b -p && npm run build-test",
-        "test-node": "npm run test-node-env && npm run test-node-ins",
+        "test-node": "npm run test-node-env && npm run test-node-ins && npm run test-node-api && npm run test-node-cdp",
         "test-node-env": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage node ./test/test-node-env.js && node ./test/generate-node-report.js",
         "test-node-ins": "node ./test/test-node-ins.js",
+        "test-node-api": "cross-env NODE_V8_COVERAGE=.temp/v8-coverage node ./test/test-node-api.js",
+        "test-node-cdp": "node --inspect=9229 ./test/test-node-cdp.js",
         "test-browser": "node ./test/test.js",
         "test": "npm run test-browser && npm run test-node && npm run build-docs",
         "dev": "sf d v8",
+        "open": "node ./scripts/open.js",
         "patch": "npm run build && sf publish patch -r"
     },
     "workspaces": [
@@ -44,12 +47,11 @@
         "istanbul-lib-report": "~3.0.1",
         "istanbul-reports": "~3.1.6",
         "lz-utils": "~2.0.1",
-        "monocart-code-viewer": "^1.0.12",
-        "monocart-formatter": "~2.2.0",
+        "monocart-code-viewer": "^1.0.13",
+        "monocart-formatter": "~2.2.1",
         "turbogrid": "~3.0.12"
     },
     "devDependencies": {
-        "cross-env": "^7.0.3",
         "eslint": "^8.56.0",
         "eslint-config-plus": "^1.0.6",
         "eslint-plugin-html": "^7.1.0",