@putout/plugin-tape 9.0.0 → 9.2.0

package/README.md

@@ -3,7 +3,11 @@
 [NPMIMGURL]: https://img.shields.io/npm/v/@putout/plugin-tape.svg?style=flat&longCache=true
 [NPMURL]: https://npmjs.org/package/@putout/plugin-tape"npm"
 
-🐊[`Putout`](https://github.com/coderaiser/putout) plugin helps to apply best parctises for tests written with 📼[`Supertape`](https://github.com/coderaiser/supertape).
+> Tape-inspired TAP-compatible simplest high speed test runner with superpowers.
+>
+> (c) 📼[**Supertape**](https://github.com/coderaiser/supertape)
+
+🐊[**Putout**](https://github.com/coderaiser/putout) plugin helps to apply best parctises for tests written with 📼[**Supertape**](https://github.com/coderaiser/supertape).
 
 ## Install
 
@@ -33,7 +37,6 @@ npm i @putout/plugin-tape -D
         "tape/convert-equal-to-called-once": "on",
         "tape/convert-equal-to-deep-equal": "on",
         "tape/convert-deep-equal-to-equal": "on",
-        "tape/expand-try-catch-arguments": "on",
         "tape/convert-emitter-to-promise": "on",
         "tape/convert-ok-to-match": "on",
         "tape/convert-ok-to-called-with": "on",
@@ -330,35 +333,6 @@ test('copymitter', async (t) => {
 });
 ```
 
-## expand-try-catch-arguments
-
-### ❌ Example of incorrect code
-
-```js
-import tryCatch from 'try-catch';
-
-test('some message', (t) => {
-    const fn = () => copymitter('/hello');
-    const [error] = tryCatch(fn);
-    
-    t.equal(error.message, 'to should be a string!');
-    t.end();
-});
-```
-
-### ✅ Example of correct code
-
-```js
-import tryCatch from 'try-catch';
-
-test('some message', (t) => {
-    const [error] = tryCatch(copymitter, '/hello');
-    
-    t.equal(error.message, 'to should be a string!');
-    t.end();
-});
-```
-
 ## apply-stub-operator
 
 ### ❌ Example of incorrect code

package/lib/apply-with-name/index.js

@@ -57,13 +57,7 @@ function checkStub(node, path) {
     const {name} = node;
     const binding = bindings[name];
     
-    if (!binding)
-        return false;
-    
-    const initPath = binding.path.get('init');
-    const calleePath = initPath.get('callee');
-    
-    return !calleePath.isMemberExpression();
+    return binding;
 }
 
 function applyWithNameToNode(node, path) {
@@ -76,9 +70,12 @@ function applyWithNameToNode(node, path) {
     
     const initPath = binding.path.get('init');
     const calleePath = initPath.get('callee');
+    const str = initPath.toString();
     
-    if (calleePath.isMemberExpression())
+    if (calleePath.isMemberExpression() && !str.includes('withName')) {
+        replaceWith(initPath, template.ast(`${initPath}.withName('${name}')`));
         return;
+    }
     
     replaceWith(initPath, template.ast(`stub().withName('${name}')`));
 }

package/lib/convert-does-not-throw-to-try-catch/index.js

@@ -2,8 +2,6 @@
 
 const {template} = require('putout');
 
-const insertRequireTryCatch = require('../insert-require-try-catch');
-
 module.exports.report = () => 'try-catch should be used instead of t.doesNotThrow';
 
 module.exports.replace = () => ({
@@ -13,9 +11,7 @@ module.exports.replace = () => ({
         `);
         
         tryCatchNode.declarations[0].init.arguments[0] = __a;
-        
         path.insertBefore(tryCatchNode);
-        insertRequireTryCatch(path);
         
         return `t.notOk(error, __b)`;
     },

package/lib/convert-emitter-to-promise/index.js

@@ -54,6 +54,7 @@ function match({__body}) {
     
     return false;
 }
+
 function replace({__a}, path) {
     declareOnce(path);
     

package/lib/convert-throws-to-try-catch/index.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const {template} = require('putout');
-const insertRequireTryCatch = require('../insert-require-try-catch');
 
 module.exports.report = () => 'try-catch should be used instead of t.throws';
 
@@ -22,8 +21,6 @@ function putTryCatch(__a, path) {
     `);
     
     tryCatchNode.declarations[0].init.arguments[0] = __a;
-    
     path.insertBefore(tryCatchNode);
-    insertRequireTryCatch(path);
 }
 

package/lib/index.js

@@ -23,7 +23,6 @@ module.exports.rules = {
     ...getRule('convert-equal-to-ok'),
     ...getRule('convert-equal-to-called-once'),
     ...getRule('convert-deep-equal-to-equal'),
-    ...getRule('expand-try-catch-arguments'),
     ...getRule('add-args'),
     ...getRule('declare'),
     ...getRule('remove-default-messages'),

package/lib/remove-skip/index.js

@@ -1,15 +1,19 @@
 'use strict';
 
-module.exports.report = () => '"test.skip" should not be used';
+const {types} = require('putout');
+
+const {isIdentifier} = types;
+
+module.exports.report = () => 'Remove "test.skip"';
 
 module.exports.replace = () => ({
     '__a.skip(__b, __c)': '__a(__b, __c)',
     '__a.skip(__b, __c, __d)': '__a(__b, __c, __d)',
-    '__a["skip"](__b, __c)': '__a(__b, __c)',
 });
 
 module.exports.filter = (path) => {
-    const {parentPath} = path.parentPath;
-    return parentPath.isProgram();
+    return isIdentifier(path.node.callee.object, {
+        name: 'test',
+    });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-tape",
-  "version": "9.0.0",
+  "version": "9.2.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin helps with tests",
@@ -35,7 +35,7 @@
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
     "eslint-plugin-node": "^11.0.0",
-    "eslint-plugin-putout": "^13.0.0",
+    "eslint-plugin-putout": "^14.0.0",
     "lerna": "^4.0.0",
     "madrun": "^9.0.0",
     "montag": "^1.2.1",

package/lib/expand-try-catch-arguments/index.js

@@ -1,43 +0,0 @@
-'use strict';
-
-module.exports.report = () => 'try-catch arguments should be expanded';
-
-module.exports.match = () => ({
-    'tryCatch(__args)': ({__args}, path) => {
-        const [fn] = __args;
-        const {name} = fn;
-        const {bindings} = path.scope;
-        
-        if (!bindings[name])
-            return false;
-        
-        const initPath = bindings[name].path.get('init');
-        
-        if (!initPath.isFunction())
-            return false;
-        
-        const bodyPath = initPath.get('body');
-        
-        return bodyPath.isCallExpression();
-    },
-});
-
-module.exports.replace = () => ({
-    'tryCatch(__args)': ({__args}, path) => {
-        const [fn] = __args;
-        const {name} = fn;
-        const {bindings} = path.scope;
-        
-        const fnPath = bindings[name].path;
-        const {node} = fnPath.get('init.body');
-        const newArgs = [
-            node.callee,
-            ...node.arguments,
-        ];
-        
-        path.node.arguments = newArgs;
-        fnPath.remove();
-        
-        return path;
-    },
-});

package/lib/insert-require-try-catch.js

@@ -1,15 +0,0 @@
-'use strict';
-
-const {template} = require('putout');
-
-const requireTryCatch = template.ast(`const tryCatch = require('try-catch')`);
-
-module.exports = (path) => {
-    const parentScope = path.scope.getProgramParent();
-    
-    if (parentScope.bindings.tryCatch)
-        return;
-    
-    parentScope.block.body.unshift(requireTryCatch);
-};
-