fix: prevent preprocess again

#254

Author: fardad-dev

.gitignore

@@ -103,4 +103,6 @@ dist/
 # TernJS port file
 .tern-port
 
-.DS_STORE
+.DS_STORE
+
+.test-cli-temp

src/index.ts

@@ -256,27 +256,32 @@ const parsers = {
 
 function mergeParsers(originalParser: prettier.Parser, parserName: string) {
   const jsDocParse = getParser(originalParser.parse, parserName) as any;
+  let hasPreprocessed = false;
 
   const jsDocPreprocess = (text: string, options: prettier.ParserOptions) => {
     normalizeOptions(options as any);
-    const tsPluginParser = findPluginByParser(parserName, options);
 
-    if (!tsPluginParser) {
-      return originalParser.preprocess
-        ? originalParser.preprocess(text, options)
-        : text;
+    // Prevent infinite recursion by checking if we've already preprocessed
+    if (hasPreprocessed) {
+      return text;
     }
 
-    const preprocess = tsPluginParser.preprocess || originalParser.preprocess;
+    hasPreprocessed = true;
+    try {
+      const tsPluginParser = findPluginByParser(parserName, options);
 
-    Object.assign(parser, {
-      ...parser,
-      ...tsPluginParser,
-      preprocess: jsDocPreprocess,
-      parse: jsDocParse,
-    });
+      if (!tsPluginParser) {
+        return originalParser.preprocess
+          ? originalParser.preprocess(text, options)
+          : text;
+      }
 
-    return preprocess ? preprocess(text, options) : text;
+      const preprocess =
+        tsPluginParser?.preprocess || originalParser.preprocess;
+      return preprocess ? preprocess(text, options) : text;
+    } finally {
+      hasPreprocessed = false;
+    }
   };
 
   const parser = {

tests/__snapshots__/compatibleWithPlugins.test.ts.snap

@@ -1,5 +1,48 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`CLI Compatibility Should format via CLI with --write flag 1`] = `
+"/**
+ * @param {number} [arg1=123] The width
+ *
+ *   Default is \`123\`
+ * @returns {void}
+ */
+function myFunc(arg1) {}
+"
+`;
+
+exports[`CLI Compatibility Should format with tailwindcss plugin via CLI without infinite recursion 1`] = `
+"/**
+ * @param {String | Number} text - Some text description
+ * @param {String} [defaultValue="defaultTest"] TODO. Default is \`"defaultTest"\`
+ * @returns {Boolean} Description for returns
+ */
+const testFunction = (text, defaultValue) => true
+"
+`;
+
+exports[`CLI Compatibility Should work with plugins in different orders via CLI 1`] = `
+"/**
+ * @param {string} name
+
+
+
+
+ * @returns {Promise<void>}
+ */
+async function example(name: string): Promise<void> {}
+"
+`;
+
+exports[`CLI Compatibility Should work with plugins in different orders via CLI 2`] = `
+"/**
+ * @param {string} name
+ * @returns {Promise<void>}
+ */
+async function example(name: string): Promise<void> {}
+"
+`;
+
 exports[`Should compatible with tailwindcss 1`] = `
 "/**
  * @param {String} [arg1="defaultTest"] Foo. Default is \`"defaultTest"\`

tests/compatibleWithPlugins.test.ts

@@ -1,5 +1,8 @@
 import * as prettier from "prettier";
 import { AllOptions } from "../src/types";
+import { execSync } from "child_process";
+import { mkdirSync, writeFileSync, readFileSync, rmSync } from "fs";
+import { join } from "path";
 
 function subject(code: string, options: Partial<AllOptions> = {}) {
   return prettier.format(code, {
@@ -90,7 +93,7 @@ test("Should convert to single line if necessary", async () => {
 test("Should compatible with tailwindcss", async () => {
   const code = `
 /**
-* @param {String} [arg1="defaultTest"] foo
+* @param {String} [arg1="defaultTest"]        foo
 * @param {number} [arg2=123] the width of the rectangle
 * @param {number} [arg3= 123 ]
 * @param {number} [arg4= Foo.bar.baz ]
@@ -101,3 +104,134 @@ test("Should compatible with tailwindcss", async () => {
 
   expect(result).toMatchSnapshot();
 });
+
+describe("CLI Compatibility", () => {
+  // CLI-based tests
+  const testDir = join(process.cwd(), ".test-cli-temp");
+
+  beforeAll(() => {
+    try {
+      mkdirSync(testDir, { recursive: true });
+    } catch (err) {
+      // Directory might already exist
+    }
+  });
+
+  afterAll(() => {
+    try {
+      rmSync(testDir, { recursive: true, force: true });
+    } catch (err) {
+      // Ignore cleanup errors
+    }
+  });
+
+  function runCommand(command: string): string {
+    return execSync(`cd ${testDir} && ${command}`, {
+      timeout: 10000,
+      encoding: "utf8",
+      cwd: process.cwd(),
+    });
+  }
+
+  test("Should format with tailwindcss plugin via CLI without infinite recursion", () => {
+    const testFile = join(testDir, "test-cli-tailwind.js");
+    const configFile = join(testDir, ".prettierrc.json");
+
+    const code = `/**
+* @param {String|Number} text - some text description
+
+
+
+* @param {String} [defaultValue="defaultTest"] TODO
+* @returns {Boolean} Description for returns
+*/
+const testFunction = (text, defaultValue) => true;
+`;
+
+    const prettierConfig = {
+      semi: false,
+      tabWidth: 2,
+      printWidth: 100,
+      singleQuote: true,
+      plugins: ["prettier-plugin-tailwindcss", "prettier-plugin-jsdoc"],
+    };
+
+    writeFileSync(testFile, code);
+    writeFileSync(configFile, JSON.stringify(prettierConfig, null, 2));
+
+    const output = runCommand(
+      `npx prettier --config ".prettierrc.json" "test-cli-tailwind.js"`,
+    );
+
+    expect(output).toBeDefined();
+    expect(output).toMatchSnapshot();
+  });
+
+  test("Should format via CLI with --write flag", () => {
+    const testFile = join(testDir, "test-cli-write.js");
+    const configFile = join(testDir, ".prettierrc.json");
+
+    const code = `/**
+* @param {number} [arg1=123] the width
+
+
+
+* @returns {void}
+*/
+function myFunc(arg1) {}
+`;
+
+    const prettierConfig = {
+      semi: false,
+      plugins: ["prettier-plugin-tailwindcss", "prettier-plugin-jsdoc"],
+    };
+
+    writeFileSync(testFile, code);
+    writeFileSync(configFile, JSON.stringify(prettierConfig, null, 2));
+
+    runCommand(
+      `npx prettier --config ".prettierrc.json" --write "test-cli-write.js"`,
+    );
+
+    const formatted = readFileSync(testFile, "utf8");
+    expect(formatted).toMatchSnapshot();
+  });
+
+  test("Should work with plugins in different orders via CLI", () => {
+    const testFile = join(testDir, "test-cli-order.ts");
+    const configFile = join(testDir, ".prettierrc.json");
+
+    const code = `/**
+ * @param {string} name
+
+
+
+
+ * @returns {Promise<void>}
+ */
+async function example(name: string): Promise<void> {}
+`;
+
+    const configs = [
+      ["prettier-plugin-jsdoc", "prettier-plugin-tailwindcss"],
+      ["prettier-plugin-tailwindcss", "prettier-plugin-jsdoc"],
+    ];
+
+    configs.forEach((plugins) => {
+      const prettierConfig = {
+        parser: "typescript",
+        plugins,
+      };
+
+      writeFileSync(testFile, code);
+      writeFileSync(configFile, JSON.stringify(prettierConfig, null, 2));
+
+      const output = runCommand(
+        `npx prettier --config ".prettierrc.json" "test-cli-order.ts"`,
+      );
+
+      expect(output).toBeDefined();
+      expect(output).toMatchSnapshot();
+    });
+  });
+});