@putout/plugin-esm 6.3.2 → 6.5.0

package/README.md

@@ -36,6 +36,7 @@ npm i putout @putout/plugin-esm -D
 
 - ✅ [apply-namespace-import-file](#resolve-imported-file);
 - ✅ [resolve-imported-file](#resolve-imported-file);
+- ✅ [shorten-imported-file](#shorten-imported-file);
 
 ## Config
 
@@ -47,8 +48,8 @@ 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": "off",
-        "esm/merge-export-declaration": "off",
+        "esm/merge-declaration-with-export": "on",
+        "esm/merge-export-declaration": "on",
         "esm/remove-quotes-from-import-assertions": "on",
         "esm/remove-empty-export": "on",
         "esm/remove-empty-import": ["on", {
@@ -56,6 +57,7 @@ npm i putout @putout/plugin-esm -D
         }],
         "esm/sort-imports-by-specifiers": "on",
         "esm/resolve-imported-file": "off",
+        "esm/shorten-imported-file": "off",
         "esm/apply-namespace-of-file": "off",
         "esm/remove-useless-export-specifiers": "off"
     }
@@ -417,6 +419,7 @@ Check out in 🐊**Putout Editor**:
 - ✅ [`get-imports`](https://putout.cloudcmd.io/#/gist/5d7687215e9fbdf705935c444503dded/75a98d2db9d3847c73017e41637924b1cfd5a598);
 - ✅ [`has-export-default`](https://putout.cloudcmd.io/#/gist/b50ccfe5cc8c0c97e2fc98b37903ade4/fbc026e6f1027581f7aa4879dcafcaa7754bf8f4);
 - ✅ [`apply-namespace-import`](https://putout.cloudcmd.io/#/gist/23a6dc6741b772c03fbed95feda2b451/1fbecac6fc40282bcda0593aa666a8c213ef85b7);
+- ✅ [`is-esm`](https://putout.cloudcmd.io/#/gist/fa080be2bf3a6560e289d84b5873c2bc/2601091f6bf97148843767968c3afcb36dde31de);
 
 Let's consider file structure:
 
@@ -447,7 +450,6 @@ Check out in 🐊**Putout Editor**:
 
 - ✅ [`resolve-imported-file`](https://putout.cloudcmd.io/#/gist/241489cb2781dd37ec96baf0115cde4e/83c2f2e9f490850b7fda432f8d25ae6a64ed07e3);
 - ✅ [`get-imports`](https://putout.cloudcmd.io/#/gist/ee10100fed86e4db926885dd54298668/7538bca7a9ae006d976f41261c0ed4c0e1902ace);
-- ✅ [`is-esm`](https://putout.cloudcmd.io/#/gist/fa080be2bf3a6560e289d84b5873c2bc/2601091f6bf97148843767968c3afcb36dde31de);
 - ✅ [`change-imports`](https://putout.cloudcmd.io/#/gist/23a6dc6741b772c03fbed95feda2b451/1fbecac6fc40282bcda0593aa666a8c213ef85b7);
 
 Let's consider file structure:
@@ -473,6 +475,36 @@ import a from './a';
 import a from './a.js';
 ```
 
+### shorten-imported-file
+
+Check out in 🐊**Putout Editor**:
+
+- ✅ [`get-imports`](https://putout.cloudcmd.io/#/gist/ee10100fed86e4db926885dd54298668/7538bca7a9ae006d976f41261c0ed4c0e1902ace);
+- ✅ [`change-imports`](https://putout.cloudcmd.io/#/gist/23a6dc6741b772c03fbed95feda2b451/1fbecac6fc40282bcda0593aa666a8c213ef85b7);
+
+Let's consider file structure:
+
+```
+/
+|-- processors/
+|  `-- index.js
+|  `-- parse-prosessor-names.js
+```
+
+In this case `index.js` can be fixed:
+
+#### ❌ Example of incorrect code
+
+```js
+import {parseProcessorNames} from '../processors/parse-processor-names.js';
+```
+
+#### ✅ Example of correct code
+
+```js
+import {parseProcessorNames} from './parse-processor-names.js';
+```
+
 ## License
 
 MIT

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

@@ -1,5 +1,5 @@
 import {join, dirname} from 'node:path';
-import tryCatch from 'try-catch';
+import {tryCatch} from 'try-catch';
 import putout, {
     parse,
     print,

package/lib/index.js

@@ -4,6 +4,7 @@ import * as removeUselessExportSpecifiers from './remove-useless-export-specifie
 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 shortenImportedFile from './shorten-imported-file/index.js';
 import * as addIndexToImport from './add-index-to-import/index.js';
 import * as declareImportsFirst from './declare-imports-first/index.js';
 import * as groupImportsBySource from './group-imports-by-source/index.js';
@@ -26,6 +27,7 @@ export const rules = {
     'remove-empty-export': removeEmptyExport,
     'sort-imports-by-specifiers': sortImportsBySpecifiers,
     'resolve-imported-file': ['off', resolveImportedFile],
+    'shorten-imported-file': ['off', shortenImportedFile],
     'apply-namespace-import-to-file': ['off', applyNamespaceImportToFile],
     'merge-declaration-with-export': mergeDeclarationWithExport,
     'remove-useless-export-specifiers': removeUselessExportSpecifiers,

package/lib/merge-export-declarations/index.js

@@ -41,8 +41,12 @@ export const traverse = ({push}) => ({
                 if (isSameSources(a, b)) {
                     marked.add(b);
                     
-                    lists[i] = lists[i] || [a];
-                    lists[i].push(b);
+                    if (!lists[i])
+                        lists.push([a]);
+                    
+                    lists
+                        .at(-1)
+                        .push(b);
                 }
             }
         }

package/lib/shorten-imported-file/get-imports/index.js

@@ -0,0 +1,16 @@
+export const report = (path) => path.node.source.value;
+
+export const fix = () => {};
+
+export const include = () => [
+    'ImportDeclaration',
+];
+
+export const filter = (path) => {
+    const {value} = path.node.source;
+    
+    if (!value.startsWith('.'))
+        return false;
+    
+    return /\.m?js/.test(value);
+};

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

@@ -0,0 +1,82 @@
+import {
+    join,
+    dirname,
+    basename,
+} from 'node:path';
+import {
+    parse,
+    print,
+    transform,
+    operator,
+} from 'putout';
+import * as getImports from './get-imports/index.js';
+import * as changeImports from '../resolve-imported-file/change-imports/index.js';
+
+const {
+    getFilename,
+    readFileContent,
+    writeFileContent,
+} = operator;
+
+const getMessage = (a) => a.message;
+
+export const report = (file, {from, to}) => `Shorten import source: '${from}' -> '${to}'`;
+export const fix = (file, {content, ast, from, to}) => {
+    transform(ast, content, {
+        rules: {
+            'change-imports': ['on', {
+                from,
+                to,
+            }],
+        },
+        plugins: [
+            ['change-imports', changeImports],
+        ],
+    });
+    
+    const newContent = print(ast);
+    
+    writeFileContent(file, newContent);
+};
+
+export const scan = (rootPath, {push, trackFile}) => {
+    const mask = [
+        '*.js',
+        '*.mjs',
+    ];
+    
+    for (const file of trackFile(rootPath, mask)) {
+        const content = readFileContent(file);
+        
+        if (!content.includes('import'))
+            continue;
+        
+        const ast = parse(content);
+        
+        const places = transform(ast, content, {
+            plugins: [
+                ['get-imports', getImports],
+            ],
+        });
+        
+        const imports = places.map(getMessage);
+        const filename = getFilename(file);
+        const dir = dirname(filename);
+        const baseDir = basename(dir);
+        
+        for (const from of imports) {
+            if (!from.startsWith(`../${baseDir}/`))
+                continue;
+            
+            const to = join(dir, from).replace(dir, '.');
+            
+            if (to.length < from.length)
+                push(file, {
+                    from,
+                    to,
+                    content,
+                    ast,
+                });
+        }
+    }
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "6.3.2",
+  "version": "6.5.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -47,22 +47,22 @@
     "@putout/plugin-reuse-duplicate-init": "*",
     "@putout/plugin-tape": "*",
     "@putout/plugin-typescript": "*",
-    "@putout/test": "^14.0.0",
+    "@putout/test": "^15.0.0",
     "c8": "^10.0.0",
     "eslint": "^10.0.0-alpha.0",
     "eslint-plugin-n": "^17.0.0",
     "eslint-plugin-putout": "^29.0.0",
-    "madrun": "^11.0.0",
+    "madrun": "^12.0.0",
     "montag": "^1.2.1",
     "nodemon": "^3.0.1",
-    "supertape": "^11.0.3"
+    "supertape": "^12.0.0"
   },
   "peerDependencies": {
     "putout": ">=41"
   },
   "license": "MIT",
   "engines": {
-    "node": ">=20"
+    "node": ">=22"
   },
   "publishConfig": {
     "access": "public"