feat: remove fields of SwcJsMinimizerRspackPluginOptions

crates/node_binding/binding.d.ts

@@ -1433,9 +1433,9 @@ export interface RawStyleConfig {
 
 export interface RawSwcJsMinimizerRspackPluginOptions {
   extractComments?: RawExtractComments
-  compress: boolean | string
-  mangle: boolean | string
-  format: string
+  compress: any
+  mangle: any
+  format: any
   module?: boolean
   test?: string | RegExp | (string | RegExp)[]
   include?: string | RegExp | (string | RegExp)[]

crates/rspack_binding_options/Cargo.toml

@@ -67,6 +67,5 @@ rspack_swc_visitors                   = { path = "../rspack_swc_visitors" }
 rustc-hash                            = { workspace = true }
 serde                                 = { workspace = true, features = ["derive"] }
 serde_json                            = { workspace = true }
-swc_config                            = { workspace = true }
 swc_core                              = { workspace = true, default-features = false, features = ["ecma_transforms_react"] }
 tokio                                 = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "test-util", "parking_lot"] }

crates/rspack_binding_options/src/options/raw_builtins/raw_swc_js_minimizer.rs

@@ -6,8 +6,8 @@ use rspack_plugin_swc_js_minimizer::{
   ExtractComments, OptionWrapper, SwcJsMinimizerRspackPluginOptions, SwcJsMinimizerRule,
   SwcJsMinimizerRules,
 };
-use serde::Deserialize;
-use swc_config::config_types::BoolOrDataConfig;
+use serde::de::DeserializeOwned;
+use swc_core::base::BoolOrDataConfig;
 
 type RawSwcJsMinimizerRule = Either<String, JsRegExp>;
 type RawSwcJsMinimizerRules = Either3<String, JsRegExp, Vec<RawSwcJsMinimizerRule>>;
@@ -22,12 +22,12 @@ pub struct RawExtractComments {
 }
 
 #[derive(Debug)]
-#[napi(object)]
+#[napi(object, object_to_js = false)]
 pub struct RawSwcJsMinimizerRspackPluginOptions {
   pub extract_comments: Option<RawExtractComments>,
-  pub compress: Either<bool, String>,
-  pub mangle: Either<bool, String>,
-  pub format: String,
+  pub compress: serde_json::Value,
+  pub mangle: serde_json::Value,
+  pub format: serde_json::Value,
   pub module: Option<bool>,
   #[napi(ts_type = "string | RegExp | (string | RegExp)[]")]
   pub test: Option<RawSwcJsMinimizerRules>,
@@ -37,13 +37,11 @@ pub struct RawSwcJsMinimizerRspackPluginOptions {
   pub exclude: Option<RawSwcJsMinimizerRules>,
 }
 
-fn try_deserialize_into<'de, T: 'de + Deserialize<'de>>(
-  value: &'de Either<bool, String>,
-) -> Result<BoolOrDataConfig<T>> {
-  Ok(match value {
-    Either::A(b) => BoolOrDataConfig::from_bool(*b),
-    Either::B(s) => BoolOrDataConfig::from_obj(serde_json::from_str(s).into_diagnostic()?),
-  })
+fn try_deserialize_into<T>(value: serde_json::Value) -> Result<T>
+where
+  T: DeserializeOwned,
+{
+  serde_json::from_value(value).into_diagnostic()
 }
 
 fn into_condition(c: Option<RawSwcJsMinimizerRules>) -> Option<SwcJsMinimizerRules> {
@@ -74,11 +72,19 @@ impl TryFrom<RawSwcJsMinimizerRspackPluginOptions> for SwcJsMinimizerRspackPlugi
   type Error = rspack_error::Error;
 
   fn try_from(value: RawSwcJsMinimizerRspackPluginOptions) -> Result<Self> {
+    let compress = try_deserialize_into::<
+      BoolOrDataConfig<rspack_plugin_swc_js_minimizer::TerserCompressorOptions>,
+    >(value.compress)?
+    .or(|| BoolOrDataConfig::from_bool(true));
+    let mangle = try_deserialize_into::<
+      BoolOrDataConfig<rspack_plugin_swc_js_minimizer::MangleOptions>,
+    >(value.mangle)?
+    .or(|| BoolOrDataConfig::from_bool(true));
     Ok(Self {
       extract_comments: into_extract_comments(value.extract_comments),
-      compress: try_deserialize_into(&value.compress)?,
-      mangle: try_deserialize_into(&value.mangle)?,
-      format: serde_json::from_str(&value.format).into_diagnostic()?,
+      compress,
+      mangle,
+      format: try_deserialize_into(value.format)?,
       module: value.module,
       test: into_condition(value.test),
       include: into_condition(value.include),

packages/rspack-test-tools/tests/__snapshots__/StatsAPI.test.js.snap

@@ -16,7 +16,7 @@ Object {
         "hotModuleReplacement": false,
       },
       "name": "main.js",
-      "size": 207,
+      "size": 206,
       "type": "asset",
     },
   ],
@@ -35,7 +35,7 @@ Object {
       "files": Array [
         "main.js",
       ],
-      "hash": "93a9c2315c37cadce79d",
+      "hash": "0de84e4ce8fcd639bcde",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -132,10 +132,10 @@ Object {
       "assets": Array [
         Object {
           "name": "main.js",
-          "size": 207,
+          "size": 206,
         },
       ],
-      "assetsSize": 207,
+      "assetsSize": 206,
       "chunks": Array [
         "909",
       ],
@@ -146,7 +146,7 @@ Object {
   "errors": Array [],
   "errorsCount": 0,
   "filteredModules": undefined,
-  "hash": "99b766bb1908ecab2ebb",
+  "hash": "53775971d218329cdf79",
   "modules": Array [
     Object {
       "assets": Array [],
@@ -214,10 +214,10 @@ Object {
       "assets": Array [
         Object {
           "name": "main.js",
-          "size": 207,
+          "size": 206,
         },
       ],
-      "assetsSize": 207,
+      "assetsSize": 206,
       "chunks": Array [
         "909",
       ],
@@ -266,7 +266,7 @@ Object {
       "files": Array [
         "main.js",
       ],
-      "hash": "4936042f572297f50e12",
+      "hash": "b9e27e54724c1cf2d77c",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -561,7 +561,7 @@ Object {
   "errors": Array [],
   "errorsCount": 0,
   "filteredModules": undefined,
-  "hash": "ab30e6de8b30ef4cc8fb",
+  "hash": "9e5faccc8912709a0754",
   "modules": Array [
     Object {
       "assets": Array [],
@@ -966,7 +966,7 @@ Object {
         "hotModuleReplacement": false,
       },
       "name": "main.js",
-      "size": 207,
+      "size": 206,
       "type": "asset",
     },
   ],
@@ -983,7 +983,7 @@ Object {
       "files": Array [
         "main.js",
       ],
-      "hash": "93a9c2315c37cadce79d",
+      "hash": "0de84e4ce8fcd639bcde",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -1058,7 +1058,7 @@ Object {
         "hotModuleReplacement": false,
       },
       "name": "main.js",
-      "size": 346,
+      "size": 337,
       "type": "asset",
     },
   ],
@@ -1077,7 +1077,7 @@ Object {
       "files": Array [
         "main.js",
       ],
-      "hash": "39e2485ff95dc65d08d1",
+      "hash": "e76e82e3d015ae94d407",
       "id": "909",
       "idHints": Array [],
       "initial": true,
@@ -1375,10 +1375,10 @@ exports.c = require(\\"./c?c=3\\");
       "assets": Array [
         Object {
           "name": "main.js",
-          "size": 346,
+          "size": 337,
         },
       ],
-      "assetsSize": 346,
+      "assetsSize": 337,
       "chunks": Array [
         "909",
       ],
@@ -1389,7 +1389,7 @@ exports.c = require(\\"./c?c=3\\");
   "errors": Array [],
   "errorsCount": 0,
   "filteredModules": undefined,
-  "hash": "9065311db3fa4c6235f4",
+  "hash": "177b5548f3cb0edb1d8d",
   "modules": Array [
     Object {
       "assets": Array [],
@@ -1658,10 +1658,10 @@ exports.c = require(\\"./c?c=3\\");
       "assets": Array [
         Object {
           "name": "main.js",
-          "size": 346,
+          "size": 337,
         },
       ],
-      "assetsSize": 346,
+      "assetsSize": 337,
       "chunks": Array [
         "909",
       ],