@putout/plugin-esm 8.0.1 → 8.0.2

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

@@ -69,6 +69,7 @@ export const scan = (rootPath, {push, trackFile}) => {
         
         for (const [name, source, importedFilename] of importsTuples) {
             const is = hasImportDefault({
+                name,
                 rootPath,
                 importedFilename,
                 privateImports,
@@ -113,7 +114,7 @@ function parseImportedFilename({importedFilename, privateImports}) {
     return importedFilename;
 }
 
-function hasImportDefault({rootPath, importedFilename, privateImports}) {
+function hasImportDefault({name, rootPath, importedFilename, privateImports}) {
     const parsedName = parseImportedFilename({
         importedFilename,
         privateImports,
@@ -140,6 +141,13 @@ function hasImportDefault({rootPath, importedFilename, privateImports}) {
     if (defaultExport.length)
         return true;
     
+    for (const {message} of esm) {
+        const [, exportName] = message.split(':');
+        
+        if (name === exportName)
+            return true;
+    }
+    
     return !esm.length;
 }
 

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

@@ -1,4 +1,37 @@
-export const report = (path) => path.type;
+import {types} from 'putout';
+
+const {
+    isIdentifier,
+    isVariableDeclaration,
+    isFunction,
+    isExportNamedDeclaration,
+} = types;
+
+export const report = (path) => {
+    const {type} = path;
+    
+    if (isExportNamedDeclaration(path)) {
+        const {declaration} = path.node;
+        
+        if (isFunction(declaration))
+            return `${type}:${declaration.id.name}`;
+        
+        if (isVariableDeclaration(declaration)) {
+            const {declarations} = declaration;
+            
+            if (declarations.length !== 1)
+                return type;
+            
+            const [first] = declarations;
+            const {id} = first;
+            
+            if (isIdentifier(id))
+                return `${type}:${id.name}`;
+        }
+    }
+    
+    return type;
+};
 
 export const fix = (path) => {
     path.node.leadingComments = [

package/package.json

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