feature: @putout/plugin-optional-chaining: convert to ESM

coderaiser · coderaiser · commit 060716f67d3e · 2025-03-31T16:12:34.000+03:00
diff --git a/packages/plugin-new/lib/add-missing/index.js b/packages/plugin-new/lib/add-missing/index.js
@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => `Add missing operator 'new'`;
 
-module.exports.report = () => `Add missing operator 'new'`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'Set(__args)': 'new Set(__args)',
     'WeakSet(__args)': 'new WeakSet(__args)',
     'Map(__args)': 'new Map(__args)',
diff --git a/packages/plugin-new/lib/add-missing/index.spec.js b/packages/plugin-new/lib/add-missing/index.spec.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as removeUselessNew from './index.js';
 
-const {createTest} = require('@putout/test');
-const removeUselessNew = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['add-missing-new', removeUselessNew],
     ],
diff --git a/packages/plugin-new/lib/index.js b/packages/plugin-new/lib/index.js
@@ -1,9 +1,7 @@
-'use strict';
+import * as addMissing from './add-missing/index.js';
+import * as removeUseless from './remove-useless/index.js';
 
-const addMissing = require('./add-missing');
-const removeUseless = require('./remove-useless');
-
-module.exports.rules = {
+export const rules = {
     'add-missing': addMissing,
     'remove-useless': removeUseless,
 };
diff --git a/packages/plugin-new/lib/remove-useless/index.js b/packages/plugin-new/lib/remove-useless/index.js
@@ -1,11 +1,10 @@
-'use strict';
+import {types} from 'putout';
 
-const {types} = require('putout');
 const {objectExpression} = types;
 
-module.exports.report = () => `Avoid useless operator 'new'`;
+export const report = () => `Avoid useless operator 'new'`;
 
-module.exports.replace = () => ({
+export const replace = () => ({
     'new new __a': 'new __a',
     'new Error(__args)': 'Error(__args)',
     'new TypeError(__args)': 'TypeError(__args)',
diff --git a/packages/plugin-new/lib/remove-useless/index.spec.js b/packages/plugin-new/lib/remove-useless/index.spec.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as removeUselessNew from './index.js';
 
-const {createTest} = require('@putout/test');
-const removeUselessNew = require('.');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['remove-useless-new', removeUselessNew],
     ],
diff --git a/packages/plugin-new/package.json b/packages/plugin-new/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@putout/plugin-new",
   "version": "3.0.1",
-  "type": "commonjs",
+  "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability to remove useless and add missing operator 'new'",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-new#readme",
diff --git a/packages/plugin-new/test/new.js b/packages/plugin-new/test/new.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as pluginNew from '../lib/index.js';
 
-const {createTest} = require('@putout/test');
-const pluginNew = require('..');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['new', pluginNew],
     ],
diff --git a/packages/plugin-optional-chaining/.madrun.js b/packages/plugin-optional-chaining/.madrun.js
diff --git a/packages/plugin-optional-chaining/eslint.config.js b/packages/plugin-optional-chaining/eslint.config.js
diff --git a/packages/plugin-optional-chaining/lib/convert-logical-assign-to-optional/index.js b/packages/plugin-optional-chaining/lib/convert-logical-assign-to-optional/index.js
@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => `Use optional expression ('a?.b = c') instead of 'condition' ('a && a.b = c')`;
 
-module.exports.report = () => `Use optional expression ('a?.b = c') instead of 'condition' ('a && a.b = c')`;
-
-module.exports.replace = () => ({
+export const replace = () => ({
     'if (__a) {__a.__b = __c}': '__a?.__b = __c',
     'if (__a) __a.__b = __c': '__a?.__b = __c',
     '__a && (__a.__b = __c)': '__a?.__b = __c',
diff --git a/packages/plugin-optional-chaining/lib/convert-logical-assign-to-optional/index.spec.js b/packages/plugin-optional-chaining/lib/convert-logical-assign-to-optional/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: [
         ['assign', plugin],
     ],
diff --git a/packages/plugin-optional-chaining/lib/convert-logical-to-optional/index.js b/packages/plugin-optional-chaining/lib/convert-logical-to-optional/index.js
@@ -1,8 +1,6 @@
-'use strict';
+export const report = () => 'Use optional chaining';
 
-module.exports.report = () => 'Use optional chaining';
-
-module.exports.replace = () => ({
+export const replace = () => ({
     '__a && __a.__b && __a.__b.__c && __a.__b.__c.__d && __a.__b.__c.__d.__e': '__a?.__b?.__c?.__d?.__e',
     '__a && __a.__b && __a.__b.__c && __a.__b.__c.__d': '__a?.__b?.__c?.__d',
     '__a && __a.__b && __a.__b.__c': '__a?.__b?.__c',
diff --git a/packages/plugin-optional-chaining/lib/convert-optional-assign-to-logical/index.js b/packages/plugin-optional-chaining/lib/convert-optional-assign-to-logical/index.js
@@ -1,13 +1,11 @@
-'use strict';
+import {template, operator} from 'putout';
+import {getLogical} from '../get-logical.js';
 
-const {template, operator} = require('putout');
-
-const {getLogical} = require('../get-logical');
 const {replaceWith} = operator;
 
-module.exports.report = () => `Use Logical Expression ('a && a.b = c') instead of Optional Chaining ('a?.b = c')`;
+export const report = () => `Use Logical Expression ('a && a.b = c') instead of Optional Chaining ('a?.b = c')`;
 
-module.exports.fix = (path) => {
+export const fix = (path) => {
     const logical = getLogical(path, {
         assign: true,
     });
@@ -18,7 +16,7 @@ module.exports.fix = (path) => {
     replaceWith(path.parentPath, logicalNode);
 };
 
-module.exports.traverse = ({push, listStore}) => ({
+export const traverse = ({push, listStore}) => ({
     'OptionalMemberExpression|OptionalCallExpression'(path) {
         if (!path.parentPath.isAssignmentExpression())
             return;
diff --git a/packages/plugin-optional-chaining/lib/convert-optional-assign-to-logical/index.spec.js b/packages/plugin-optional-chaining/lib/convert-optional-assign-to-logical/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: [
         ['optional-chaining/convert-optional-assign-to-logical', plugin],
     ],
diff --git a/packages/plugin-optional-chaining/lib/convert-optional-to-logical/index.js b/packages/plugin-optional-chaining/lib/convert-optional-to-logical/index.js
@@ -1,23 +1,21 @@
-'use strict';
+import {template, operator} from 'putout';
+import {getLogical} from '../get-logical.js';
 
-const {template, operator} = require('putout');
-const {getLogical} = require('../get-logical');
-
-module.exports.report = () => `Use Logical Expression instead of Optional Chaining`;
+export const report = () => `Use Logical Expression instead of Optional Chaining`;
 
 const {replaceWith} = operator;
 
-module.exports.fix = (path) => {
+export const fix = (path) => {
     const logical = getLogical(path);
     replaceWith(path, template.ast(logical));
 };
 
-module.exports.include = () => [
+export const include = () => [
     'OptionalMemberExpression',
     'OptionalCallExpression',
 ];
 
-module.exports.filter = ({parentPath}) => {
+export const filter = ({parentPath}) => {
     if (parentPath.isOptionalMemberExpression())
         return false;
     
diff --git a/packages/plugin-optional-chaining/lib/convert-optional-to-logical/index.spec.js b/packages/plugin-optional-chaining/lib/convert-optional-to-logical/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: [
         ['optional-chaining/convert-optional-to-logical', plugin],
     ],
diff --git a/packages/plugin-optional-chaining/lib/get-logical.js b/packages/plugin-optional-chaining/lib/get-logical.js
@@ -1,6 +1,4 @@
-'use strict';
-
-module.exports.getLogical = (path, {assign} = {}) => {
+export const getLogical = (path, {assign} = {}) => {
     const list = path
         .toString()
         .split('?.');
diff --git a/packages/plugin-optional-chaining/lib/index.js b/packages/plugin-optional-chaining/lib/index.js
@@ -1,11 +1,9 @@
-'use strict';
+import * as convertLogicalAssignToOptional from './convert-logical-assign-to-optional/index.js';
+import * as convertLogicalToOptional from './convert-logical-to-optional/index.js';
+import * as convertOptionalAssignToLogical from './convert-optional-assign-to-logical/index.js';
+import * as convertOptionalToLogical from './convert-optional-to-logical/index.js';
 
-const convertLogicalAssignToOptional = require('./convert-logical-assign-to-optional');
-const convertLogicalToOptional = require('./convert-logical-to-optional');
-const convertOptionalAssignToLogical = require('./convert-optional-assign-to-logical');
-const convertOptionalToLogical = require('./convert-optional-to-logical');
-
-module.exports.rules = {
+export const rules = {
     'convert-logical-assign-to-optional': ['off', convertLogicalAssignToOptional],
     'convert-logical-to-optional': convertLogicalToOptional,
     'convert-optional-assign-to-logical': convertOptionalAssignToLogical,
diff --git a/packages/plugin-optional-chaining/package.json b/packages/plugin-optional-chaining/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@putout/plugin-optional-chaining",
   "version": "1.0.4",
-  "type": "commonjs",
+  "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability apply optional chaining",
   "homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-optional-chaining#readme",
@@ -41,11 +41,11 @@
     "nodemon": "^3.0.1"
   },
   "peerDependencies": {
-    "putout": ">=37"
+    "putout": ">=39"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=18"
+    "node": ">=20"
   },
   "publishConfig": {
     "access": "public"
diff --git a/packages/plugin-optional-chaining/test/convert-optional-to-logical.js b/packages/plugin-optional-chaining/test/convert-optional-to-logical.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as plugin from '../lib/index.js';
 
-const {createTest} = require('@putout/test');
-const plugin = require('..');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     rules: {
         'optional-chaining/convert-optional-to-logical': 'on',
     },
diff --git a/packages/plugin-optional-chaining/test/optional-chaining.js b/packages/plugin-optional-chaining/test/optional-chaining.js
@@ -1,9 +1,7 @@
-'use strict';
+import {createTest} from '@putout/test';
+import * as optionalChaining from '../lib/index.js';
 
-const {createTest} = require('@putout/test');
-const optionalChaining = require('..');
-
-const test = createTest(__dirname, {
+const test = createTest(import.meta.url, {
     plugins: [
         ['optional-chaining', optionalChaining],
     ],

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@putout/plugin-new",`
`3`	`3`	`"version": "3.0.1",`
`4`		`- "type": "commonjs",`
	`4`	`+ "type": "module",`
`5`	`5`	`"author": "coderaiser <[email protected]> (https://github.com/coderaiser)",`
`6`	`6`	`"description": "🐊Putout plugin adds ability to remove useless and add missing operator 'new'",`
`7`	`7`	`"homepage": "https://github.com/coderaiser/putout/tree/master/packages/plugin-new#readme",`