@putout/plugin-esm 6.1.1 → 6.3.0

package/README.md

@@ -93,15 +93,20 @@ export const rules = {};
 >
 > (c) [MDN](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Statements/export)
 
-Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/##/gist/c9a3983d269745da89c1c7560f3b7fac/3ecb9aa6b910ce3816605bae11c8dd86bdc457e5).
+Check out 🐊**Putout Editor**:
+
+- [#1](https://putout.cloudcmd.io/#/gist/c9a3983d269745da89c1c7560f3b7fac/3ecb9aa6b910ce3816605bae11c8dd86bdc457e5);
+- [#2](https://putout.cloudcmd.io/#/gist/9b2a0a51acf477291a6bbcbe7d846ddf/fa21768506f518ca0a1073beb82a9b8b8f5e7c19);
 
 #### ❌ Example of incorrect code
 
 ```js
 import * as ns_1 from 'x';
+import {createAsyncLoader} from './load/async-loader.js';
 
 export {
     ns_1 as ns,
+    createAsyncLoader,
 };
 ```
 
@@ -109,6 +114,7 @@ export {
 
 ```js
 export * as ns from 'x';
+export {createAsyncLoader} from './load/async-loader.js';
 ```
 
 ### merge-declaration-with-export

package/lib/apply-export-from/index.js

@@ -1,43 +1,78 @@
 import {types, operator} from 'putout';
 
 const {
-    compare,
-    getTemplateValues,
-    remove,
-} = operator;
+    isExportSpecifier,
+    isImportSpecifier,
+    exportNamedDeclaration,
+    exportNamespaceSpecifier,
+    isImportNamespaceSpecifier,
+} = types;
 
-const {exportNamespaceSpecifier} = types;
+const {values} = Object;
+const {remove, insertAfter} = operator;
 
-export const report = () => `Use 'export *' instead of 'import/export'`;
+export const report = () => `Use 'export from' instead of 'import' + 'export'`;
 
-const IMPORT = 'import * as __a from "__b"';
-
-export const fix = ({path, current}) => {
-    const {exported} = current.node.specifiers[0];
-    
-    current.node.source = path.node.source;
-    
-    delete current.node.local;
-    delete current.node.exported;
-    
-    current.node.specifiers = [
-        exportNamespaceSpecifier(exported),
-    ];
+export const fix = ({path, reference}) => {
+    const {parentPath} = path;
+    const parentReference = reference.parentPath;
+    const exportNode = createExport(path, parentReference);
     
-    remove(path);
+    insertAfter(parentPath, exportNode);
+    removeSpecifier(path);
+    removeSpecifier(parentReference);
 };
 
 export const traverse = ({push}) => ({
-    [IMPORT]: (path) => {
-        const {__a} = getTemplateValues(path, IMPORT);
-        const {name} = __a;
+    Program(path) {
+        const {bindings} = path.scope;
+        const imports = values(bindings).filter(isExported);
         
-        for (const current of path.parentPath.get('body')) {
-            if (compare(current, `export {${name} as __b}`))
-                push({
-                    path,
-                    current,
-                });
+        for (const {path, referencePaths} of imports) {
+            const [reference] = referencePaths;
+            
+            push({
+                path,
+                reference,
+            });
         }
     },
 });
+
+function isExported(binding) {
+    const {
+        path,
+        references,
+        referencePaths,
+    } = binding;
+    
+    if (references !== 1)
+        return false;
+    
+    if (!isImportSpecifier(path) && !isImportNamespaceSpecifier(path))
+        return false;
+    
+    const [refPath] = referencePaths;
+    
+    return isExportSpecifier(refPath.parentPath);
+}
+
+function removeSpecifier(path) {
+    if (path.parentPath.node.specifiers.length === 1)
+        remove(path.parentPath);
+    else
+        remove(path);
+}
+
+function createExport(path, parentReference) {
+    const {parentPath} = path;
+    const {source} = parentPath.node;
+    
+    if (isImportSpecifier(path))
+        return exportNamedDeclaration(null, [parentReference.node], source);
+    
+    const {exported} = parentReference.node;
+    const specifier = exportNamespaceSpecifier(exported);
+    
+    return exportNamedDeclaration(null, [specifier], source);
+}

package/lib/index.js

@@ -1,3 +1,4 @@
+import * as applyExportFrom from './apply-export-from/index.js';
 import * as mergeExportDeclarations from './merge-export-declarations/index.js';
 import * as removeUselessExportSpecifiers from './remove-useless-export-specifiers/index.js';
 import * as mergeDeclarationWithExport from './merge-declaration-with-export/index.js';
@@ -12,7 +13,6 @@ import * as removeEmptyImport from './remove-empty-import/index.js';
 import * as removeEmptyExport from './remove-empty-export/index.js';
 import * as mergeDuplicateImports from './merge-duplicate-imports/index.js';
 import * as convertAssertToWith from './convert-assert-to-with/index.js';
-import * as applyExportFrom from './apply-export-from/index.js';
 
 export const rules = {
     'add-index-to-import': ['off', addIndexToImport],

package/lib/merge-declaration-with-export/index.js

@@ -25,6 +25,9 @@ export const filter = (path) => {
     const {scope} = path;
     const specifiers = path.get('specifiers');
     
+    if (!specifiers.length)
+        return false;
+    
     for (const spec of specifiers) {
         const {local, exported} = spec.node;
         const {name} = local;

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.1.1",
+  "version": "6.3.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",