@1adybug/prettier-plugin-sort-imports 0.0.19 → 0.0.21

package/README.md

@@ -234,29 +234,19 @@ export default createPlugin({
         const path = statement.path
 
         // React and related libraries
-        if (path.startsWith("react") || path.startsWith("@react")) {
-            return "react"
-        }
+        if (path.startsWith("react") || path.startsWith("@react")) return "react"
 
         // UI libraries
-        if (path.includes("antd") || path.includes("@mui") || path.includes("chakra")) {
-            return "ui"
-        }
+        if (path.includes("antd") || path.includes("@mui") || path.includes("chakra")) return "ui"
 
         // Utility libraries
-        if (path.includes("lodash") || path.includes("ramda") || path.includes("date-fns")) {
-            return "utils"
-        }
+        if (path.includes("lodash") || path.includes("ramda") || path.includes("date-fns")) return "utils"
 
         // External packages (node_modules)
-        if (!path.startsWith(".") && !path.startsWith("@/")) {
-            return "external"
-        }
+        if (!path.startsWith(".") && !path.startsWith("@/")) return "external"
 
         // Internal aliases (@/)
-        if (path.startsWith("@/")) {
-            return "internal"
-        }
+        if (path.startsWith("@/")) return "internal"
 
         // Relative imports
         return "relative"
@@ -272,9 +262,7 @@ export default createPlugin({
     // Custom import content sorting
     sortImportContent: (a, b) => {
         // Types first, then variables
-        if (a.type !== b.type) {
-            return a.type === "type" ? -1 : 1
-        }
+        if (a.type !== b.type) return a.type === "type" ? -1 : 1
 
         // Alphabetical order within same type
         const aName = a.alias ?? a.name

package/README.zh-CN.md

@@ -230,29 +230,19 @@ export default createPlugin({
         const path = statement.path
 
         // React 及相关库
-        if (path.startsWith("react") || path.startsWith("@react")) {
-            return "react"
-        }
+        if (path.startsWith("react") || path.startsWith("@react")) return "react"
 
         // UI 库
-        if (path.includes("antd") || path.includes("@mui") || path.includes("chakra")) {
-            return "ui"
-        }
+        if (path.includes("antd") || path.includes("@mui") || path.includes("chakra")) return "ui"
 
         // 工具库
-        if (path.includes("lodash") || path.includes("ramda") || path.includes("date-fns")) {
-            return "utils"
-        }
+        if (path.includes("lodash") || path.includes("ramda") || path.includes("date-fns")) return "utils"
 
         // 外部包 (node_modules)
-        if (!path.startsWith(".") && !path.startsWith("@/")) {
-            return "external"
-        }
+        if (!path.startsWith(".") && !path.startsWith("@/")) return "external"
 
         // 内部别名 (@/)
-        if (path.startsWith("@/")) {
-            return "internal"
-        }
+        if (path.startsWith("@/")) return "internal"
 
         // 相对导入
         return "relative"
@@ -268,9 +258,7 @@ export default createPlugin({
     // 自定义导入内容排序
     sortImportContent: (a, b) => {
         // 类型在前，变量在后
-        if (a.type !== b.type) {
-            return a.type === "type" ? -1 : 1
-        }
+        if (a.type !== b.type) return a.type === "type" ? -1 : 1
 
         // 同类型内按字母顺序
         const aName = a.alias ?? a.name

package/dist/index.js

@@ -1,12 +1,13 @@
 import { createRequire } from "module";
 import { relative } from "path";
-import { parse } from "@babel/parser";
+import { format } from "prettier";
+import { parse as parser_parse } from "@babel/parser";
 import traverse from "@babel/traverse";
 const analyzer_traverse = "function" == typeof traverse ? traverse : traverse["default"];
 function analyzeUsedIdentifiers(code) {
     const usedIdentifiers = new Set();
     try {
-        const ast = parse(code, {
+        const ast = parser_parse(code, {
             sourceType: "module",
             plugins: [
                 "typescript",
@@ -174,7 +175,7 @@ function formatImportStatements(statements) {
 function parseImports(code, filepath) {
     const hasImportOrExport = /^\s*(import|export)\s/m.test(code);
     if (!hasImportOrExport) return [];
-    const ast = parse(code, {
+    const ast = parser_parse(code, {
         sourceType: "module",
         plugins: [
             "typescript",
@@ -195,10 +196,8 @@ function parseImports(code, filepath) {
     return importStatements;
 }
 function parseImportNode(node, comments, usedComments, code, isFirstImport, filepath) {
-    node.type;
     const source = node.source?.value ?? "";
     const nodeStartLine = node.loc?.start.line ?? 0;
-    node.loc?.end.line;
     const nodeStart = node.start ?? 0;
     let nodeEnd = node.end ?? 0;
     const leadingComments = [];
@@ -463,21 +462,23 @@ function groupImports(imports, userConfig) {
     const groupMap = new Map();
     for (const statement of imports){
         const groupName = config.getGroup(statement);
-        const key = `${groupName}|||${statement.isSideEffect}`;
+        const key = `${groupName}|||${statement.isSideEffect}|||${statement.isExport}`;
         const statements = groupMap.get(key) ?? [];
         statements.push(statement);
         groupMap.set(key, statements);
     }
     const groups = [];
     for (const [key, statements] of Array.from(groupMap.entries())){
-        const separatorIndex = key.lastIndexOf("|||");
-        const name = key.slice(0, separatorIndex);
-        const isSideEffect = "true" === key.slice(separatorIndex + 3);
+        const parts = key.split("|||");
+        const isExport = "true" === parts.pop();
+        const isSideEffect = "true" === parts.pop();
+        const name = parts.join("|||");
         const filepath = statements[0].filepath;
         groups.push({
             filepath,
             name,
             isSideEffect,
+            isExport,
             importStatements: statements
         });
     }
@@ -618,26 +619,25 @@ function preprocessImports(text, options, config = {}) {
 const { parsers: { babel } } = src_require("prettier/parser-babel");
 const { parsers: { typescript } } = src_require("prettier/parser-typescript");
 const { parsers: { "babel-ts": babelTs } } = src_require("prettier/parser-babel");
+const PROCESSING_MARKER = Symbol("prettier-plugin-sort-imports-processing");
 function createCombinedPreprocess(parserName, config) {
-    return function(text, options) {
-        const otherPlugins = config.otherPlugins || [];
-        if (0 === otherPlugins.length) return preprocessImports(text, options, config);
-        const prettierOptions = config.prettierOptions || {};
-        const mergedOptions = {
-            ...options,
-            ...prettierOptions
-        };
-        const preprocessFunctions = [];
-        preprocessFunctions.push((text, options)=>preprocessImports(text, options, config));
-        for (const plugin of otherPlugins){
-            const parser = plugin?.parsers?.[parserName];
-            if (parser?.preprocess && "function" == typeof parser.preprocess) preprocessFunctions.push(parser.preprocess);
-        }
-        let processedText = text;
-        for (const preprocess of preprocessFunctions)try {
-            processedText = preprocess(processedText, mergedOptions);
+    const otherPlugins = config.otherPlugins || [];
+    const pluginsWithPreprocess = otherPlugins.filter((plugin)=>{
+        const parser = plugin?.parsers?.[parserName];
+        return parser?.preprocess && "function" == typeof parser.preprocess;
+    });
+    return async function(text, options) {
+        if (options[PROCESSING_MARKER]) return text;
+        let processedText = preprocessImports(text, options, config);
+        if (0 === pluginsWithPreprocess.length) return processedText;
+        try {
+            processedText = await format(processedText, {
+                ...options,
+                plugins: pluginsWithPreprocess,
+                [PROCESSING_MARKER]: true
+            });
         } catch (error) {
-            console.warn("Plugin preprocess failed:", error instanceof Error ? error.message : String(error));
+            console.warn("Failed to apply other plugins preprocess:", error instanceof Error ? error.message : String(error));
         }
         return processedText;
     };
@@ -685,16 +685,30 @@ function createPluginInstance(config = {}) {
         let merged = {
             ...baseParser
         };
+        const transformASTFunctions = [];
         for (const plugin of otherPlugins){
             const otherParser = plugin?.parsers?.[parserName];
             if (otherParser) {
-                const { preprocess, ...otherAttrs } = otherParser;
+                if ("function" == typeof otherParser.__transformAST) transformASTFunctions.push(otherParser.__transformAST);
+                const { preprocess, parse, __transformAST, ...otherAttrs } = otherParser;
                 merged = {
                     ...merged,
                     ...otherAttrs
                 };
             }
         }
+        if (transformASTFunctions.length > 0) {
+            const originalParse = baseParser.parse;
+            merged.parse = function(text, options) {
+                let ast = originalParse(text, options);
+                for (const transformAST of transformASTFunctions)try {
+                    ast = transformAST(ast, options);
+                } catch (error) {
+                    console.warn("Plugin transformAST failed:", error instanceof Error ? error.message : String(error));
+                }
+                return ast;
+            };
+        }
         merged.preprocess = createCombinedPreprocess(parserName, config);
         mergedParsers[parserName] = merged;
     }

package/dist/sorter.d.ts

@@ -6,7 +6,7 @@ export interface MergedConfig extends Omit<Required<PluginConfig>, "separator" |
 }
 /** 对导入语句进行排序 */
 export declare function sortImports(imports: ImportStatement[], userConfig: PluginConfig): ImportStatement[];
-/** 对导入语句进行分组，同时根据 name 和 isSideEffect 区分 */
+/** 对导入语句进行分组，同时根据 name、isSideEffect 和 isExport 区分 */
 export declare function groupImports(imports: ImportStatement[], userConfig: PluginConfig): Group[];
 /** 对分组进行排序 */
 export declare function sortGroups(groups: Group[], userConfig: PluginConfig): Group[];

package/dist/types.d.ts

@@ -45,6 +45,8 @@ export interface Group {
     name: string;
     /** 是否是副作用分组，默认为 false */
     isSideEffect: boolean;
+    /** 是否是导出分组，默认为 false */
+    isExport: boolean;
     /** 分组对应的导入语句列表 */
     importStatements: ImportStatement[];
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1adybug/prettier-plugin-sort-imports",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "一个 Prettier 插件，用于对 JavaScript/TypeScript 文件的导入语句进行分组和排序",
   "keywords": [
     "prettier",
@@ -56,7 +56,7 @@
     "typescript": "^5.9.2"
   },
   "peerDependencies": {
-    "prettier": "^3.0.0"
+    "prettier": "^3.7.3"
   },
   "scripts": {
     "build": "rslib build",