@putout/plugin-esm 9.11.1 → 10.0.1

package/lib/apply-js-imported-file/index.js

@@ -22,8 +22,8 @@ const getMessage = (a) => a.message;
 const applyJS = (a) => a.replace(/\.[cm]js$/, '.js');
 
 export const report = (file, {from, to}) => `Apply 'js' imported source: '${from}' -> '${to}'`;
-export const fix = (file, {content, ast, from, to}) => {
-    transform(ast, content, {
+export const fix = (file, {ast, from, to}) => {
+    transform(ast, {
         rules: {
             'change-imports': ['on', {
                 from,
@@ -59,7 +59,7 @@ export const scan = (rootPath, {push, trackFile}) => {
         if (error)
             continue;
         
-        const places = transform(ast, content, {
+        const places = transform(ast, {
             plugins: [
                 ['get-imports', getImports],
             ],

package/lib/apply-name-to-imported-file/get-imports-tuples.js

@@ -6,7 +6,7 @@ const {getFilename} = operator;
 const getMessage = (a) => a.message;
 
 export const getImportsTuples = (file, content, ast) => {
-    const places = transform(ast, content, {
+    const places = transform(ast, {
         fix: false,
         plugins: [
             ['get-imports', getImportsPlugin],

package/lib/apply-name-to-imported-file/transform-named-import.js

@@ -1,8 +1,8 @@
 import {transform} from 'putout';
 import * as applyNamedImportPlugin from './apply-named-import/index.js';
 
-export const transformNamedImport = (ast, {name, source, content}) => {
-    transform(ast, content, {
+export const transformNamedImport = (ast, {name, source}) => {
+    transform(ast, {
         rules: {
             'apply-named-import': ['on', {
                 name,

package/lib/apply-namespace-to-imported-file/transform-namespace-import.js

@@ -1,8 +1,8 @@
 import {transform} from 'putout';
 import * as applyNamespaceImportPlugin from './apply-namespace-import/index.js';
 
-export const transformNamespaceImport = (ast, {source, content, name}) => {
-    transform(ast, content, {
+export const transformNamespaceImport = (ast, {source, name}) => {
+    transform(ast, {
         rules: {
             'apply-namespace-import': ['on', {
                 name,

package/lib/apply-privately-imported-file/index.js

@@ -20,8 +20,8 @@ const getMessage = (a) => a.message;
 export const report = (file, {from, to, filename}) => {
     return `Apply private import: '${from}' -> '${to}' in '${filename}'`;
 };
-export const fix = (file, {content, ast, from, to}) => {
-    transform(ast, content, {
+export const fix = (file, {ast, from, to}) => {
+    transform(ast, {
         rules: {
             'change-imports': ['on', {
                 from,
@@ -59,7 +59,7 @@ export const scan = (rootPath, {push, trackFile}) => {
         
         const ast = parse(content);
         
-        const places = transform(ast, content, {
+        const places = transform(ast, {
             plugins: [
                 ['get-imports', getImports],
             ],

package/lib/resolve-imported-file/build-resolved.js

@@ -27,6 +27,11 @@ export const buildResolved = ({dir, imports, rootPath, crawlFile}) => {
             continue;
         }
         
+        if (crawlFile(rootPath, withJs).length) {
+            result.push([relative, `${relative}.js`]);
+            continue;
+        }
+        
         if (relative.startsWith('..')) {
             result.push(parseMainFromDotDot({
                 relative,
@@ -36,11 +41,6 @@ export const buildResolved = ({dir, imports, rootPath, crawlFile}) => {
             }));
             continue;
         }
-        
-        if (crawlFile(rootPath, withJs).length) {
-            result.push([relative, `${relative}.js`]);
-            continue;
-        }
     }
     
     return result.filter(Boolean);

package/lib/resolve-imported-file/index.js

@@ -21,8 +21,8 @@ export const report = (file, {from, to, filename}) => {
     return `Resolve import source: '${from}' -> '${to}' in '${filename}'`;
 };
 
-export const fix = (file, {content, ast, from, to}) => {
-    transform(ast, content, {
+export const fix = (file, {ast, from, to}) => {
+    transform(ast, {
         rules: {
             'change-imports': ['on', {
                 from,
@@ -53,7 +53,7 @@ export const scan = (rootPath, {push, trackFile, crawlFile}) => {
         
         const ast = parse(content);
         
-        const places = transform(ast, content, {
+        const places = transform(ast, {
             plugins: [
                 ['get-imports-source', getImports],
             ],

package/lib/shorten-imported-file/index.js

@@ -25,8 +25,8 @@ export const report = (file, {from, to}) => {
     const name = getFilename(file);
     return `Shorten import source: '${from}' -> '${to}' in '${name}'`;
 };
-export const fix = (file, {content, ast, from, to}) => {
-    transform(ast, content, {
+export const fix = (file, {ast, from, to}) => {
+    transform(ast, {
         rules: {
             'change-imports': ['on', {
                 from,
@@ -60,7 +60,7 @@ export const scan = (rootPath, {push, trackFile}) => {
         if (error)
             continue;
         
-        const places = transform(ast, content, {
+        const places = transform(ast, {
             plugins: [
                 ['get-imports', getImports],
             ],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "9.11.1",
+  "version": "10.0.1",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -61,15 +61,15 @@
     "c8": "^10.0.0",
     "eslint": "^10.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^30.0.0",
-    "madrun": "^12.0.0",
+    "eslint-plugin-putout": "^31.0.0",
+    "madrun": "^13.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",
-    "redlint": "^5.0.4",
+    "redlint": "^6.0.0",
     "supertape": "^12.0.0"
   },
   "peerDependencies": {
-    "putout": ">=41"
+    "putout": ">=42"
   },
   "license": "MIT",
   "engines": {