@putout/plugin-nodejs 16.1.0 → 16.3.0

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

@@ -27,7 +27,11 @@ export const include = () => [
     'require',
 ];
 
-export const filter = ({scope}) => {
+export const filter = (path) => {
+    if (path.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-require/index.js

@@ -1,9 +1,9 @@
+import justCamelCase from 'just-camel-case';
 import {
     types,
     operator,
     template,
 } from 'putout';
-import justCamelCase from 'just-camel-case';
 
 const {
     awaitExpression,
@@ -63,12 +63,23 @@ export const match = () => ({
 });
 
 export const replace = () => ({
+    'const __a = require(__b).__c': ({__c}, path) => {
+        const {name} = __c;
+        
+        if (name === 'default')
+            return 'import __a from "__b"';
+        
+        const bindingPath = path.scope.bindings[name];
+        
+        if (bindingPath)
+            return 'const __a = __c';
+        
+        return `{
+            const {__c} = require(__b);
+            const __a = __c;
+        }`;
+    },
     'const __a = require(".")': 'import __a from "./index.js"',
-    'const __a = require("__b").default': 'import __a from "__b"',
-    'const __a = require(__b).__c': `{
-        const {__c} = require(__b);
-        const __a = __c;
-    }`,
     'require("__a")': 'import("__a")',
     'const __a = require(__b)': ({__a}, path) => {
         const {value} = path.get(__B).evaluate();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-nodejs",
-  "version": "16.1.0",
+  "version": "16.3.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",