prettier 3.0.0-alpha.11 → 3.0.0-alpha.12

package/internal/cli.mjs

@@ -5251,6 +5251,7 @@ var cli_options_evaluate_default = {
     "default": [
       {
         "value": [
+          ".gitignore",
           ".prettierignore"
         ]
       }
@@ -5281,10 +5282,6 @@ var cli_options_evaluate_default = {
     "description": "What level of logs to report.",
     "type": "choice"
   },
-  "pluginSearch": {
-    "oppositeDescription": "Disable plugin autoloading.",
-    "type": "boolean"
-  },
   "supportInfo": {
     "description": "Print support information as JSON.",
     "type": "boolean"
@@ -5356,11 +5353,10 @@ function supportInfoToContextOptions({ options: supportOptions, languages }) {
     detailedOptions
   };
 }
-async function getContextOptions(plugins, pluginSearchDirs) {
+async function getContextOptions(plugins) {
   const supportInfo = await getSupportInfo({
     showDeprecated: true,
-    plugins,
-    pluginSearchDirs
+    plugins
   });
   return supportInfoToContextOptions(supportInfo);
 }
@@ -5495,6 +5491,15 @@ async function statSafe(filePath) {
     }
   }
 }
+async function lstatSafe(filePath) {
+  try {
+    return await fs.lstat(filePath);
+  } catch (error) {
+    if (error.code !== "ENOENT") {
+      throw error;
+    }
+  }
+}
 function isJson(value) {
   try {
     JSON.parse(value);
@@ -5547,7 +5552,7 @@ function createMinimistOptions(detailedOptions) {
     if (alias) {
       names.push(alias);
     }
-    if (!option.deprecated && (!option.forwardToApi || name === "plugin" || name === "plugin-search-dir") && option.default !== void 0) {
+    if (!option.deprecated && (!option.forwardToApi || name === "plugin") && option.default !== void 0) {
       defaultValues[option.name] = option.default;
     }
   }
@@ -5659,9 +5664,6 @@ function parseArgv(rawArguments, detailedOptions, logger, keys) {
   const minimistOptions = createMinimistOptions(detailedOptions);
   let argv = minimistParse(rawArguments, minimistOptions);
   if (keys) {
-    if (keys.includes("plugin-search-dir") && !keys.includes("plugin-search")) {
-      keys.push("plugin-search");
-    }
     detailedOptions = detailedOptions.filter(
       (option) => keys.includes(option.name)
     );
@@ -5708,20 +5710,18 @@ var Context = class {
       logger
     } = this;
     const {
-      plugins,
-      pluginSearchDirs
-    } = parseArgvWithoutPlugins(rawArguments, logger, ["plugin", "plugin-search-dir"]);
-    await this.pushContextPlugins(plugins, pluginSearchDirs);
+      plugins
+    } = parseArgvWithoutPlugins(rawArguments, logger, ["plugin"]);
+    await this.pushContextPlugins(plugins);
     const argv = parseArgv(rawArguments, this.detailedOptions, logger);
     this.argv = argv;
     this.filePatterns = argv._;
   }
   /**
    * @param {string[]} plugins
-   * @param {string[]=} pluginSearchDirs
    */
-  async pushContextPlugins(plugins, pluginSearchDirs) {
-    const options = await getContextOptions(plugins, pluginSearchDirs);
+  async pushContextPlugins(plugins) {
+    const options = await getContextOptions(plugins);
     __privateGet(this, _stack).push(options);
     Object.assign(this, options);
   }
@@ -5937,7 +5937,8 @@ async function* expandPatternsInternal(context) {
   }
   const globOptions = {
     dot: true,
-    ignore: silentlyIgnoredDirs.map((dir) => "**/" + dir)
+    ignore: silentlyIgnoredDirs.map((dir) => "**/" + dir),
+    followSymbolicLinks: false
   };
   let supportedFilesGlob;
   const cwd2 = process.cwd();
@@ -5947,9 +5948,13 @@ async function* expandPatternsInternal(context) {
     if (containsIgnoredPathSegment(absolutePath, cwd2, silentlyIgnoredDirs)) {
       continue;
     }
-    const stat = await statSafe(absolutePath);
+    const stat = await lstatSafe(absolutePath);
     if (stat) {
-      if (stat.isFile()) {
+      if (stat.isSymbolicLink()) {
+        yield {
+          error: `Explicitly specified pattern "${pattern}" is a symbolic link.`
+        };
+      } else if (stat.isFile()) {
         entries.push({
           type: "file",
           glob: escapePathForGlob(fixWindowsSlashes(pattern)),
@@ -6269,7 +6274,12 @@ function locatePathSync(paths, {
   const statFunction = allowSymlinks ? fs2.statSync : fs2.lstatSync;
   for (const path_ of paths) {
     try {
-      const stat = statFunction(path3.resolve(cwd2, path_));
+      const stat = statFunction(path3.resolve(cwd2, path_), {
+        throwIfNoEntry: false
+      });
+      if (!stat) {
+        continue;
+      }
       if (matchType(type, stat)) {
         return path_;
       }
@@ -6482,10 +6492,15 @@ function diff(a, b) {
 var DebugError = class extends Error {
 };
 function handleError(context, filename, error, printedFilename) {
-  if (error instanceof errors.UndefinedParserError) {
-    if ((context.argv.write || context.argv.ignoreUnknown) && printedFilename) {
+  const errorIsUndefinedParseError = error instanceof errors.UndefinedParserError;
+  if (printedFilename) {
+    if ((context.argv.write || context.argv.ignoreUnknown) && errorIsUndefinedParseError) {
       printedFilename.clear();
+    } else {
+      process.stdout.write("\n");
     }
+  }
+  if (errorIsUndefinedParseError) {
     if (context.argv.ignoreUnknown) {
       return;
     }
@@ -6495,9 +6510,6 @@ function handleError(context, filename, error, printedFilename) {
     context.logger.error(error.message);
     return;
   }
-  if (context.argv.write) {
-    process.stdout.write("\n");
-  }
   const isParseError = Boolean(error == null ? void 0 : error.loc);
   const isValidationError = /^Invalid \S+ value\./.test(error == null ? void 0 : error.message);
   if (isParseError) {
@@ -6746,6 +6758,7 @@ ${error.message}`
       continue;
     }
     if (isFileIgnored) {
+      printedFilename == null ? void 0 : printedFilename.clear();
       writeOutput(context, { formatted: input }, options);
       continue;
     }
@@ -6769,9 +6782,7 @@ ${error.message}`
     }
     const isDifferent = output !== input;
     let shouldSetCache = !isDifferent;
-    if (printedFilename) {
-      printedFilename.clear();
-    }
+    printedFilename == null ? void 0 : printedFilename.clear();
     if (performanceTestFlag) {
       context.logger.log(
         `'${performanceTestFlag.name}' option found, skipped print code or write files.`
@@ -6849,14 +6860,12 @@ async function logFileInfoOrDie(context) {
     ignorePath,
     withNodeModules,
     plugins,
-    pluginSearchDirs,
     config
   } = context.argv;
   const fileInfo = await getFileInfo(file, {
     ignorePath,
     withNodeModules,
     plugins,
-    pluginSearchDirs,
     resolveConfig: config !== false
   });
   printToScreen(await format3((0, import_fast_json_stable_stringify2.default)(fileInfo), { parser: "json" }));
@@ -6918,14 +6927,6 @@ async function run(rawArguments) {
 }
 async function main(context) {
   context.logger.debug(`normalized argv: ${JSON.stringify(context.argv)}`);
-  if (context.argv.pluginSearch === false) {
-    const rawPluginSearchDirs = context.argv.__raw["plugin-search-dir"];
-    if (typeof rawPluginSearchDirs === "string" || isNonEmptyArray(rawPluginSearchDirs)) {
-      throw new Error(
-        "Cannot use --no-plugin-search and --plugin-search-dir together."
-      );
-    }
-  }
   if (context.argv.check && context.argv.listDifferent) {
     throw new Error("Cannot use --check and --list-different together.");
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier",
-  "version": "3.0.0-alpha.11",
+  "version": "3.0.0-alpha.12",
   "description": "Prettier is an opinionated code formatter",
   "bin": "./bin/prettier.cjs",
   "repository": "prettier/prettier",