@1adybug/prettier-plugin-sort-imports 0.0.7 → 0.0.8

package/dist/index.js

@@ -72,9 +72,13 @@ function removeUnusedImportsFromStatements(importStatements, code) {
     return filteredStatements;
 }
 function formatImportStatement(statement) {
-    const { path, isExport, isSideEffect, importContents, leadingComments, trailingComments, removedTrailingComments } = statement;
+    const { path, isExport, isSideEffect, importContents, leadingComments, trailingComments, removedTrailingComments, emptyLinesAfterComments } = statement;
     const lines = [];
-    if (leadingComments && leadingComments.length > 0) lines.push(...leadingComments);
+    if (leadingComments && leadingComments.length > 0) {
+        lines.push(...leadingComments);
+        const emptyLines = emptyLinesAfterComments ?? 0;
+        for(let i = 0; i < emptyLines; i++)lines.push("");
+    }
     if (isSideEffect) {
         let importLine = "";
         importLine = isExport ? `export * from "${path}"` : `import "${path}"`;
@@ -170,30 +174,42 @@ function parseImports(code) {
     const importStatements = [];
     const { body } = ast.program;
     const usedComments = new Set();
+    let isFirstImport = true;
     for (const node of body)if ("ImportDeclaration" === node.type || "ExportNamedDeclaration" === node.type && node.source || "ExportAllDeclaration" === node.type) {
-        const statement = parseImportNode(node, ast.comments ?? [], usedComments);
+        const statement = parseImportNode(node, ast.comments ?? [], usedComments, code, isFirstImport);
         importStatements.push(statement);
+        isFirstImport = false;
     } else break;
     return importStatements;
 }
-function parseImportNode(node, comments, usedComments) {
+function parseImportNode(node, comments, usedComments, code, isFirstImport) {
     node.type;
     const source = node.source?.value ?? "";
-    node.loc?.start.line;
+    const nodeStartLine = node.loc?.start.line ?? 0;
     node.loc?.end.line;
     const nodeStart = node.start ?? 0;
     let nodeEnd = node.end ?? 0;
     const leadingComments = [];
     const trailingComments = [];
     let start = nodeStart;
+    let emptyLinesAfterComments = 0;
     if (node.leadingComments) {
+        let lastCommentEndLine = 0;
         for (const comment of node.leadingComments)if (!usedComments.has(comment)) {
+            const commentEndLine = comment.loc?.end.line ?? 0;
+            const emptyLinesBetween = nodeStartLine - commentEndLine - 1;
+            if (isFirstImport && emptyLinesBetween >= 1) {
+                usedComments.add(comment);
+                continue;
+            }
             if ("CommentLine" === comment.type) leadingComments.push(`//${comment.value}`);
             else if ("CommentBlock" === comment.type) leadingComments.push(`/*${comment.value}*/`);
             const commentStart = comment.start ?? 0;
             if (commentStart < start) start = commentStart;
+            lastCommentEndLine = commentEndLine;
             usedComments.add(comment);
         }
+        if (leadingComments.length > 0 && lastCommentEndLine > 0) emptyLinesAfterComments = nodeStartLine - lastCommentEndLine - 1;
     }
     if (node.trailingComments) {
         for (const comment of node.trailingComments)if (!usedComments.has(comment)) {
@@ -221,6 +237,7 @@ function parseImportNode(node, comments, usedComments) {
             importContents,
             leadingComments: leadingComments.length > 0 ? leadingComments : void 0,
             trailingComments: trailingComments.length > 0 ? trailingComments : void 0,
+            emptyLinesAfterComments: emptyLinesAfterComments > 0 ? emptyLinesAfterComments : void 0,
             start,
             end
         };
@@ -228,10 +245,11 @@ function parseImportNode(node, comments, usedComments) {
     if ("ExportAllDeclaration" === node.type) return {
         path: source,
         isExport: true,
-        isSideEffect: false,
+        isSideEffect: true,
         importContents: [],
         leadingComments: leadingComments.length > 0 ? leadingComments : void 0,
         trailingComments: trailingComments.length > 0 ? trailingComments : void 0,
+        emptyLinesAfterComments: emptyLinesAfterComments > 0 ? emptyLinesAfterComments : void 0,
         start,
         end
     };
@@ -244,6 +262,7 @@ function parseImportNode(node, comments, usedComments) {
         importContents,
         leadingComments: leadingComments.length > 0 ? leadingComments : void 0,
         trailingComments: trailingComments.length > 0 ? trailingComments : void 0,
+        emptyLinesAfterComments: emptyLinesAfterComments > 0 ? emptyLinesAfterComments : void 0,
         start,
         end
     };

package/dist/types.d.ts

@@ -28,6 +28,8 @@ export interface ImportStatement {
     trailingComments?: string[];
     /** 被移除的导入语句的行尾注释（合并时使用） */
     removedTrailingComments?: string[];
+    /** 前导注释后的空行数（用于保留注释和 import 之间的空行） */
+    emptyLinesAfterComments?: number;
     /** 在源代码中的起始位置（包括注释） */
     start?: number;
     /** 在源代码中的结束位置 */

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "@1adybug/prettier-plugin-sort-imports",
     "type": "module",
-    "version": "0.0.7",
+    "version": "0.0.8",
     "description": "一个 Prettier 插件，用于对 JavaScript/TypeScript 文件的导入语句进行分组和排序",
     "keywords": [
         "prettier",