@putout/plugin-esm 7.5.1 → 7.7.0

package/lib/apply-namespace-import-to-file/index.js

@@ -6,6 +6,7 @@ import putout, {
     transform,
     operator,
 } from 'putout';
+import {createGetPrivateImports} from '#private-imports';
 import * as isESMPlugin from './is-esm/index.js';
 import * as hasExportDefaultPlugin from './has-export-default/index.js';
 import * as applyNamespaceImportPlugin from './apply-namespace-import/index.js';
@@ -51,6 +52,8 @@ export const scan = (rootPath, {push, trackFile}) => {
         '*.mjs',
     ];
     
+    const getPrivateImports = createGetPrivateImports();
+    
     for (const file of trackFile(rootPath, mask)) {
         const content = readFileContent(file);
         const [error, ast] = tryCatch(parse, content);
@@ -60,8 +63,18 @@ export const scan = (rootPath, {push, trackFile}) => {
         
         const importsTuples = getImports(file, content, ast);
         
+        const [, privateImports] = getPrivateImports(file, {
+            aliasBased: true,
+        });
+        
         for (const [name, source, importedFilename] of importsTuples) {
-            if (hasImportDefault(rootPath, importedFilename))
+            const is = hasImportDefault({
+                rootPath,
+                importedFilename,
+                privateImports,
+            });
+            
+            if (is)
                 continue;
             
             push(file, {
@@ -93,8 +106,20 @@ function getImports(file, content, ast) {
     return buildImports(dir, imports);
 }
 
-function hasImportDefault(rootPath, importedFilename) {
-    const [importedFile] = findFile(rootPath, importedFilename);
+function parseImportedFilename({importedFilename, privateImports}) {
+    if (privateImports.has(importedFilename))
+        return privateImports.get(importedFilename);
+    
+    return importedFilename;
+}
+
+function hasImportDefault({rootPath, importedFilename, privateImports}) {
+    const parsedName = parseImportedFilename({
+        importedFilename,
+        privateImports,
+    });
+    
+    const [importedFile] = findFile(rootPath, parsedName);
     
     if (!importedFile)
         return true;
@@ -118,12 +143,19 @@ function hasImportDefault(rootPath, importedFilename) {
     return !esm.length;
 }
 
+function parseFull(dir, source) {
+    if (source.startsWith('#'))
+        return source;
+    
+    return join(dir, source);
+}
+
 function buildImports(dir, imports) {
     const list = [];
     
     for (const current of imports) {
         const [name, source] = current.split(' <- ');
-        const full = join(dir, source);
+        const full = parseFull(dir, source);
         
         list.push([name, source, full]);
     }

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

@@ -1,9 +1,4 @@
-import {
-    join,
-    dirname,
-    resolve,
-} from 'node:path';
-import {tryCatch} from 'try-catch';
+import {join, dirname} from 'node:path';
 import {
     parse,
     print,
@@ -12,19 +7,14 @@ import {
 } from 'putout';
 import * as getImports from '#get-imports';
 import * as changeImports from '#change-imports';
-
-const isString = (a) => typeof a === 'string';
+import {createGetPrivateImports} from '#private-imports';
 
 const {
     getFilename,
     readFileContent,
     writeFileContent,
-    findFileUp,
 } = operator;
 
-const {entries} = Object;
-const {parse: parseJson} = JSON;
-
 const getMessage = (a) => a.message;
 
 export const report = (file, {from, to}) => `Apply privately imported source: '${from}' -> '${to}'`;
@@ -91,58 +81,3 @@ export const scan = (rootPath, {push, trackFile}) => {
         }
     }
 };
-
-const createGetPrivateImports = (importsCache = new Map(), emptyMap = new Map()) => (file) => {
-    const filename = getFilename(file);
-    const dir = dirname(filename);
-    
-    if (importsCache.has(dir))
-        return [dir, importsCache.get(dir)];
-    
-    const [packageDirectory, packagePath] = findFileUp(file, 'package.json');
-    
-    if (!packagePath) {
-        importsCache.set(dir, {});
-        return ['', emptyMap];
-    }
-    
-    const packageContent = readFileContent(packagePath);
-    const [error, packageJson] = tryCatch(parseJson, packageContent);
-    
-    if (error) {
-        importsCache.set(dir, emptyMap);
-        
-        return ['', emptyMap];
-    }
-    
-    const {imports = {}} = packageJson;
-    const importsEntries = new Map();
-    
-    for (const [alias, property] of entries(imports)) {
-        const filePath = parseProperty(property);
-        
-        if (!filePath)
-            continue;
-        
-        const resolvedPath = resolve(packageDirectory, filePath);
-        
-        importsEntries.set(resolvedPath, alias);
-    }
-    
-    importsCache.set(dir, [packageDirectory, importsEntries]);
-    
-    return [packageDirectory, importsEntries];
-};
-
-function parseProperty(property) {
-    if (isString(property))
-        return property;
-    
-    const {
-        default: filePath,
-        node,
-        browser,
-    } = property;
-    
-    return filePath || node || browser;
-}

package/lib/apply-privately-imported-file/private-imports.js

@@ -0,0 +1,81 @@
+import {dirname, resolve} from 'node:path';
+import {tryCatch} from 'try-catch';
+import {operator} from 'putout';
+
+const {
+    getFilename,
+    readFileContent,
+    findFileUp,
+} = operator;
+
+const {entries} = Object;
+const {parse: parseJson} = JSON;
+const isString = (a) => typeof a === 'string';
+
+function insert(a, b, {importsEntries, aliasBased}) {
+    if (aliasBased) {
+        importsEntries.set(b, a);
+        return;
+    }
+    
+    importsEntries.set(a, b);
+}
+
+export const createGetPrivateImports = (importsCache = new Map(), emptyMap = new Map()) => (file, options = {}) => {
+    const filename = getFilename(file);
+    const dir = dirname(filename);
+    const {aliasBased = false} = options;
+    
+    if (importsCache.has(dir))
+        return [dir, importsCache.get(dir)];
+    
+    const [packageDirectory, packagePath] = findFileUp(file, 'package.json');
+    
+    if (!packagePath) {
+        importsCache.set(dir, emptyMap);
+        return ['', emptyMap];
+    }
+    
+    const packageContent = readFileContent(packagePath);
+    const [error, packageJson] = tryCatch(parseJson, packageContent);
+    
+    if (error) {
+        importsCache.set(dir, emptyMap);
+        
+        return ['', emptyMap];
+    }
+    
+    const {imports = {}} = packageJson;
+    const importsEntries = new Map();
+    
+    for (const [alias, property] of entries(imports)) {
+        const filePath = parseProperty(property);
+        
+        if (!filePath)
+            continue;
+        
+        const resolvedPath = resolve(packageDirectory, filePath);
+        
+        insert(resolvedPath, alias, {
+            importsEntries,
+            aliasBased,
+        });
+    }
+    
+    importsCache.set(packageDirectory, importsEntries);
+    
+    return [packageDirectory, importsEntries];
+};
+
+function parseProperty(property) {
+    if (isString(property))
+        return property;
+    
+    const {
+        default: filePath,
+        node,
+        browser,
+    } = property;
+    
+    return filePath || node || browser;
+}

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

@@ -93,6 +93,11 @@ function buildResolved(rootPath, importsTuples) {
         const withJs = `${current}.js`;
         
         if (findFile(rootPath, withIndex).length) {
+            if (relative.endsWith('/')) {
+                result.push([relative, `${relative}index.js`]);
+                continue;
+            }
+            
             result.push([relative, `${relative}/index.js`]);
             continue;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "7.5.1",
+  "version": "7.7.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -12,7 +12,8 @@
   },
   "imports": {
     "#get-imports": "./lib/shorten-imported-file/get-imports/index.js",
-    "#change-imports": "./lib/resolve-imported-file/change-imports/index.js"
+    "#change-imports": "./lib/resolve-imported-file/change-imports/index.js",
+    "#private-imports": "./lib/apply-privately-imported-file/private-imports.js"
   },
   "release": false,
   "tag": false,
@@ -55,7 +56,7 @@
     "c8": "^10.0.0",
     "eslint": "^10.0.0-alpha.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^29.0.0",
+    "eslint-plugin-putout": "^30.0.0",
     "madrun": "^12.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",