feature: @putout/plugin-operator-declare: nodejs/convert-esm-to-commonjs: improve support

Author: coderaiser

packages/operator-declare/lib/declare.js

@@ -2,6 +2,7 @@
 
 const {template} = require('@putout/engine-parser');
 const {isESM, insertAfter} = require('@putout/operate');
+
 const {compare} = require('@putout/compare');
 
 const {types} = require('@putout/babel');
@@ -143,8 +144,12 @@ function insert(node, bodyPath) {
     if (isVariableDeclaration(node) && isImportDeclaration(insertionPath) || isRequire(insertionPath))
         return insertAfter(insertionPath, node);
 
-    if (isVariableDeclaration(node))
+    if (isVariableDeclaration(node)) {
+        if (isRequire(first))
+            return first.insertAfter(node);
+        
         return first.insertBefore(node);
+    }
 
     if (!insertionPath)
         return first.insertBefore(node);

packages/operator-declare/lib/declare.spec.js

@@ -3,6 +3,7 @@
 const test = require('supertape');
 const putout = require('putout');
 const montag = require('montag');
+const nodejs = require('@putout/plugin-nodejs');
 
 const {declare} = require('./declare.js');
 
@@ -636,8 +637,8 @@ test('putout: operator: declare: require', (t) => {
     });
 
     const expected = montag`
-        const process = require('process');
         const fs = require('fs');
+        const process = require('process');
         const a = 5;
         
         async function hello() {
@@ -1047,3 +1048,34 @@ test('putout: operator: declare: under require', (t) => {
     t.equal(code, expected);
     t.end();
 });
+
+test('putout: operator: declare: insert before require', (t) => {
+    const declarations = {
+        operator: `import {operator} from 'putout'`,
+        findFile: `const {findFile} = operator`,
+    };
+    
+    const source = montag`
+        import {operator} from 'putout';
+        const a = 5;
+        findFile();
+    `;
+    
+    const {code} = putout(source, {
+        plugins: [
+            ['convert-esm-to-commonjs', nodejs.rules['convert-esm-to-commonjs']],
+            ['declare', declare(declarations)],
+        ],
+    });
+    
+    const expected = montag`
+        const {operator: operator} = require('putout');
+        const {findFile} = operator;
+        const a = 5;
+        
+        findFile();\n
+    `;
+    
+    t.equal(code, expected);
+    t.end();
+});

packages/operator-declare/package.json

@@ -37,6 +37,7 @@
   ],
   "devDependencies": {
     "@putout/eslint-flat": "^2.0.0",
+    "@putout/plugin-nodejs": "*",
     "@putout/test": "^12.0.0",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",

packages/plugin-declare-before-reference/test/declare-before-reference.js

@@ -123,3 +123,11 @@ test('plugin-nodejs: group-require-by-id: no report after transform: group-requi
     });
     t.end();
 });
+
+test('plugin-declare-before-reference: transform: convert-traverse-to-scan', (t) => {
+    t.transform('convert-traverse-to-scan', {
+        'convert-esm-to-commonjs': nodejs.rules['convert-esm-to-commonjs'],
+        'putout/declare': putout.rules.declare,
+    });
+    t.end();
+});

packages/plugin-declare-before-reference/test/fixture/convert-traverse-to-scan-fix.js

@@ -0,0 +1,16 @@
+const {operator: operator} = require('putout');
+const {findFile} = operator;
+const {removeFile} = operator;
+const FS = '__putout_processor_filesystem(__object)';
+
+module.exports.report = () => `Remove vim swap file`;
+
+module.exports.fix = (filePath) => {
+    removeFile(filePath);
+};
+
+module.exports.traverse = ({push}) => ({
+    [FS](path) {
+        findFile(path, '*.swp').map(push);
+    },
+});

packages/plugin-declare-before-reference/test/fixture/convert-traverse-to-scan.js

@@ -0,0 +1,14 @@
+const FS = '__putout_processor_filesystem(__object)';
+
+export const report = () => `Remove vim swap file`;
+
+export const fix = (filePath) => {
+    removeFile(filePath);
+};
+
+export const traverse = ({push}) => ({
+    [FS](path) {
+        findFile(path, '*.swp').map(push);
+    }
+});
+