[autofix.ci] apply automated fixes

Author: autofix-ci[bot]

apps/oxfmt/src/format.rs

@@ -25,8 +25,6 @@ pub struct FormatRunner {
     cwd: PathBuf,
 }
 
-const DEFAULT_CONFIG_NAME: &str = ".oxfmtrc.json";
-
 impl FormatRunner {
     /// Creates a new FormatRunner instance.
     ///
@@ -177,34 +175,36 @@ impl FormatRunner {
     }
 }
 
-/// Load configuration file
-///
+const DEFAULT_CONFIG_NAMES: &[&str] = &[".oxfmtrc.json", ".oxfmtrc.jsonc"];
+
 /// # Errors
 ///
 /// Returns error if:
 /// - Config file is specified but not found or invalid
 /// - Config file parsing fails
 fn load_config(cwd: &Path, config: Option<&PathBuf>) -> Result<FormatOptions, String> {
-    // If --config is explicitly specified, use that path directly
+    // If `--config` is explicitly specified, use that path directly
     if let Some(config_path) = config {
         let full_path =
             if config_path.is_absolute() { config_path.clone() } else { cwd.join(config_path) };
 
+        // This will error if the file does not exist or is invalid
         let oxfmtrc = Oxfmtrc::from_file(&full_path)?;
         return oxfmtrc.into_format_options();
     }
 
-    // If --config is not specified, search for default config file
-    // starting from cwd and walking up to root
+    // If `--config` is not specified, search the nearest config file from cwd upwards
     let mut current_dir = cwd;
     loop {
-        let config_path = current_dir.join(DEFAULT_CONFIG_NAME);
-        if config_path.exists() {
-            let oxfmtrc = Oxfmtrc::from_file(&config_path)?;
-            return oxfmtrc.into_format_options();
+        // Try each config name in order
+        for config_name in DEFAULT_CONFIG_NAMES {
+            let config_path = current_dir.join(config_name);
+            if config_path.exists() {
+                let oxfmtrc = Oxfmtrc::from_file(&config_path)?;
+                return oxfmtrc.into_format_options();
+            }
         }
 
-        // Move to parent directory, or break if at root
         if let Some(parent) = current_dir.parent() {
             current_dir = parent;
         } else {

apps/oxfmt/tests/fixtures/config_file/fmt.jsonc

@@ -0,0 +1,4 @@
+{
+  // Supports JSONC!
+  "semicorons": false
+}

apps/oxfmt/tests/fixtures/config_file/nested/.oxfmtrc.json renamed to apps/oxfmt/tests/fixtures/config_file/nested/.oxfmtrc.jsonc

@@ -68,6 +68,10 @@ fn config_file_auto_discovery() {
 #[test]
 fn config_file_explicit() {
     Tester::new().with_cwd(PathBuf::from("tests/fixtures/config_file")).test_and_snapshot_multiple(
-        &[&["--check", "--config", "./fmt.json"], &["--check", "--config", "NOT_EXISTS.json"]],
+        &[
+            &["--check", "--config", "./fmt.json"],
+            &["--check", "--config", "./fmt.jsonc"],
+            &[ "--check", "--config", "NOT_EXISTS.json" ],
+        ],
     );
 }

apps/oxfmt/tests/mod.rs

@@ -14,6 +14,19 @@ Finished in <variable>ms on 1 files using 1 threads.
 CLI result: FormatMismatch
 ----------
 
+########## 
+arguments: --check --config ./fmt.jsonc
+working directory: tests/fixtures/config_file
+----------
+Checking formatting...
+nested/deep/test.js (<variable>ms)
+
+Format issues found in above 1 files. Run without `--check` to fix.
+Finished in <variable>ms on 1 files using 1 threads.
+----------
+CLI result: FormatMismatch
+----------
+
 ########## 
 arguments: --check --config NOT_EXISTS.json
 working directory: tests/fixtures/config_file