@putout/plugin-nodejs 18.16.1 → 19.0.0

package/README.md

@@ -347,7 +347,7 @@ const {readFile} = require('fs/promises');
 const name = 'hello.txt';
 ```
 
-## convert-commonjs-to-esm
+## convert-commonjs-to-esm/require
 
 Convert **CommonJS** **EcmaScript Modules**.
 
@@ -355,8 +355,6 @@ Convert **CommonJS** **EcmaScript Modules**.
 >
 > (c) [parceljs](https://parceljs.org/languages/javascript/)
 
-### require
-
 ### ❌ Example of incorrect code
 
 ```js
@@ -378,7 +376,7 @@ const args = minimist({
 });
 ```
 
-### exports
+## convert-commonjs-to-esm/exports
 
 Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/39dd730c35e488db3e2cf8d4b4df0c5a/feb042a49539e6b4b2165558a1c636b705726c47).
 
@@ -394,7 +392,7 @@ module.exports = () => {};
 export default () => {};
 ```
 
-### Commons
+## convert-commonjs-to-esm/commons
 
 ### ❌ Example of incorrect code
 

package/lib/{convert-commonjs-to-esm-commons → convert-commonjs-to-esm/commons}/index.js

@@ -11,7 +11,7 @@ const initCommons = template.ast(`
     const require = createRequire(import.meta.url);
 `);
 
-export const report = () => 'In ESM declare "__filename", "__dirname" and "require"';
+export const report = () => `Declare '__filename', '__dirname' and 'require' in ESM`;
 
 export const fix = ({scope}) => {
     const programScope = scope.getProgramParent();
@@ -27,11 +27,13 @@ export const include = () => [
     'require',
 ];
 
-export const filter = (path) => {
-    if (path.parentPath.isObjectProperty())
+export const filter = ({parentPath, scope}) => {
+    if (parentPath.isMemberExpression())
+        return false;
+    
+    if (parentPath.isObjectProperty())
         return false;
     
-    const {scope} = path;
     const isDirname = scope.hasBinding('__dirname');
     const isFilename = scope.hasBinding('__filename');
     const isRequire = scope.hasBinding('require');

package/lib/convert-commonjs-to-esm/index.js

@@ -0,0 +1,9 @@
+import * as exports from './exports/index.js';
+import * as commons from './commons/index.js';
+import * as require from './require/index.js';
+
+export const rules = {
+    exports,
+    commons,
+    require,
+};

package/lib/index.js

@@ -11,9 +11,7 @@ import * as removeProcessExit from './remove-process-exit/index.js';
 import * as addNodePrefix from './add-node-prefix/index.js';
 import * as convertExportsToModuleExports from './convert-exports-to-module-exports/index.js';
 import * as convertEsmToCommonjs from './convert-esm-to-commonjs/index.js';
-import * as convertCommonjsToEsmExports from './convert-commonjs-to-esm-exports/index.js';
-import * as convertCommonjsToEsmCommons from './convert-commonjs-to-esm-commons/index.js';
-import * as convertCommonjsToEsmRequire from './convert-commonjs-to-esm-require/index.js';
+import * as convertCommonjsToEsm from './convert-commonjs-to-esm/index.js';
 import * as cjsFile from './cjs-file/index.js';
 import * as mjsFile from './mjs-file/index.js';
 import * as renameFileCjsToJs from './rename-file-cjs-to-js/index.js';
@@ -36,9 +34,9 @@ export const rules = {
     'convert-exports-to-module-exports': convertExportsToModuleExports,
     
     'convert-esm-to-commonjs': ['off', convertEsmToCommonjs],
-    'convert-commonjs-to-esm-exports': ['off', convertCommonjsToEsmExports],
-    'convert-commonjs-to-esm-common': ['off', convertCommonjsToEsmCommons],
-    'convert-commonjs-to-esm-require': ['off', convertCommonjsToEsmRequire],
+    'convert-commonjs-to-esm/exports': ['off', convertCommonjsToEsm.rules.exports],
+    'convert-commonjs-to-esm/common': ['off', convertCommonjsToEsm.rules.commons],
+    'convert-commonjs-to-esm/require': ['off', convertCommonjsToEsm.rules.require],
     
     'cjs-file': ['off', cjsFile],
     'mjs-file': ['off', mjsFile],

package/lib/mjs-file/index.js

@@ -1,5 +1,5 @@
 import {operator} from 'putout';
-import * as plugin from '../convert-commonjs-to-esm.js';
+import * as plugin from '../convert-commonjs-to-esm/index.js';
 
 const {matchFiles} = operator;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-nodejs",
-  "version": "18.16.1",
+  "version": "19.0.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability to transform code to new API of Node.js",
@@ -10,7 +10,7 @@
     ".": "./lib/index.js",
     "./strict-mode": "./lib/strict-mode/index.js",
     "./convert-esm-to-commonjs": "./lib/convert-esm-to-commonjs/index.js",
-    "./convert-commonjs-to-esm": "./lib/convert-commonjs-to-esm.js"
+    "./convert-commonjs-to-esm": "./lib/convert-commonjs-to-esm/index.js"
   },
   "release": false,
   "tag": false,

package/lib/convert-commonjs-to-esm.js

@@ -1,9 +0,0 @@
-import * as convertCommonjsToEsmExports from './convert-commonjs-to-esm-exports/index.js';
-import * as convertCommonjsToEsmCommons from './convert-commonjs-to-esm-commons/index.js';
-import * as convertCommonjsToEsmRequire from './convert-commonjs-to-esm-require/index.js';
-
-export const rules = {
-    'convert-commonjs-to-esm-exports': convertCommonjsToEsmExports,
-    'convert-commonjs-to-esm-common': convertCommonjsToEsmCommons,
-    'convert-commonjs-to-esm-require': convertCommonjsToEsmRequire,
-};