feat(html): improve template parameters

Author: LingyuCoder

crates/rspack_plugin_html/src/visitors/asset.rs

@@ -98,7 +98,7 @@ impl VisitMut for AssetWriter<'_> {
                 span: DUMMY_SP,
                 data: Atom::from(
                   tag
-                    .content
+                    .inner_html
                     .as_ref()
                     .unwrap_or_else(|| panic!("should have title content"))
                     .to_string(),

crates/rspack_plugin_html/src/visitors/tag.rs

@@ -1,7 +1,11 @@
-use std::collections::HashMap;
+use std::{collections::HashMap, fmt};
 
 use itertools::Itertools;
-use serde::{Deserialize, Serialize};
+use serde::{
+  de::{MapAccess, Visitor},
+  ser::SerializeMap,
+  Deserialize, Deserializer, Serialize, Serializer,
+};
 
 use super::asset::HtmlPluginAttribute;
 use crate::config::{HtmlInject, HtmlRspackPluginBaseOptions, HtmlScriptLoading};
@@ -10,14 +14,64 @@ use crate::config::{HtmlInject, HtmlRspackPluginBaseOptions, HtmlScriptLoading};
 #[serde(rename_all = "camelCase")]
 pub struct HTMLPluginTag {
   pub tag_name: String,
+  #[serde(
+    serialize_with = "serialize_attributes",
+    deserialize_with = "deserialize_attributes"
+  )]
   pub attributes: Vec<HtmlPluginAttribute>,
   pub void_tag: bool,
-  pub content: Option<String>,
+  #[serde(rename = "innerHTML")]
+  pub inner_html: Option<String>,
   // `head`, `body`, `false`
   #[serde(skip)]
   pub append_to: HtmlInject,
 }
 
+fn serialize_attributes<S>(x: &Vec<HtmlPluginAttribute>, s: S) -> Result<S::Ok, S::Error>
+where
+  S: Serializer,
+{
+  let mut map = s.serialize_map(Some(x.len()))?;
+  for attr in x {
+    let attr_value = attr.attr_value.to_owned().unwrap_or("true".to_string());
+    map.serialize_entry(&attr.attr_name, &attr_value)?;
+  }
+  map.end()
+}
+
+fn deserialize_attributes<'de, D>(d: D) -> Result<Vec<HtmlPluginAttribute>, D::Error>
+where
+  D: Deserializer<'de>,
+{
+  struct DataVisitor;
+
+  impl<'de> Visitor<'de> for DataVisitor {
+    type Value = Vec<HtmlPluginAttribute>;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+      formatter.write_str("html attributes")
+    }
+
+    fn visit_map<A>(self, mut access: A) -> Result<Self::Value, A::Error>
+    where
+      A: MapAccess<'de>,
+    {
+      let mut res = vec![];
+
+      while let Some((k, v)) = access.next_entry::<String, Option<String>>()? {
+        res.push(HtmlPluginAttribute {
+          attr_name: k,
+          attr_value: v.filter(|value| value != "true"),
+        });
+      }
+
+      Ok(res)
+    }
+  }
+
+  d.deserialize_map(DataVisitor)
+}
+
 impl HTMLPluginTag {
   pub fn create_style(href: &str, append_to: HtmlInject) -> HTMLPluginTag {
     HTMLPluginTag {
@@ -112,7 +166,7 @@ impl HTMLPluginTag {
     HTMLPluginTag {
       tag_name: "title".to_string(),
       void_tag: true,
-      content: Some(title.to_string()),
+      inner_html: Some(title.to_string()),
       ..Default::default()
     }
   }

crates/rspack_plugin_html/src/visitors/utils.rs

@@ -91,17 +91,17 @@ pub fn html_tag_object_to_string(tag: &HTMLPluginTag) -> String {
     "<{} {}{}>{}{}",
     tag.tag_name,
     attributes.join(" "),
-    if tag.void_tag && tag.content.is_none() {
+    if tag.void_tag && tag.inner_html.is_none() {
       "/"
     } else {
       ""
     },
-    if let Some(content) = &tag.content {
-      content
+    if let Some(inner_html) = &tag.inner_html {
+      inner_html
     } else {
       ""
     },
-    if !tag.void_tag || tag.content.is_some() {
+    if !tag.void_tag || tag.inner_html.is_some() {
       format!("</{}>", tag.tag_name)
     } else {
       String::new()