@putout/plugin-esm 5.3.1 → 6.1.0

package/README.md

@@ -25,6 +25,7 @@ npm i putout @putout/plugin-esm -D
 - ✅ [group-imports-by-source](#group-imports-by-source);
 - ✅ [merge-duplicate-imports](#merge-duplicate-imports);
 - ✅ [merge-declaration-with-export](#merge-declaration-with-export);
+- ✅ [merge-export-declarations](#merge-export-declarations);
 - ✅ [remove-quotes-from-import-assertions](#remove-quotes-from-import-assertions);
 - ✅ [remove-empty-import](#remove-empty-import);
 - ✅ [remove-empty-export](#remove-empty-export);
@@ -47,6 +48,7 @@ npm i putout @putout/plugin-esm -D
         "esm/group-imports-by-source": "on",
         "esm/merge-duplicate-imports": "on",
         "esm/merge-declaration-with-export": "off",
+        "esm/merge-export-declaration": "off",
         "esm/remove-quotes-from-import-assertions": "on",
         "esm/remove-empty-export": "on",
         "esm/remove-empty-import": ["on", {
@@ -160,6 +162,30 @@ export const {
 } = createRemoveFiles(['*.swp', '*.swo']);
 ```
 
+### merge-export-declarations
+
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/d3e490352bd4a98033de89db670b4737/3ff4803578bf39f8587cb578a103e5d92dd92050).
+
+#### ❌ Example of incorrect code
+
+```js
+export {
+    loadPlugins,
+};
+export {
+    loadPluginsAsync,
+};
+```
+
+#### ❌ Example of incorrect code
+
+```js
+export {
+    loadPlugins,
+    loadPluginsAsync,
+};
+```
+
 ### remove-useless-export-specifiers
 
 Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/e5c3ea469437ade0f4467323dcec9a36/7c298c7078b004ae3aba2a29e38579bf8f48a098).
@@ -362,7 +388,7 @@ Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/9f85897b9
 
 #### ❌ Example of incorrect code
 
-```js
+```
 import json from './foo.json' assert {
     type: 'json',
 };

package/lib/convert-assert-to-with/index.js

@@ -1,6 +1,11 @@
-const setImportType = (path, type) => {
-    path.node.options.properties[0].key.name = type;
-};
+import {operator, types} from 'putout';
+
+const {
+    importAttribute,
+    identifier,
+} = types;
+
+const {compare, remove} = operator;
 
 export const report = () => `Use 'with' instead of 'assert'`;
 
@@ -10,19 +15,38 @@ export const include = () => [
 ];
 
 export const fix = (path) => {
-    if (path.isImportDeclaration()) {
-        delete path.node.extra.deprecatedAssertSyntax;
+    if (path.isImportExpression()) {
+        path.node.options.properties[0].key.name = 'with';
         return;
     }
     
-    setImportType(path, 'with');
+    const next = path.getNextSibling();
+    const nextNext = next.getNextSibling();
+    const nextNextNext = nextNext.getNextSibling();
+    const {body} = nextNext.node.body[0];
+    
+    remove(next);
+    remove(nextNext);
+    
+    if (nextNextNext.isEmptyStatement())
+        remove(nextNextNext);
+    
+    path.node.attributes = [
+        importAttribute(identifier('type'), body.expression),
+    ];
 };
 
 export const filter = (path) => {
-    const {extra} = path.node;
-    
-    if (path.isImportDeclaration())
-        return extra?.deprecatedAssertSyntax;
+    if (path.isImportDeclaration()) {
+        const next = path.getNextSibling();
+        
+        if (!compare(next, 'assert;'))
+            return false;
+        
+        const nextNext = next.getNextSibling();
+        
+        return compare(nextNext, '{type: "__";}');
+    }
     
-    return true;
+    return path.isImportExpression();
 };

package/lib/index.js

@@ -1,3 +1,4 @@
+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';
 import * as applyNamespaceImportToFile from './apply-namespace-import-to-file/index.js';
@@ -28,4 +29,5 @@ export const rules = {
     'apply-namespace-import-to-file': ['off', applyNamespaceImportToFile],
     'merge-declaration-with-export': mergeDeclarationWithExport,
     'remove-useless-export-specifiers': removeUselessExportSpecifiers,
+    'merge-export-declarations': mergeExportDeclarations,
 };

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

@@ -0,0 +1,45 @@
+import {operator, types} from 'putout';
+
+const {isExportNamedDeclaration} = types;
+const {remove} = operator;
+
+export const report = () => `Merge export declarations`;
+
+export const fix = ({path, count, exports}) => {
+    const all = [];
+    
+    for (const [index, path] of exports.entries()) {
+        const {node} = path;
+        const {specifiers} = node;
+        
+        all.push(...specifiers);
+        
+        if (index < count - 1)
+            remove(path);
+    }
+    
+    path.node.specifiers = all;
+};
+
+export const traverse = ({push}) => ({
+    Program(path) {
+        const exports = path.get('body').filter(hasSpecifiers);
+        const count = exports.length;
+        
+        if (count < 2)
+            return;
+        
+        push({
+            path: exports.at(-1),
+            exports,
+            count,
+        });
+    },
+});
+
+function hasSpecifiers(path) {
+    if (!isExportNamedDeclaration(path))
+        return false;
+    
+    return path.node.specifiers.length;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "5.3.1",
+  "version": "6.1.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -40,7 +40,7 @@
     "@putout/eslint-flat": "^3.0.0",
     "@putout/plugin-declare": "*",
     "@putout/plugin-declare-before-reference": "*",
-    "@putout/plugin-merge-destructuring-properties": "*",
+    "@putout/plugin-destructuring": "*",
     "@putout/plugin-nodejs": "*",
     "@putout/plugin-putout": "*",
     "@putout/plugin-reuse-duplicate-init": "*",
@@ -48,16 +48,16 @@
     "@putout/plugin-typescript": "*",
     "@putout/test": "^14.0.0",
     "c8": "^10.0.0",
-    "eslint": "v10.0.0-alpha.0",
+    "eslint": "^10.0.0-alpha.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^28.0.0",
+    "eslint-plugin-putout": "^29.0.0",
     "madrun": "^11.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",
     "supertape": "^11.0.3"
   },
   "peerDependencies": {
-    "putout": ">=40"
+    "putout": ">=41"
   },
   "license": "MIT",
   "engines": {