escover 1.0.3 → 1.0.4

package/ChangeLog

@@ -1,3 +1,9 @@
+2022.01.08, v1.0.4
+
+feature:
+- escover: add support of AssignmentExpression
+
+
 2022.01.08, v1.0.3
 
 feature:

package/coverage.json

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

package/lib/c4.js

@@ -5,10 +5,10 @@ export const createFileEntry = (url) => {
     files.set(url, lines);
     
     return {
-        mark: (line, column) => {
+        '🧨': (line, column) => {
             lines.set(`${line}:${column}`, true);
         },
-        init: (line, column) => {
+        'init': (line, column) => {
             lines.set(`${line}:${column}`, false);
         },
     };

package/lib/escover.js

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

package/lib/instrument/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

@@ -1 +1,2 @@
-const [error, {packageJson} = (__c4.mark(1, 14), {})] = (__c4.mark(1, 36), tryCatch(readPackageUpSync));
+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

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

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

@@ -1,3 +1,6 @@
 if (error) {
-    throw (__c4.mark(2, 4), `error reading package.json: ${error.message}`);
+    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

@@ -1,3 +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

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

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

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

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

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

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

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

package/lib/instrument/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,
+    if (path.isAssignmentPattern() || path.isAssignmentExpression()) {
+        replaceWith(path.get('right'), SequenceExpression([
+            lineNode.expression,
             node.right,
-        ]);
+        ]));
         return;
     }
     
@@ -102,12 +102,8 @@ 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,
-        ]));
-    }
+    if (path.isThrowStatement())
+        return addMarkToThrow(path, lineNode);
     
     replaceWith(path, BlockStatement([
         node,
@@ -132,7 +128,7 @@ export const include = () => [
 ];
 
 export const traverse = ({push}) => ({
-    AssignmentPattern(path) {
+    'AssignmentPattern|AssignmentExpression'(path) {
         if (compareAny(path.get('right'), EXCLUDE))
             return;
         
@@ -170,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/report.js

@@ -14,7 +14,7 @@ export const report = () => {
         uncoveredCount: 0,
     };
     
-    console.log('# TAP version 13');
+    console.log('# CAP version 13');
     console.log('');
     
     for (const {name, lines} of coverageFile) {
@@ -45,9 +45,9 @@ export const report = () => {
     for (const {name, covered, uncoveredLines} of files) {
         if (!covered) {
             console.log(`# ${name}`);
-            console.log('❌ should be covered');
+            console.log('🧨 should be covered');
             console.log('---');
-            console.log(`lines: ${chalk.red(uncoveredLines.join(','))}`);
+            console.log(`lines: ${chalk.red(uncoveredLines.join(', '))}`);
         }
     }
     

package/package.json

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