@putout/plugin-conditions 7.1.1 → 7.3.0

package/README.md

@@ -22,11 +22,13 @@ 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);
 - ✅ [remove-same-values-condition](hremove-same-values-condition);
-- ✅ [remove-useless-else](#remove-ureless-else);
+- ✅ [remove-useless-else](#remove-useless-else);
+- ✅ [remove-useless-loop-condition](#remove-useless-loop-condition);
 - ✅ [remove-zero](#remove-zero);
 - ✅ [simplify](#simplify);
 - ✅ [wrap-with-block](#wrap-with-block);
@@ -49,8 +51,10 @@ npm i @putout/plugin-conditions -D
         "conditions/remove-constant": "on",
         "conditions/remove-zero": "on",
         "conditions/remove-useless-else": "on",
+        "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"
     }
@@ -350,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)
 
@@ -369,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.
@@ -406,6 +432,25 @@ Linter | Rule | Fix
 🐊 **Putout** | [`conditions/remove-useless-else`](https://github.com/coderaiser/putout/tree/master/packages/plugin-conditions#remove-useless-else) | ✅
 ⏣ **ESLint** | [`no-else-return`](https://eslint.org/docs/rules/no-else-return) | ✅
 
+## remove-useless-loop-condition
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/eefe12da089fda5554d394746ee25a6f/7a3c467cb95a5909f6d7f7d8228b5003da674113).
+
+### ❌ Example of incorrect code
+
+```js
+while (currentDirPath = getParentDirectory(currentDirPath)) {
+    if (!currentDirPath)
+        break;
+}
+```
+
+### ✅ Example of correct code
+
+```js
+while (currentDirPath = getParentDirectory(currentDirPath)) {}
+```
+
 ## remove-same-values-condition
 
 Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/e537d4ec636d4a9b849063a8326b70ae/661041b3fbb1e3678bf7f828e4c8bf6ca723f89d).

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

@@ -4,8 +4,8 @@ const {types, operator} = require('putout');
 const {replaceWith} = operator;
 const {
     isBlockStatement,
-    BlockStatement,
     isVariableDeclaration,
+    blockStatement,
 } = types;
 
 module.exports.report = () => `Use consistent blocks`;
@@ -19,7 +19,7 @@ module.exports.fix = (path) => {
                 continue;
             
             const {node} = path;
-            replaceWith(path, BlockStatement([node]));
+            replaceWith(path, blockStatement([node]));
         }
     else
         for (const path of paths) {

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

@@ -4,12 +4,12 @@ const {types, operator} = require('putout');
 
 const {replaceWith, compute} = operator;
 
-const {isIdentifier, BooleanLiteral} = types;
+const {isIdentifier, booleanLiteral} = types;
 
 module.exports.report = () => 'Avoid constant conditions';
 
 module.exports.fix = ({path, value}) => {
-    replaceWith(path, BooleanLiteral(value));
+    replaceWith(path, booleanLiteral(value));
 };
 
 module.exports.traverse = ({push}) => ({

package/lib/index.js

@@ -16,6 +16,8 @@ const addReturn = require('./add-return');
 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,
@@ -34,4 +36,6 @@ module.exports.rules = {
     'convert-arrow-to-condition': convertArrowToCondition,
     'reverse-condition': reverseCondition,
     'wrap-with-block': wrapWithBlock,
+    'remove-useless-loop-condition': removeUselessLoopCondition,
+    'merge-if-with-else': mergeIfWithElse,
 };

package/lib/merge-if-statements/index.js

@@ -3,7 +3,7 @@
 const {types, operator} = require('putout');
 
 const {replaceWith} = operator;
-const {LogicalExpression} = types;
+const {logicalExpression} = types;
 
 module.exports.report = () => `Merge 'if' statements`;
 
@@ -12,7 +12,7 @@ module.exports.fix = ({path, consequentPath}) => {
     const left = testPath.node;
     const right = consequentPath.node.test;
     
-    replaceWith(testPath, LogicalExpression('&&', left, right));
+    replaceWith(testPath, logicalExpression('&&', left, right));
     
     replaceWith(path.get('consequent'), consequentPath.get('consequent'));
 };

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/lib/remove-useless-loop-condition/index.js

@@ -0,0 +1,28 @@
+'use strict';
+
+const {operator} = require('putout');
+const {
+    getTemplateValues,
+    compare,
+} = operator;
+
+const LOOP = 'while (__c = __d) __body';
+
+module.exports.report = () => `Avoid useless loop condition`;
+
+module.exports.match = () => ({
+    'if (!__a) __b': ({__a}, path) => {
+        const {parentPath} = path.parentPath;
+        
+        if (!compare(parentPath, LOOP))
+            return false;
+        
+        const {__c} = getTemplateValues(parentPath, LOOP);
+        
+        return compare(__a, __c);
+    },
+});
+
+module.exports.replace = () => ({
+    'if (!__a) __b': '',
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-conditions",
-  "version": "7.1.1",
+  "version": "7.3.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of conditions transformations",
@@ -32,13 +32,13 @@
     "conditions"
   ],
   "devDependencies": {
+    "@putout/eslint-flat": "^2.0.0",
     "@putout/plugin-for-of": "*",
-    "@putout/test": "^11.0.0",
+    "@putout/test": "^12.0.0",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^24.0.0",
-    "lerna": "^6.0.1",
+    "eslint-plugin-putout": "^25.0.1",
     "madrun": "^10.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1"