@1adybug/prettier-plugin-sort-imports 0.0.26 → 0.0.27

package/dist/index.js

@@ -209,7 +209,7 @@ function parseImports(code, filepath) {
         const statement = parseImportNode(node, ast.comments ?? [], usedComments, code, isFirstImport, filepath);
         importStatements.push(statement);
         isFirstImport = false;
-    } else break;
+    }
     return importStatements;
 }
 function parseImportNode(node, comments, usedComments, code, isFirstImport, filepath) {
@@ -583,6 +583,35 @@ function mergeImports(imports) {
     return Array.from(mergedMap.values());
 }
 const src_require = createRequire(import.meta.url);
+function getImportRanges(imports) {
+    const ranges = imports.map((statement)=>({
+            start: statement.start ?? 0,
+            end: statement.end ?? 0
+        })).filter((range)=>range.end > range.start).sort((a, b)=>a.start - b.start);
+    const merged = [];
+    for (const range of ranges){
+        const last = merged[merged.length - 1];
+        if (last && range.start <= last.end) {
+            last.end = Math.max(last.end, range.end);
+            continue;
+        }
+        merged.push({
+            ...range
+        });
+    }
+    return merged;
+}
+function removeRangesFromText(text, ranges) {
+    if (0 === ranges.length) return text;
+    let result = "";
+    let cursor = 0;
+    for (const range of ranges){
+        result += text.slice(cursor, range.start);
+        cursor = range.end;
+    }
+    result += text.slice(cursor);
+    return result;
+}
 function preprocessImports(text, options, config = {}) {
     try {
         const parser = options.parser;
@@ -605,12 +634,10 @@ function preprocessImports(text, options, config = {}) {
             sortSideEffect: config.sortSideEffect ?? optionsConfig.sortSideEffect ?? false,
             removeUnusedImports: config.removeUnusedImports ?? optionsConfig.removeUnusedImports ?? false
         };
+        const importRanges = getImportRanges(imports);
+        const textWithoutImports = removeRangesFromText(text, importRanges);
         let processedImports = imports;
-        if (finalConfig.removeUnusedImports) {
-            const lastImport = imports[imports.length - 1];
-            const codeAfterImports = text.slice(lastImport.end ?? 0);
-            processedImports = removeUnusedImportsFromStatements(imports, codeAfterImports);
-        }
+        if (finalConfig.removeUnusedImports) processedImports = removeUnusedImportsFromStatements(imports, textWithoutImports);
         const sortedImports = sortImports(processedImports, finalConfig);
         const mergedImports = mergeImports(sortedImports);
         let formattedImports;
@@ -620,13 +647,12 @@ function preprocessImports(text, options, config = {}) {
             formattedImports = formatGroups(sortedGroups, finalConfig, options.trailingComma);
         } else formattedImports = formatImportStatements(mergedImports, options.trailingComma);
         const firstImport = imports[0];
-        const lastImport = imports[imports.length - 1];
         const startIndex = firstImport.start ?? 0;
-        const endIndex = lastImport.end ?? text.length;
-        const beforeImports = text.slice(0, startIndex);
-        const afterImports = text.slice(endIndex);
+        const beforeImports = textWithoutImports.slice(0, startIndex);
+        let afterImports = textWithoutImports.slice(startIndex);
+        if (afterImports) afterImports = afterImports.replace(/^\n+/, "\n");
         const needsExtraNewline = afterImports && !afterImports.startsWith("\n");
-        const separator = needsExtraNewline ? "\n\n" : "\n";
+        const separator = afterImports ? needsExtraNewline ? "\n\n" : "\n" : "";
         return beforeImports + formattedImports + separator + afterImports;
     } catch (error) {
         return text;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1adybug/prettier-plugin-sort-imports",
-  "version": "0.0.26",
+  "version": "0.0.27",
   "description": "一个 Prettier 插件，用于对 JavaScript/TypeScript 文件的导入语句进行分组和排序",
   "keywords": [
     "prettier",
@@ -41,23 +41,23 @@
     "registry": "https://registry.npmjs.com/"
   },
   "dependencies": {
-    "@babel/core": "^7.28.4",
-    "@babel/parser": "^7.28.4",
-    "@babel/traverse": "^7.28.5",
-    "@babel/types": "^7.28.4"
+    "@babel/core": "^7.28.6",
+    "@babel/parser": "^7.28.6",
+    "@babel/traverse": "^7.28.6",
+    "@babel/types": "^7.28.6"
   },
   "devDependencies": {
-    "@rslib/core": "^0.15.0",
+    "@rslib/core": "^0.15.1",
     "@types/babel__core": "^7.20.5",
     "@types/babel__traverse": "^7.28.0",
     "@types/bun": "latest",
-    "@types/node": "^22.18.6",
+    "@types/node": "^24.10.8",
     "json5": "^2.2.3",
     "supports-color": "^10.2.2",
-    "typescript": "^5.9.2"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
-    "prettier": "^3.7.3"
+    "prettier": "^3.8.0"
   },
   "scripts": {
     "build": "rslib build",