@putout/plugin-esm 4.10.0 → 5.1.0

package/README.md

@@ -29,7 +29,6 @@ npm i putout @putout/plugin-esm -D
 - ✅ [remove-empty-export](#remove-empty-export);
 - ✅ [remove-useless-export-specifiers](#remove-useless-export-specifiers);
 - ✅ [sort-imports-by-specifiers](#sort-imports-by-specifiers);
-- ✅ [inline-export](#inline-export);
 
 ## File rules
 
@@ -46,7 +45,7 @@ npm i putout @putout/plugin-esm -D
         "esm/declare-imports-first": "on",
         "esm/group-imports-by-source": "on",
         "esm/merge-duplicate-imports": "on",
-        "esm/merge-declaration-with-export": "on",
+        "esm/merge-declaration-with-export": "off",
         "esm/remove-quotes-from-import-assertions": "on",
         "esm/remove-empty-export": "on",
         "esm/remove-empty-import": ["on", {
@@ -55,7 +54,6 @@ npm i putout @putout/plugin-esm -D
         "esm/sort-imports-by-specifiers": "on",
         "esm/resolve-imported-file": "off",
         "esm/apply-namespace-of-file": "off",
-        "esm/inline-export": "off",
         "esm/remove-useless-export-specifiers": "off"
     }
 }
@@ -110,9 +108,25 @@ export {
 export * as ns from 'x';
 ```
 
-### inline-export
+### merge-declaration-with-export
 
-Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/c9a3983d269745da89c1c7560f3b7fac/3ecb9aa6b910ce3816605bae11c8dd86bdc457e5).
+Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/3fad517d76942d0a1f51d7f58a2799af/7a052ab18a31fa382228d6513c412be37091cfb8).
+
+#### ❌ Example of incorrect code
+
+```js
+const {
+    report,
+    fix,
+    scan,
+} = createRemoveFiles(['*.swp', '*.swo']);
+
+export {
+    report,
+    fix,
+    scan,
+};
+```
 
 #### ❌ Example of incorrect code
 
@@ -137,6 +151,12 @@ export const stack = [];
 export function sum(a, b) {
     i32.add(local.get(), local.get());
 }
+
+export const {
+    report,
+    fix,
+    scan,
+} = createRemoveFiles(['*.swp', '*.swo']);
 ```
 
 ### remove-useless-export-specifiers
@@ -210,36 +230,6 @@ import ss from '../../bb/ss.js';
 const c = 5;
 ```
 
-### merge-declaration-with-export
-
-Checkout in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/3fad517d76942d0a1f51d7f58a2799af/7a052ab18a31fa382228d6513c412be37091cfb8).
-
-#### ❌ Example of incorrect code
-
-```js
-const {
-    report,
-    fix,
-    scan,
-} = createRemoveFiles(['*.swp', '*.swo']);
-
-export {
-    report,
-    fix,
-    scan,
-};
-```
-
-##### ✅ Example of correct code
-
-```js
-export const {
-    report,
-    fix,
-    scan,
-} = createRemoveFiles(['*.swp', '*.swo']);
-```
-
 ### merge-duplicate-imports
 
 #### join

package/lib/index.js

@@ -1,5 +1,5 @@
 import * as removeUselessExportSpecifiers from './remove-useless-export-specifiers/index.js';
-import * as inlineExport from './inline-export/index.js';
+import * as mergeDeclarationWithExport from './merge-declaration-with-export/index.js';
 import * as applyNamespaceImportToFile from './apply-namespace-import-to-file/index.js';
 import * as resolveImportedFile from './resolve-imported-file/index.js';
 import * as addIndexToImport from './add-index-to-import/index.js';
@@ -10,7 +10,6 @@ import * as sortImportsBySpecifiers from './sort-imports-by-specifiers/index.js'
 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 mergeDeclarationWithExport from './merge-declaration-with-export/index.js';
 import * as convertAssertToWith from './convert-assert-to-with/index.js';
 import * as applyExportFrom from './apply-export-from/index.js';
 
@@ -28,6 +27,5 @@ export const rules = {
     'resolve-imported-file': ['off', resolveImportedFile],
     'apply-namespace-import-to-file': ['off', applyNamespaceImportToFile],
     'merge-declaration-with-export': mergeDeclarationWithExport,
-    'inline-export': inlineExport,
     'remove-useless-export-specifiers': removeUselessExportSpecifiers,
 };

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

@@ -1,61 +1,81 @@
-import {operator, types} from 'putout';
+import {types, operator} from 'putout';
 
-const {remove, replaceWith} = operator;
 const {
-    exportNamedDeclaration,
-    isExportSpecifier,
+    remove,
+    replaceWith,
+    compare,
+} = operator;
+const {
+    variableDeclaration,
     isVariableDeclarator,
+    exportNamedDeclaration,
+    isFunctionDeclaration,
+    isImportSpecifier,
+    isImportDefaultSpecifier,
+    isExportNamedDeclaration,
 } = types;
 
-export const report = () => `Merge declaration with export`;
+export const report = () => `Inline export`;
+export const include = () => [
+    'export {__exports}',
+];
 
-export const fix = ({path, bindingPath}) => {
-    const {parentPath} = bindingPath;
-    const {node} = parentPath;
+export const filter = (path) => {
+    const {scope} = path;
+    const specifiers = path.get('specifiers');
     
-    replaceWith(parentPath, exportNamedDeclaration(node));
-    remove(path);
+    for (const spec of specifiers) {
+        const {local, exported} = spec.node;
+        const {name} = local;
+        
+        if (name !== exported.name)
+            return false;
+        
+        const binding = scope.bindings[name];
+        
+        if (!binding)
+            return false;
+        
+        const bindingPath = binding.path;
+        
+        if (isExportNamedDeclaration(bindingPath.parentPath.parentPath))
+            return false;
+        
+        if (isImportSpecifier(bindingPath))
+            return false;
+        
+        if (isImportDefaultSpecifier(bindingPath))
+            return false;
+        
+        if (compare(bindingPath, 'const __a = require(__b)'))
+            return false;
+    }
+    
+    return true;
 };
-export const traverse = ({push}) => ({
-    ExportNamedDeclaration(path) {
-        const {specifiers} = path.node;
-        
-        if (!specifiers.length)
-            return;
-        
-        const bindingPaths = [];
-        
-        for (const spec of specifiers) {
-            if (!isExportSpecifier(spec))
-                return;
-            
-            const {local, exported} = spec;
-            const {name} = local;
-            
-            if (name !== exported.name)
-                return;
-            
-            const binding = path.scope.bindings[name];
-            
-            if (!binding)
-                return;
-            
-            const {path: bindingPath} = binding;
-            
-            if (!isVariableDeclarator(bindingPath))
-                return;
-            
-            if (!bindingPaths.length) {
-                bindingPaths.push(bindingPath);
-                continue;
-            }
-        }
+
+export const fix = (path) => {
+    const {scope} = path;
+    const specifiers = path.get('specifiers');
+    
+    for (const spec of specifiers) {
+        const {local} = spec.node;
+        const {name} = local;
         
-        const [bindingPath] = bindingPaths;
+        const binding = scope.bindings[name];
+        const bindingPath = binding.path;
         
-        push({
-            path,
-            bindingPath,
-        });
-    },
-});
+        if (isFunctionDeclaration(bindingPath)) {
+            replaceWith(bindingPath, exportNamedDeclaration(bindingPath.node));
+            continue;
+        }
+        
+        if (isVariableDeclarator(bindingPath)) {
+            const declaration = variableDeclaration('const', [bindingPath.node]);
+            replaceWith(bindingPath.parentPath, exportNamedDeclaration(declaration));
+            continue;
+        }
+    }
+    
+    remove(path);
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "4.10.0",
+  "version": "5.1.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -46,7 +46,7 @@
     "@putout/plugin-reuse-duplicate-init": "*",
     "@putout/plugin-tape": "*",
     "@putout/plugin-typescript": "*",
-    "@putout/test": "^13.0.0",
+    "@putout/test": "^14.0.0",
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",

package/lib/inline-export/index.js

@@ -1,71 +0,0 @@
-import {types, operator} from 'putout';
-
-const {remove, replaceWith} = operator;
-const {
-    variableDeclaration,
-    isVariableDeclarator,
-    exportNamedDeclaration,
-    isFunctionDeclaration,
-    isImportSpecifier,
-    isImportDefaultSpecifier,
-} = types;
-
-export const report = () => `Inline export`;
-export const include = () => [
-    'export {__exports}',
-];
-export const exclude = () => [`export * as __a from '__b'`];
-
-export const filter = (path) => {
-    const {scope} = path;
-    const specifiers = path.get('specifiers');
-    
-    for (const spec of specifiers) {
-        const {local, exported} = spec.node;
-        const {name} = local;
-        
-        if (name !== exported.name)
-            return false;
-        
-        const binding = scope.bindings[name];
-        
-        if (!binding)
-            return false;
-        
-        const bindingPath = binding.path;
-        
-        if (isImportSpecifier(bindingPath))
-            return false;
-        
-        if (isImportDefaultSpecifier(bindingPath))
-            return false;
-    }
-    
-    return true;
-};
-
-export const fix = (path) => {
-    const {scope} = path;
-    const specifiers = path.get('specifiers');
-    
-    for (const spec of specifiers) {
-        const {local} = spec.node;
-        const {name} = local;
-        
-        const binding = scope.bindings[name];
-        const bindingPath = binding.path;
-        
-        if (isFunctionDeclaration(bindingPath)) {
-            replaceWith(bindingPath, exportNamedDeclaration(bindingPath.node));
-            continue;
-        }
-        
-        if (isVariableDeclarator(bindingPath)) {
-            const declaration = variableDeclaration('const', [bindingPath.node]);
-            replaceWith(bindingPath.parentPath, exportNamedDeclaration(declaration));
-            continue;
-        }
-    }
-    
-    remove(path);
-};