eslint-plugin-putout 11.18.0 → 12.0.2

package/README.md

@@ -5,7 +5,7 @@
 [CoverageURL]: https://coveralls.io/github/coderaiser/putout?branch=master
 [CoverageIMGURL]: https://coveralls.io/repos/coderaiser/putout/badge.svg?branch=master&service=github
 
-[`ESLint`](https://eslint.org) plugin for 🐊[`Putout`](https://github.com/coderaiser/putout) with built-in rules from [@putout/eslint-config](https://github.com/coderaiser/eslint-plugin-putout/tree/master/packages/eslint-config).
+[`ESLint`](https://eslint.org) plugin for 🐊[`Putout`](https://github.com/coderaiser/putout) with built-in rules from [`@putout/eslint-config`](https://github.com/coderaiser/putout/tree/master/packages/eslint-config).
 
 ## Installation
 
@@ -17,7 +17,7 @@ $ npm i putout eslint eslint-plugin-putout -D
 
 ## Usage
 
-Add `putout` to the plugins section of your `.eslintrc` configuration file. You can omit the `eslint-plugin-` prefix:
+Add `putout` to the plugins section of your `.eslintrc.json` configuration file. You can omit the `eslint-plugin-` prefix:
 
 ```json
 {
@@ -88,7 +88,7 @@ Then configure the rules you want to use under the rules section.
 
 ### Safe mode
 
-When using `putout` in IDE with `--fix` on save, or when you want to disable the most dangerous rules, use:
+When using 🐊`Putout` in IDE with `--fix` on save, or when you want to disable the most dangerous rules, use:
 
 ```json
 {
@@ -101,7 +101,7 @@ When using `putout` in IDE with `--fix` on save, or when you want to disable the
 }
 ```
 
-List of disabled `putout` rules:
+List of disabled 🐊`Putout` rules:
 
 - [remove-empty](https://github.com/coderaiser/putout/tree/v22.0.0/packages/plugin-remove-empty);
 - [remove-unused-variables](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-unused-variables);

package/lib/add-newline-after-function-call/README.md

@@ -1,4 +1,4 @@
-# Add new line after function call (add-newline-after-function-call)
+# Add new line after function call (`add-newline-after-function-call`)
 
 ## Rule Details
 

package/lib/add-newline-after-function-call/index.js

@@ -12,7 +12,7 @@ const {
 
 const regExp = /^;?\n( +)?\n +$/;
 
-module.exports.category = 'typescript';
+module.exports.category = 'layout';
 module.exports.report = () => 'Add newline after function call';
 
 module.exports.filter = ({text, node, getText, getCommentsAfter}) => {
@@ -47,6 +47,7 @@ module.exports.filter = ({text, node, getText, getCommentsAfter}) => {
         if (i === n - 1)
             break;
         
+        const prev = body[i - 1];
         const next = body[i + 1];
         
         if (!isVariableDeclaration(next))
@@ -62,8 +63,14 @@ module.exports.filter = ({text, node, getText, getCommentsAfter}) => {
         
         const spacesAfterNext = getSpacesAfterNode(next, {getText});
         
-        if (!regExp.test(spacesAfterNext))
+        if (regExp.test(spacesAfterNext))
+            break;
+        
+        if (!prev)
             return true;
+        
+        const spacesAfterPrev = getSpacesAfterNode(prev, {getText});
+        return !regExp.test(spacesAfterPrev);
     }
     
     return false;

package/lib/add-newline-before-function-call/README.md

@@ -1,4 +1,4 @@
-# Add new line before function call (add-newline-before-function-call)
+# Add new line before function call (`add-newline-before-function-call`)
 
 ## Rule Details
 

package/lib/add-newline-before-function-call/index.js

@@ -13,7 +13,7 @@ const regExp = /^\n( +)?\n +$/;
 module.exports.category = 'typescript';
 module.exports.report = () => 'Add newline before function call';
 
-module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
+module.exports.filter = ({text, node, getCommentsBefore, getSpacesBeforeNode}) => {
     if (!isExpressionStatement(node.parent))
         return false;
     
@@ -31,7 +31,7 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
     if (n < 3)
         return false;
     
-    const spaces = getSpacesBeforeNode(node, {text, getText});
+    const spaces = getSpacesBeforeNode(node, text);
     
     if (regExp.test(spaces))
         return false;
@@ -43,16 +43,21 @@ module.exports.filter = ({text, node, getText, getCommentsBefore}) => {
             continue;
         
         const prevA = body[i - 1];
+        const nextA = body[i + 1];
         
         if (!isVariableDeclaration(prevA))
             return false;
         
-        const spaces = getSpacesBeforeNode(prevA, {getText});
+        const spaces = getSpacesBeforeNode(prevA);
         
         if (regExp.test(spaces))
             return false;
         
-        return true;
+        if (!nextA)
+            return true;
+        
+        const nextSpaces = getSpacesBeforeNode(nextA);
+        return !regExp.test(nextSpaces);
     }
     
     return false;
@@ -66,13 +71,3 @@ module.exports.include = () => [
     'CallExpression',
 ];
 
-function getSpacesBeforeNode(node, {getText, text = getText(node)}) {
-    let spaces = '';
-    let i = 0;
-    
-    while (!spaces || /^[ \n]+$/.test(spaces))
-        spaces = getText(node, ++i)
-            .replace(text, '');
-    
-    return spaces.slice(1);
-}

package/lib/add-newlines-between-types-in-union/README.md

@@ -1,4 +1,4 @@
-# Add new lines between types in union (add-newlines-between-types-in-union)
+# Add new lines between types in union (`add-newlines-between-types-in-union`)
 
 ## Rule Details
 

package/lib/align-spaces/README.md

@@ -1,4 +1,4 @@
-# Spaces should be aligned (aling-spaces)
+# Spaces should be aligned (`aling-spaces`)
 
 After `putout` process files it can remove spaces from empty line, this `rule` fixes it.
 

package/lib/array-element-newline/README.md

@@ -1,4 +1,4 @@
-# Add new lines between types in union (add-newlines-between-types-in-union)
+# Add new lines between types in union (`add-newlines-between-types-in-union`)
 
 Because [`array-element-newline`](https://eslint.org/docs/rules/array-element-newline) requires [`array-bracket-newline`](https://eslint.org/docs/rules/array-bracket-newline).
 And `array-bracket-newline` and conflicts with [`object-braces-inside-array`](https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout/lib/objects-braces-inside-array).

package/lib/destructuring-as-function-argument/README.md

@@ -1,4 +1,4 @@
-# keep curly bracesin in one line when you use destructuring as function argument (destructuring-as-function-argument)
+# Keep curly braces in one line when you use destructuring as function argument (`destructuring-as-function-argument`)
 
 When `putout` removes unused variable located in function argument object pattern, it formats in in a multiple lines.
 

package/lib/evaluate/README.md

@@ -1,4 +1,4 @@
-# evaluate expression (evaluate)
+# evaluate expression (`evaluate`)
 
 Evaluate expression started with `__putout_evaluate: `.
 Provided code is processed with [`@putout/plugin-declare-undefined-variables`](https://github.com/coderaiser/putout/tree/master/packages/plugin-declare-undefined-variables). So next code:

package/lib/for-of-multiple-properties-destructuring/README.md

@@ -1,4 +1,4 @@
-# Keep all properties in one line when using destructuring in for-of (for-of-multiple-properties-destructuring)
+# Keep all properties in one line when using destructuring in `for-of` (`for-of-multiple-properties-destructuring`)
 
 ## Rule Details
 

package/lib/function-declaration-paren-newline/README.md

@@ -1,4 +1,4 @@
-# Use spaces around "catch" (function-declaration-paren-newline)
+# Remove newlines between parens in function declaration (`function-declaration-paren-newline`)
 
 Similar to `eslint` [function-paren-newline](https://eslint.org/docs/rules/function-declaration-paren-newline), but forbids new lines in function declarations and expressions arguments.
 

package/lib/keyword-spacing/README.md

@@ -1,4 +1,4 @@
-# Use spaces around "catch" (keyword-spacing)
+# Use spaces around `catch` (`keyword-spacing`)
 
 When `putout` removes unused variable in `catch` [eslint keyword spacing](https://eslint.org/docs/rules/keyword-spacing) can't handle [optional catch binding](https://github.com/tc39/proposal-optional-catch-binding) correctly.
 

package/lib/long-properties-destructuring/README.md

@@ -1,4 +1,4 @@
-# keep each property on separate line when destructuring long properties (long-properties-destructuring)
+# Keep each property on separate line when destructuring long properties (`long-properties-destructuring`)
 
 Always add new lines, when property name is longer then 15 characters.
 

package/lib/markdown.js

@@ -33,13 +33,19 @@ module.exports = [{
             parserOpts,
             plugins: [
                 '@babel/plugin-syntax-class-properties',
-                '@babel/plugin-syntax-top-level-await',
             ],
         },
     },
 }, {
     ...ts,
     files: '*.md{ts}',
-    rules: commonRules,
+    rules: {
+        ...commonRules,
+        ...ts.rules,
+        '@typescript-eslint/no-unused-vars': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/no-inferrable-types': 'off',
+        '@typescript-eslint/array-type': 'off',
+    },
 }];
 

package/lib/multiple-properties-destructuring/README.md

@@ -1,4 +1,4 @@
-# keep each property on separate line when using multiple destructuring properties (multiple-properties-destructuring)
+# Keep each property on separate line when using multiple destructuring properties (`multiple-properties-destructuring`)
 
 In the same way as eslint [object-property-newline](https://eslint.org/docs/rules/object-property-newline), but for destructuring.
 

package/lib/newline-function-call-arguments/README.md

@@ -1,4 +1,4 @@
-# keep curly bracesin in one line when property is single (newline-function-call-arguments)
+# Keep curly braces in one line when property is single (`newline-function-call-arguments`)
 
 Addition to eslint's [function-paren-newline](https://eslint.org/docs/rules/function-paren-newline)
 

package/lib/no-unresolved/README.md

@@ -1,4 +1,4 @@
-# check if path can be resolved and fix if cannot (no-unresolved)
+# Check if path can be resolved and fix if cannot (`no-unresolved`)
 
 Similar to [`no-unresolved`](https://github.com/import-js/eslint-plugin-import/blob/HEAD/docs/rules/no-unresolved.md) from
 [`eslint-plugin-putout`](https://github.com/import-js/eslint-plugin-import). But supports only `ESM` and have `autofix`.

package/lib/object-init/README.md

@@ -1,4 +1,4 @@
-# keep each property on separate line when initializing an object(object-init)
+# Keep each property on separate line when initializing an object(`object-init`)
 
 In the same way as eslint [object-property-newline](https://github.com/coderaiser/putout/tree/master/packages/eslint-plugin-putout/lib/multiple-properties-destructuring) but for initializing variables with `object expression`.
 

package/lib/objects-braces-inside-array/README.md

@@ -1,4 +1,4 @@
-# keep braces on the same line as brackets (object-braces-inside-array)
+# Keep braces on the same line as brackets (`object-braces-inside-array`)
 
 ## Rule Details
 

package/lib/putout/README.md

@@ -1,4 +1,4 @@
-# Putout (putout)
+# Putout (`putout`)
 
 🐊[`Putout`](https://github.com/coderaiser/putout) used as eslint plugin.
 

package/lib/remove-empty-newline-after-last-specifier/README.md

@@ -1,4 +1,4 @@
-# Remove empty new line after last specifier(remove-empty-newline-after-last-specifier)
+# Remove empty new line after last specifier(`remove-empty-newline-after-last-specifier`)
 
 ## Rule Details
 

package/lib/remove-empty-newline-before-first-specifier/README.md

@@ -1,4 +1,4 @@
-# Remove empty new line before first specifier(remove-empty-newline-before-first-specifier)
+# Remove empty new line before first specifier (`remove-empty-newline-before-first-specifier`)
 
 ## Rule Details
 

package/lib/remove-newline-after-default-import/README.md

@@ -1,6 +1,6 @@
-# Keep opening curly brace on one line with default import (remove-newline-after-default-import)
+# Keep opening curly brace on one line with default import (`remove-newline-after-default-import`)
 
-Fixes [object-curly-newline](https://eslint.org/docs/rules/object-curly-newline) + [eslint-plugin-modules-newline](https://github.com/gmsorrow/eslint-plugin-modules-newline).
+Fixes [`object-curly-newline`](https://eslint.org/docs/rules/object-curly-newline) + [`eslint-plugin-modules-newline`](https://github.com/gmsorrow/eslint-plugin-modules-newline).
 
 ## Rule Details
 

package/lib/remove-newline-from-empty-object/README.md

@@ -1,4 +1,4 @@
-# Remove new line in empty object (remove-newline-from-empty-object)
+# Remove new line in empty object (`remove-newline-from-empty-object`)
 
 ## Rule Details
 

package/lib/single-property-destructuring/README.md

@@ -1,6 +1,6 @@
-# keep curly bracesin in one line when property is single (single-property-destructuring)
+# Keep curly braces in one line when property is single (`single-property-destructuring`)
 
-When `putout` removes unused variables declared as destructured properties, it keeps one property to take 3 lines, instead of 1.
+When 🐊[`Putout`](https://github.com/coderaiser/putout) removes unused variables declared as destructured properties, it keeps one property to take 3 lines, instead of 1.
 
 ## Rule Details
 

package/lib/tape-add-newline-before-assertion/README.md

@@ -1,6 +1,6 @@
-# Add newline before assertion (add-newline-before-assertion)
+# Add newline before assertion (`add-newline-before-assertion`)
 
-Add newline before `t.equal()` etc, for [supertape](https://github.com/coderaiser/supertape).
+Add newline before `t.equal()` etc, for [`supertape`](https://github.com/coderaiser/supertape).
 
 ## Rule Details
 

package/lib/tape-add-newline-between-tests/README.md

@@ -1,6 +1,6 @@
-# Add newline between tests (add-newline-between-tests)
+# Add newline between tests (`add-newline-between-tests`)
 
-Add newline between tests, for [supertape](https://github.com/coderaiser/supertape).
+Add newline between tests, for [`supertape`](https://github.com/coderaiser/supertape).
 
 ## Rule Details
 

package/lib/tape-remove-newline-before-t-end/README.md

@@ -1,6 +1,6 @@
-# Remove newline before `t.end()` (remove-newline-before-t-end)
+# Remove newline before `t.end()` (`remove-newline-before-t-end`)
 
-Remove newline before `t.end()`, for [supertape](https://github.com/coderaiser/supertape).
+Remove newline before `t.end()`, for [`supertape`](https://github.com/coderaiser/supertape).
 
 ## Rule Details
 

package/lib/tape-remove-newline-before-t-end/index.js

@@ -1,16 +1,45 @@
 'use strict';
 
+const {
+    operator,
+    types,
+} = require('putout');
+
+const {
+    isCallExpression,
+    isIdentifier,
+} = types;
+
+const {compare} = operator;
+
 module.exports.category = 'tape';
 module.exports.report = () => 'Remove newline before t.end()';
 
 const newlineReg = /\n( +)?\n +t.end\(\)/;
 
-module.exports.filter = ({text}) => {
+module.exports.filter = ({text, node}) => {
     if (!/^test(\.only|\.skip)?\(/.test(text))
         return false;
     
-    if (newlineReg.test(text))
-        return true;
+    if (!newlineReg.test(text))
+        return false;
+    
+    const {body} = node.arguments[1].body;
+    const n = body.length;
+    
+    for (let i = 1; i < n; i++) {
+        const current = body[i];
+        const prev = body[i - 1];
+        
+        if (!compare(current, 't.end()'))
+            continue;
+        
+        if (!isCallExpression(prev.expression))
+            break;
+        
+        const {callee} = prev.expression;
+        return isIdentifier(callee.object, {name: 't'});
+    }
     
     return false;
 };

package/lib/ts.js

@@ -1,21 +1,47 @@
 'use strict';
 
-const parserOpts = require('@putout/engine-parser/babel/options');
-
-module.exports = [{
+const ts = {
     files: '*.ts',
-    parser: '@babel/eslint-parser/experimental-worker',
+    parser: '@typescript-eslint/parser',
     parserOptions: {
-        requireConfigFile: false,
-        babelOptions: {
-            parserOpts,
-            plugins: ['@babel/plugin-syntax-typescript'],
+        ecmaFeatures: {
+            jsx: false,
         },
     },
+    plugins: [
+        '@typescript-eslint',
+    ],
+    extends: [
+        'plugin:@typescript-eslint/recommended',
+    ],
     rules: {
         'no-undef': 'off',
         'no-var': 'off',
         'putout/no-unresolved': 'off',
+        'semi': 'off',
+        '@typescript-eslint/semi': 'error',
+        '@typescript-eslint/array-type': 'error',
+        'space-before-function-paren': 'off',
+        '@typescript-eslint/no-explicit-any': 'off',
+        '@typescript-eslint/ban-types': 'off',
+        '@typescript-eslint/no-empty-function': 'off',
+        '@typescript-eslint/space-before-function-paren': ['error', {
+            anonymous: 'never',
+            named: 'never',
+            asyncArrow: 'always',
+        }],
+    },
+};
+
+module.exports = [
+    ts, {
+        ...ts,
+        files: '*.tsx',
+        parserOptions: {
+            ecmaFeatures: {
+                jsx: true,
+            },
+        },
     },
-}];
+];
 

package/lib/wrap.js

@@ -8,6 +8,9 @@ const prepare = (plugin, context, options) => (node) => {
     const getText = source.getText.bind(source);
     const getCommentsBefore = source.getCommentsBefore.bind(source);
     const getCommentsAfter = source.getCommentsAfter.bind(source);
+    const getSpacesBeforeNode = createGetSpacesBeforeNode({
+        getText,
+    });
     
     const text = getText(node);
     
@@ -18,6 +21,7 @@ const prepare = (plugin, context, options) => (node) => {
         getText,
         getCommentsBefore,
         getCommentsAfter,
+        getSpacesBeforeNode,
         filename,
     });
     
@@ -91,3 +95,14 @@ function getTraversers(names, plugin) {
     return traversers;
 }
 
+const createGetSpacesBeforeNode = ({getText}) => (node, text = getText(node)) => {
+    let spaces = '';
+    let i = 0;
+    
+    while (!spaces || /^[ \n]+$/.test(spaces))
+        spaces = getText(node, ++i)
+            .replace(text, '');
+    
+    return spaces.slice(1);
+};
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "11.18.0",
+  "version": "12.0.2",
   "description": "eslint plugin for putout",
   "release": false,
   "tag": false,
@@ -36,17 +36,17 @@
     "@babel/core": "^7.12.3",
     "@babel/eslint-parser": "^7.15.0",
     "@babel/plugin-syntax-class-properties": "^7.12.1",
-    "@babel/plugin-syntax-top-level-await": "^7.12.1",
-    "@babel/plugin-syntax-typescript": "^7.12.1",
     "@putout/engine-parser": "^4.6.0",
     "@putout/eslint-config": "^6.0.0",
+    "@typescript-eslint/eslint-plugin": "^5.5.0",
+    "@typescript-eslint/parser": "^5.4.0",
     "align-spaces": "^1.0.0",
     "eslint-plugin-node": "^11.0.0",
     "estree-to-babel": "^4.0.1",
-    "try-catch": "^3.0.0"
+    "try-catch": "^3.0.0",
+    "typescript": "^4.5.2"
   },
   "devDependencies": {
-    "@typescript-eslint/parser": "^5.4.0",
     "c8": "^7.5.0",
     "eslint": "^8.0.1",
     "eslint-plugin-eslint-plugin": "^3.2.0",
@@ -56,14 +56,14 @@
     "simport": "^1.2.0",
     "supertape": "^6.6.0",
     "try-to-catch": "^3.0.0",
-    "typescript": "^4.5.2"
+    "@babel/plugin-syntax-typescript": "^7.12.1"
   },
   "engines": {
     "node": ">=14"
   },
   "peerDependencies": {
     "eslint": ">=8.0.0",
-    "putout": ">=21"
+    "putout": ">=22"
   },
   "license": "MIT",
   "publishConfig": {