eslint-plugin-putout 12.4.0 → 12.7.0

package/README.md

@@ -103,6 +103,7 @@ When using 🐊`Putout` in IDE with `--fix` on save, or when you want to disable
 
 List of disabled 🐊`Putout` rules:
 
+- [no-useless-return](https://eslint.org/docs/rules/no-useless-return)
 - [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);
 - [remove-unused-types](https://github.com/coderaiser/putout/tree/v22.0.0/packages/remove-unused-types);

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

@@ -6,12 +6,11 @@ const {
     transform,
     print,
     parse,
-    generate,
 } = require('putout');
 
+const traverse = require('@babel/traverse').default;
+
 const v8 = require('v8');
-const toBabel = require('estree-to-babel');
-const tryCatch = require('try-catch');
 
 const parseOptions = require('putout/parse-options');
 
@@ -22,6 +21,9 @@ const getContextOptions = ({options}) => {
 };
 
 const copyAST = (a) => v8.deserialize(v8.serialize(a));
+const returns = (a) => () => a;
+
+const EMPTY_VISITORS = {};
 
 module.exports = {
     meta: {
@@ -35,47 +37,44 @@ 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: {
-                        parse: () => toBabel(copyAST(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 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,
+                },
+            });
+        }
+        
+        return EMPTY_VISITORS;
     },
 };
 
@@ -88,17 +87,33 @@ const fix = ({ast, text, node, source, resultOptions}) => (fixer) => {
     transform(ast, text, resultOptions);
     
     const [, last] = lastToken.range;
-    const code = printCode(ast);
+    const code = print(ast);
     
     return fixer.replaceTextRange([0, last], code);
 };
 
-function printCode(ast) {
-    const [, code] = tryCatch(print, ast);
+const createParser = (node) => {
+    const ast = copyAST(node);
+    removeParent(ast);
     
-    if (code)
-        return code;
+    const parser = {
+        parse: returns(ast),
+    };
     
-    return generate(ast).code;
+    return parser;
+};
+
+// ESLint adds parent to each node
+// it makes recase go crazy
+// so we better drop them
+//
+// https://github.com/eslint/eslint/blob/v8.4.0/lib/linter/linter.js#L964
+function removeParent(ast) {
+    traverse(ast, {
+        noScope: true,
+        enter(path) {
+            delete path.node.parent;
+        },
+    });
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eslint-plugin-putout",
-  "version": "12.4.0",
+  "version": "12.7.0",
   "description": "eslint plugin for putout",
   "release": false,
   "tag": false,
@@ -36,13 +36,13 @@
     "@babel/core": "^7.12.3",
     "@babel/eslint-parser": "^7.15.0",
     "@babel/plugin-syntax-class-properties": "^7.12.1",
+    "@babel/traverse": "^7.16.3",
     "@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",
     "typescript": "^4.5.2"
   },