@putout/plugin-return 1.1.2 → 3.0.0

package/lib/apply-early/index.js

@@ -1,11 +1,9 @@
-'use strict';
-
-const {operator, types} = require('putout');
+import {operator, types} from 'putout';
 
 const {isIdentifier} = types;
 const {compare, remove} = operator;
 
-module.exports.report = () => `Apply early return`;
+export const report = () => `Apply early return`;
 
 const FROM = `
     if (__a)
@@ -21,7 +19,7 @@ const TO = `{
     return __e;
 }`;
 
-module.exports.match = () => ({
+export const match = () => ({
     [FROM]: ({__b}, path) => {
         if (!isIdentifier(__b))
             return;
@@ -32,7 +30,7 @@ module.exports.match = () => ({
     },
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     [FROM]: (vars, path) => {
         remove(path.getNextSibling());
         

package/lib/convert-from-break/index.js

@@ -1,5 +1,7 @@
-'use strict';
+import {convertFrom} from '../convert-from.js';
 
-const {convertFrom} = require('../convert-from');
-
-module.exports = convertFrom('break');
+export const {
+    report,
+    traverse,
+    fix,
+} = convertFrom('break');

package/lib/convert-from-continue/index.js

@@ -1,5 +1,7 @@
-'use strict';
+import {convertFrom} from '../convert-from.js';
 
-const {convertFrom} = require('../convert-from');
-
-module.exports = convertFrom('continue');
+export const {
+    report,
+    traverse,
+    fix,
+} = convertFrom('continue');

package/lib/convert-from.js

@@ -1,19 +1,18 @@
-'use strict';
+import {types, operator} from 'putout';
 
-const {types, operator} = require('putout');
 const {replaceWith} = operator;
 const {
     isLabeledStatement,
-    ReturnStatement,
+    returnStatement,
 } = types;
 
 const createReport = (name) => () => `Use 'return' instead of '${name}'`;
 
 const fix = (path) => {
-    replaceWith(path, ReturnStatement());
+    replaceWith(path, returnStatement());
 };
 
-module.exports.convertFrom = (name) => {
+export const convertFrom = (name) => {
     const visitor = name[0].toUpperCase() + name.slice(1) + `Statement`;
     
     return {

package/lib/index.js

@@ -1,13 +1,11 @@
-'use strict';
+import * as applyEarly from './apply-early/index.js';
+import * as convertFromContinue from './convert-from-continue/index.js';
+import * as convertFromBreak from './convert-from-break/index.js';
+import * as mergeWithNextSibling from './merge-with-next-sibling/index.js';
+import * as removeUseless from './remove-useless/index.js';
+import * as simplifyBoolean from './simplify-boolean/index.js';
 
-const applyEarly = require('./apply-early');
-const convertFromContinue = require('./convert-from-continue');
-const convertFromBreak = require('./convert-from-break');
-const mergeWithNextSibling = require('./merge-with-next-sibling');
-const removeUseless = require('./remove-useless');
-const simplifyBoolean = require('./simplify-boolean');
-
-module.exports.rules = {
+export const rules = {
     'apply-early': applyEarly,
     'convert-from-continue': convertFromContinue,
     'convert-from-break': convertFromBreak,

package/lib/merge-with-next-sibling/index.js

@@ -1,15 +1,15 @@
-'use strict';
+import {types, operator} from 'putout';
 
-const {types, operator} = require('putout');
-const {remove} = operator;
 const {
-    ObjectExpression,
-    ObjectProperty,
+    objectExpression,
+    objectProperty,
 } = types;
 
-module.exports.report = () => `Merge 'return' with next sibling`;
+const {remove} = operator;
+
+export const report = () => `Merge 'return' with next sibling`;
 
-module.exports.fix = ({path, nextPath}) => {
+export const fix = ({path, nextPath}) => {
     let {node} = nextPath;
     
     if (!nextPath.isBlockStatement()) {
@@ -18,17 +18,17 @@ module.exports.fix = ({path, nextPath}) => {
         const properties = [];
         
         for (const {label, body} of nextPath.node.body) {
-            const property = ObjectProperty(label, body.expression);
+            const property = objectProperty(label, body.expression);
             properties.push(property);
         }
         
-        node = ObjectExpression(properties);
+        node = objectExpression(properties);
     }
     
     path.node.argument = node;
     remove(nextPath);
 };
-module.exports.traverse = ({push}) => ({
+export const traverse = ({push}) => ({
     ReturnStatement(path) {
         if (path.node.argument)
             return false;

package/lib/remove-useless/index.js

@@ -1,35 +1,32 @@
-'use strict';
+import {types, operator} from 'putout';
 
-const {types, operator} = require('putout');
 const {replaceWith} = operator;
 const {
     isIdentifier,
     isLiteral,
     isAssignmentPattern,
+    isObjectExpression,
 } = types;
 
-module.exports.report = () => `Avoid useless 'return'`;
+export const report = () => `Avoid useless 'return'`;
 
-module.exports.include = () => [
+export const include = () => [
     'ArrowFunctionExpression',
 ];
 
-module.exports.fix = (path) => {
+export const fix = (path) => {
     const bodyPath = path.get('body');
     const returnPath = bodyPath.get('body.0');
     
     replaceWith(bodyPath, returnPath.node.argument);
 };
 
-module.exports.filter = (path) => {
+export const filter = (path) => {
     const bodyPath = path.get('body');
     
     if (!bodyPath.isBlockStatement())
         return false;
     
-    if (hasComplexParams(path))
-        return false;
-    
     const first = bodyPath.get('body.0');
     
     if (!first)
@@ -46,6 +43,9 @@ module.exports.filter = (path) => {
     if (!argPath.node)
         return false;
     
+    if (hasComplexParams(path) && !isObjectExpression(argPath))
+        return false;
+    
     if (isChainCall(argPath))
         return false;
     

package/lib/simplify-boolean/index.js

@@ -1,6 +1,10 @@
-'use strict';
+import {operator, types} from 'putout';
 
-const {operator, types} = require('putout');
+const {
+    unaryExpression,
+    isUnaryExpression,
+    returnStatement,
+} = types;
 
 const {
     compareAny,
@@ -8,19 +12,13 @@ const {
     remove,
 } = operator;
 
-const {
-    UnaryExpression,
-    isUnaryExpression,
-    ReturnStatement,
-} = types;
-
-module.exports.report = () => `Simplify boolean return`;
+export const report = () => `Simplify boolean return`;
 
-module.exports.match = () => ({
+export const match = () => ({
     'if (__a) return __bool__a;': checkNext,
 });
 
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a) return __bool__a;'({__a, __bool__a}, path) {
         const next = path.getNextSibling();
         
@@ -31,10 +29,10 @@ module.exports.replace = () => ({
         
         if (isUnaryExpression(__a, {operator: '!'})) {
             const {argument} = __a;
-            return ReturnStatement(argument);
+            return returnStatement(argument);
         }
         
-        const unary = UnaryExpression('!', __a);
+        const unary = unaryExpression('!', __a);
         replaceWith(path.get('test'), unary);
         
         return 'return !(__a)';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@putout/plugin-return",
-  "version": "1.1.2",
-  "type": "commonjs",
+  "version": "3.0.0",
+  "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability to transform code related to return",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-return#readme",
@@ -34,25 +34,24 @@
     "@putout/plugin-declare": "*",
     "@putout/plugin-declare-before-reference": "*",
     "@putout/plugin-putout": "*",
-    "@putout/plugin-remove-unused-variables": "*",
     "@putout/plugin-reuse-duplicate-init": "*",
     "@putout/plugin-typescript": "*",
-    "@putout/test": "^11.0.0",
+    "@putout/plugin-variables": "*",
+    "@putout/test": "^14.0.0",
     "c8": "^10.0.0",
-    "eslint": "^9.0.0",
+    "eslint": "^10.0.0-alpha.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^24.0.0",
-    "lerna": "^6.0.1",
-    "madrun": "^10.0.0",
+    "eslint-plugin-putout": "^29.0.0",
+    "madrun": "^11.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=38"
+    "putout": ">=41"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "publishConfig": {
     "access": "public"