@putout/plugin-conditions 7.3.1 → 8.1.0

package/lib/add-return/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => `Add return statement`;
 
-module.exports.report = () => `Add return statement`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a) false': 'if (__a) return false',
     'if (__a) true': 'if (__a) return true',
 });

package/lib/apply-comparison-order/index.js

@@ -1,12 +1,12 @@
-'use strict';
+import {operator} from 'putout';
 
-module.exports.report = ({leftPath, rightPath}) => {
+const {replaceWith} = operator;
+
+export const report = ({leftPath, rightPath}) => {
     return `Swap '${leftPath.toString()}' with '${rightPath}'`;
 };
 
-const {replaceWith} = require('putout').operator;
-
-module.exports.fix = ({path, leftPath, rightPath, operator}) => {
+export const fix = ({path, leftPath, rightPath, operator}) => {
     const leftNode = leftPath.node;
     const rightNode = rightPath.node;
     
@@ -16,7 +16,7 @@ module.exports.fix = ({path, leftPath, rightPath, operator}) => {
     path.node.operator = convertOperator(operator);
 };
 
-module.exports.traverse = ({push}) => ({
+export const traverse = ({push}) => ({
     BinaryExpression: (path) => {
         const {operator} = path.node;
         

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

@@ -1,6 +1,5 @@
-'use strict';
+import {types, operator} from 'putout';
 
-const {types, operator} = require('putout');
 const {replaceWith} = operator;
 const {
     isBlockStatement,
@@ -8,9 +7,9 @@ const {
     blockStatement,
 } = types;
 
-module.exports.report = () => `Use consistent blocks`;
+export const report = () => `Use consistent blocks`;
 
-module.exports.fix = (path) => {
+export const fix = (path) => {
     const paths = getAllNodes(path);
     
     if (isAllBlocks(paths))
@@ -51,16 +50,19 @@ function isAllBlocks(paths) {
     return false;
 }
 
-module.exports.include = () => [
+export const include = () => [
     'IfStatement',
 ];
 
-module.exports.filter = (path) => {
+export const filter = (path) => {
     const {consequent, alternate} = path.node;
     
     if (!alternate && !consequent.body?.length)
         return false;
     
+    if (isBlockStatement(consequent) && !consequent.body.length)
+        return false;
+    
     if (path === path.parentPath.get('alternate'))
         return false;
     

package/lib/apply-if/index.js

@@ -1,11 +1,10 @@
-'use strict';
+import {operator} from 'putout';
 
-const {operator} = require('putout');
 const {remove, replaceWith} = operator;
 
-module.exports.report = () => 'Avoid empty statement in if condition';
+export const report = () => 'Avoid empty statement in if condition';
 
-module.exports.filter = (path) => {
+export const filter = (path) => {
     const nextPath = path.getNextSibling();
     
     if (!nextPath.node)
@@ -14,11 +13,11 @@ module.exports.filter = (path) => {
     return path.get('consequent').isEmptyStatement();
 };
 
-module.exports.include = () => [
+export const include = () => [
     'IfStatement',
 ];
 
-module.exports.fix = (path) => {
+export const fix = (path) => {
     const nextPath = path.getNextSibling();
     const consequentPath = path.get('consequent');
     

package/lib/avoid-in-assertions.js

@@ -1,12 +1,11 @@
-'use strict';
+import {types} from 'putout';
 
-const {types} = require('putout');
 const {
     isBinaryExpression,
     isJSXExpressionContainer,
 } = types;
 
-module.exports.createAvoidInAssertions = (value) => ({
+export const createAvoidInAssertions = (value) => ({
     report: createReport(value),
     match: createMatch(value),
     replace: createReplace(value),

package/lib/convert-arrow-to-condition/index.js

@@ -1,7 +1,5 @@
-'use strict';
+export const report = () => `Use 'condition' instead of 'arrow function'`;
 
-module.exports.report = () => `Use 'condition' instead of 'arrow function'`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a => __b) __c': 'if (__a >= __b) __c',
 });

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

@@ -1,18 +1,16 @@
-'use strict';
-
-const {types, operator} = require('putout');
+import {types, operator} from 'putout';
 
 const {replaceWith, compute} = operator;
 
 const {isIdentifier, booleanLiteral} = types;
 
-module.exports.report = () => 'Avoid constant conditions';
+export const report = () => 'Avoid constant conditions';
 
-module.exports.fix = ({path, value}) => {
+export const fix = ({path, value}) => {
     replaceWith(path, booleanLiteral(value));
 };
 
-module.exports.traverse = ({push}) => ({
+export const traverse = ({push}) => ({
     BinaryExpression(path) {
         const {
             left,

package/lib/convert-equal-to-strict-equal/index.js

@@ -1,13 +1,11 @@
-'use strict';
+export const report = () => `Use strict equal ('===') instead of equal ('==')`;
 
-module.exports.report = () => `Use strict equal ('===') instead of equal ('==')`;
-
-module.exports.exclude = () => [
+export const exclude = () => [
     '__ == null',
     '__ != null',
 ];
 
-module.exports.replace = () => ({
+export const replace = () => ({
     '__a == __b': '__a === __b',
     '__a != __b': '__a !== __b',
 });

package/lib/evaluate/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => 'Avoid useless conditions';
 
-module.exports.report = () => 'Avoid useless conditions';
-
-module.exports.match = () => ({
+export const match = () => ({
     'if (__a) __b': (vars, path) => {
         const testPath = path.get('test');
         const {confident} = testPath.evaluate();
@@ -11,7 +9,7 @@ module.exports.match = () => ({
     },
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a) __b': (vars, path) => {
         const testPath = path.get('test');
         const {value} = testPath.evaluate();

package/lib/index.js

@@ -1,25 +1,23 @@
-'use strict';
+import * as applyConsistentBlocks from './apply-consistent-blocks/index.js';
+import * as applyComparisonOrder from './apply-comparison-order/index.js';
+import * as applyIf from './apply-if/index.js';
+import * as evaluate from './evaluate/index.js';
+import * as convertComparisonToBoolean from './convert-comparison-to-boolean/index.js';
+import * as convertEqualToStrictEqual from './convert-equal-to-strict-equal/index.js';
+import * as mergeIfStatements from './merge-if-statements/index.js';
+import * as removeBoolean from './remove-boolean/index.js';
+import removeZero from './remove-zero/index.js';
+import * as removeUselessElse from './remove-useless-else/index.js';
+import * as simplify from './simplify/index.js';
+import * as removeSameValuesCondition from './remove-same-values-condition/index.js';
+import * as addReturn from './add-return/index.js';
+import * as convertArrowToCondition from './convert-arrow-to-condition/index.js';
+import * as reverseCondition from './reverse-condition/index.js';
+import * as wrapWithBlock from './wrap-with-block/index.js';
+import * as removeUselessLoopCondition from './remove-useless-loop-condition/index.js';
+import * as mergeIfWithElse from './merge-if-with-else/index.js';
 
-const applyConsistentBlocks = require('./apply-consistent-blocks');
-const applyComparisonOrder = require('./apply-comparison-order');
-const applyIf = require('./apply-if');
-const evaluate = require('./evaluate');
-const convertComparisonToBoolean = require('./convert-comparison-to-boolean');
-const convertEqualToStrictEqual = require('./convert-equal-to-strict-equal');
-const mergeIfStatements = require('./merge-if-statements');
-const removeBoolean = require('./remove-boolean');
-const removeZero = require('./remove-zero');
-const removeUselessElse = require('./remove-useless-else');
-const simplify = require('./simplify');
-const removeSameValuesCondition = require('./remove-same-values-condition');
-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 = {
+export const rules = {
     'apply-comparison-order': applyComparisonOrder,
     'apply-consistent-blocks': applyConsistentBlocks,
     'apply-if': applyIf,

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

@@ -1,13 +1,11 @@
-'use strict';
-
-const {types, operator} = require('putout');
+import {types, operator} from 'putout';
 
 const {replaceWith} = operator;
 const {logicalExpression} = types;
 
-module.exports.report = () => `Merge 'if' statements`;
+export const report = () => `Merge 'if' statements`;
 
-module.exports.fix = ({path, consequentPath}) => {
+export const fix = ({path, consequentPath}) => {
     const testPath = path.get('test');
     const left = testPath.node;
     const right = consequentPath.node.test;
@@ -37,7 +35,7 @@ const getConsequent = (path) => {
     return null;
 };
 
-module.exports.traverse = ({push}) => ({
+export const traverse = ({push}) => ({
     'if (__) __': onIfStatement({
         push,
     }),

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

@@ -1,20 +1,18 @@
-'use strict';
-
-const {types, operator} = require('putout');
+import {types, operator} from 'putout';
 
 const {compare} = operator;
 const {logicalExpression} = types;
 
-module.exports.report = () => `Merge 'if' with 'else' when the body is the same`;
+export const report = () => `Merge 'if' with 'else' when the body is the same`;
 
-module.exports.fix = (path) => {
+export const 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}) => ({
+export const traverse = ({push}) => ({
     IfStatement: (path) => {
         if (!path.node.alternate)
             return;

package/lib/remove-boolean/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => 'Avoid boolean in assertions';
 
-module.exports.report = () => 'Avoid boolean in assertions';
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'return __a === true': 'return Boolean(__a)',
     'return __a == true': 'return Boolean(__a)',
     'const __a = __b === true': 'const __a = __b',

package/lib/remove-constant/index.js

@@ -1,7 +1,5 @@
-'use strict';
-
-const {runInNewContext} = require('node:vm');
-const {types, operator} = require('putout');
+import {runInNewContext} from 'node:vm';
+import {types, operator} from 'putout';
 
 const {
     replaceWith,
@@ -11,9 +9,9 @@ const {
 
 const {isIdentifier} = types;
 
-module.exports.report = () => 'Avoid constant conditions';
+export const report = () => 'Avoid constant conditions';
 
-module.exports.fix = ({path, result}) => {
+export const fix = ({path, result}) => {
     const {alternate, consequent} = path.node;
     
     const {body = [consequent]} = consequent;
@@ -27,7 +25,7 @@ module.exports.fix = ({path, result}) => {
     replaceWith(path, alternate);
 };
 
-module.exports.traverse = ({push, generate}) => ({
+export const traverse = ({push, generate}) => ({
     IfStatement(path) {
         const testPath = path.get('test');
         

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

@@ -1,20 +1,19 @@
-'use strict';
+import {operator} from 'putout';
 
-const {operator} = require('putout');
 const {
     getTemplateValues,
     compare,
     traverse,
 } = operator;
 
-module.exports.report = () => `Avoid condition with the same value`;
+export const report = () => `Avoid condition with the same value`;
 
-module.exports.match = () => ({
+export const match = () => ({
     'if (__a === __b) __c': check('if (__a !== __b) __c'),
     'if (__a !== __b) __c': check('if (__a === __b) __c'),
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a === __b) __c': '__c',
     'if (__a !== __b) __c': '__c',
 });

package/lib/remove-useless-else/index.js

@@ -1,30 +1,38 @@
-'use strict';
+import {types} from 'putout';
 
 const {
     isReturnStatement,
     isBlockStatement,
     isContinueStatement,
     isBreakStatement,
-} = require('putout').types;
+} = types;
 
-module.exports.report = () => `Avoid useless 'else'`;
+export const report = () => `Avoid useless 'else'`;
 
-module.exports.match = () => ({
+export const match = () => ({
     'if (__a) __b; else __c': ({__b}) => {
         if (!isBlockStatement(__b))
             return isReturnLike(__b);
         
+        if (!__b.body.length)
+            return true;
+        
         const latest = __b.body.at(-1);
         
         return isReturnLike(latest);
     },
 });
 
-module.exports.replace = () => ({
-    'if (__a) __b; else __c': `{
-        if (__a) __b;
-        __c;
-    }`,
+export const replace = () => ({
+    'if (__a) __b; else __c': ({__b}) => {
+        if (isBlockStatement(__b) && !__b.body.length)
+            return 'if (!__a) __c';
+        
+        return `{
+            if (__a) __b;
+            __c;
+        }`;
+    },
 });
 
 function isReturnLike(node) {

package/lib/remove-useless-loop-condition/index.js

@@ -1,6 +1,5 @@
-'use strict';
+import {operator} from 'putout';
 
-const {operator} = require('putout');
 const {
     getTemplateValues,
     compare,
@@ -8,9 +7,9 @@ const {
 
 const LOOP = 'while (__c = __d) __body';
 
-module.exports.report = () => `Avoid useless loop condition`;
+export const report = () => `Avoid useless loop condition`;
 
-module.exports.match = () => ({
+export const match = () => ({
     'if (!__a) __b': ({__a}, path) => {
         const {parentPath} = path.parentPath;
         
@@ -23,6 +22,6 @@ module.exports.match = () => ({
     },
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (!__a) __b': '',
 });

package/lib/remove-zero/index.js

@@ -1,5 +1,3 @@
-'use strict';
+import {createAvoidInAssertions} from '../avoid-in-assertions.js';
 
-const {createAvoidInAssertions} = require('../avoid-in-assertions');
-
-module.exports = createAvoidInAssertions(0);
+export default createAvoidInAssertions(0);

package/lib/reverse-condition/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => `Avoid useless '!'`;
 
-module.exports.report = () => `Avoid useless '!'`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     '!(__a > __b)': '__a <= __b',
     '!(__a !== __b && __c === __d)': '__a === __b || __c !== __d',
     '!(__a !== __b || __c !== __d)': '__a === __b && __c === __d',

package/lib/simplify/index.js

@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => 'Avoid useless conditions';
 
-module.exports.report = () => 'Avoid useless conditions';
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a?.__b) {__a.__b(__args)}': '__a?.__b(__args)',
     'if (__a?.__b) __a.__b(__args)': '__a?.__b(__args)',
     'if (__a) __b; else __b': '__b',

package/lib/wrap-with-block/index.js

@@ -1,13 +1,11 @@
-'use strict';
+export const report = () => `Lexical declaration cannot appear in single-statement-context`;
 
-module.exports.report = () => `Lexical declaration cannot appear in single-statement-context`;
-
-module.exports.match = () => ({
+export const match = () => ({
     'const __a = __b': (vars, path) => {
         return path.parentPath.isIfStatement();
     },
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     'const __a = __b': '{const __a = __b}',
 });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@putout/plugin-conditions",
-  "version": "7.3.1",
-  "type": "commonjs",
+  "version": "8.1.0",
+  "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds support of conditions transformations",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-conditions#readme",
@@ -32,23 +32,23 @@
     "conditions"
   ],
   "devDependencies": {
-    "@putout/eslint-flat": "^2.0.0",
+    "@putout/eslint-flat": "^3.0.0",
     "@putout/plugin-for-of": "*",
-    "@putout/test": "^12.0.0",
+    "@putout/test": "^13.0.0",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^25.0.1",
-    "madrun": "^10.0.0",
+    "eslint-plugin-putout": "^27.0.0",
+    "madrun": "^11.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=38"
+    "putout": ">=40"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "publishConfig": {
     "access": "public"