@putout/plugin-nodejs 18.12.0 → 18.14.0

package/README.md

@@ -380,6 +380,8 @@ const args = minimist({
 
 ### exports
 
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/39dd730c35e488db3e2cf8d4b4df0c5a/feb042a49539e6b4b2165558a1c636b705726c47).
+
 ### ❌ Example of incorrect code
 
 ```js

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

@@ -5,7 +5,6 @@ import {
 } from 'putout';
 
 const {
-    arrowFunctionExpression,
     exportSpecifier,
     isIdentifier,
     isImportSpecifier,
@@ -16,10 +15,11 @@ const {
     exportNamespaceSpecifier,
     isSpreadElement,
     isObjectMethod,
+    isFunction,
 } = types;
 
 const {replaceWith} = operator;
-const createFn = template('export const NAME = BODY');
+const createFn = template('export const NAME = (PARAMS) => BODY');
 
 export const report = () => `Use 'ESM' instead of 'CommonJS'`;
 
@@ -78,11 +78,29 @@ export const replace = () => ({
             const {key, value} = property;
             
             if (isObjectMethod(property)) {
+                const {params, body} = property;
+                
                 declareFunction({
                     object: __a,
                     property,
                     index,
                     programPath,
+                    params,
+                    body,
+                });
+                continue;
+            }
+            
+            if (isFunction(value)) {
+                const {params, body} = property.value;
+                
+                declareFunction({
+                    object: __a,
+                    property,
+                    index,
+                    programPath,
+                    params,
+                    body,
                 });
                 continue;
             }
@@ -163,11 +181,12 @@ function parseBindingPath(path) {
     return path;
 }
 
-function declareFunction({index, property, object, programPath}) {
-    const {key, body} = property;
+function declareFunction({index, property, object, params, body, programPath}) {
+    const {key} = property;
     const fnNode = createFn({
         NAME: key,
-        BODY: arrowFunctionExpression([], body),
+        PARAMS: params,
+        BODY: body,
     });
     
     delete object.properties[index];

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

@@ -77,11 +77,14 @@ export const match = () => ({
 
 export const replace = () => ({
     'const __a = require("__b").default': 'import __a from "__b"',
-    'const __a = require(__b).__c': ({__c}, path) => {
+    'const __a = require(__b).__c': ({__a, __c}, path) => {
         const {name} = __c;
-        const bindingPath = path.scope.bindings[name];
+        const binding = path.scope.bindings[name];
         
-        if (bindingPath)
+        if (binding && isIdentifier(__a))
+            return 'import {__c as __a} from "__b"';
+        
+        if (binding && isObjectPattern(__a))
             return 'const __a = __c';
         
         return `{

package/package.json

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