escover 1.0.2 → 1.0.3

package/ChangeLog

@@ -1,3 +1,10 @@
+2022.01.08, v1.0.3
+
+feature:
+- escover: plugin-mark: add support ot ThrowStatement
+- escover: add merger
+
+
 2022.01.08, v1.0.2
 
 fix:

package/coverage.json

@@ -1,6 +1,6 @@
 [
     {
-        "name": "file:///Users/coderaiser/escover/example/example.js",
+        "name": "/Users/coderaiser/escover/example/example.js",
         "lines": {
             "1": true
         }

package/lib/escover.js

@@ -27,6 +27,8 @@ export async function load(url, context, defaultLoad) {
         ${instrument(url, rawSource)}
     `;
     
+    console.log(source);
+    
     return {
         format,
         source,

package/lib/instrument/plugin-mark/fixture/if-fix.js

@@ -0,0 +1,3 @@
+if (error) {
+    throw (__c4.mark(2, 4), `error reading package.json: ${error.message}`);
+}

package/lib/instrument/plugin-mark/fixture/if.js

@@ -0,0 +1,3 @@
+if (error) {
+    throw `error reading package.json: ${error.message}`;
+}

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

@@ -10,7 +10,6 @@ const {
     NumericLiteral,
     SequenceExpression,
     BlockStatement,
-    ExpressionStatement,
 } = types;
 
 const {
@@ -103,6 +102,13 @@ export const fix = (path, {options}) => {
     if (path.isArrowFunctionExpression())
         return addMarkToArrowFunction(path, lineNode);
     
+    if (path.isThrowStatement()) {
+        return replaceWith(path.get('argument'), SequenceExpression([
+            lineNode.expression,
+            node.argument,
+        ]));
+    }
+    
     replaceWith(path, BlockStatement([
         node,
     ]));
@@ -113,6 +119,7 @@ const EXCLUDE = [
     `(${LINE}, __z)`,
     `return (${LINE}, __z)`,
     `return ${LINE}`,
+    `throw (${LINE}, __z)`,
 ];
 
 export const exclude = () => EXCLUDE;
@@ -121,6 +128,7 @@ export const include = () => [
     'CallExpression',
     'NewExpression',
     'ReturnStatement',
+    'ThrowStatement',
 ];
 
 export const traverse = ({push}) => ({

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

@@ -0,0 +1,17 @@
+import {
+    types,
+    operator,
+} from 'putout';
+const {SequenceExpression} = types;
+
+const {replaceWith} = operator;
+
+export const addMarkToThrow = (path, lineNode) => {
+    const argumentPath = path.get('argument');
+    
+    return replaceWith(argumentPath, SequenceExpression([
+        lineNode.expression,
+        argumentPath.node,
+    ]));
+};
+

package/lib/merge.js

@@ -0,0 +1,44 @@
+const {entries} = Object;
+
+export const merge = (files) => {
+    const deduplicator = {};
+    
+    for (const {rawName, rawLines} of files) {
+        const name = cutQuery(rawName);
+        const lines = applyCoverage({
+            name,
+            rawLines,
+            deduplicator,
+        });
+        
+        deduplicator[name] = lines;
+    }
+    
+    const list = [];
+    for (const [name, lines] of entries(deduplicator)) {
+        list.push({
+            name,
+            lines,
+        });
+    }
+    
+    return list;
+};
+
+function applyCoverage({rawLines, name, deduplicator}) {
+    if (!deduplicator[name])
+        return rawLines;
+    
+    const newLines = {};
+    
+    for (const [line, value] of entries(rawLines))
+        newLines[line] = deduplicator[name][line] || value;
+    
+    return newLines;
+}
+
+function cutQuery(name) {
+    return name
+        .replace('file://', '')
+        .replace(/\?.*/, '');
+}

package/lib/parse.js

@@ -0,0 +1,20 @@
+export const parse = (files) => {
+    const result = [];
+    
+    for (const [rawName, places] of files.entries()) {
+        const rawLines = {};
+        
+        for (const [place, covered] of places.entries()) {
+            const [line] = place.split(':');
+            
+            rawLines[line] = covered;
+        }
+        
+        result.push({
+            rawName,
+            rawLines,
+        });
+    }
+    
+    return result;
+};

package/lib/report.js

@@ -2,24 +2,25 @@ import chalk from 'chalk';
 import {readFileSync} from 'fs';
 
 const {parse} = JSON;
+const {entries} = Object;
 
 export const report = () => {
     const coverageFile = parse(readFileSync('./coverage.json', 'utf8'));
-
+    
     const files = [];
     const coverage = {
         files,
         coveredCount: 0,
         uncoveredCount: 0,
     };
-
+    
     console.log('# TAP version 13');
     console.log('');
-
+    
     for (const {name, lines} of coverageFile) {
         const uncoveredLines = [];
         
-        for (const [line, covered] of Object.entries(lines)) {
+        for (const [line, covered] of entries(lines)) {
             if (covered)
                 continue;
             
@@ -40,7 +41,7 @@ export const report = () => {
         
         files.push(file);
     }
-
+    
     for (const {name, covered, uncoveredLines} of files) {
         if (!covered) {
             console.log(`# ${name}`);
@@ -49,21 +50,21 @@ export const report = () => {
             console.log(`lines: ${chalk.red(uncoveredLines.join(','))}`);
         }
     }
-
+    
     if (coverage.uncoveredCount)
         console.log('');
-
+    
     console.log(`1..${files.length}`);
     console.log(`# files: ${files.length}`);
     console.log(`# covered: ${coverage.coveredCount}`);
-
+    
     if (!coverage.uncoveredCount) {
         console.log('');
         console.log('# ☘️  ok');
     }
-
+    
     if (coverage.uncoveredCount) {
         console.log(`# 🧨 fail: ${coverage.uncoveredCount}`);
     }
-}
+};
 

package/lib/save.js

@@ -1,26 +1,14 @@
 import {writeFileSync} from 'fs';
 import {getFiles} from './c4.js';
+import {parse} from './parse.js';
+import {merge} from './merge.js';
 
 const {stringify} = JSON;
 
 export const save = () => {
     const files = getFiles();
-    const report = [];
-    for (const [name, places] of files.entries()) {
-        const lines = {};
-        const current = {
-            name,
-            lines,
-        };
-        for (const [place, covered] of places.entries()) {
-            const [line] = place.split(':');
-            
-            lines[line] = covered;
-        }
-        
-        report.push(current);
-    }
+    const parsed = parse(files);
+    const merged = merge(parsed);
     
-    writeFileSync('./coverage.json', stringify(report, null, 4));
+    writeFileSync('./coverage.json', stringify(merged, null, 4));
 };
-

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "escover",
-  "version": "1.0.2",
+  "version": "1.0.3",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",