fix: consistency

Author: wjw99830

Diff for: crates/swc_ecma_minifier/src/option/mod.rs

@@ -9,6 +9,7 @@ use swc_atoms::Atom;
 use swc_common::Mark;
 use swc_config::{merge::Merge, CachedRegex};
 use swc_ecma_ast::{EsVersion, Expr, Id};
+use terser::TerserExperimentalOptions;
 
 /// Implement default using serde.
 macro_rules! impl_default {
@@ -132,6 +133,20 @@ pub struct CompressExperimentalOptions {
     pub reduce_escaped_newline: bool,
 }
 
+impl CompressExperimentalOptions {
+    fn from_defaults(defaults: bool) -> Self {
+        CompressExperimentalOptions {
+            reduce_escaped_newline: defaults,
+        }
+    }
+
+    fn from_terser_with_defaults(terser: TerserExperimentalOptions, defaults: bool) -> Self {
+        CompressExperimentalOptions {
+            reduce_escaped_newline: terser.reduce_escaped_newline.unwrap_or(defaults),
+        }
+    }
+}
+
 impl Default for CompressExperimentalOptions {
     fn default() -> Self {
         CompressExperimentalOptions {

Diff for: crates/swc_ecma_minifier/src/option/terser.rs

@@ -75,16 +75,8 @@ pub enum TerserTopRetainOption {
 #[serde(deny_unknown_fields)]
 #[non_exhaustive]
 pub struct TerserExperimentalOptions {
-    #[serde(default = "true_by_default")]
-    pub reduce_escaped_newline: bool,
-}
-
-impl Default for TerserExperimentalOptions {
-    fn default() -> Self {
-        TerserExperimentalOptions {
-            reduce_escaped_newline: true,
-        }
-    }
+    #[serde(default)]
+    pub reduce_escaped_newline: Option<bool>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -421,11 +413,15 @@ impl TerserCompressorOptions {
                     })
                 })
                 .collect(),
-            experimental: self.experimental.map(From::from).unwrap_or(
-                CompressExperimentalOptions {
-                    reduce_escaped_newline: self.defaults,
-                },
-            ),
+            experimental: self
+                .experimental
+                .map(|experimental| {
+                    CompressExperimentalOptions::from_terser_with_defaults(
+                        experimental,
+                        self.defaults,
+                    )
+                })
+                .unwrap_or(CompressExperimentalOptions::from_defaults(self.defaults)),
         }
     }
 }
@@ -481,14 +477,6 @@ impl From<TerserTopRetainOption> for Vec<Atom> {
     }
 }
 
-impl From<TerserExperimentalOptions> for CompressExperimentalOptions {
-    fn from(value: TerserExperimentalOptions) -> Self {
-        CompressExperimentalOptions {
-            reduce_escaped_newline: value.reduce_escaped_newline,
-        }
-    }
-}
-
 fn value_to_expr(v: Value) -> Box<Expr> {
     match v {
         Value::Null => Lit::Null(Null { span: DUMMY_SP }).into(),