@putout/plugin-return 2.0.0 → 4.0.0

package/README.md

@@ -22,6 +22,7 @@ npm i putout @putout/plugin-return -D
 - ✅ [convert-from-break](#convert-from-continue);
 - ✅ [merge-with-next-sibling](#merge-with-next-sibling);
 - ✅ [remove-useless](#remove-useless);
+- ✅ [remove-last-empty](#remove-last-empty);
 - ✅ [simplify-boolean](#simplify-boolean);
 
 ## Config
@@ -34,6 +35,7 @@ npm i putout @putout/plugin-return -D
         "return/convert-from-break": "on",
         "return/merge-with-next-sibling": "on",
         "return/remove-useless": "on",
+        "return/remove-last-empty": "on",
         "return/simplify-boolean": "on"
     }
 }
@@ -198,6 +200,27 @@ const traverse = ({push}) => ({
 });
 ```
 
+### remove-last-empty
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/111549a3e6d61f8637ea12217062ea80/10e7842f9fbbf7fb0712d3b41cdcc707ae410fe5).
+
+### ❌ Example of incorrect code
+
+```js
+const exit = (vars, path, {push}) => {
+    push(path);
+    return;
+};
+```
+
+### ✅ Example of correct code
+
+```js
+const exit = (vars, path, {push}) => {
+    push(path);
+};
+```
+
 ## simplify-boolean
 
 Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/304035b9529830cf20e76e9a1f35f14c/39c743921c6bfad3984a3989f25c2986ab51e8c8).

package/lib/convert-from-break/index.js

@@ -1,13 +1,7 @@
 import {convertFrom} from '../convert-from.js';
 
-const {
+export const {
     report,
     traverse,
     fix,
 } = convertFrom('break');
-
-export {
-    report,
-    traverse,
-    fix,
-};

package/lib/convert-from-continue/index.js

@@ -1,13 +1,7 @@
 import {convertFrom} from '../convert-from.js';
 
-const {
+export const {
     report,
     traverse,
     fix,
 } = convertFrom('continue');
-
-export {
-    report,
-    traverse,
-    fix,
-};

package/lib/index.js

@@ -1,3 +1,4 @@
+import * as removeLastEmpty from './remove-last-empty/index.js';
 import * as applyEarly from './apply-early/index.js';
 import * as convertFromContinue from './convert-from-continue/index.js';
 import * as convertFromBreak from './convert-from-break/index.js';
@@ -12,4 +13,5 @@ export const rules = {
     'merge-with-next-sibling': mergeWithNextSibling,
     'simplify-boolean': simplifyBoolean,
     'remove-useless': removeUseless,
+    'remove-last-empty': removeLastEmpty,
 };

package/lib/remove-last-empty/index.js

@@ -0,0 +1,28 @@
+import {types} from 'putout';
+
+const {
+    isFunction,
+    isBlockStatement,
+} = types;
+
+export const report = () => `Avoid empty 'return' in function body`;
+
+export const match = () => ({
+    return: (vars, path) => {
+        const {parentPath} = path;
+        
+        if (!isBlockStatement(parentPath))
+            return false;
+        
+        const next = path.getNextSibling();
+        
+        if (next.node)
+            return false;
+        
+        return isFunction(parentPath.parentPath);
+    },
+});
+
+export const replace = () => ({
+    return: '',
+});

package/lib/remove-useless/index.js

@@ -5,6 +5,7 @@ const {
     isIdentifier,
     isLiteral,
     isAssignmentPattern,
+    isObjectExpression,
 } = types;
 
 export const report = () => `Avoid useless 'return'`;
@@ -26,9 +27,6 @@ export const filter = (path) => {
     if (!bodyPath.isBlockStatement())
         return false;
     
-    if (hasComplexParams(path))
-        return false;
-    
     const first = bodyPath.get('body.0');
     
     if (!first)
@@ -45,6 +43,9 @@ export const filter = (path) => {
     if (!argPath.node)
         return false;
     
+    if (hasComplexParams(path) && !isObjectExpression(argPath))
+        return false;
+    
     if (isChainCall(argPath))
         return false;
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-return",
-  "version": "2.0.0",
+  "version": "4.0.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability to transform code related to return",
@@ -31,28 +31,27 @@
     "return"
   ],
   "devDependencies": {
-    "@putout/eslint-flat": "^3.0.0",
     "@putout/plugin-declare": "*",
     "@putout/plugin-declare-before-reference": "*",
     "@putout/plugin-putout": "*",
-    "@putout/plugin-remove-unused-variables": "*",
     "@putout/plugin-reuse-duplicate-init": "*",
     "@putout/plugin-typescript": "*",
-    "@putout/test": "^13.0.0",
-    "c8": "^10.0.0",
-    "eslint": "^9.0.0",
+    "@putout/plugin-variables": "*",
+    "@putout/test": "^15.0.0",
+    "eslint": "^10.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^26.0.0",
-    "madrun": "^11.0.0",
+    "eslint-plugin-putout": "^31.0.0",
+    "madrun": "^13.0.0",
     "montag": "^1.2.1",
-    "nodemon": "^3.0.1"
+    "nodemon": "^3.0.1",
+    "superc8": "^12.0.0"
   },
   "peerDependencies": {
-    "putout": ">=40"
+    "putout": ">=42"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "publishConfig": {
     "access": "public"