@putout/plugin-esm 8.5.1 → 8.7.0

package/README.md

@@ -34,8 +34,8 @@ npm i putout @putout/plugin-esm -D
 
 ## File rules
 
-- ✅ [apply-name-to-imported-file](#apply-name-to-imported-file]]);
-- ✅ [apply-namespace-to-imported-file](#apply-namespace-to-imported-file]]);
+- ✅ [apply-name-to-imported-file](#apply-name-to-imported-file);
+- ✅ [apply-namespace-to-imported-file](#apply-namespace-to-imported-file);
 - ✅ [apply-privately-imported-file](#apply-privately-imported-file);
 - ✅ [apply-js-imported-file](#apply-js-imported-file);
 - ✅ [resolve-imported-file](#resolve-imported-file);
@@ -428,9 +428,9 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js "import a from './a.js';"
-|  `-- a.js "export const x = 2;"
+└── lib/
+    ├── index.js "import a from './a.js';"
+    └── b.js "export const b = 2;" 
 ```
 
 In this case `index.js` can be fixed:
@@ -459,9 +459,10 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js "import a from './a.js';"
-|  `-- a.js "export const a = 2;"
+└── lib/
+    ├── 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
@@ -495,12 +500,12 @@ Let's consider file structure:
 
 ```
 /
-|-- package.json {"imports": {"#is: {"default": "./lib/tokenize/is.js"}}}
-|-- lib/
-|  `-- tokenize/
-|     `-- is.js "export const isPrev = () => {}"
-|     `-- expressions/
-        `-- spread-element.js "import {isPrev} from '../is.js"
+├── package.json {"imports": {"#is: {"default": "./lib/tokenize/is.js"}}}
+└──  lib/
+    └── tokenize/
+        ├── is.js "export const isPrev = () => {}"
+        └── expressions/
+            └── spread-element.js "import {isPrev} from '../is.js"
 ```
 
 In this case `spread-element.js` can be fixed:
@@ -529,9 +534,9 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js
-|  `-- a.js
+└── lib/
+    ├── index.js
+    └── a.js
 ```
 
 In this case `index.js` can be fixed:
@@ -559,9 +564,9 @@ Let's consider file structure:
 
 ```
 /
-|-- processors/
-|  `-- index.js
-|  `-- parse-processor-names.js
+└── processors/
+    ├── index.js
+    └── parse-processor-names.js
 ```
 
 In this case `index.js` can be fixed:
@@ -589,9 +594,9 @@ Let's consider file structure:
 
 ```
 /
-|-- lib/
-|  `-- index.js
-|  `-- a.js
+└── lib/
+    ├── index.js
+    └── a.js
 ```
 
 In this case `index.js` can be fixed:

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/determine-import-type.js

@@ -5,20 +5,15 @@ import * as isESMPlugin from '#is-esm';
 const isESM = (a) => a.rule === 'is-esm';
 const hasExportDefault = (a) => a.rule === 'has-export-default';
 
-const {
-    findFile,
-    readFileContent,
-} = operator;
+const {readFileContent} = operator;
 
-export const determineImportType = ({name, rootPath, importedFilename, privateImports, crawled}) => {
+export const determineImportType = ({name, rootPath, importedFilename, privateImports, crawlFile}) => {
     const parsedName = parseImportedFilename({
         importedFilename,
         privateImports,
     });
     
-    const [importedFile] = findFile(rootPath, parsedName, {
-        crawled,
-    });
+    const [importedFile] = crawlFile(rootPath, parsedName);
     
     if (!importedFile)
         return '';

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,22 @@ 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

@@ -6,19 +6,22 @@ import {
 } from 'putout';
 import {createGetPrivateImports} from '#private-imports';
 import {determineImportType} from '#determine-import-type';
+import {getImportsTuples} from '#get-imports-tuples';
 import {transformNamedImport} from './transform-named-import.js';
-import {getImportsTuples} from './get-imports-tuples.js';
 
 const {
     getFilename,
     readFileContent,
     writeFileContent,
-    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}) => {
@@ -33,14 +36,13 @@ export const fix = (file, {name, source, content, ast}) => {
     writeFileContent(file, newContent);
 };
 
-export const scan = (rootPath, {push, trackFile}) => {
+export const scan = (rootPath, {push, trackFile, crawlFile}) => {
     const mask = [
         '*.js',
         '*.mjs',
     ];
     
     const getPrivateImports = createGetPrivateImports();
-    const crawled = crawlDirectory(rootPath);
     
     for (const file of trackFile(rootPath, mask)) {
         const content = readFileContent(file);
@@ -55,18 +57,18 @@ 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,
                 importedFilename,
                 privateImports,
-                crawled,
+                crawlFile,
             });
             
             if (importType === 'equal')
                 push(file, {
-                    importType,
+                    type,
                     name,
                     source,
                     ast,

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

@@ -6,14 +6,13 @@ import {
 } from 'putout';
 import {createGetPrivateImports} from '#private-imports';
 import {determineImportType} from '#determine-import-type';
+import {getImportsTuples} from '#get-imports-tuples';
 import {transformNamespaceImport} from './transform-namespace-import.js';
-import {getImportsTuples} from '../apply-name-to-imported-file/get-imports-tuples.js';
 
 const {
     getFilename,
     readFileContent,
     writeFileContent,
-    crawlDirectory,
 } = operator;
 
 export const report = (file, {name, source}) => {
@@ -33,14 +32,13 @@ export const fix = (file, {name, source, content, ast}) => {
     writeFileContent(file, newContent);
 };
 
-export const scan = (rootPath, {push, trackFile}) => {
+export const scan = (rootPath, {push, trackFile, crawlFile}) => {
     const mask = [
         '*.js',
         '*.mjs',
     ];
     
     const getPrivateImports = createGetPrivateImports();
-    const crawled = crawlDirectory(rootPath);
     
     for (const file of trackFile(rootPath, mask)) {
         const content = readFileContent(file);
@@ -61,7 +59,7 @@ export const scan = (rootPath, {push, trackFile}) => {
                 rootPath,
                 importedFilename,
                 privateImports,
-                crawled,
+                crawlFile,
             });
             
             if (importType === 'namespace')

package/lib/resolve-imported-file/change-imports/index.js

@@ -1,6 +1,9 @@
 export const report = () => '';
 export const replace = ({options}) => {
-    const {from = '', to = ''} = options;
+    const {
+        from = '',
+        to = '',
+    } = options;
     
     if (!from || !to)
         return {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "8.5.1",
+  "version": "8.7.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -12,7 +12,7 @@
   },
   "imports": {
     "#get-imports": "./lib/shorten-imported-file/get-imports/index.js",
-    "#get-imports-tuples": "./lib/shorten-imported-file/get-imports-tuples.js",
+    "#get-imports-tuples": "./lib/apply-name-to-imported-file/get-imports-tuples.js",
     "#get-default-imports": "./lib/apply-name-to-imported-file/get-imports/index.js",
     "#change-imports": "./lib/resolve-imported-file/change-imports/index.js",
     "#private-imports": "./lib/apply-privately-imported-file/private-imports.js",