@putout/plugin-nodejs 16.0.0 → 16.2.0

package/lib/cjs-file/index.js

@@ -2,16 +2,11 @@ import {operator} from 'putout';
 import * as plugin from '../convert-esm-to-commonjs/index.js';
 
 const {matchFiles} = operator;
-const {
+
+export const {
     report,
     fix,
     scan,
 } = matchFiles({
     '*.cjs': plugin,
 });
-
-export {
-    report,
-    fix,
-    scan,
-};

package/lib/convert-buffer-to-buffer-alloc/index.js

@@ -6,15 +6,6 @@ const isNumber = (a) => typeof a === 'number';
 
 export const report = () => `Use 'Buffer.alloc()' or 'Buffer.from()' instead of 'Buffer()' and 'new Buffer()'`;
 
-export const match = () => ({
-    'new Buffer(__a)': (vars, path) => {
-        const __aPath = path.get('arguments.0');
-        const [is] = compute(__aPath);
-        
-        return is;
-    },
-});
-
 export const replace = () => ({
     'new Buffer(__a)': transform,
     'new Buffer(__a, __b)': transform,

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/lib/mjs-file/index.js

@@ -2,16 +2,11 @@ import {operator} from 'putout';
 import * as plugin from '../convert-commonjs-to-esm.js';
 
 const {matchFiles} = operator;
-const {
+
+export const {
     report,
     fix,
     scan,
 } = matchFiles({
     '*.mjs': plugin,
 });
-
-export {
-    report,
-    fix,
-    scan,
-};

package/lib/rename-file-cjs-to-js/index.js

@@ -2,7 +2,7 @@ import {operator} from 'putout';
 
 const {renameFiles} = operator;
 
-const {
+export const {
     report,
     fix,
     scan,
@@ -13,9 +13,3 @@ const {
         return name.replace(/cjs$/, 'js');
     },
 });
-
-export {
-    report,
-    fix,
-    scan,
-};

package/lib/rename-file-mjs-to-js/index.js

@@ -1,7 +1,8 @@
 import {operator} from 'putout';
 
 const {renameFiles} = operator;
-const {
+
+export const {
     report,
     fix,
     scan,
@@ -12,9 +13,3 @@ const {
         return name.replace(/mjs$/, 'js');
     },
 });
-
-export {
-    report,
-    fix,
-    scan,
-};

package/package.json

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