[autofix.ci] apply automated fixes (attempt 2/3)

Author: autofix-ci[bot]

apps/oxfmt/src/api/format_api.rs

@@ -7,7 +7,7 @@ use oxc_napi::OxcError;
 use crate::core::{
     ExternalFormatter, FormatResult, JsFormatEmbeddedCb, JsFormatEmbeddedDocCb, JsFormatFileCb,
     JsInitExternalFormatterCb, JsSortTailwindClassesCb, SourceFormatter, classify_file_kind,
-    resolve, utils,
+    resolve_for_api, utils,
 };
 
 pub struct ApiFormatResult {
@@ -64,7 +64,7 @@ pub fn run(
             errors: vec![OxcError::new(format!("Unsupported file type: {filename}"))],
         };
     };
-    let strategy = match resolve(options.unwrap_or_default(), kind, Some(&cwd)) {
+    let strategy = match resolve_for_api(options.unwrap_or_default(), kind, &cwd) {
         Ok(strategy) => strategy,
         Err(err) => {
             external_formatter.cleanup();

apps/oxfmt/src/api/text_to_doc_api.rs

@@ -1,3 +1,6 @@
+use std::path::PathBuf;
+
+use serde::Deserialize;
 use serde_json::Value;
 use tracing::{debug, instrument};
 
@@ -12,9 +15,11 @@ use oxc_span::SourceType;
 
 use crate::{
     core::{
-        EmbeddedCallbackPayload, ExternalFormatter, JsFormatEmbeddedCb, JsFormatEmbeddedDocCb,
-        JsFormatFileCb, JsInitExternalFormatterCb, JsSortTailwindClassesCb,
-        oxfmtrc::{inject_filepath, inject_tailwind_plugin_payload, to_prettier_options},
+        ExternalFormatter, JsFormatEmbeddedCb, JsFormatEmbeddedDocCb, JsFormatFileCb,
+        JsInitExternalFormatterCb, JsSortTailwindClassesCb,
+        oxfmtrc::{
+            FormatConfig, inject_filepath, inject_tailwind_plugin_payload, to_prettier_options,
+        },
         resolve_options_for_embedded_js,
     },
     prettier_compat::to_prettier_doc,
@@ -107,11 +112,9 @@ fn run_full(
 ) -> Option<Value> {
     let num_of_threads = 1;
 
-    // Paths in `_oxfmtPluginOptionsJson` are already resolved to absolute paths
-    // by the host (`format_by_external_formatter` with `supports_oxfmt = true`)
-    // when processing the parent file (e.g., App.vue). No further path resolution
-    // needed here.
-    let payload = parse_payload(oxfmt_plugin_options_json);
+    // Tailwind paths in the payload are already absolute (resolved by the host before serialization),
+    // so no `cwd` is threaded through here.
+    let (config, parent_filepath) = parse_payload(oxfmt_plugin_options_json);
 
     let external_formatter = ExternalFormatter::new(
         init_external_formatter_cb,
@@ -137,15 +140,12 @@ fn run_full(
             .expect("source_ext should be a valid JS/TS extension"),
     );
 
-    let resolved = resolve_options_for_embedded_js(payload)
+    let resolved = resolve_options_for_embedded_js(config, parent_filepath)
         .expect("`_oxfmtPluginOptionsJson` should contain valid config");
 
-    // Build Prettier options for nested embedded callbacks (e.g., CSS-in-JS inside
-    // the embedded JS). `oxc_formatter` always supports Tailwind sorting, so the
-    // Tailwind plugin payload is injected unconditionally (the inject helper
-    // no-ops when the user config has it disabled). `filepath` uses the parent
-    // path so Tailwind config resolution works correctly (Prettier overwrites
-    // the inner filepath with `dummy.{ts,tsx}`).
+    // Prettier options for callbacks that `oxc_formatter` may dispatch (e.g., CSS-in-JS).
+    // The embedded JS context is treated as always Tailwind-capable, so the inject is unconditional.
+    // The helper no-ops when user config has Tailwind disabled.
     let mut external_options = to_prettier_options(&resolved.config);
     inject_filepath(&mut external_options, &resolved.parent_filepath);
     inject_tailwind_plugin_payload(&mut external_options, &resolved.config);
@@ -198,11 +198,10 @@ fn run_fragment(
     let source_type = SourceType::from_extension(source_ext)
         .expect("source_ext should be a valid JS/TS extension");
 
-    // NOTE: Paths are already resolved (see `run_full()` comment).
     // `run_fragment()` does not support external formatting, so we discard
     // `parent_filepath` and `config` from the resolved bundle.
-    let payload = parse_payload(oxfmt_plugin_options_json);
-    let resolved = resolve_options_for_embedded_js(payload)
+    let (config, parent_filepath) = parse_payload(oxfmt_plugin_options_json);
+    let resolved = resolve_options_for_embedded_js(config, parent_filepath)
         .expect("`_oxfmtPluginOptionsJson` should contain valid config");
     let format_options = resolved.format_options;
 
@@ -286,12 +285,14 @@ fn run_fragment(
 
 // ---
 
-/// Deserializes the plugin options JSON into a typed [`EmbeddedCallbackPayload`].
-///
-/// The host (`format_by_external_formatter` with `supports_oxfmt = true`)
-/// serializes the typed `FormatConfig` plus the parent filepath into
-/// `_oxfmtPluginOptionsJson`, and we recover that exact shape here.
-fn parse_payload(oxfmt_plugin_options_json: &str) -> EmbeddedCallbackPayload {
-    serde_json::from_str(oxfmt_plugin_options_json)
-        .expect("`_oxfmtPluginOptionsJson` should deserialize as `EmbeddedCallbackPayload`")
+/// Deserialize `_oxfmtPluginOptionsJson` into the typed config + parent filepath.
+fn parse_payload(oxfmt_plugin_options_json: &str) -> (FormatConfig, PathBuf) {
+    #[derive(Deserialize)]
+    struct Payload {
+        config: FormatConfig,
+        filepath: String,
+    }
+    let payload: Payload = serde_json::from_str(oxfmt_plugin_options_json)
+        .expect("`_oxfmtPluginOptionsJson` should deserialize");
+    (payload.config, PathBuf::from(payload.filepath))
 }