escover 1.2.3 → 1.3.3

package/ChangeLog

@@ -1,3 +1,31 @@
+2022.01.15, v1.3.3
+
+feature:
+- escover: exclude not from current path
+
+
+2022.01.15, v1.3.2
+
+fix:
+- escover: rm console.log
+
+
+2022.01.15, v1.3.1
+
+fix:
+- escover: do not write coverage when empty
+
+feature:
+- escover: add ability to get coverage of itself
+
+
+2022.01.15, v1.3.0
+
+feature:
+- escover: exclude test
+- escover: config -> coverage
+
+
 2022.01.15, v1.2.3
 
 fix:

package/bin/escover.js

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

package/lib/c4.js

@@ -1,8 +1,8 @@
-const files = new Map();
+export const __fileEntries = new Map();
 
 export const createFileEntry = (url) => {
-    const lines = files.get(url) || new Map();
-    files.set(url, lines);
+    const lines = __fileEntries.get(url) || new Map();
+    __fileEntries.set(url, lines);
     
     return {
         '🧨': (line, column) => {
@@ -14,4 +14,4 @@ export const createFileEntry = (url) => {
     };
 };
 
-export const getFiles = () => files;
+export const getFileEntries = () => __fileEntries;

package/lib/{config.js → coverage.js}

@@ -3,7 +3,7 @@ import {
     writeFileSync,
     readFileSync,
 } from 'fs';
-import {getFiles} from './c4.js';
+import {getFileEntries} from './c4.js';
 import {transform} from './transform.js';
 import {merge} from './merge.js';
 import findCacheDir from 'find-cache-dir';
@@ -17,7 +17,11 @@ const NAME = 'escover';
 const buildName = (a) => `${a}/${NAME}.json`;
 
 export const write = () => {
-    const files = getFiles();
+    const files = getFileEntries();
+    
+    if (!files.size)
+        return;
+    
     const parsed = transform(files);
     const merged = merge(parsed);
     const name = findCacheDir({

package/lib/escover.js

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

package/lib/exit.js

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

package/lib/instrument/index.js

@@ -3,11 +3,11 @@ import putout, {} from 'putout';
 import * as mark from './plugin-mark/index.js';
 
 export const instrument = (url, source) => {
-    const __c4 = global.__createC4(url);
+    const c4 = global.__createC4(url);
     const options = {
         rules: {
             mark: ['on', {
-                __c4,
+                c4,
             }],
         },
         plugins: [

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

@@ -23,8 +23,8 @@ const buildLineNode = template(LINE, {
     placeholderPattern: /^__[a-z]$/,
 });
 
-function getLineNode(__c4, {line, column}) {
-    __c4.init(line, column);
+function getLineNode(c4, {line, column}) {
+    c4.init(line, column);
     
     return buildLineNode({
         __l: NumericLiteral(line),
@@ -35,24 +35,18 @@ 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 = {
+        c4 = {
             mark: () => {},
             init: () => {},
         },
     } = options;
     
-    const lineNode = getLineNode(__c4, start);
+    const lineNode = getLineNode(c4, start);
     
     if (path.isBlockStatement()) {
         path.node.body.unshift(lineNode);
@@ -74,7 +68,7 @@ export const fix = (path, {options}) => {
             path.node.left,
         ]));
         replaceWith(path.get('right'), SequenceExpression([
-            getLineNode(__c4, path.node.right.loc.start).expression,
+            getLineNode(c4, path.node.right.loc.start).expression,
             path.node.right,
         ]));
         return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "1.2.3",
+  "version": "1.3.3",
   "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",