escover 1.3.2 → 1.4.1

package/ChangeLog

@@ -1,3 +1,27 @@
+2022.01.15, v1.4.1
+
+feature:
+- escover: coverage -> coverage-file
+
+
+2022.01.15, v1.4.0
+
+feature:
+- escover: add ability to preserve fileEntries
+
+
+2022.01.15, v1.3.4
+
+fix:
+- escover: rm useless import
+
+
+2022.01.15, v1.3.3
+
+feature:
+- escover: exclude not from current path
+
+
 2022.01.15, v1.3.2
 
 fix:

package/bin/escover.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import {cli} from '../lib/cli/cli.js';
-import {read} from '../lib/coverage.js';
+import {read} from '../lib/coverage-file.js';
 
 cli({
     argv: process.argv,

package/lib/c4.js

@@ -1,17 +1,36 @@
-export const __fileEntries = new Map();
+const noop = () => {};
 
+global.__fileEntries = global.__fileEntries || new Map();
+
+export const {__fileEntries} = global;
 export const createFileEntry = (url) => {
-    const lines = __fileEntries.get(url) || new Map();
+    url = url.replace(/\?.*$/, '');
+    let lines = __fileEntries.get(url);
+    
+    if (lines) {
+        return {
+            '🧨': set(lines),
+            'init': noop,
+        };
+    }
+    
+    lines = new Map();
+    
     __fileEntries.set(url, lines);
     
     return {
-        '🧨': (line, column) => {
-            lines.set(`${line}:${column}`, true);
-        },
-        'init': (line, column) => {
-            lines.set(`${line}:${column}`, false);
-        },
+        '🧨': set(lines),
+        'init': init(lines),
     };
 };
 
+const set = (lines) => (line, column) => {
+    lines.set(`${line}:${column}`, true);
+};
+
+const init = (lines) => (line, column) => {
+    lines.set(`${line}:${column}`, false);
+};
+
 export const getFileEntries = () => __fileEntries;
+

package/lib/{coverage.js → coverage-file.js}

@@ -23,6 +23,7 @@ export const write = () => {
         return;
     
     const parsed = transform(files);
+    
     const merged = merge(parsed);
     const name = findCacheDir({
         name: NAME,

package/lib/escover.js

@@ -9,6 +9,7 @@ import {createFileEntry} from './c4.js';
 global.__createC4 = createFileEntry;
 
 process.once('exit', exit);
+const CWD = process.cwd();
 
 const EXCLUDE = [
     '.spec.',
@@ -26,6 +27,12 @@ export async function load(url, context, defaultLoad) {
             format,
         };
     
+    if (!url.includes(CWD))
+        return {
+            format,
+            source: rawSource,
+        };
+    
     if (exclude(url, EXCLUDE))
         return {
             format,

package/lib/exit.js

@@ -1,5 +1,5 @@
 import once from 'once';
-import {write} from './coverage.js';
+import {write} from './coverage-file.js';
 
 export const exit = once(() => {
     write();

package/lib/instrument/index.js

@@ -1,4 +1,4 @@
-import putout, {} from 'putout';
+import putout from 'putout';
 
 import * as mark from './plugin-mark/index.js';
 

package/lib/instrument/plugin-mark/index.js

@@ -35,15 +35,9 @@ function getLineNode(c4, {line, column}) {
 export const report = () => 'Mark line';
 
 export const fix = (path, {options}) => {
-    const {
-        parentPath,
-        node,
-    } = path;
+    const {node} = path;
     
-    const {start} = path.node.loc || parentPath.node.loc || {};
-    
-    if (!start)
-        return;
+    const {start} = path.node.loc;
     
     const {
         c4 = {
@@ -99,8 +93,9 @@ export const fix = (path, {options}) => {
     if (path.isReturnStatement())
         return addMarkToReturn(path, lineNode);
     
-    if (path.isArrowFunctionExpression())
+    if (path.isArrowFunctionExpression()) {
         return addMarkToArrowFunction(path, lineNode);
+    }
     
     if (path.isThrowStatement())
         return addMarkToThrow(path, lineNode);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "1.3.2",
+  "version": "1.4.1",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -54,7 +54,7 @@
   "devDependencies": {
     "@putout/test": "^4.1.0",
     "c8": "^7.8.0",
-    "escover": ".",
+    "escover": "^1.0.0",
     "eslint": "^8.3.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-putout": "^13.0.1",