@putout/plugin-conditions 3.1.0 → 4.0.0

package/README.md

@@ -16,6 +16,7 @@ npm i @putout/plugin-conditions -D
 ```json
 {
     "rules": {
+        "conditions/apply-consistent-blocks": "on",
         "conditions/apply-comparison-order": "on",
         "conditions/apply-if": "on",
         "conditions/convert-comparison-to-boolean": "on",
@@ -31,6 +32,54 @@ npm i @putout/plugin-conditions -D
 }
 ```
 
+## apply-consistent-blocks
+
+> A **block statement** is used to group zero or more statements. The block is delimited by a pair of braces ("curly braces") and contains a list of zero or more statements and declarations.
+>
+> (c) [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/block)
+
+Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/9035db21bae7b6c76d1dc875d4c74828/07edbfd755060ae263949caf08b31aa43609375a).
+
+### ❌ Example of incorrect code
+
+```js
+if (a > 3) {
+    m();
+}
+
+if (a > 3)
+    b = 5;
+else {
+    b = 6;
+}
+
+if (a > 3)
+    b = 5;
+else {
+    b = 6;
+    fn();
+}
+```
+
+### ✅ Example of correct code
+
+```js
+if (a > 3)
+    m();
+
+if (a > 3)
+    b = 5;
+else
+    b = 6;
+
+if (a > 3) {
+    b = 5;
+} else {
+    b = 6;
+    fn();
+}
+```
+
 ## apply-comparison-order
 
 > The result of evaluating an equality operator is always of type boolean based on whether the comparison is true.
@@ -126,9 +175,8 @@ if (a === b) {}
 const a = [];
 const c = a;
 
-if (a) {
+if (a)
     console.log(a);
-}
 ```
 
 ### ✅ Example of correct code
@@ -201,9 +249,8 @@ if (b) {}
 ### ❌ Example of incorrect code
 
 ```js
-if (zone?.tooltipCallback) {
+if (zone?.tooltipCallback)
     zone.tooltipCallback(e);
-}
 
 if (a)
     alert('hello');
@@ -228,19 +275,16 @@ alert('hello');
 ### ❌ Example of incorrect code
 
 ```js
-if (a > b) {
-    if (b < c) {
+if (a > b)
+    if (b < c)
         console.log('hello');
-    }
-}
 ```
 
 ### ✅ Example of correct code
 
 ```js
-if (a > b && b < c) {
+if (a > b && b < c)
     console.log('hello');
-}
 ```
 
 ## remove-useless-else

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

@@ -0,0 +1,38 @@
+'use strict';
+
+const {types} = require('putout');
+const {
+    isBlockStatement,
+    isIfStatement,
+} = types;
+
+module.exports.report = () => `Use consistent blocks`;
+
+const notBlock = ({__b}) => !isBlockStatement(__b);
+
+module.exports.match = () => ({
+    'if (__a) {__b} else {__c}': () => true,
+    'if (__a) __b; else __body': notBlock,
+    'if (__a) __body; else __b': ({__b}) => !isIfStatement(__b),
+    'if (__a) {__b}': (vars, path) => {
+        const {parentPath} = path;
+        
+        if (!parentPath.isIfStatement())
+            return true;
+        
+        return path !== parentPath.get('alternate');
+    },
+});
+
+module.exports.replace = () => ({
+    'if (__a) {if (__b) {__c}}': 'if (__a) if (__b) __c',
+    'if (__a) {__b}': 'if (__a) __b',
+    'if (__a) {__b} else {__c}': () => 'if (__a) __b; else __c',
+    'if (__a) __b; else __body': 'if (__a) {__b} else __body',
+    'if (__a) __body; else __b': ({__b}, path) => {
+        if (isBlockStatement(__b))
+            return path;
+        
+        return 'if (__a) __body; else {__b}';
+    },
+});

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

@@ -28,12 +28,11 @@ module.exports.traverse = ({push}) => ({
         
         const [confident, value] = compute(path);
         
-        if (confident) {
+        if (confident)
             return push({
                 path,
                 value,
             });
-        }
         
         if (sameIdentifiers(left, right))
             return push({

package/lib/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+const applyConsistentBlocks = require('./apply-consistent-blocks');
 const applyComparisonOrder = require('./apply-comparison-order');
 const applyIf = require('./apply-if');
 const evaluate = require('./evaluate');
@@ -14,6 +15,7 @@ const removeSameValuesCondition = require('./remove-same-values-condition');
 
 module.exports.rules = {
     'apply-comparison-order': applyComparisonOrder,
+    'apply-consistent-blocks': applyConsistentBlocks,
     'apply-if': applyIf,
     evaluate,
     'convert-comparison-to-boolean': convertComparisonToBoolean,

package/lib/remove-same-values-condition/index.js

@@ -2,7 +2,6 @@
 
 const {operator} = require('putout');
 const {
-    replaceWith,
     getTemplateValues,
     compare,
     traverse,
@@ -11,37 +10,37 @@ const {
 module.exports.report = () => `Avoid condition with the same value`;
 
 module.exports.match = () => ({
-    'if (__a === __b) __c'({__a, __b}, prev) {
-        while (prev = prev.getPrevSibling(), prev.node) {
-            if (!compare(prev, 'if (__a !== __b) __c'))
-                continue;
-            
-            const values = getTemplateValues(prev, 'if (__a !== __b) __c');
-            
-            if (!compare(__a, values.__a))
-                continue;
-            
-            if (!compare(__b, values.__b))
-                continue;
-            
-            if (!hasContinue(prev))
-                continue;
-            
-            return true;
-        }
-        
-        return false;
-    },
+    'if (__a === __b) __c': check('if (__a !== __b) __c'),
+    'if (__a !== __b) __c': check('if (__a === __b) __c'),
 });
 
 module.exports.replace = () => ({
-    'if (__a === __b) __c': (vars, path) => {
-        replaceWith(path, path.get('consequent'));
-        
-        return path;
-    },
+    'if (__a === __b) __c': '__c',
+    'if (__a !== __b) __c': '__c',
 });
 
+const check = (template) => ({__a, __b}, prev) => {
+    while (prev = prev.getPrevSibling(), prev.node) {
+        if (!compare(prev, template))
+            continue;
+        
+        const values = getTemplateValues(prev, template);
+        
+        if (!compare(__a, values.__a))
+            continue;
+        
+        if (!compare(__b, values.__b))
+            continue;
+        
+        if (!hasContinue(prev))
+            continue;
+        
+        return true;
+    }
+    
+    return false;
+};
+
 function hasContinue(path) {
     let is = false;
     

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-conditions",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of conditions transformations",
@@ -44,7 +44,7 @@
     "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=32"
+    "putout": ">=33"
   },
   "license": "MIT",
   "engines": {