@putout/plugin-esm 8.5.0 → 8.6.0

package/README.md

@@ -460,8 +460,9 @@ Let's consider file structure:
 ```
 /
 |-- lib/
-|  `-- index.js "import a from './a.js';"
+|  `-- index.js "import a from './a.js';\n export * as b from './b.js'"
 |  `-- a.js "export const a = 2;"
+|  `-- b.js "export const b = 2;"
 ```
 
 In this case `index.js` can be fixed:
@@ -470,12 +471,16 @@ In this case `index.js` can be fixed:
 
 ```js
 import a from './a.js';
+
+export * as b from './b.js';
 ```
 
 ##### ✅ Example of correct code
 
 ```js
 import {a} from './a.js';
+
+export {b} from './b.js';
 ```
 
 ### apply-privately-imported-file

package/lib/apply-name-to-imported-file/apply-named-import/index.js

@@ -1,10 +1,23 @@
+import {types} from 'putout';
+
+const {isImportDefaultSpecifier} = types;
+
 export const report = (path) => {
     const source = path.node.source.value;
     const {specifiers} = path.node;
-    const [{local}] = specifiers;
-    const {name} = local;
+    const [first] = specifiers;
+    
+    if (isImportDefaultSpecifier(first)) {
+        const {local} = first;
+        const {name} = local;
+        
+        return `'import ${name} from "${source}"' -> 'import {${name}} from "${source}"'`;
+    }
+    
+    const {exported} = first;
+    const {name} = exported;
     
-    return `'import ${name} from "${source}"' -> 'import {${name}} from "${source}"'`;
+    return `'export * as ${name} from "${source}"' -> 'export {${name}} from "${source}"'`;
 };
 
 export const replace = ({options}) => {
@@ -12,5 +25,6 @@ export const replace = ({options}) => {
     
     return {
         [`import ${name} from "${source}"`]: `import {${name}} from "${source}"`,
+        [`export * as ${name} from "${source}"`]: `export {${name}} from "${source}"`,
     };
 };

package/lib/apply-name-to-imported-file/get-imports/index.js

@@ -1,10 +1,15 @@
+import {types} from 'putout';
+
+const {isImportDefaultSpecifier} = types;
+
 export const include = () => [
     'import __a from "__b"',
+    'export * as __a from "__b"',
 ];
 
 export const report = (path) => {
-    const [name, source] = getImport(path);
-    return `${name} <- ${source}`;
+    const [name, source, type] = getImport(path);
+    return `${name} <- ${source} <- ${type}`;
 };
 
 export const fix = (path) => {
@@ -23,7 +28,21 @@ const CommentLine = (value) => ({
 const getImport = (path) => {
     const source = path.node.source.value;
     const [first] = path.node.specifiers;
-    const {name} = first.local;
     
-    return [name, source];
+    if (isImportDefaultSpecifier(first)) {
+        const {name} = first.local;
+        return [
+            name,
+            source,
+            'import',
+        ];
+    }
+    
+    const {name} = first.exported;
+    
+    return [
+        name,
+        source,
+        'export',
+    ];
 };

package/lib/apply-name-to-imported-file/get-imports-tuples.js

@@ -6,9 +6,6 @@ const {getFilename} = operator;
 const getMessage = (a) => a.message;
 
 export const getImportsTuples = (file, content, ast) => {
-    if (!content.includes('import'))
-        return [];
-    
     const places = transform(ast, content, {
         fix: false,
         plugins: [
@@ -35,10 +32,15 @@ function buildImports(dir, imports) {
     const list = [];
     
     for (const current of imports) {
-        const [name, source] = current.split(' <- ');
+        const [name, source, type] = current.split(' <- ');
         const full = parseFull(dir, source);
         
-        list.push([name, source, full]);
+        list.push([
+            name,
+            source,
+            full,
+            type,
+        ]);
     }
     
     return list;

package/lib/apply-name-to-imported-file/index.js

@@ -16,9 +16,13 @@ const {
     crawlDirectory,
 } = operator;
 
-export const report = (file, {name, source}) => {
+export const report = (file, {name, source, type}) => {
     const filename = getFilename(file);
-    return `Use \`import {${name}} from '${source}'\` in '${filename}'`;
+    
+    if (type === 'import')
+        return `Use \`import {${name}} from '${source}'\` in '${filename}'`;
+    
+    return `Use \`export {${name}} from '${source}'\` in '${filename}'`;
 };
 
 export const fix = (file, {name, source, content, ast}) => {
@@ -55,7 +59,7 @@ export const scan = (rootPath, {push, trackFile}) => {
             aliasBased: true,
         });
         
-        for (const [name, source, importedFilename] of importsTuples) {
+        for (const [name, source, importedFilename, type] of importsTuples) {
             const importType = determineImportType({
                 name,
                 rootPath,
@@ -66,7 +70,7 @@ export const scan = (rootPath, {push, trackFile}) => {
             
             if (importType === 'equal')
                 push(file, {
-                    importType,
+                    type,
                     name,
                     source,
                     ast,

package/lib/index.js

@@ -19,7 +19,7 @@ import * as resolveImportedFile from './resolve-imported-file/index.js';
 import * as shortenImportedFile from './shorten-imported-file/index.js';
 
 export const rules = {
-    'add-index-to-import': ['off', addIndexToImport],
+    'add-index-to-import': addIndexToImport,
     'apply-export-from': applyExportFrom,
     'convert-assert-to-with': convertAssertToWith,
     'declare-imports-first': declareImportsFirst,

package/package.json

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