fix: plugin options string

crates/mako/src/ast.rs

@@ -6,7 +6,6 @@ pub(crate) mod error;
 pub mod file;
 pub(crate) mod js_ast;
 pub(crate) mod sourcemap;
-#[cfg(test)]
 pub mod tests;
 pub mod utils;
 

crates/mako/src/compiler.rs

@@ -8,6 +8,7 @@ use anyhow::{anyhow, Error, Result};
 use colored::Colorize;
 use libloading::Library;
 use regex::Regex;
+use serde_json::Value;
 use swc_core::common::sync::Lrc;
 use swc_core::common::{Globals, SourceMap, DUMMY_SP};
 use swc_core::ecma::ast::Ident;
@@ -245,7 +246,7 @@ impl Compiler {
             for rust_plugin in config.experimental.rust_plugins.clone() {
                 let lib = Arc::new(Library::new(rust_plugin.path)?);
                 let plugin_create_fn: libloading::Symbol<
-                    unsafe extern "C" fn(option: String) -> Arc<dyn Plugin>,
+                    unsafe extern "C" fn(option: Value) -> Arc<dyn Plugin>,
                 > = lib.get(b"_plugin_create").unwrap();
                 let plugin = plugin_create_fn(rust_plugin.options);
                 external_plugins.push(plugin);

crates/mako/src/config.rs

@@ -75,6 +75,7 @@ pub use umd::{deserialize_umd, Umd};
 pub use watch::WatchConfig;
 
 use crate::build::load::JS_EXTENSIONS;
+use crate::config::experimental::RustPlugin;
 use crate::features::node::Node;
 
 #[derive(Debug, Diagnostic)]
@@ -233,7 +234,7 @@ impl Config {
     ) -> Result<Self> {
         let abs_config_file = root.join(CONFIG_FILE);
         let abs_config_file = abs_config_file.to_str().unwrap();
-        let mut overrides_json: Option<String> = None;
+        let mut overrides_json: Option<Value> = None;
         let c = config::Config::builder();
         // default config
         let c = c.add_source(config::File::from_str(
@@ -245,13 +246,11 @@ impl Config {
         let c = if let Some(default_config) = default_config {
             let result: Result<Value, serde_json::Error> = serde_json::from_str(default_config);
             if let Ok(config) = result {
-                if let Some(experimental) = config.get("experimental") {
-                    overrides_json = Some(
-                        serde_json::to_string(&json!({
-                            "experimental": experimental
-                        }))
-                        .unwrap(),
-                    );
+                if let Some(rust_plugins) = config
+                    .get("experimental")
+                    .and_then(|experimental| experimental.get("rustPlugins"))
+                {
+                    overrides_json = Some(json!({ "rust_plugins": rust_plugins }));
                 }
             };
             c.add_source(config::File::from_str(
@@ -274,20 +273,19 @@ impl Config {
         } else {
             c
         };
-        // overrides config
-        let c = if let Some(overrides) = overrides_json {
-            c.add_source(config::File::from_str(
-                overrides.as_str(),
-                config::FileFormat::Json5,
-            ))
-        } else {
-            c
-        };
 
         let c = c.build()?;
         let mut ret = c.try_deserialize::<Config>();
         // normalize & check
         if let Ok(config) = &mut ret {
+            // overrides  config
+
+            if let Some(overrides) = overrides_json {
+                let rust_plugins: Vec<RustPlugin> =
+                    serde_json::from_value(overrides.get("rust_plugins").unwrap().clone())?;
+                config.experimental.rust_plugins = rust_plugins;
+            }
+
             // normalize output
             if config.output.path.is_relative() {
                 config.output.path = root.join(config.output.path.to_string_lossy().to_string());

crates/mako/src/config/experimental.rs

@@ -1,11 +1,12 @@
 use serde::{Deserialize, Serialize};
+use serde_json::Value;
 
 use crate::create_deserialize_fn;
 
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct RustPlugin {
     pub path: String,
-    pub options: String,
+    pub options: Value,
 }
 
 #[derive(Deserialize, Serialize, Debug)]

crates/mako_plugin_macro/Cargo.toml

@@ -7,6 +7,7 @@ license = "MIT"
 [dependencies]
 proc-macro2 = "1"
 quote       = "1"
+serde_json  = { workspace = true }
 syn         = { version = "2", features = ["full"] }
 
 [lib]

crates/mako_plugin_macro/src/lib.rs

@@ -15,7 +15,7 @@ fn handler_create(input: TokenStream2) -> TokenStream2 {
     let struct_name = &ast.ident;
     let ts = quote! {
       #[no_mangle]
-      pub fn _plugin_create(option: std::string::String) -> std::sync::Arc<dyn Plugin> {
+      pub fn _plugin_create(option: serde_json::Value) -> std::sync::Arc<dyn Plugin> {
         std::sync::Arc::new(#struct_name::new(option))
       }
     };