@putout/plugin-esm 9.4.0 → 9.5.0

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

@@ -0,0 +1,71 @@
+import {join} from 'node:path';
+import {operator} from 'putout';
+
+const {readFileContent} = operator;
+
+export const buildResolved = ({dir, imports, rootPath, crawlFile}) => {
+    const importsTuples = buildImports(dir, imports);
+    const result = [];
+    
+    for (const [relative, current] of importsTuples) {
+        const withIndex = join(current, 'index.js');
+        const withJs = `${current}.js`;
+        const withJson = `${current}.json`;
+        
+        if (crawlFile(rootPath, withIndex).length) {
+            if (relative.endsWith('/')) {
+                result.push([relative, `${relative}index.js`]);
+                continue;
+            }
+            
+            result.push([relative, `${relative}/index.js`]);
+            continue;
+        }
+        
+        if (crawlFile(rootPath, withJson).length) {
+            result.push([relative, `${relative}.json`]);
+            continue;
+        }
+        
+        if (relative.startsWith('..')) {
+            result.push(parseMainFromDotDot({
+                relative,
+                current,
+                rootPath,
+                crawlFile,
+            }));
+            continue;
+        }
+        
+        if (crawlFile(rootPath, withJs).length) {
+            result.push([relative, `${relative}.js`]);
+            continue;
+        }
+    }
+    
+    return result.filter(Boolean);
+};
+
+function parseMainFromDotDot({relative, current, rootPath, crawlFile}) {
+    const withPackage = join(current, 'package.json');
+    const [packageJson] = crawlFile(rootPath, withPackage);
+    
+    if (!packageJson)
+        return;
+    
+    const json = readFileContent(packageJson);
+    const {main} = JSON.parse(json);
+    
+    return [relative, join(relative, main)];
+}
+
+function buildImports(dir, imports) {
+    const list = [];
+    
+    for (const current of imports) {
+        const full = join(dir, current);
+        list.push([current, full]);
+    }
+    
+    return list;
+}

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

@@ -1,4 +1,4 @@
-import {join, dirname} from 'node:path';
+import {dirname} from 'node:path';
 import {
     parse,
     print,
@@ -7,9 +7,9 @@ import {
 } from 'putout';
 import * as changeImports from '#change-imports';
 import * as getImports from './get-imports/index.js';
+import {buildResolved} from './build-resolved.js';
 
 const {
-    findFile,
     getFilename,
     readFileContent,
     writeFileContent,
@@ -36,7 +36,7 @@ export const fix = (file, {content, ast, from, to}) => {
     writeFileContent(file, newContent);
 };
 
-export const scan = (rootPath, {push, trackFile}) => {
+export const scan = (rootPath, {push, trackFile, crawlFile}) => {
     const mask = [
         '*.js',
         '*.mjs',
@@ -60,8 +60,12 @@ export const scan = (rootPath, {push, trackFile}) => {
         const filename = getFilename(file);
         const dir = dirname(filename);
         
-        const importsTuples = buildImports(dir, imports);
-        const resolvedTuples = buildResolved(rootPath, importsTuples);
+        const resolvedTuples = buildResolved({
+            dir,
+            imports,
+            rootPath,
+            crawlFile,
+        });
         
         for (const [from, to] of resolvedTuples) {
             push(file, {
@@ -73,61 +77,3 @@ export const scan = (rootPath, {push, trackFile}) => {
         }
     }
 };
-
-function buildImports(dir, imports) {
-    const list = [];
-    
-    for (const current of imports) {
-        const full = join(dir, current);
-        list.push([current, full]);
-    }
-    
-    return list;
-}
-
-function buildResolved(rootPath, importsTuples) {
-    const result = [];
-    
-    for (const [relative, current] of importsTuples) {
-        const withIndex = join(current, 'index.js');
-        const withJs = `${current}.js`;
-        const withJson = `${current}.json`;
-        
-        if (findFile(rootPath, withIndex).length) {
-            if (relative.endsWith('/')) {
-                result.push([relative, `${relative}index.js`]);
-                continue;
-            }
-            
-            result.push([relative, `${relative}/index.js`]);
-            continue;
-        }
-        
-        if (findFile(rootPath, withJson).length) {
-            result.push([relative, `${relative}.json`]);
-            continue;
-        }
-        
-        if (relative === '..' || relative === '../') {
-            const withPackage = join(current, 'package.json');
-            const [packageJson] = findFile(rootPath, withPackage);
-            
-            if (!packageJson)
-                continue;
-            
-            const json = readFileContent(packageJson);
-            const {main} = JSON.parse(json);
-            
-            result.push([relative, join(relative, main)]);
-            
-            continue;
-        }
-        
-        if (findFile(rootPath, withJs).length) {
-            result.push([relative, `${relative}.js`]);
-            continue;
-        }
-    }
-    
-    return result;
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "9.4.0",
+  "version": "9.5.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",