@putout/plugin-conditions 7.2.0 → 7.3.0

package/README.md

@@ -22,6 +22,7 @@ npm i @putout/plugin-conditions -D
 - ✅ [convert-arrow-to-condition](#convert-arrow-to-condition);
 - ✅ [evaluate](#evaluate);
 - ✅ [merge-if-statements](#merge-if-statements);
+- ✅ [merge-if-with-else](#merge-if-with-else);
 - ✅ [reverse](#reverse);
 - ✅ [remove-boolean](#remove-boolean);
 - ✅ [remove-constant](#remove-constant);
@@ -53,6 +54,7 @@ npm i @putout/plugin-conditions -D
         "conditions/remove-useless-loop-condition": "on",
         "conditions/remove-same-values-condition": "on",
         "conditions/merge-if-statements": "on",
+        "conditions/merge-if-with-else": "on",
         "conditions/simplify": "on",
         "conditions/wrap-with-block": "on"
     }
@@ -352,7 +354,7 @@ alert('hello');
 
 ## merge-if-statements
 
-> The `if` statement executes a statement `if` a specified condition is truthy.
+> Multiple `if...else` statements can be nested to create an else if clause
 >
 > (c) [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/if...else)
 
@@ -371,6 +373,28 @@ if (a > b && b < c)
     console.log('hello');
 ```
 
+## merge-if-with-else
+
+> The `if` statement executes a statement `if` a specified condition is truthy.
+>
+> (c) [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/if...else)
+
+### ❌ Example of incorrect code
+
+```js
+if (!matchFn)
+    fix(from, to, path);
+else if (matchFn(options))
+    fix(from, to, path);
+```
+
+### ✅ Example of correct code
+
+```js
+if (!matchFn || matchFn(options))
+    fix(from, to, path);
+```
+
 ## remove-useless-else
 
 > You can skip the `else` block if your `if` block always executes a `return` statement, it makes code a lot easier to read.

package/lib/index.js

@@ -17,6 +17,7 @@ const convertArrowToCondition = require('./convert-arrow-to-condition');
 const reverseCondition = require('./reverse-condition');
 const wrapWithBlock = require('./wrap-with-block');
 const removeUselessLoopCondition = require('./remove-useless-loop-condition');
+const mergeIfWithElse = require('./merge-if-with-else');
 
 module.exports.rules = {
     'apply-comparison-order': applyComparisonOrder,
@@ -36,4 +37,5 @@ module.exports.rules = {
     'reverse-condition': reverseCondition,
     'wrap-with-block': wrapWithBlock,
     'remove-useless-loop-condition': removeUselessLoopCondition,
+    'merge-if-with-else': mergeIfWithElse,
 };

package/lib/merge-if-with-else/index.js

@@ -0,0 +1,27 @@
+'use strict';
+
+const {types, operator} = require('putout');
+
+const {compare} = operator;
+const {logicalExpression} = types;
+
+module.exports.report = () => `Merge 'if' with 'else' when the body is the same`;
+
+module.exports.fix = (path) => {
+    const {test: testFirst, alternate} = path.node;
+    const {test: testSecond} = alternate;
+    
+    path.node.test = logicalExpression('||', testFirst, testSecond);
+    delete path.node.alternate;
+};
+module.exports.traverse = ({push}) => ({
+    IfStatement: (path) => {
+        if (!path.node.alternate)
+            return;
+        
+        if (!compare(path.node.consequent, path.node.alternate.consequent))
+            return;
+        
+        push(path);
+    },
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-conditions",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of conditions transformations",