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): preserve native element interfaces in XML documents

ldm0fde957b8532b
diff --git a/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/elements.rs b/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/elements.rs
index 443a56d2e..a2da557b0 100644
--- a/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/elements.rs
+++ b/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/elements.rs
@@ -462,6 +462,8 @@ pub(in crate::native_bridge::document) fn build_detached_element_object<'s>(
&& html_element_constructor_name(&local_name).is_some();
let svg_interface_like = namespace_uri.as_deref() == Some(SVG_NS)
&& svg_element_constructor_name(&local_name).is_some();
+ let mathml_interface_like =
+ namespace_uri.as_deref() == Some(crate::native_bridge::document::MATHML_NS);
let node_name = if html_like {
qualified.to_ascii_uppercase()
} else {
@@ -471,6 +473,8 @@ pub(in crate::native_bridge::document) fn build_detached_element_object<'s>(
Some(html_element_to_string_tag(&local_name))
} else if namespace_uri.as_deref() == Some(SVG_NS) {
Some(svg_element_to_string_tag(&local_name))
+ } else if mathml_interface_like {
+ Some("MathMLElement")
} else {
Some("Element")
};
@@ -481,6 +485,8 @@ pub(in crate::native_bridge::document) fn build_detached_element_object<'s>(
html_element_constructor_name(&local_name)
} else if svg_interface_like {
svg_element_constructor_name(&local_name)
+ } else if mathml_interface_like {
+ Some("MathMLElement")
} else {
None
};
diff --git a/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/names.rs b/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/names.rs
index 551514bc0..163b4dcda 100644
--- a/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/names.rs
+++ b/moli-renderer-v8/src/native_bridge/document/detached_objects/builders/names.rs
@@ -32,10 +32,7 @@ pub(in crate::native_bridge::document) fn svg_element_to_string_tag(
pub(in crate::native_bridge::document) fn svg_element_constructor_name(
local_name: &str,
) -> Option<&'static str> {
- match svg_element_interface_name(local_name) {
- "SVGElement" => None,
- interface => Some(interface),
- }
+ Some(svg_element_interface_name(local_name))
}
pub(crate) fn is_valid_pi_target(target: &str) -> bool {
diff --git a/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs b/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs
index 5a1976c82..ae1b9ad9e 100644
--- a/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs
+++ b/moli-renderer-v8/src/native_bridge/document/detached_objects/mutation.rs
@@ -510,10 +510,12 @@ fn adopt_live_node_as_detached_with_parent<'s>(
native_handle.is_some_and(|(runtime_ptr, handle)| {
crate::custom_elements::preserves_custom_element_identity(runtime_ptr, handle)
});
- let preserve_xhtml_element_interface =
- native_snapshot.is_some() && raw_namespace_uri.as_deref() == Some(XHTML_NS);
+ // Native wrappers already carry the interface selected from their
+ // namespace and local name. An XML owner Document does not turn
+ // SVG, MathML or XHTML elements into generic Elements.
+ let preserve_native_element_interface = native_snapshot.is_some();
if document_kind != "html"
- && !preserve_xhtml_element_interface
+ && !preserve_native_element_interface
&& !preserve_custom_element_identity
{
crate::detached_dom_surface::set_object_prototype(scope, node, "Element");
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document/element_interfaces.rs b/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document/element_interfaces.rs
index cd822269f..e8a0fd9ba 100644
--- a/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document/element_interfaces.rs
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document/element_interfaces.rs
@@ -1,5 +1,15 @@
use super::*;
+#[test]
+fn xml_documents_preserve_native_element_interfaces() {
+ let mut vm = new_parsed_test_vm("https://xml-interfaces.test/", "<html><body></body></html>");
+ assert_eq!(
+ vm.eval(include_str!("xml_element_interfaces.js"))
+ .expect("XML element interface fixture should evaluate"),
+ "true"
+ );
+}
+
#[test]
fn specialized_element_methods_live_on_owner_prototypes() {
let mut vm = new_parsed_test_vm(
diff --git a/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document/xml_element_interfaces.js b/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document/xml_element_interfaces.js
new file mode 100644
index 000000000..cc0116813
--- /dev/null
+++ b/moli-renderer-v8/src/script_vm/tests/dom_elements/live_document/xml_element_interfaces.js
@@ -0,0 +1,24 @@
+(() => {
+ const check = (value, message) => { if (!value) throw new Error(message); };
+ const source = '<root xmlns:s="http://www.w3.org/2000/svg" xmlns:m="http://www.w3.org/1998/Math/MathML" xmlns:h="http://www.w3.org/1999/xhtml">' +
+ '<s:rect/><s:g/><s:unknown/><m:math/><m:mrow/><h:a/><plain/>';
+ const constructors = [SVGRectElement, SVGGElement, SVGElement, MathMLElement, MathMLElement, HTMLAnchorElement, Element];
+ // Cover both eager and lazy native imports of parsed documents.
+ for (const padding of ['', '<filler/>'.repeat(1001)]) {
+ const parsed = new DOMParser().parseFromString(source + padding + '</root>', 'application/xml');
+ for (const doc of [parsed, parsed.cloneNode(true)]) {
+ for (const [index, Constructor] of constructors.entries()) {
+ const child = doc.documentElement.children[index];
+ for (const element of [child, child.cloneNode(), document.importNode(child)]) {
+ check(Object.getPrototypeOf(element) === Constructor.prototype, Constructor.name + ' native prototype');
+ check(Object.prototype.toString.call(element) === '[object ' + Constructor.name + ']', Constructor.name + ' native tag');
+ }
+ }
+ const rect = doc.documentElement.firstElementChild;
+ const target = document.implementation.createDocument(null, 'target');
+ target.adoptNode(rect);
+ check(rect instanceof SVGRectElement && rect.ownerDocument === target, 'adoption preserves native interface');
+ }
+ }
+ return true;
+})()