@putout/plugin-esm 1.3.0 → 2.1.0

package/lib/declare-imports-first/index.js

@@ -1,6 +1,13 @@
 'use strict';
 
-const {replaceWith} = require('putout').operator;
+const {types, operator} = require('putout');
+const {
+    isImportDeclaration,
+    isExportDeclaration,
+} = types;
+
+const {replaceWith} = operator;
+const isESMNode = (a) => isImportDeclaration(a) || isExportDeclaration(a);
 
 module.exports.report = () => `Declare imports first`;
 
@@ -39,6 +46,12 @@ module.exports.traverse = ({push, pathStore}) => ({
     },
     Program: {
         exit: () => {
+            const all = pathStore();
+            const esmNodes = all.filter(isESMNode);
+            
+            if (!esmNodes.length)
+                return;
+            
             for (const importPath of pathStore()) {
                 if (importPath) {
                     const path = importPath.getPrevSibling();

package/lib/group-imports-by-source/index.js

@@ -31,6 +31,7 @@ module.exports.traverse = ({pathStore, push}) => ({
             const external = [];
             const internal = [];
             const builtin = [];
+            const hashed = [];
             const all = pathStore().filter(isImportDeclaration);
             
             if (!all.length)
@@ -49,12 +50,18 @@ module.exports.traverse = ({pathStore, push}) => ({
                     continue;
                 }
                 
+                if (value.startsWith('#')) {
+                    hashed.push(current);
+                    continue;
+                }
+                
                 external.push(current);
             }
             
             const grouped = [
                 ...builtin,
                 ...external,
+                ...hashed,
                 ...internal,
             ];
             

package/lib/sort-imports-by-specifiers/index.js

@@ -29,13 +29,18 @@ module.exports.traverse = ({push}) => ({
         if (nextPath.node.specifiers.length !== 1)
             return;
         
-        if (!source.value.startsWith('./') && nextPath.node.source.value.startsWith('./'))
-            return;
-        
-        if (source.value.startsWith('node:') && !nextPath.node.source.value.startsWith('node:'))
-            return;
+        const is = isExcluded(source, nextPath, {
+            direct: [
+                ['node:', 'node:'],
+                ['#', '#'],
+            ],
+            reversed: [
+                ['./', './'],
+                ['../', '../'],
+            ],
+        });
         
-        if (source.value.startsWith('#') && !nextPath.node.source.value.startsWith('#'))
+        if (is)
             return;
         
         push({
@@ -44,3 +49,17 @@ module.exports.traverse = ({push}) => ({
         });
     },
 });
+
+function isExcluded(source, nextPath, {direct, reversed}) {
+    for (const [current, next] of direct) {
+        if (source.value.startsWith(current) && !nextPath.node.source.value.startsWith(next))
+            return true;
+    }
+    
+    for (const [current, next] of reversed) {
+        if (!source.value.startsWith(current) && nextPath.node.source.value.startsWith(next))
+            return true;
+    }
+    
+    return false;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "1.3.0",
+  "version": "2.1.0",
   "type": "commonjs",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -49,7 +49,7 @@
     "c8": "^10.0.0",
     "eslint": "^9.0.0",
     "eslint-plugin-n": "^17.0.0",
-    "eslint-plugin-putout": "^23.0.0",
+    "eslint-plugin-putout": "^24.0.0",
     "lerna": "^6.0.1",
     "madrun": "^10.0.0",
     "montag": "^1.2.1",
@@ -57,7 +57,7 @@
     "supertape": "^10.8.0"
   },
   "peerDependencies": {
-    "putout": ">=37"
+    "putout": ">=38"
   },
   "license": "MIT",
   "engines": {