Add EndTag.removed property to consolidate impl_mutations_end_tag

cloudflare · Mar 7, 2025 · e95998e · e95998e
1 parent 38ad28c
commit e95998e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 42 deletions.
diff --git a/js-api/src/end_tag.rs b/js-api/src/end_tag.rs
@@ -5,7 +5,7 @@ use lol_html::html_content::EndTag as NativeEndTag;
 pub struct EndTag(NativeRefWrap<NativeEndTag<'static>>);
 
 impl_from_native!(NativeEndTag => EndTag);
-impl_mutations_end_tag!(EndTag);
+impl_mutations!(EndTag);
 
 #[wasm_bindgen]
 impl EndTag {

diff --git a/js-api/src/lib.rs b/js-api/src/lib.rs
@@ -155,47 +155,6 @@ macro_rules! impl_mutations {
     };
 }
 
-macro_rules! impl_mutations_end_tag {
-    ($Ty:ident) => {
-        #[wasm_bindgen]
-        impl $Ty {
-            pub fn before(
-                &mut self,
-                content: &str,
-                content_type: Option<ContentTypeOptions>,
-            ) -> Result<(), JsValue> {
-                self.0
-                    .get_mut()
-                    .map(|o| o.before(content, content_type.into_native()))
-            }
-
-            pub fn after(
-                &mut self,
-                content: &str,
-                content_type: Option<ContentTypeOptions>,
-            ) -> Result<(), JsValue> {
-                self.0
-                    .get_mut()
-                    .map(|o| o.after(content, content_type.into_native()))
-            }
-
-            pub fn replace(
-                &mut self,
-                content: &str,
-                content_type: Option<ContentTypeOptions>,
-            ) -> Result<(), JsValue> {
-                self.0
-                    .get_mut()
-                    .map(|o| o.replace(content, content_type.into_native()))
-            }
-
-            pub fn remove(&mut self) -> Result<(), JsValue> {
-                self.0.get_mut().map(|o| o.remove())
-            }
-        }
-    };
-}
-
 macro_rules! impl_from_native {
     ($Ty:ty => $JsTy:path) => {
         impl $JsTy {

diff --git a/src/rewritable_units/tokens/end_tag.rs b/src/rewritable_units/tokens/end_tag.rs
@@ -141,6 +141,13 @@ impl<'i> EndTag<'i> {
         self.mutations.mutate().remove();
     }
 
+    /// Returns `true` if the end tag has been replaced or removed.
+    #[inline]
+    #[must_use]
+    pub fn removed(&self) -> bool {
+        self.mutations.removed()
+    }
+
     #[inline]
     fn serialize_self(&self, output_handler: &mut dyn FnMut(&[u8])) -> Result<(), RewritingError> {
         if let Some(raw) = &self.raw {