escover 1.0.0 → 1.0.4

package/ChangeLog

@@ -0,0 +1,27 @@
+2022.01.08, v1.0.4
+
+feature:
+- escover: add support of AssignmentExpression
+
+
+2022.01.08, v1.0.3
+
+feature:
+- escover: plugin-mark: add support ot ThrowStatement
+- escover: add merger
+
+
+2022.01.08, v1.0.2
+
+fix:
+- escover: impove support of AssignmentPattern
+
+feature:
+- escover: plugin-mark-line -> plugin-mark
+
+
+2022.01.08, v1.0.1
+
+fix:
+- c4 -> escover
+

package/example/example.js

@@ -1,4 +1,4 @@
 export const sum = (a, b) => a + b;
 
-export const mul = (a, b) => a * b;
+// export const mul = (a, b) => a * b;
 

package/lib/c4.js

@@ -1,36 +1,17 @@
-import montag from 'montag';
-import process from 'process';
-import {instrument} from './instrument/index.js';
-import {exclude} from './exclude.js';
-import {save} from './save.js';
-import {createFileEntry} from './report.js';
+const files = new Map();
 
-global.__createC4 = createFileEntry;
-
-export async function load(url, context, defaultLoad) {
-    const {format, source: rawSource} = await defaultLoad(url, context, defaultLoad);
-    
-    if (/commonjs|builtin/.test(format))
-        return {
-            format,
-        };
-    
-    if (exclude(url, ['.spec.js', 'node_modules']))
-        return {
-            format,
-            source: rawSource,
-        };
-    
-    const source = montag`
-        const __c4 = global.__createC4('${url}');
-        ${instrument(url, rawSource)}
-    `;
+export const createFileEntry = (url) => {
+    const lines = files.get(url) || new Map();
+    files.set(url, lines);
     
     return {
-        format,
-        source: `${source}\n console.log('🧨', '${url}')`,
+        '🧨': (line, column) => {
+            lines.set(`${line}:${column}`, true);
+        },
+        'init': (line, column) => {
+            lines.set(`${line}:${column}`, false);
+        },
     };
-}
-
-process.once('exit', save);
+};
 
+export const getFiles = () => files;

package/lib/escover.js

@@ -0,0 +1,37 @@
+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';
+
+global.__createC4 = createFileEntry;
+
+export async function load(url, context, defaultLoad) {
+    const {format, source: rawSource} = await defaultLoad(url, context, defaultLoad);
+    
+    if (/commonjs|builtin/.test(format))
+        return {
+            format,
+        };
+    
+    if (exclude(url, ['.spec.js', 'node_modules']))
+        return {
+            format,
+            source: rawSource,
+        };
+    
+    const source = montag`
+        const __c4 = global.__createC4('${url}');
+        ${instrument(url, rawSource)}
+    `;
+    
+    return {
+        format,
+        source,
+    };
+}
+
+process.once('exit', exit);
+

package/lib/exit.js

@@ -0,0 +1,9 @@
+import once from 'once';
+
+import {save} from './save.js';
+import {report} from './report.js';
+
+export const exit = once(() => {
+    save();
+    report();
+});

package/lib/instrument/index.js

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

package/lib/instrument/{plugin-mark-line → plugin-mark}/fixture/arrow-fix.js

@@ -1,6 +1,6 @@
 export const nothing = (a, b) => {
-    return __c4.mark(2, 4);
+    return __c4['🧨'](2, 4);
 };
 export const sum = (a, b) => {
-    return __c4.mark(5, 4), a + b;
+    return __c4['🧨'](5, 4), a + b;
 };

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

@@ -0,0 +1,2 @@
+const [error, {packageJson} = (__c4['🧨'](1, 14), {})] = (__c4['🧨'](1, 36), tryCatch(readPackageUpSync));
+data += (__c4['🧨'](2, 0), 'fix:' + '\n');

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

@@ -0,0 +1,2 @@
+const [error, {packageJson} = {}] = tryCatch(readPackageUpSync);
+data += 'fix:' + '\n';

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

@@ -0,0 +1,6 @@
+if (error) {
+    throw (__c4['🧨'](2, 4), `error reading package.json: ${error.message}`);
+}
+
+if (error)
+    throw (__c4['🧨'](6, 4), (__c4.mark(11, 8), `error reading package.json: ${error.message}`));

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

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

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

@@ -0,0 +1,3 @@
+if ((__c4['🧨'](1, 4), a) || (__c4['🧨'](1, 9), b)) {
+  __c4['🧨'](1, 12);
+}

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

@@ -0,0 +1,30 @@
+const a = () => {
+    a = (__c4['🧨'](2, 4), 5);
+    __c4['🧨'](3, 4), console.log(5);
+};
+
+
+function x() {
+    
+    if (a > 2) {
+        __c4['🧨'](9, 14), a();
+    } else {
+        __c4['🧨'](10, 9), b();
+    }
+}
+
+for (const x of y) {
+    __c4['🧨'](13, 19);
+}
+
+const ax = ((__c4['🧨'](16, 12), a()), (__c4['🧨'](16, 17), b()));
+const bx = (c, (__c4['🧨'](17, 15), d()));
+
+if ((__c4['🧨'](19, 4), a) || (__c4['🧨'](19, 9), b)) {
+    __c4['🧨'](19, 12);
+}
+
+
+function x1(a, b = (__c4['🧨'](23, 15), 5)) {
+    __c4['🧨'](23, 22);
+}

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

@@ -0,0 +1 @@
+const files = (__c4['🧨'](1, 14), new Map());

package/lib/instrument/plugin-mark/fixture/no-loc-fix.js

@@ -0,0 +1,8 @@
+__c4['🧨'](1, 0), cli({
+    stdout,
+    stderr,
+    exit,
+    cwd: (__c4['🧨'](5, 9), process.cwd()),
+    argv: (__c4['🧨'](6, 10), process.argv.slice(2))
+});
+

package/lib/instrument/{plugin-mark-line → plugin-mark}/index.js

@@ -5,6 +5,7 @@ import {
 } from 'putout';
 import {addMarkToReturn} from './return.js';
 import {addMarkToArrowFunction} from './arrow.js';
+import {addMarkToThrow} from './throw.js';
 
 const {
     NumericLiteral,
@@ -13,12 +14,11 @@ const {
 } = types;
 
 const {
-    replaceWithMultiple,
     replaceWith,
     compareAny,
 } = operator;
 
-const LINE = '__c4.mark(__l, __c)';
+const LINE = `__c4['🧨'](__l, __c)`;
 const buildLineNode = template(LINE, {
     placeholderPattern: /^__[a-z]$/,
 });
@@ -80,11 +80,11 @@ export const fix = (path, {options}) => {
         return;
     }
     
-    if (path.isAssignmentPattern()) {
-        replaceWithMultiple(path.get('right'), [
-            lineNode,
-            node.left,
-        ]);
+    if (path.isAssignmentPattern() || path.isAssignmentExpression()) {
+        replaceWith(path.get('right'), SequenceExpression([
+            lineNode.expression,
+            node.right,
+        ]));
         return;
     }
     
@@ -102,6 +102,9 @@ export const fix = (path, {options}) => {
     if (path.isArrowFunctionExpression())
         return addMarkToArrowFunction(path, lineNode);
     
+    if (path.isThrowStatement())
+        return addMarkToThrow(path, lineNode);
+    
     replaceWith(path, BlockStatement([
         node,
     ]));
@@ -112,18 +115,25 @@ const EXCLUDE = [
     `(${LINE}, __z)`,
     `return (${LINE}, __z)`,
     `return ${LINE}`,
+    `throw (${LINE}, __z)`,
 ];
 
 export const exclude = () => EXCLUDE;
 
 export const include = () => [
-    'AssignmentPattern',
     'CallExpression',
     'NewExpression',
     'ReturnStatement',
+    'ThrowStatement',
 ];
 
 export const traverse = ({push}) => ({
+    'AssignmentPattern|AssignmentExpression'(path) {
+        if (compareAny(path.get('right'), EXCLUDE))
+            return;
+        
+        push(path);
+    },
     ArrowFunctionExpression(path) {
         if (path.get('body').isBlockStatement())
             return;
@@ -156,7 +166,7 @@ export const traverse = ({push}) => ({
         const consequentPath = path.get('consequent');
         const alternatePath = path.get('alternate');
         
-        if (!consequentPath.isBlockStatement())
+        if (!consequentPath.isBlockStatement() && !compareAny(consequentPath, EXCLUDE))
             push(consequentPath);
         
         if (!alternatePath.node)

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

@@ -1,17 +1,70 @@
-const files = new Map();
+import chalk from 'chalk';
+import {readFileSync} from 'fs';
 
-export const createFileEntry = (url) => {
-    const lines = files.get(url) || new Map();
-    files.set(url, lines);
-    
-    return {
-        mark: (line, column) => {
-            lines.set(`${line}:${column}`, true);
-        },
-        init: (line, column) => {
-            lines.set(`${line}:${column}`, false);
-        },
+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('# CAP version 13');
+    console.log('');
+    
+    for (const {name, lines} of coverageFile) {
+        const uncoveredLines = [];
+        
+        for (const [line, covered] of entries(lines)) {
+            if (covered)
+                continue;
+            
+            uncoveredLines.push(line);
+        }
+        
+        const file = {
+            name,
+            covered: !uncoveredLines.length,
+            uncoveredLines,
+        };
+        
+        if (file.covered)
+            ++coverage.coveredCount;
+        
+        if (!file.covered)
+            ++coverage.uncoveredCount;
+        
+        files.push(file);
+    }
+    
+    for (const {name, covered, uncoveredLines} of files) {
+        if (!covered) {
+            console.log(`# ${name}`);
+            console.log('🧨 should be covered');
+            console.log('---');
+            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}`);
+    }
 };
 
-export const getFiles = () => files;

package/lib/save.js

@@ -1,27 +1,14 @@
 import {writeFileSync} from 'fs';
-import once from 'once';
-import {getFiles} from './report.js';
+import {getFiles} from './c4.js';
+import {parse} from './parse.js';
+import {merge} from './merge.js';
 
 const {stringify} = JSON;
 
-export const save = once(() => {
+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,13 +1,10 @@
 {
   "name": "escover",
-  "version": "1.0.0",
+  "version": "1.0.4",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "Coverage for EcmaScript Modules",
   "main": "lib/escover.js",
   "type": "module",
-  "bin": {
-    "escover": "bin/escover.js"
-  },
   "repository": {
     "type": "git",
     "url": "git://github.com/coderaiser/escover.git"

package/bin/c4.js

@@ -1,69 +0,0 @@
-#!/usr/bin/env node
-
-import chalk from 'chalk';
-
-import {readFileSync} from 'fs';
-
-const {parse} = JSON;
-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)) {
-        if (covered)
-            continue;
-        
-        uncoveredLines.push(line);
-    }
-    
-    const file = {
-        name,
-        covered: !uncoveredLines.length,
-        uncoveredLines,
-    };
-    
-    if (file.covered)
-        ++coverage.coveredCount;
-    
-    if (!file.covered)
-        ++coverage.uncoveredCount;
-    
-    files.push(file);
-}
-
-for (const {name, covered, uncoveredLines} of files) {
-    if (!covered) {
-        console.log(`# ${name}`);
-        console.log('❌ should be covered');
-        console.log('---');
-        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/instrument/plugin-mark-line/fixture/logical-fix.js

@@ -1,3 +0,0 @@
-if ((__c4.mark(1, 4), a) || (__c4.mark(1, 9), b)) {
-  __c4.mark(1, 12);
-}

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

@@ -1,30 +0,0 @@
-const a = () => {
-    a = 5;
-    __c4.mark(3, 4), console.log(5);
-};
-
-
-function x() {
-    
-    if (a > 2) {
-        __c4.mark(9, 14), a();
-    } else {
-        __c4.mark(10, 9), b();
-    }
-}
-
-for (const x of y) {
-    __c4.mark(13, 19);
-}
-
-const ax = ((__c4.mark(16, 12), a()), (__c4.mark(16, 17), b()));
-const bx = (c, (__c4.mark(17, 15), d()));
-
-if ((__c4.mark(19, 4), a) || (__c4.mark(19, 9), b)) {
-    __c4.mark(19, 12);
-}
-
-
-function x1(a, b = (__c4.mark(23, 15), b)) {
-    __c4.mark(23, 22);
-}

package/lib/instrument/plugin-mark-line/fixture/new-fix.js

@@ -1 +0,0 @@
-const files = (__c4.mark(1, 14), new Map());

package/lib/instrument/plugin-mark-line/fixture/no-loc-fix.js

@@ -1,8 +0,0 @@
-__c4.mark(1, 0), cli({
-    stdout,
-    stderr,
-    exit,
-    cwd: (__c4.mark(5, 9), process.cwd()),
-    argv: (__c4.mark(6, 10), process.argv.slice(2))
-});
-