eslint-plugin-putout 12.5.1 → 12.8.0

package/README.md

@@ -101,7 +101,11 @@ When using 🐊`Putout` in IDE with `--fix` on save, or when you want to disable
 }
 ```
 
-List of disabled 🐊`Putout` rules:
+Disabled `ESLint` rules:
+
+- [no-useless-return](https://eslint.org/docs/rules/no-useless-return)
+
+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/index.js

@@ -15,7 +15,7 @@ const regExp = /^;?\n( +)?\n +$/;
 module.exports.category = 'layout';
 module.exports.report = () => 'Add newline after function call';
 
-module.exports.filter = ({text, node, getText, getCommentsAfter}) => {
+module.exports.filter = ({text, node, getText, getCommentsAfter, getSpacesAfterNode}) => {
     if (!isExpressionStatement(node.parent))
         return false;
     
@@ -33,7 +33,7 @@ module.exports.filter = ({text, node, getText, getCommentsAfter}) => {
     if (n < 3)
         return false;
     
-    const spaces = getSpacesAfterNode(node, {text, getText});
+    const spaces = getSpacesAfterNode(node, {text});
     
     if (regExp.test(spaces))
         return false;
@@ -84,14 +84,3 @@ module.exports.include = () => [
     'CallExpression',
 ];
 
-function getSpacesAfterNode(node, {getText, text = getText(node)}) {
-    let spaces = '';
-    let i = 0;
-    
-    while (!spaces || /^[ \n;]+$/.test(spaces))
-        spaces = getText(node, 0, ++i)
-            .replace(text, '');
-    
-    return spaces.slice(0, -1);
-}
-

package/lib/index.js

@@ -97,6 +97,7 @@ const safe = {
     ...recommended,
     rules: {
         ...recommended.rules,
+        'no-useless-return': 'off',
         'putout/align-spaces': 'off',
         'putout/putout': ['error', {
             rules: {

package/lib/putout/index.js

@@ -1,5 +1,7 @@
 'use strict';
 
+const tryCatch = require('try-catch');
+
 const {
     ignores,
     findPlaces,
@@ -13,6 +15,7 @@ const traverse = require('@babel/traverse').default;
 const v8 = require('v8');
 
 const parseOptions = require('putout/parse-options');
+const {parseError} = require('./parse-error');
 
 const cwd = process.cwd();
 const getContextOptions = ({options}) => {
@@ -23,6 +26,8 @@ const getContextOptions = ({options}) => {
 const copyAST = (a) => v8.deserialize(v8.serialize(a));
 const returns = (a) => () => a;
 
+const EMPTY_VISITORS = {};
+
 module.exports = {
     meta: {
         type: 'suggestion',
@@ -35,45 +40,50 @@ module.exports = {
     },
     
     create(context) {
-        return {
-            Program(node) {
-                const name = context.getFilename();
-                const options = getContextOptions(context);
-                const resultOptions = parseOptions({
-                    name,
-                    options,
-                });
-                
-                if (ignores(cwd, name, resultOptions))
-                    return;
-                
-                const source = context.getSourceCode();
-                const {text} = source;
-                
-                const ast = parse(text, {
-                    parser: createParser(node),
-                });
-                
-                const places = findPlaces(ast, text, resultOptions);
-                
-                for (const {rule, message, position} of places) {
-                    context.report({
-                        message: `${message} (${rule})`,
-                        fix: fix({
-                            ast,
-                            text,
-                            node,
-                            source,
-                            resultOptions,
-                        }),
-                        loc: {
-                            start: position,
-                            end: position,
-                        },
-                    });
-                }
-            },
-        };
+        const name = context.getFilename();
+        const options = getContextOptions(context);
+        const resultOptions = parseOptions({
+            name,
+            options,
+        });
+        
+        if (ignores(cwd, name, resultOptions))
+            return EMPTY_VISITORS;
+        
+        const source = context.getSourceCode();
+        const {text} = source;
+        const node = source.ast;
+        
+        const ast = parse(text, {
+            parser: createParser(node),
+        });
+        
+        const [error, places = []] = tryCatch(findPlaces, ast, text, resultOptions);
+        
+        if (error)
+            context.report({
+                message: `${parseError(error)} (putout)`,
+                node,
+            });
+        
+        for (const {rule, message, position} of places) {
+            context.report({
+                message: `${message} (${rule})`,
+                fix: fix({
+                    ast,
+                    text,
+                    node,
+                    source,
+                    resultOptions,
+                }),
+                loc: {
+                    start: position,
+                    end: position,
+                },
+            });
+        }
+        
+        return EMPTY_VISITORS;
     },
 };
 

package/lib/putout/parse-error.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports.parseError = ({message}) => {
+    if (message.includes('buildError'))
+        return 'Parser error';
+    
+    return message;
+};

package/lib/ts.js

@@ -59,6 +59,9 @@ const extensionRules = {
     
     'space-infix-ops': 'off',
     '@typescript-eslint/space-infix-ops': rules[ 'space-infix-ops'],
+    
+    'no-redecalre': 'off',
+    '@typescript-eslint/no-redeclare': 'error',
 };
 
 const ts = {

package/lib/wrap.js

@@ -8,10 +8,15 @@ 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 getSpacesAfterNode = createGetSpacesAfterNode({
+        getText,
+    });
+    
     const text = getText(node);
     
     const result = filter({
@@ -22,6 +27,7 @@ const prepare = (plugin, context, options) => (node) => {
         getCommentsBefore,
         getCommentsAfter,
         getSpacesBeforeNode,
+        getSpacesAfterNode,
         filename,
     });
     
@@ -106,3 +112,14 @@ const createGetSpacesBeforeNode = ({getText}) => (node, text = getText(node)) =>
     return spaces.slice(1);
 };
 
+const createGetSpacesAfterNode = ({getText}) => (node, {text = getText(node)}) => {
+    let spaces = '';
+    let i = 0;
+    
+    while (!spaces || /^[ \n;]+$/.test(spaces))
+        spaces = getText(node, 0, ++i)
+            .replace(text, '');
+    
+    return spaces.slice(0, -1);
+};
+

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "12.5.1",
+  "version": "12.8.0",
   "description": "eslint plugin for putout",
   "release": false,
   "tag": false,