@putout/plugin-esm 8.0.1 → 8.1.0

package/README.md

@@ -34,7 +34,8 @@ npm i putout @putout/plugin-esm -D
 
 ## File rules
 
-- ✅ [apply-namespace-import-file](#resolve-imported-file);
+- ✅ [apply-namespace-import-to-file](#apply-namespace-import-file]);
+- ✅ [apply-named-import-to-file](#apply-named-import-to-file);
 - ✅ [apply-privately-imported-file](#apply-privately-imported-file);
 - ✅ [apply-js-imported-file](#apply-js-imported-file);
 - ✅ [resolve-imported-file](#resolve-imported-file);
@@ -61,7 +62,8 @@ npm i putout @putout/plugin-esm -D
         "esm/apply-js-imported-file": "off",
         "esm/resolve-imported-file": "off",
         "esm/shorten-imported-file": "off",
-        "esm/apply-namespace-of-file": "off",
+        "esm/apply-namespace-import-to-file": "off",
+        "esm/apply-named-import-to-file": "off",
         "esm/apply-privately-imported-file": "off",
         "esm/remove-useless-export-specifiers": "off"
     }
@@ -399,6 +401,41 @@ import('foo.json', {
 
 ## File Rules
 
+### apply-named-import-to-file
+
+The rule fixes:
+
+> `SyntaxError: The requested module './a.js' does not provide an export named 'default'`
+
+Check out in 🐊**Putout Editor**:
+
+- ✅ [`get-imports`](https://putout.cloudcmd.io/#/gist/5d7687215e9fbdf705935c444503dded/75a98d2db9d3847c73017e41637924b1cfd5a598);
+- ✅ [`has-export-default`](https://putout.cloudcmd.io/#/gist/b50ccfe5cc8c0c97e2fc98b37903ade4/fbc026e6f1027581f7aa4879dcafcaa7754bf8f4);
+- ✅ [`is-esm`](https://putout.cloudcmd.io/#/gist/fa080be2bf3a6560e289d84b5873c2bc/2601091f6bf97148843767968c3afcb36dde31de);
+
+Let's consider file structure:
+
+```
+/
+|-- lib/
+|  `-- index.js "import a from './a.js';"
+|  `-- a.js "export const a = 2;"
+```
+
+In this case `index.js` can be fixed:
+
+#### ❌ Example of incorrect code
+
+```js
+import a from './a.js';
+```
+
+#### ✅ Example of correct code
+
+```js
+import {a} from './a.js';
+```
+
 ### apply-namespace-import-to-file
 
 The rule fixes:

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

@@ -0,0 +1,16 @@
+export const report = (path) => {
+    const source = path.node.source.value;
+    const {specifiers} = path.node;
+    const [{local}] = specifiers;
+    const {name} = local;
+    
+    return `'import ${name} from "${source}"' -> 'import {${name}} from "${source}"'`;
+};
+
+export const replace = ({options}) => {
+    const {name, source} = options;
+    
+    return {
+        [`import ${name} from "${source}"`]: `import {${name}} from "${source}"`,
+    };
+};

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

@@ -0,0 +1,176 @@
+import {join, dirname} from 'node:path';
+import {tryCatch} from 'try-catch';
+import putout, {
+    parse,
+    print,
+    transform,
+    operator,
+} from 'putout';
+import {createGetPrivateImports} from '#private-imports';
+import * as isESMPlugin from '#is-esm';
+import * as hasExportDefaultPlugin from '#has-export-default';
+import * as getImportsPlugin from '#get-default-imports';
+import * as applyNamedImportPlugin from './apply-named-import/index.js';
+
+const {
+    findFile,
+    getFilename,
+    readFileContent,
+    writeFileContent,
+} = operator;
+
+const getMessage = (a) => a.message;
+const isESM = (a) => a.rule === 'is-esm';
+const hasExportDefault = (a) => a.rule === 'has-export-default';
+
+export const report = (file, {name, source}) => {
+    const filename = getFilename(file);
+    return `Use 'import {${name}} from '${source}' in '${filename}'`;
+};
+
+export const fix = (file, {name, source, content, ast}) => {
+    transform(ast, content, {
+        rules: {
+            'apply-named-import': ['on', {
+                name,
+                source,
+            }],
+        },
+        plugins: [
+            ['apply-named-import', applyNamedImportPlugin],
+        ],
+    });
+    
+    const newContent = print(ast);
+    
+    writeFileContent(file, newContent);
+};
+
+export const scan = (rootPath, {push, trackFile}) => {
+    const mask = [
+        '*.js',
+        '*.mjs',
+    ];
+    
+    const getPrivateImports = createGetPrivateImports();
+    
+    for (const file of trackFile(rootPath, mask)) {
+        const content = readFileContent(file);
+        const [error, ast] = tryCatch(parse, content);
+        
+        if (error)
+            continue;
+        
+        const importsTuples = getImports(file, content, ast);
+        
+        const privateImports = getPrivateImports(file, {
+            aliasBased: true,
+        });
+        
+        for (const [name, source, importedFilename] of importsTuples) {
+            const is = hasNamedImport({
+                name,
+                rootPath,
+                importedFilename,
+                privateImports,
+            });
+            
+            if (!is)
+                continue;
+            
+            push(file, {
+                name,
+                source,
+                ast,
+                content,
+            });
+        }
+    }
+};
+
+function getImports(file, content, ast) {
+    if (!content.includes('import'))
+        return [];
+    
+    const places = transform(ast, content, {
+        fix: false,
+        plugins: [
+            ['get-imports', getImportsPlugin],
+        ],
+    });
+    
+    const filename = getFilename(file);
+    const dir = dirname(filename);
+    
+    const imports = places.map(getMessage);
+    
+    return buildImports(dir, imports);
+}
+
+function parseImportedFilename({importedFilename, privateImports}) {
+    if (privateImports.has(importedFilename))
+        return privateImports.get(importedFilename);
+    
+    return importedFilename;
+}
+
+function hasNamedImport({name, rootPath, importedFilename, privateImports}) {
+    const parsedName = parseImportedFilename({
+        importedFilename,
+        privateImports,
+    });
+    
+    const [importedFile] = findFile(rootPath, parsedName);
+    
+    if (!importedFile)
+        return false;
+    
+    const importedContent = readFileContent(importedFile);
+    
+    const {places} = putout(importedContent, {
+        fix: false,
+        plugins: [
+            ['has-export-default', hasExportDefaultPlugin],
+            ['is-esm', isESMPlugin],
+        ],
+    });
+    
+    const esm = places.filter(isESM);
+    
+    if (!esm.length)
+        return false;
+    
+    const defaultExport = places.filter(hasExportDefault);
+    
+    if (defaultExport.length)
+        return false;
+    
+    for (const {message} of esm) {
+        const [, exportName] = message.split(':');
+        
+        if (name === exportName)
+            return true;
+    }
+    
+    return false;
+}
+
+function parseFull(dir, source) {
+    if (source.startsWith('#'))
+        return source;
+    
+    return join(dir, source);
+}
+
+function buildImports(dir, imports) {
+    const list = [];
+    
+    for (const current of imports) {
+        const [name, source] = current.split(' <- ');
+        const full = parseFull(dir, source);
+        
+        list.push([name, source, full]);
+    }
+    
+    return list;
+}

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

@@ -7,10 +7,10 @@ import putout, {
     operator,
 } from 'putout';
 import {createGetPrivateImports} from '#private-imports';
-import * as isESMPlugin from './is-esm/index.js';
-import * as hasExportDefaultPlugin from './has-export-default/index.js';
+import * as isESMPlugin from '#is-esm';
+import * as hasExportDefaultPlugin from '#has-export-default';
+import * as getImportsPlugin from '#get-default-imports';
 import * as applyNamespaceImportPlugin from './apply-namespace-import/index.js';
-import * as getImportsPlugin from './get-imports/index.js';
 
 const {
     findFile,
@@ -69,6 +69,7 @@ export const scan = (rootPath, {push, trackFile}) => {
         
         for (const [name, source, importedFilename] of importsTuples) {
             const is = hasImportDefault({
+                name,
                 rootPath,
                 importedFilename,
                 privateImports,
@@ -113,7 +114,7 @@ function parseImportedFilename({importedFilename, privateImports}) {
     return importedFilename;
 }
 
-function hasImportDefault({rootPath, importedFilename, privateImports}) {
+function hasImportDefault({name, rootPath, importedFilename, privateImports}) {
     const parsedName = parseImportedFilename({
         importedFilename,
         privateImports,
@@ -140,6 +141,13 @@ function hasImportDefault({rootPath, importedFilename, privateImports}) {
     if (defaultExport.length)
         return true;
     
+    for (const {message} of esm) {
+        const [, exportName] = message.split(':');
+        
+        if (name === exportName)
+            return true;
+    }
+    
     return !esm.length;
 }
 

package/lib/apply-namespace-import-to-file/is-esm/index.js

@@ -1,4 +1,37 @@
-export const report = (path) => path.type;
+import {types} from 'putout';
+
+const {
+    isIdentifier,
+    isVariableDeclaration,
+    isFunction,
+    isExportNamedDeclaration,
+} = types;
+
+export const report = (path) => {
+    const {type} = path;
+    
+    if (isExportNamedDeclaration(path)) {
+        const {declaration} = path.node;
+        
+        if (isFunction(declaration))
+            return `${type}:${declaration.id.name}`;
+        
+        if (isVariableDeclaration(declaration)) {
+            const {declarations} = declaration;
+            
+            if (declarations.length !== 1)
+                return type;
+            
+            const [first] = declarations;
+            const {id} = first;
+            
+            if (isIdentifier(id))
+                return `${type}:${id.name}`;
+        }
+    }
+    
+    return type;
+};
 
 export const fix = (path) => {
     path.node.leadingComments = [

package/lib/index.js

@@ -13,6 +13,7 @@ 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 applyNamespaceImportToFile from './apply-namespace-import-to-file/index.js';
+import * as applyNamedImportToFile from './apply-named-import-to-file/index.js';
 import * as applyPrivatelyImportedFile from './apply-privately-imported-file/index.js';
 import * as resolveImportedFile from './resolve-imported-file/index.js';
 import * as shortenImportedFile from './shorten-imported-file/index.js';
@@ -34,6 +35,7 @@ export const rules = {
     
     'resolve-imported-file': ['off', resolveImportedFile],
     'shorten-imported-file': ['off', shortenImportedFile],
+    'apply-named-import-to-file': ['off', applyNamedImportToFile],
     'apply-namespace-import-to-file': ['off', applyNamespaceImportToFile],
     'apply-privately-imported-file': ['off', applyPrivatelyImportedFile],
     'apply-js-imported-file': ['off', applyJsImportedFile],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "8.0.1",
+  "version": "8.1.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -12,8 +12,11 @@
   },
   "imports": {
     "#get-imports": "./lib/shorten-imported-file/get-imports/index.js",
+    "#get-default-imports": "./lib/apply-namespace-import-to-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"
+    "#private-imports": "./lib/apply-privately-imported-file/private-imports.js",
+    "#is-esm": "./lib/apply-namespace-import-to-file/is-esm/index.js",
+    "#has-export-default": "./lib/apply-namespace-import-to-file/has-export-default/index.js"
   },
   "release": false,
   "tag": false,