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

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",
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@1adybug/prettier-plugin-sort-imports",
-  "version": "0.0.20",
+  "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",