@putout/plugin-nodejs 11.7.1 → 11.8.0

package/README.md

@@ -56,12 +56,18 @@ Check out in 🐊[Putout Editor](https://putout.cloudcmd.io/#/gist/534093e0bf0a4
 
 ```js
 import fs from 'fs';
+
+const path = require('path');
+await import('path');
 ```
 
 ### ✅ Example of correct code
 
 ```js
 import fs from 'node:fs';
+
+const path = require('node:path');
+await import('node:path');
 ```
 
 ### Comparison
@@ -382,7 +388,7 @@ Check out in 🐊[Putout Editor](https://putout.cloudcmd.io/#/gist/779e7fb720af5
 
 ## rename-file-cjs-to-js
 
-Rename `*.cjs` files when `module !== "module"`:
+Rename `*.cjs` files when `type === "commonjs"`:
 
 ```diff
  /
@@ -396,7 +402,7 @@ Check out in 🐊[Putout Editor](https://putout.cloudcmd.io/#/gist/8d8f3cd6662b7
 
 ## rename-file-mjs-to-js
 
-Rename `*.mjs` files when `module === "module"`:
+Rename `*.mjs` files when `type === "module"`:
 
 ```diff
  /

package/lib/add-node-prefix/index.js

@@ -1,28 +1,68 @@
 'use strict';
 
-const {operator} = require('putout');
-const {isBuiltin} = require('module');
-const {setLiteralValue} = operator;
+const {types, operator} = require('putout');
+const {isBuiltin} = require('node:module');
+const {
+    setLiteralValue,
+    getTemplateValues,
+} = operator;
 
-module.exports.report = () => `Add 'node:' prefix`;
+const {isCallExpression} = types;
 
-module.exports.fix = (path) => {
-    const {source} = path.node;
-    const {value} = source;
+const REQUIRE = 'require("__a")';
+const IMPORT = 'import("__a")';
+
+module.exports.report = ({value}) => {
+    return `Use 'node:${value}' instead of '${value}'`;
+};
+
+module.exports.fix = ({path, value}) => {
+    if (isCallExpression(path)) {
+        const arg = path.get('arguments.0');
+        setLiteralValue(arg, `node:${value}`);
+        
+        return;
+    }
     
+    const {source} = path.node;
     setLiteralValue(source, `node:${value}`);
 };
 
 module.exports.traverse = ({push}) => ({
-    ImportDeclaration(path) {
-        const {value} = path.node.source;
+    [IMPORT](path) {
+        const {__a} = getTemplateValues(path, IMPORT);
+        const {value} = __a;
         
-        if (value.startsWith('node:'))
-            return;
+        if (check(value))
+            push({
+                path,
+                value,
+            });
+    },
+    [REQUIRE](path) {
+        const {__a} = getTemplateValues(path, REQUIRE);
+        const {value} = __a;
         
-        if (!isBuiltin(value))
-            return;
+        if (check(value))
+            push({
+                path,
+                value,
+            });
+    },
+    ImportDeclaration(path) {
+        const {value} = path.node.source;
         
-        push(path);
+        if (check(value))
+            push({
+                path,
+                value,
+            });
     },
 });
+
+function check(value) {
+    if (value.startsWith('node:'))
+        return false;
+    
+    return isBuiltin(value);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-nodejs",
-  "version": "11.7.1",
+  "version": "11.8.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin adds ability to transform code to new API of Node.js",