@putout/plugin-esm 9.1.0 → 9.3.0

package/README.md

@@ -528,6 +528,7 @@ Let's consider file structure:
 
 ```
 /
+├── package.json
 └── lib/
     ├── index.js
     └── a.js
@@ -539,12 +540,16 @@ In this case `index.js` can be fixed:
 
 ```js
 import a from './a';
+import info from '../package';
 ```
 
 #### ✅ Example of correct code
 
 ```js
 import a from './a.js';
+import info from '../package.json' with {
+    type: 'json',
+};
 ```
 
 ### shorten-imported-file

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

@@ -1,8 +1,26 @@
-import {types} from 'putout';
+import {types, operator} from 'putout';
 
-const {isImportDefaultSpecifier} = types;
+const {getTemplateValues} = operator;
+const {
+    isImportDefaultSpecifier,
+    isVariableDeclaration,
+} = types;
+
+const DYNAMIC = 'const __identifier__a = await import(__b)';
 
 export const report = (path) => {
+    if (isVariableDeclaration(path)) {
+        const {
+            __identifier__a,
+            __b,
+        } = getTemplateValues(path, DYNAMIC);
+        
+        const {name} = __identifier__a;
+        const source = __b.value;
+        
+        return `'const ${name} = await import("${source}")' -> 'const {${name}} = await import("${source}")'`;
+    }
+    
     const source = path.node.source.value;
     const {specifiers} = path.node;
     const [first] = specifiers;
@@ -24,6 +42,7 @@ export const replace = ({options}) => {
     const {name, source} = options;
     
     return {
+        [`const ${name} = await import("${source}")`]: `const {${name}} = await import("${source}")`,
         [`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,17 @@
-import {types} from 'putout';
+import {types, operator} from 'putout';
 
-const {isImportDefaultSpecifier} = types;
+const {getTemplateValues} = operator;
+const {
+    isImportDefaultSpecifier,
+    isVariableDeclaration,
+} = types;
+
+const DYNAMIC = 'const __identifier__a = await import(__b)';
 
 export const include = () => [
     'import __a from "__b"',
     'export * as __a from "__b"',
+    DYNAMIC,
 ];
 
 export const report = (path) => {
@@ -26,6 +33,19 @@ const CommentLine = (value) => ({
 });
 
 const getImport = (path) => {
+    if (isVariableDeclaration(path)) {
+        const {
+            __identifier__a,
+            __b,
+        } = getTemplateValues(path, DYNAMIC);
+        
+        return [
+            __identifier__a.name,
+            __b.value,
+            'dynamic',
+        ];
+    }
+    
     const source = path.node.source.value;
     const [first] = path.node.specifiers;
     

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

@@ -17,11 +17,13 @@ const {
 
 export const report = (file, {name, source, type}) => {
     const filename = getFilename(file);
+    const reports = {
+        import: `Use \`import {${name}} from '${source}'\` in '${filename}'`,
+        dynamic: `Use \`const {${name}} = await import('${source}')\` in '${filename}'`,
+        export: `Use \`export {${name}} from '${source}'\` in '${filename}'`,
+    };
     
-    if (type === 'import')
-        return `Use \`import {${name}} from '${source}'\` in '${filename}'`;
-    
-    return `Use \`export {${name}} from '${source}'\` in '${filename}'`;
+    return reports[type];
 };
 
 export const fix = (file, {name, source, content, ast}) => {

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

@@ -8,8 +8,20 @@ export const replace = ({options}) => {
     if (!from || !to)
         return {};
     
+    if (!to.endsWith('json'))
+        return {
+            [`import __imports from '${from}'`]: `import __imports from '${to}'`,
+            [`import('${from}')`]: `import('${to}')`,
+        };
+    
     return {
-        [`import __imports from '${from}'`]: `import __imports from '${to}'`,
-        [`import('${from}')`]: `import('${to}')`,
+        [`import __imports from '${from}'`]: `import __imports from '${to}' with {
+            type: 'json',
+        }`,
+        [`import('${from}')`]: `import('${to}', {
+            with: {
+                type: 'json',
+            }
+        })`,
     };
 };

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

@@ -91,6 +91,7 @@ function buildResolved(rootPath, importsTuples) {
     for (const [relative, current] of importsTuples) {
         const withIndex = join(current, 'index.js');
         const withJs = `${current}.js`;
+        const withJson = `${current}.json`;
         
         if (findFile(rootPath, withIndex).length) {
             if (relative.endsWith('/')) {
@@ -102,6 +103,11 @@ function buildResolved(rootPath, importsTuples) {
             continue;
         }
         
+        if (findFile(rootPath, withJson).length) {
+            result.push([relative, `${relative}.json`]);
+            continue;
+        }
+        
         if (relative === '..') {
             const withPackage = join(current, 'package.json');
             const [packageJson] = findFile(rootPath, withPackage);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "9.1.0",
+  "version": "9.3.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -59,7 +59,7 @@
     "@putout/plugin-typescript": "*",
     "@putout/test": "^15.0.0",
     "c8": "^10.0.0",
-    "eslint": "^10.0.0-alpha.0",
+    "eslint": "^10.0.0",
     "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-putout": "^30.0.0",
     "madrun": "^12.0.0",