escover 1.6.0 → 1.8.0

package/ChangeLog

@@ -1,3 +1,30 @@
+2022.01.19, v1.8.0
+
+fix:
+- chore: instrument: rm useless fixture
+
+feature:
+- escover: when one of expressions lin line not covered - line not covered
+
+
+2022.01.18, v1.7.2
+
+feature:
+- escover: config: isExclude: add ability to drop stars
+
+
+2022.01.17, v1.7.1
+
+fix:
+- escover: config: rm once
+
+
+2022.01.17, v1.7.0
+
+feature:
+- escover: add ability to read config
+
+
 2022.01.17, v1.6.0
 
 feature:

package/README.md

@@ -45,15 +45,15 @@ Run to collect and show coverage:
 escover npm test
 ```
 
-## How it looks like?
+## Config
 
-When everything is covered:
+`exclude` section of configuration file `.nyrc.json` supported.
 
-![image](https://user-images.githubusercontent.com/1573141/147943954-ef708577-2856-4de0-9397-dead487b8c08.png)
+## How it looks like?
 
-When some lines missing coverage:
+When everything is covered:
 
-![image](https://user-images.githubusercontent.com/1573141/147944130-9b901646-05ff-4a76-86c9-30631b0a0dd4.png)
+![image](https://user-images.githubusercontent.com/1573141/149822261-ff9bc3b4-6ee4-452c-9ada-3cc922b630ec.png)
 
 ## What if I want to use 🎩`ESCover` with `mock-import`?
 

package/lib/config.js

@@ -0,0 +1,42 @@
+import {readFileSync} from 'fs';
+import picomatch from 'picomatch';
+import {findUpSync} from 'find-up';
+
+const {parse} = JSON;
+
+const addStars = (patterns) => {
+    const result = [];
+    for (const pattern of patterns) {
+        result.push(...[
+            `**/${pattern}/**`,
+            pattern,
+        ]);
+    }
+    
+    return result;
+};
+
+export const isExclude = (name, patterns) => {
+    const isMatch = picomatch(addStars(patterns), {
+        dot: true,
+    });
+    
+    return isMatch(name);
+};
+
+const defaults = {
+    exclude: [],
+};
+
+export const readConfig = () => {
+    const name = findUpSync('.nycrc.json');
+    
+    if (!name)
+        return defaults;
+    
+    const data = readFileSync(name, 'utf8');
+    return {
+        ...defaults,
+        ...parse(data),
+    };
+};

package/lib/escover.js

@@ -2,21 +2,27 @@ import montag from 'montag';
 import process from 'process';
 
 import {instrument} from './instrument/index.js';
-import {exclude} from './exclude.js';
 import {exit} from './exit.js';
 import {createFileEntry} from './c4.js';
+import {
+    readConfig,
+    isExclude,
+} from './config.js';
 
 global.__createC4 = createFileEntry;
 
 process.once('exit', exit);
 const CWD = process.cwd();
 
+const {exclude} = readConfig();
+
 const EXCLUDE = [
-    '.spec.',
-    'node_modules',
-    '/fixture/',
-    '.madrun.',
-    '/test/',
+    '**/*.spec.*',
+    '**/node_modules/**',
+    '**/fixture/**',
+    '**/.madrun.*',
+    '**/test/**',
+    ...exclude,
 ];
 
 export async function load(url, context, defaultLoad) {
@@ -33,7 +39,7 @@ export async function load(url, context, defaultLoad) {
             source: rawSource,
         };
     
-    if (exclude(url, EXCLUDE))
+    if (isExclude(url, EXCLUDE))
         return {
             format,
             source: rawSource,

package/lib/transform.js

@@ -1,17 +1,13 @@
 const sort = (a) => new Map(Array.from(a.entries()).sort());
 
+const isBool = (a) => typeof a === 'boolean';
+
 export const transform = (files) => {
     const result = [];
     const sorted = sort(files);
     
     for (const [rawName, places] of sorted.entries()) {
-        const rawLines = {};
-        
-        for (const [place, covered] of places.entries()) {
-            const [line] = place.split(':');
-            
-            rawLines[line] = covered;
-        }
+        const rawLines = mergeLines(places);
         
         result.push({
             rawName,
@@ -22,3 +18,20 @@ export const transform = (files) => {
     return result;
 };
 
+function mergeLines(places) {
+    const result = {};
+    
+    for (const [place, covered] of places.entries()) {
+        const [line] = place.split(':');
+        
+        if (isBool(result[line])) {
+            result[line] &= covered;
+            continue;
+        }
+        
+        result[line] = covered;
+    }
+    
+    return result;
+}
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "1.6.0",
+  "version": "1.8.0",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
@@ -42,6 +42,7 @@
     "mock-import": "^2.11.1",
     "montag": "^1.2.1",
     "once": "^1.4.0",
+    "picomatch": "^2.3.1",
     "putout": "^24.0.2",
     "table": "^6.8.0",
     "try-catch": "^3.0.0",