@putout/plugin-conditions 8.6.0 → 9.0.0

package/README.md

@@ -15,6 +15,7 @@ npm i @putout/plugin-conditions -D
 
 - ✅ [add-return](#add-return);
 - ✅ [apply-comparison-order](#apply-comparison-order);
+- ✅ [apply-early-return](#apply-early-return);
 - ✅ [apply-consistent-blocks](#apply-consistent-blocks);
 - ✅ [apply-equal](#apply-equal);
 - ✅ [apply-if](#apply-if);
@@ -40,6 +41,7 @@ npm i @putout/plugin-conditions -D
 {
     "rules": {
         "conditions/apply-consistent-blocks": "on",
+        "conditions/apply-return-return": "on",
         "conditions/apply-comparison-order": "on",
         "conditions/apply-equal": "on",
         "conditions/apply-if": "on",
@@ -143,6 +145,31 @@ Linter | Rule | Fix
 🐊 **Putout**| [`conditions/apply-comparison-order`](https://github.com/coderaiser/putout/tree/master/packages/plugin-conditions/#apply-comparison-order)| ✅
 ⏣ **ESLint** | [`yoda`](https://eslint.org/docs/rules/yoda) | ½
 
+## apply-early-return
+
+### ❌ Example of incorrect code
+
+```js
+function notBlockNoNext() {
+    if (a)
+        x();
+    else
+        b();
+}
+```
+
+### ✅ Example of correct code
+
+```js
+function notBlockNoNext() {
+    if (a) {
+        x();
+        return;
+    } else
+        b();
+}
+```
+
 ## apply-equal
 
 Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/7ec940ad79df7e12a1d9111136b4a168/2ccea607e3232721eb950c18195168f8d9b4ef6a).
@@ -520,17 +547,16 @@ Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/256b1b6a90
 
 ### ❌ Example of incorrect code
 
-```js
-const a = 5;
-
-if (a) {}
+```
+if (a)
+   const b = 5;
 ```
 
 ### ✅ Example of correct code
 
 ```js
 if (a) {
-    const a = 5;
+    const b = 5;
 }
 ```
 

package/lib/apply-consistent-blocks/index.js

@@ -97,7 +97,14 @@ export const filter = (path) => {
     const couple = [];
     
     for (const path of paths) {
-        const is = isBlockStatement(path) && path.node.body.length > 1;
+        if (!isBlockStatement(path)) {
+            couple.push(false);
+            continue;
+        }
+        
+        const {length} = path.node.body;
+        const is = length > 1 || !length;
+        
         couple.push(is);
     }
     

package/lib/apply-early-return/index.js

@@ -0,0 +1,50 @@
+import {types} from 'putout';
+
+const {
+    isReturnStatement,
+    isBlockStatement,
+    isFunction,
+    returnStatement,
+} = types;
+
+export const report = () => `Use 'early return' instead of 'else'`;
+
+export const match = () => ({
+    'if (__a) __b; else __c': check,
+});
+
+export const replace = () => ({
+    'if (__a) __b; else __c': ({__b}, path) => {
+        if (isBlockStatement(__b)) {
+            __b.body.push(returnStatement());
+            return path;
+        }
+        
+        return `
+            if (__a) {
+                __b;
+                return;
+            } else
+                __c
+        `;
+    },
+});
+
+function check(vars, path) {
+    if (!isFunction(path.parentPath.parentPath))
+        return false;
+    
+    if (path.getNextSibling().node)
+        return false;
+    
+    const consequent = path.get('consequent');
+    
+    if (isBlockStatement(consequent)) {
+        const last = consequent.node.body.at(-1);
+        
+        if (isReturnStatement(last))
+            return false;
+    }
+    
+    return true;
+}

package/lib/convert-comparison-to-boolean/index.js

@@ -18,7 +18,7 @@ export const traverse = ({push}) => ({
             operator,
         } = path.node;
         
-        if (!/<|>|===?|!===?/.test(operator))
+        if (!/[<>]|===?|!===?/.test(operator))
             return;
         
         if (/<<|>>/.test(operator))

package/lib/index.js

@@ -1,3 +1,4 @@
+import * as applyEarlyReturn from './apply-early-return/index.js';
 import * as applyEqual from './apply-equal/index.js';
 import * as applyConsistentBlocks from './apply-consistent-blocks/index.js';
 import * as applyComparisonOrder from './apply-comparison-order/index.js';
@@ -38,4 +39,5 @@ export const rules = {
     'remove-useless-loop-condition': removeUselessLoopCondition,
     'merge-if-with-else': mergeIfWithElse,
     'apply-equal': applyEqual,
+    'apply-early-return': applyEarlyReturn,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-conditions",
-  "version": "8.6.0",
+  "version": "9.0.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of conditions transformations",
@@ -32,23 +32,23 @@
     "conditions"
   ],
   "devDependencies": {
-    "@putout/eslint-flat": "^3.0.0",
+    "@putout/eslint-flat": "^4.0.0",
     "@putout/plugin-for-of": "*",
-    "@putout/test": "^14.0.0",
-    "c8": "^10.0.0",
-    "eslint": "^9.0.0",
+    "@putout/test": "^15.0.0",
+    "eslint": "^10.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^28.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"