@putout/plugin-tape 8.0.0 → 9.1.0

package/README.md

@@ -3,7 +3,7 @@
 [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).
+🐊[**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 +33,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",
@@ -51,7 +50,7 @@ npm i @putout/plugin-tape -D
 
 ## switch-expected-with-result
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
@@ -60,7 +59,7 @@ test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
@@ -71,13 +70,13 @@ test('plugin-apply-destructuring: transform: array: destructuring', (t) => {
 
 ## convert-tape-to-supertape
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('tape');
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const test = require('supertape');
@@ -85,7 +84,7 @@ const test = require('supertape');
 
 ## convert-throws-to-try-catch
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('supertape');
@@ -96,7 +95,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const tryCatch = require('try-catch');
@@ -112,7 +111,7 @@ test('some message', (t) => {
 
 ## convert-does-not-throw-to-try-catch
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('supertape');
@@ -123,7 +122,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const test = require('supertape');
@@ -139,7 +138,7 @@ test('some test', (t) => {
 
 ## convert-called-with-args
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('supertape');
@@ -155,7 +154,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const test = require('supertape');
@@ -175,7 +174,7 @@ test('some message', (t) => {
 
 No need to use [`equal`](https://github.com/coderaiser/supertape#tequalactual-expected-msg), [`supertape`](https://github.com/coderaiser/supertape) supports [`calledOnce`](https://github.com/coderaiser/supertape/tree/master/packages/operator-stub#tcalledoncefn--message).
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('supertape');
@@ -191,7 +190,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const test = require('supertape');
@@ -211,7 +210,7 @@ test('some message', (t) => {
 
 Use [`equal`](https://github.com/coderaiser/supertape#tequalactual-expected-msg) when comparing with primitives, [`deepEqual`](https://github.com/coderaiser/supertape#tdeepequalactual-expected-msg) for [`Objects`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object) and [`Arrays`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array);
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('supertape');
@@ -223,7 +222,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const test = require('supertape');
@@ -237,7 +236,7 @@ test('some message', (t) => {
 
 ## convert-called-with-to-called-with-no-args
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('supertape');
@@ -253,7 +252,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const test = require('supertape');
@@ -271,7 +270,7 @@ test('some message', (t) => {
 
 ## convert-called-with-no-args-to-called-with
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const test = require('supertape');
@@ -287,7 +286,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const test = require('supertape');
@@ -305,7 +304,7 @@ test('some message', (t) => {
 
 ## convert-emitter-to-promise
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('copymitter', (t) => {
@@ -317,7 +316,7 @@ test('copymitter', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const {once} = require('events');
@@ -330,38 +329,9 @@ test('copymitter', async (t) => {
 });
 ```
 
-## expand-try-catch-arguments
-
-### ❌ Incorrect code example
-
-```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();
-});
-```
-
-### ✅ Correct code example
-
-```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
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('some message', (t) => {
@@ -370,7 +340,7 @@ test('some message', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('some message', (t) => {
@@ -381,7 +351,7 @@ test('some message', (t) => {
 
 ## apply-with-name
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('should call init before show', (t) => {
@@ -393,7 +363,7 @@ test('should call init before show', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('should call init before show', (t) => {
@@ -407,7 +377,7 @@ test('should call init before show', (t) => {
 
 ## sync-with-name
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('should call init before show', (t) => {
@@ -419,7 +389,7 @@ test('should call init before show', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('should call init before show', (t) => {
@@ -435,7 +405,7 @@ test('should call init before show', (t) => {
 
 ### `mockImport`
 
-#### ❌ Incorrect code example
+#### ❌ Example of incorrect code
 
 ```js
 import {stub} from 'supertape';
@@ -445,7 +415,7 @@ mockImport('fs/promises', {
 });
 ```
 
-##### ✅ Correct code Example
+##### ✅ Example of correct code
 
 ```js
 import {stub} from 'supertape';
@@ -464,7 +434,7 @@ mockImport('fs/promises', {
 
 ### `tape`
 
-#### ❌ Incorrect code example
+#### ❌ Example of incorrect code
 
 ```js
 test('xxx', (t) => {
@@ -473,7 +443,7 @@ test('xxx', (t) => {
 });
 ```
 
-#### ✅ Correct code example
+#### ✅ Example of correct code
 
 ```js
 import {
@@ -489,7 +459,7 @@ test('xxx', (t) => {
 
 ## add-args
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('xxx', () => {
@@ -497,7 +467,7 @@ test('xxx', () => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('xxx', (t) => {
@@ -507,14 +477,14 @@ test('xxx', (t) => {
 
 ## add-t-end
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('xxx', () => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('xxx', (t) => {
@@ -524,7 +494,7 @@ test('xxx', (t) => {
 
 ## add-await-to-re-import
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('stop-all: should be called', (t) => {
@@ -533,7 +503,7 @@ test('stop-all: should be called', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('stop-all: should be called', async (t) => {
@@ -546,7 +516,7 @@ test('stop-all: should be called', async (t) => {
 
 When you write test mocking `ESM` with [`mockImport()`](https://github.com/coderaiser/mock-import#mockimportname-mock) never forget to call [`stopAll()`](https://github.com/coderaiser/mock-import#stopall) when you no longer need it. This leads to bugs in tests which are hard to find, each test should be checked with the one which pass when called alone but fail when called with others.
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('stop-all: should be called', (t) => {
@@ -557,7 +527,7 @@ test('stop-all: should be called', (t) => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('stop-all: should be called', (t) => {
@@ -572,7 +542,7 @@ test('stop-all: should be called', (t) => {
 
 ## remove-useless-t-end
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('test: remove me', () => {
@@ -581,7 +551,7 @@ test('test: remove me', () => {
 });
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 test('test: remove me', () => {
@@ -591,13 +561,13 @@ test('test: remove me', () => {
 
 ## convert-ok-to-match
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 t.ok(result.includes('hello'));
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 t.match(result, /hello/);
@@ -605,13 +575,13 @@ t.match(result, /hello/);
 
 ## convert-ok-to-match
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 t.ok(set.calledWith(1, 2));
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 t.calledWith(set, [1, 2]);
@@ -619,13 +589,13 @@ t.calledWith(set, [1, 2]);
 
 ## convert-equal-to-not-ok
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 t.equal(error, null);
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 t.notOk(error);
@@ -633,13 +603,13 @@ t.notOk(error);
 
 ## convert-equal-to-ok
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 t.equal(result, true);
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 t.ok(result);
@@ -647,7 +617,7 @@ t.ok(result);
 
 ## convert-equal-to-deep-equal
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 const expected = {
@@ -658,7 +628,7 @@ t.equal(error, expected);
 t.end();
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 const expected = {
@@ -671,13 +641,13 @@ t.end();
 
 ## convert-match-regexp-to-string
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 t.match(result, RegExp('hello'));
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 t.match(result, 'hello');
@@ -688,13 +658,13 @@ t.match(result, 'hello');
 `supertape` will put this information for you, and it is always the same.
 No need to repeat the same information twice on one line, better to avoid it.
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 t.equal(result, expected, 'should equal');
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 t.equal(result, expected);
@@ -702,13 +672,13 @@ t.equal(result, expected);
 
 ## remove-useless-not-called-args
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 t.notCalled(fn, []);
 ```
 
-### ✅ Correct code example
+### ✅ Example of correct code
 
 ```js
 t.notCalled(fn);
@@ -716,7 +686,7 @@ t.notCalled(fn);
 
 ## remove-only
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test.only('some test', (t) => {
@@ -725,7 +695,7 @@ test.only('some test', (t) => {
 
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 test('some test', (t) => {
@@ -735,7 +705,7 @@ test('some test', (t) => {
 
 ## remove-skip
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test.skip('some test', (t) => {
@@ -748,7 +718,7 @@ test.skip('some test', (t) => {
 
 When `reImport()` or `reRequire` not called, `stopAll()` is redundant and should be removed.
 
-### ❌ Incorrect code example
+### ❌ Example of incorrect code
 
 ```js
 test('some test', (t) => {
@@ -758,7 +728,7 @@ test('some test', (t) => {
 
 ```
 
-### ✅ Correct code Example
+### ✅ Example of correct code
 
 ```js
 test('some test', (t) => {

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-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-only/index.js

@@ -1,15 +1,18 @@
 'use strict';
 
-module.exports.report = () => '"test.only" should not be used';
+const {types} = require('putout');
+const {isIdentifier} = types;
+
+module.exports.report = () => `Remove 'test.only'`;
 
 module.exports.replace = () => ({
     '__a.only(__b, __c)': '__a(__b, __c)',
     '__a.only(__b, __c, __d)': '__a(__b, __c, __d)',
-    '__a["only"](__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/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": "8.0.0",
+  "version": "9.1.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "putout plugin helps with tests",
@@ -31,22 +31,22 @@
     "putout"
   ],
   "devDependencies": {
-    "@putout/test": "^4.0.0",
+    "@putout/test": "^5.0.0",
     "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": "^8.0.1",
+    "madrun": "^9.0.0",
     "montag": "^1.2.1",
     "nodemon": "^2.0.1"
   },
   "peerDependencies": {
-    "putout": ">=24"
+    "putout": ">=25"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=14"
+    "node": ">=16"
   },
   "publishConfig": {
     "access": "public"

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);
-};
-