@putout/plugin-esm 5.3.0 → 6.0.0

package/README.md

@@ -362,7 +362,7 @@ Check out in 🐊[**Putout Editor**](https://putout.cloudcmd.io/#/gist/9f85897b9
 
 #### ❌ Example of incorrect code
 
-```js
+```
 import json from './foo.json' assert {
     type: 'json',
 };

package/lib/convert-assert-to-with/index.js

@@ -1,6 +1,11 @@
-const setImportType = (path, type) => {
-    path.node.options.properties[0].key.name = type;
-};
+import {operator, types} from 'putout';
+
+const {
+    importAttribute,
+    identifier,
+} = types;
+
+const {compare, remove} = operator;
 
 export const report = () => `Use 'with' instead of 'assert'`;
 
@@ -10,19 +15,38 @@ export const include = () => [
 ];
 
 export const fix = (path) => {
-    if (path.isImportDeclaration()) {
-        delete path.node.extra.deprecatedAssertSyntax;
+    if (path.isImportExpression()) {
+        path.node.options.properties[0].key.name = 'with';
         return;
     }
     
-    setImportType(path, 'with');
+    const next = path.getNextSibling();
+    const nextNext = next.getNextSibling();
+    const nextNextNext = nextNext.getNextSibling();
+    const {body} = nextNext.node.body[0];
+    
+    remove(next);
+    remove(nextNext);
+    
+    if (nextNextNext.isEmptyStatement())
+        remove(nextNextNext);
+    
+    path.node.attributes = [
+        importAttribute(identifier('type'), body.expression),
+    ];
 };
 
 export const filter = (path) => {
-    const {extra} = path.node;
-    
-    if (path.isImportDeclaration())
-        return extra?.deprecatedAssertSyntax;
+    if (path.isImportDeclaration()) {
+        const next = path.getNextSibling();
+        
+        if (!compare(next, 'assert;'))
+            return false;
+        
+        const nextNext = next.getNextSibling();
+        
+        return compare(nextNext, '{type: "__";}');
+    }
     
-    return true;
+    return path.isImportExpression();
 };

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

@@ -1,15 +1,17 @@
 import {parseImportSpecifiers} from 'parse-import-specifiers';
 import {operator, types} from 'putout';
 
-const {insertBefore, remove} = operator;
+const {insertAfter, remove} = operator;
+
 const {isImportDeclaration} = types;
 
 export const report = () => `Sort imports by specifiers count`;
 
 export const fix = ({path, nextPath}) => {
-    const {node} = nextPath;
-    remove(nextPath);
-    insertBefore(path, node);
+    const {node} = path;
+    
+    remove(path);
+    insertAfter(nextPath, node);
 };
 
 export const traverse = ({push}) => ({
@@ -18,40 +20,15 @@ export const traverse = ({push}) => ({
         
         for (const path of paths) {
             const {node} = path;
-            
-            if (!node)
-                continue;
-            
-            const {source, specifiers} = node;
+            const {specifiers} = node;
             const {imports} = parseImportSpecifiers(specifiers);
             
             if (imports.length < 4)
                 continue;
             
-            const nextPath = path.getNextSibling();
-            
-            if (!nextPath.isImportDeclaration())
-                continue;
+            const nextPath = getLastNextPath(path);
             
-            if (nextPath.node.specifiers.length !== 1)
-                continue;
-            
-            const first = source.value;
-            const second = nextPath.node.source.value;
-            
-            const is = isExcluded(first, second, {
-                direct: [
-                    ['node:', 'node:'],
-                    ['#', '#'],
-                ],
-                reversed: [
-                    ['./', './'],
-                    ['../', '../'],
-                    ['#', '#'],
-                ],
-            });
-            
-            if (is)
+            if (!nextPath)
                 continue;
             
             push({
@@ -62,6 +39,52 @@ export const traverse = ({push}) => ({
     },
 });
 
+function getLastNextPath(path) {
+    let next = path;
+    let prev;
+    
+    do {
+        prev = next;
+        next = getNextPath(prev);
+    } while (next);
+    
+    if (prev === path)
+        return null;
+    
+    return prev;
+}
+
+function getNextPath(path) {
+    const nextPath = path.getNextSibling();
+    
+    if (!nextPath.isImportDeclaration())
+        return null;
+    
+    if (nextPath.node.specifiers.length !== 1)
+        return null;
+    
+    const {source} = path.node;
+    const first = source.value;
+    const second = nextPath.node.source.value;
+    
+    const is = isExcluded(first, second, {
+        direct: [
+            ['node:', 'node:'],
+            ['#', '#'],
+        ],
+        reversed: [
+            ['./', './'],
+            ['../', '../'],
+            ['#', '#'],
+        ],
+    });
+    
+    if (is)
+        return null;
+    
+    return nextPath;
+}
+
 function isExcluded(first, second, {direct, reversed}) {
     for (const [current, next] of direct) {
         if (first.startsWith(current) && !second.startsWith(next))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@putout/plugin-esm",
-  "version": "5.3.0",
+  "version": "6.0.0",
   "type": "module",
   "author": "coderaiser <mnemonic.enemy@gmail.com> (https://github.com/coderaiser)",
   "description": "🐊Putout plugin improves ability to transform ESM code",
@@ -57,7 +57,7 @@
     "supertape": "^11.0.3"
   },
   "peerDependencies": {
-    "putout": ">=40"
+    "putout": ">=41"
   },
   "license": "MIT",
   "engines": {