@putout/plugin-nodejs 18.5.0 → 18.6.0

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

@@ -39,7 +39,10 @@ const isPackage = ({value}) => /package(\.json)?$/.test(value);
 
 export const match = () => ({
     'const __a = require("__b").default': (vars, path) => {
-        return isProgram(path.parentPath);
+        if (isProgram(path.parentPath))
+            return true;
+        
+        return isProgram(path.parentPath.parentPath);
     },
     'const __a = require(__b)': ({__b}, path) => {
         if (path.scope.getBinding('require'))

package/lib/strict-mode/add-missing/index.js

@@ -1,15 +1,11 @@
 import {types} from 'putout';
 
-const {
-    isExpressionStatement,
-    stringLiteral,
-    expressionStatement,
-} = types;
+const {directiveLiteral} = types;
 
 export const report = () => `Add missing 'use strict' directive on top of CommonJS`;
 
 export const fix = ({node}) => {
-    node.body.unshift(expressionStatement(stringLiteral('use strict')));
+    node.directives.push(directiveLiteral('use strict'));
 };
 
 export const traverse = ({push, store}) => ({
@@ -27,20 +23,18 @@ export const traverse = ({push, store}) => ({
     },
     Program: {
         exit(path) {
-            for (const node of path.node.body)
-                if (isExpressionStatement(node) && node.expression.value === 'use strict')
+            for (const node of path.node.body) {
+                if (store('is-module'))
                     return;
-            
-            if (store('is-module'))
-                return;
-            
-            if (path.node.directives.length)
-                return;
-            
-            if (!store('is-common'))
-                return;
-            
-            push(path);
+                
+                if (path.node.directives.length)
+                    return;
+                
+                if (!store('is-common'))
+                    return;
+                
+                push(path);
+            }
         },
     },
 });

package/lib/strict-mode/remove-illegal/index.js

@@ -16,14 +16,17 @@ export const fix = (path) => {
     remove(path);
 };
 export const traverse = ({push}) => ({
-    DirectiveLiteral(path) {
-        const fnPath = path.parentPath.parentPath.parentPath;
+    DirectiveLiteral({parentPath}) {
+        if (!parentPath.parentPath)
+            return;
+        
+        const fnPath = parentPath.parentPath.parentPath;
         
         if (!isFunction(fnPath))
             return;
         
         if (isIllegal(fnPath))
-            push(path.parentPath);
+            push(parentPath);
     },
 });
 

package/lib/strict-mode/remove-useless/index.js

@@ -30,13 +30,6 @@ export const traverse = ({push, store}) => ({
     },
     'Program': {
         exit(path) {
-            const [, ...paths] = path.get('body');
-            
-            for (const path of paths) {
-                if (path.isExpressionStatement() && path.node.expression.value === 'use strict')
-                    push(path);
-            }
-            
             const directives = path.get('directives');
             
             if (directives.length)

package/package.json

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