feature: @putout/plugin-return: convert to ESM

coderaiser · coderaiser · commit 766298d137af · 2025-04-16T14:30:11.000+03:00
diff --git a/packages/plugin-return/.madrun.js b/packages/plugin-return/.madrun.js
diff --git a/packages/plugin-return/.putout.json b/packages/plugin-return/.putout.json
@@ -1,4 +1,13 @@
 {
+    "rules": {
+        "putout/apply-exports": ["on", {
+            "convertFrom": [
+                "report",
+                "traverse",
+                "fix"
+            ]
+        }]
+    },
     "match": {
         "*.md": {
             "return": "off"
diff --git a/packages/plugin-return/eslint.config.js b/packages/plugin-return/eslint.config.js
diff --git a/packages/plugin-return/lib/apply-early/index.js b/packages/plugin-return/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());
         
diff --git a/packages/plugin-return/lib/apply-early/index.spec.js b/packages/plugin-return/lib/apply-early/index.spec.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as applyEarlyReturn from './index.js';
 
-const {createTest} = require('@putout/test');
-const applyEarlyReturn = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['apply-early-return', applyEarlyReturn],
     ],
diff --git a/packages/plugin-return/lib/convert-from-break/index.js b/packages/plugin-return/lib/convert-from-break/index.js
@@ -1,5 +1,13 @@
-'use strict';
+import {convertFrom} from '../convert-from.js';
 
-const {convertFrom} = require('../convert-from');
+const {
+    report,
+    traverse,
+    fix,
+} = convertFrom('break');
 
-module.exports = convertFrom('break');
+export {
+    report,
+    traverse,
+    fix,
+};
diff --git a/packages/plugin-return/lib/convert-from-break/index.spec.js b/packages/plugin-return/lib/convert-from-break/index.spec.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as plugin from './index.js';
 
-const {createTest} = require('@putout/test');
-const plugin = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['convert-from-break', plugin],
     ],
diff --git a/packages/plugin-return/lib/convert-from-continue/index.js b/packages/plugin-return/lib/convert-from-continue/index.js
@@ -1,5 +1,13 @@
-'use strict';
+import {convertFrom} from '../convert-from.js';
 
-const {convertFrom} = require('../convert-from');
+const {
+    report,
+    traverse,
+    fix,
+} = convertFrom('continue');
 
-module.exports = convertFrom('continue');
+export {
+    report,
+    traverse,
+    fix,
+};
diff --git a/packages/plugin-return/lib/convert-from-continue/index.spec.js b/packages/plugin-return/lib/convert-from-continue/index.spec.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as plugin from './index.js';
 
-const {createTest} = require('@putout/test');
-const plugin = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['convert-from-continue', plugin],
     ],
diff --git a/packages/plugin-return/lib/convert-from.js b/packages/plugin-return/lib/convert-from.js
@@ -1,6 +1,5 @@
-'use strict';
+import {types, operator} from 'putout';
 
-const {types, operator} = require('putout');
 const {replaceWith} = operator;
 const {
     isLabeledStatement,
@@ -13,7 +12,7 @@ const fix = (path) => {
     replaceWith(path, returnStatement());
 };
 
-module.exports.convertFrom = (name) => {
+export const convertFrom = (name) => {
     const visitor = name[0].toUpperCase() + name.slice(1) + `Statement`;
     
     return {
diff --git a/packages/plugin-return/lib/index.js b/packages/plugin-return/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,
diff --git a/packages/plugin-return/lib/merge-with-next-sibling/index.js b/packages/plugin-return/lib/merge-with-next-sibling/index.js
@@ -1,16 +1,15 @@
-'use strict';
+import {types, operator} from 'putout';
 
-const {types, operator} = require('putout');
 const {
     objectExpression,
     objectProperty,
 } = types;
 
 const {remove} = operator;
 
-module.exports.report = () => `Merge 'return' with next sibling`;
+export const report = () => `Merge 'return' with next sibling`;
 
-module.exports.fix = ({path, nextPath}) => {
+export const fix = ({path, nextPath}) => {
     let {node} = nextPath;
     
     if (!nextPath.isBlockStatement()) {
@@ -29,7 +28,7 @@ module.exports.fix = ({path, nextPath}) => {
     path.node.argument = node;
     remove(nextPath);
 };
-module.exports.traverse = ({push}) => ({
+export const traverse = ({push}) => ({
     ReturnStatement(path) {
         if (path.node.argument)
             return false;
diff --git a/packages/plugin-return/lib/merge-with-next-sibling/index.spec.js b/packages/plugin-return/lib/merge-with-next-sibling/index.spec.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as plugin from './index.js';
 
-const {createTest} = require('@putout/test');
-const plugin = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['merge-with-next-sibling', plugin],
     ],
diff --git a/packages/plugin-return/lib/remove-useless/index.js b/packages/plugin-return/lib/remove-useless/index.js
@@ -1,27 +1,26 @@
-'use strict';
+import {types, operator} from 'putout';
 
-const {types, operator} = require('putout');
 const {replaceWith} = operator;
 const {
     isIdentifier,
     isLiteral,
     isAssignmentPattern,
 } = 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())
diff --git a/packages/plugin-return/lib/remove-useless/index.spec.js b/packages/plugin-return/lib/remove-useless/index.spec.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as removeUselessReturn from './index.js';
 
-const {createTest} = require('@putout/test');
-const removeUselessReturn = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['remove-useless', removeUselessReturn],
     ],
diff --git a/packages/plugin-return/lib/simplify-boolean/index.js b/packages/plugin-return/lib/simplify-boolean/index.js
@@ -1,6 +1,5 @@
-'use strict';
+import {operator, types} from 'putout';
 
-const {operator, types} = require('putout');
 const {
     unaryExpression,
     isUnaryExpression,
@@ -13,13 +12,13 @@ const {
     remove,
 } = operator;
 
-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();
         
diff --git a/packages/plugin-return/lib/simplify-boolean/index.spec.js b/packages/plugin-return/lib/simplify-boolean/index.spec.js
@@ -1,10 +1,8 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as removeUnusedVariables from '@putout/plugin-remove-unused-variables';
+import * as simplifyBoolean from './index.js';
 
-const {createTest} = require('@putout/test');
-const removeUnusedVariables = require('@putout/plugin-remove-unused-variables');
-const simplifyBoolean = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['simplify-boolean', simplifyBoolean],
     ],
diff --git a/packages/plugin-return/package.json b/packages/plugin-return/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@putout/plugin-return",
   "version": "1.1.2",
-  "type": "commonjs",
+  "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",
@@ -48,11 +48,11 @@
     "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=38"
+    "putout": ">=40"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/plugin-return/test/return.js b/packages/plugin-return/test/return.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as returnPlugin from '../lib/index.js';
 
-const {createTest} = require('@putout/test');
-const returnPlugin = require('..');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['return', returnPlugin],
     ],
