@putout/plugin-esm 6.2.0 → 6.3.1

package/README.md

@@ -94,6 +94,7 @@ export const rules = {};
 > (c) [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export)
 
 Check out 🐊**Putout Editor**:
+
 - [#1](https://putout.cloudcmd.io/#/gist/c9a3983d269745da89c1c7560f3b7fac/3ecb9aa6b910ce3816605bae11c8dd86bdc457e5);
 - [#2](https://putout.cloudcmd.io/#/gist/9b2a0a51acf477291a6bbcbe7d846ddf/fa21768506f518ca0a1073beb82a9b8b8f5e7c19);
 

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

@@ -1,4 +1,5 @@
 import {join, dirname} from 'node:path';
+import tryCatch from 'try-catch';
 import putout, {
     parse,
     print,
@@ -52,7 +53,13 @@ export const scan = (rootPath, {push, trackFile}) => {
     
     for (const file of trackFile(rootPath, mask)) {
         const content = readFileContent(file);
-        const ast = parse(content);
+        const [error, ast] = tryCatch(parse, content);
+        
+        if (error) {
+            error.message += `\n${content}\n`;
+            throw error;
+        }
+        
         const importsTuples = getImports(file, content, ast);
         
         for (const [name, source, importedFilename] of importsTuples) {

package/lib/merge-export-declarations/index.js

@@ -1,39 +1,58 @@
 import {operator, types} from 'putout';
 
-const {isExportNamedDeclaration} = types;
 const {remove} = operator;
+const {isExportNamedDeclaration} = types;
 
 export const report = () => `Merge export declarations`;
 
-export const fix = ({path, count, exports}) => {
+export const fix = ({path, exports}) => {
     const all = [];
     
-    for (const [index, path] of exports.entries()) {
+    for (const path of exports) {
         const {node} = path;
         const {specifiers} = node;
         
         all.push(...specifiers);
-        
-        if (index < count - 1)
-            remove(path);
+        remove(path);
     }
     
-    path.node.specifiers = all;
+    path.node.specifiers.push(...all);
 };
 
 export const traverse = ({push}) => ({
     Program(path) {
-        const exports = path.get('body').filter(hasSpecifiers);
-        const count = exports.length;
+        const filteredExports = path.get('body').filter(hasSpecifiers);
+        const count = filteredExports.length;
         
         if (count < 2)
             return;
         
-        push({
-            path: exports.at(-1),
-            exports,
-            count,
-        });
+        const lists = [];
+        const marked = new Set();
+        
+        for (const [i, a] of filteredExports.entries()) {
+            if (marked.has(a))
+                continue;
+            
+            for (const b of filteredExports) {
+                if (a === b)
+                    continue;
+                
+                if (isSameSources(a, b)) {
+                    marked.add(b);
+                    
+                    lists[i] = lists[i] || [a];
+                    lists[i].push(b);
+                }
+            }
+        }
+        
+        for (const [path, ...exports] of lists) {
+            push({
+                path,
+                exports,
+            });
+        }
     },
 });
 
@@ -43,3 +62,16 @@ function hasSpecifiers(path) {
     
     return path.node.specifiers.length;
 }
+
+function isSameSources(a, b) {
+    const sourceA = a.node.source;
+    const sourceB = b.node.source;
+    
+    if (!sourceA && sourceA === sourceB)
+        return true;
+    
+    if (!sourceA || !sourceB)
+        return false;
+    
+    return sourceA.value === sourceB.value;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "6.2.0",
+  "version": "6.3.1",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -28,7 +28,8 @@
     "report": "madrun report"
   },
   "dependencies": {
-    "parse-import-specifiers": "^1.0.3"
+    "parse-import-specifiers": "^1.0.3",
+    "try-catch": "^3.0.1"
   },
   "keywords": [
     "putout",