Skip to content

armgit / moli

Public Imported from GitHub
0

Best headless browser for AI agents. Lite, Fast, High-Compatibility. Built in Rust

fix(dom): serialize namespaced HTML attributes

ldm0ad4aa5a43f4a
diff --git a/moli-benchmark/wpt-cross-current/failed-cases.txt b/moli-benchmark/wpt-cross-current/failed-cases.txt
index 84e53ac23..fd33793e4 100644
--- a/moli-benchmark/wpt-cross-current/failed-cases.txt
+++ b/moli-benchmark/wpt-cross-current/failed-cases.txt
@@ -3484,7 +3484,6 @@ html/syntax/parsing/the-end.html
html/syntax/serializing-html-fragments/escaping.html
html/syntax/serializing-html-fragments/serializing-cdata-in-html-document.html
html/syntax/serializing-html-fragments/serializing.html
-html/syntax/serializing-html-fragments/template.html
html/syntax/serializing-xml-fragments/outerHTML.html
html/syntax/xmldecl/xmldecl-1.html
html/syntax/xmldecl/xmldecl-2.html
diff --git a/moli-benchmark/wpt-cross-current/passed-cases.txt b/moli-benchmark/wpt-cross-current/passed-cases.txt
index 83afa38a8..825ae3bf5 100644
--- a/moli-benchmark/wpt-cross-current/passed-cases.txt
+++ b/moli-benchmark/wpt-cross-current/passed-cases.txt
@@ -6278,6 +6278,7 @@ html/syntax/parsing/zero.html
html/syntax/serializing-html-fragments/initial-linefeed-pre.html
html/syntax/serializing-html-fragments/outerHTML.html
html/syntax/serializing-html-fragments/serializing-lt-gt.html
+html/syntax/serializing-html-fragments/template.html
html/webappapis/animation-frames/callback-cross-realm-report-exception.html
html/webappapis/animation-frames/callback-exception.html
html/webappapis/animation-frames/callback-handle.html
diff --git a/moli-dom/src/native/element/attribute.rs b/moli-dom/src/native/element/attribute.rs
index 72aeb03cd..48e296bcb 100644
--- a/moli-dom/src/native/element/attribute.rs
+++ b/moli-dom/src/native/element/attribute.rs
@@ -11,6 +11,10 @@ pub struct Attribute {
}
impl Attribute {
+ const XLINK_NAMESPACE: &'static str = "http://www.w3.org/1999/xlink";
+ const XML_NAMESPACE: &'static str = "http://www.w3.org/XML/1998/namespace";
+ const XMLNS_NAMESPACE: &'static str = "http://www.w3.org/2000/xmlns/";
+
pub fn new(
local_name: String,
namespace: String,
@@ -36,6 +40,24 @@ impl Attribute {
}
}
+ pub(crate) fn push_html_serialized_name(&self, mut push_str: impl FnMut(&str)) {
+ let namespace: &str = self.namespace.as_ref();
+ let local_name: &str = self.local_name.as_ref();
+ let prefix = match namespace {
+ Self::XML_NAMESPACE => Some("xml"),
+ Self::XLINK_NAMESPACE => Some("xlink"),
+ Self::XMLNS_NAMESPACE if self.prefix.is_none() && local_name != "xmlns" => {
+ Some("xmlns")
+ }
+ _ => self.prefix.as_deref().filter(|prefix| !prefix.is_empty()),
+ };
+ if let Some(prefix) = prefix {
+ push_str(prefix);
+ push_str(":");
+ }
+ push_str(local_name);
+ }
+
pub fn name_matches(&self, name: &str) -> bool {
match self.prefix.as_deref() {
Some(prefix) if !prefix.is_empty() => {
diff --git a/moli-dom/src/native/host/serialize.rs b/moli-dom/src/native/host/serialize.rs
index 8e6f6d2c8..67f486343 100644
--- a/moli-dom/src/native/host/serialize.rs
+++ b/moli-dom/src/native/host/serialize.rs
@@ -267,7 +267,7 @@ impl DomHost {
}
for attribute in element.attributes() {
out.push(' ');
- out.push_str(attribute.local_name());
+ attribute.push_html_serialized_name(|part| out.push_str(part));
out.push_str("=\"");
escape_html_attribute(attribute.value(), out);
out.push('"');
diff --git a/moli-dom/src/native/node/mod.rs b/moli-dom/src/native/node/mod.rs
index b499de0ac..d5a718efc 100644
--- a/moli-dom/src/native/node/mod.rs
+++ b/moli-dom/src/native/node/mod.rs
@@ -851,7 +851,7 @@ fn serialize_html_node_frame<'a, S>(
return;
}
out.push(' ');
- out.push_str(attribute.local_name());
+ attribute.push_html_serialized_name(|part| out.push_str(part));
out.push_str("=\"");
escape_html_attribute(attribute.value(), out);
out.push('"');
diff --git a/moli-dom/src/native/serialize.rs b/moli-dom/src/native/serialize.rs
index 5818d4518..f23231e48 100644
--- a/moli-dom/src/native/serialize.rs
+++ b/moli-dom/src/native/serialize.rs
@@ -230,4 +230,55 @@ mod tests {
})
);
}
+
+ #[test]
+ fn html_serializers_apply_attribute_serialized_name_rules() {
+ let mut dom = NativeDom::new_html(test_url());
+ let container = dom.create_element("section");
+ let element = dom
+ .create_element_ns(Some("urn:element"), "div")
+ .expect("namespaced element");
+ assert!(dom.set_attribute_ns(
+ element,
+ Some("http://www.w3.org/XML/1998/namespace"),
+ Some("alternate"),
+ "lang",
+ "en-us",
+ ));
+ assert!(dom.set_attribute_ns(
+ element,
+ Some("http://www.w3.org/2000/xmlns/"),
+ None,
+ "binding",
+ "urn:binding",
+ ));
+ assert!(dom.set_attribute_ns(
+ element,
+ Some("http://www.w3.org/2000/xmlns/"),
+ None,
+ "xmlns",
+ "urn:default",
+ ));
+ assert!(dom.set_attribute_ns(
+ element,
+ Some("http://www.w3.org/1999/xlink"),
+ Some("alternate"),
+ "href",
+ "target",
+ ));
+ assert!(dom.set_attribute_ns(element, Some("urn:custom"), Some("p"), "attr", "value",));
+ assert!(dom.append_child(container, element));
+
+ let expected = concat!(
+ "<div xml:lang=\"en-us\" xmlns:binding=\"urn:binding\" ",
+ "xmlns=\"urn:default\" xlink:href=\"target\" p:attr=\"value\"></div>"
+ );
+ assert_eq!(dom.inner_html(container).as_deref(), Some(expected));
+
+ let host = DomHost::from_dom(dom);
+ assert_eq!(
+ host.get_html(container, false, &[]).as_deref(),
+ Some(expected)
+ );
+ }
}